Skip to content

Commit

Permalink
Add SynchronizationContextTimerProvider
Browse files Browse the repository at this point in the history
  • Loading branch information
neuecc committed Mar 3, 2024
1 parent 235b8b2 commit 2f21e01
Show file tree
Hide file tree
Showing 23 changed files with 697 additions and 0 deletions.
19 changes: 19 additions & 0 deletions R3.sln
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "R3.WinUI3", "src\R3.WinUI3\
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WinUI3App1", "sandbox\WinUI3App1\WinUI3App1.csproj", "{CDC17599-81AD-44B9-B4E5-38241147CDA2}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BlazorApp1", "sandbox\BlazorApp1\BlazorApp1.csproj", "{F55F3891-FD11-4C69-9DB6-0CC24B591F59}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -397,6 +399,22 @@ Global
{CDC17599-81AD-44B9-B4E5-38241147CDA2}.Release|x86.ActiveCfg = Release|x86
{CDC17599-81AD-44B9-B4E5-38241147CDA2}.Release|x86.Build.0 = Release|x86
{CDC17599-81AD-44B9-B4E5-38241147CDA2}.Release|x86.Deploy.0 = Release|x86
{F55F3891-FD11-4C69-9DB6-0CC24B591F59}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F55F3891-FD11-4C69-9DB6-0CC24B591F59}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F55F3891-FD11-4C69-9DB6-0CC24B591F59}.Debug|ARM64.ActiveCfg = Debug|Any CPU
{F55F3891-FD11-4C69-9DB6-0CC24B591F59}.Debug|ARM64.Build.0 = Debug|Any CPU
{F55F3891-FD11-4C69-9DB6-0CC24B591F59}.Debug|x64.ActiveCfg = Debug|Any CPU
{F55F3891-FD11-4C69-9DB6-0CC24B591F59}.Debug|x64.Build.0 = Debug|Any CPU
{F55F3891-FD11-4C69-9DB6-0CC24B591F59}.Debug|x86.ActiveCfg = Debug|Any CPU
{F55F3891-FD11-4C69-9DB6-0CC24B591F59}.Debug|x86.Build.0 = Debug|Any CPU
{F55F3891-FD11-4C69-9DB6-0CC24B591F59}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F55F3891-FD11-4C69-9DB6-0CC24B591F59}.Release|Any CPU.Build.0 = Release|Any CPU
{F55F3891-FD11-4C69-9DB6-0CC24B591F59}.Release|ARM64.ActiveCfg = Release|Any CPU
{F55F3891-FD11-4C69-9DB6-0CC24B591F59}.Release|ARM64.Build.0 = Release|Any CPU
{F55F3891-FD11-4C69-9DB6-0CC24B591F59}.Release|x64.ActiveCfg = Release|Any CPU
{F55F3891-FD11-4C69-9DB6-0CC24B591F59}.Release|x64.Build.0 = Release|Any CPU
{F55F3891-FD11-4C69-9DB6-0CC24B591F59}.Release|x86.ActiveCfg = Release|Any CPU
{F55F3891-FD11-4C69-9DB6-0CC24B591F59}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -422,6 +440,7 @@ Global
{D754069D-C912-4D71-97CB-9B2DDD2380B4} = {9FA6D327-728B-4436-AE3A-9E46D8FEF591}
{87F12DBB-E32B-49B8-B5F1-5B53B711989B} = {9FA6D327-728B-4436-AE3A-9E46D8FEF591}
{CDC17599-81AD-44B9-B4E5-38241147CDA2} = {FAB2137C-1DBA-4F2F-8E22-DF3521C9B365}
{F55F3891-FD11-4C69-9DB6-0CC24B591F59} = {FAB2137C-1DBA-4F2F-8E22-DF3521C9B365}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {84B77761-6B9E-46BA-B132-6C77B0B6E4FA}
Expand Down
13 changes: 13 additions & 0 deletions sandbox/BlazorApp1/BlazorApp1.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\src\R3\R3.csproj" />
</ItemGroup>

</Project>
20 changes: 20 additions & 0 deletions sandbox/BlazorApp1/Components/App.razor
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<!DOCTYPE html>
<html lang="en">

<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<base href="/" />
<link rel="stylesheet" href="bootstrap/bootstrap.min.css" />
<link rel="stylesheet" href="app.css" />
<link rel="stylesheet" href="BlazorApp1.styles.css" />
<link rel="icon" type="image/png" href="favicon.png" />
<HeadOutlet />
</head>

<body>
<Routes />
<script src="_framework/blazor.web.js"></script>
</body>

</html>
23 changes: 23 additions & 0 deletions sandbox/BlazorApp1/Components/Layout/MainLayout.razor
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
@inherits LayoutComponentBase

<div class="page">
<div class="sidebar">
<NavMenu />
</div>

<main>
<div class="top-row px-4">
<a href="https://learn.microsoft.com/aspnet/core/" target="_blank">About</a>
</div>

<article class="content px-4">
@Body
</article>
</main>
</div>

<div id="blazor-error-ui">
An unhandled error has occurred.
<a href="" class="reload">Reload</a>
<a class="dismiss">🗙</a>
</div>
96 changes: 96 additions & 0 deletions sandbox/BlazorApp1/Components/Layout/MainLayout.razor.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
.page {
position: relative;
display: flex;
flex-direction: column;
}

main {
flex: 1;
}

.sidebar {
background-image: linear-gradient(180deg, rgb(5, 39, 103) 0%, #3a0647 70%);
}

.top-row {
background-color: #f7f7f7;
border-bottom: 1px solid #d6d5d5;
justify-content: flex-end;
height: 3.5rem;
display: flex;
align-items: center;
}

.top-row ::deep a, .top-row ::deep .btn-link {
white-space: nowrap;
margin-left: 1.5rem;
text-decoration: none;
}

.top-row ::deep a:hover, .top-row ::deep .btn-link:hover {
text-decoration: underline;
}

.top-row ::deep a:first-child {
overflow: hidden;
text-overflow: ellipsis;
}

@media (max-width: 640.98px) {
.top-row {
justify-content: space-between;
}

.top-row ::deep a, .top-row ::deep .btn-link {
margin-left: 0;
}
}

@media (min-width: 641px) {
.page {
flex-direction: row;
}

.sidebar {
width: 250px;
height: 100vh;
position: sticky;
top: 0;
}

.top-row {
position: sticky;
top: 0;
z-index: 1;
}

.top-row.auth ::deep a:first-child {
flex: 1;
text-align: right;
width: 0;
}

.top-row, article {
padding-left: 2rem !important;
padding-right: 1.5rem !important;
}
}

#blazor-error-ui {
background: lightyellow;
bottom: 0;
box-shadow: 0 -1px 2px rgba(0, 0, 0, 0.2);
display: none;
left: 0;
padding: 0.6rem 1.25rem 0.7rem 1.25rem;
position: fixed;
width: 100%;
z-index: 1000;
}

#blazor-error-ui .dismiss {
cursor: pointer;
position: absolute;
right: 0.75rem;
top: 0.5rem;
}
30 changes: 30 additions & 0 deletions sandbox/BlazorApp1/Components/Layout/NavMenu.razor
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<div class="top-row ps-3 navbar navbar-dark">
<div class="container-fluid">
<a class="navbar-brand" href="">BlazorApp1</a>
</div>
</div>

<input type="checkbox" title="Navigation menu" class="navbar-toggler" />

<div class="nav-scrollable" onclick="document.querySelector('.navbar-toggler').click()">
<nav class="flex-column">
<div class="nav-item px-3">
<NavLink class="nav-link" href="" Match="NavLinkMatch.All">
<span class="bi bi-house-door-fill-nav-menu" aria-hidden="true"></span> Home
</NavLink>
</div>

<div class="nav-item px-3">
<NavLink class="nav-link" href="counter">
<span class="bi bi-plus-square-fill-nav-menu" aria-hidden="true"></span> Counter
</NavLink>
</div>

<div class="nav-item px-3">
<NavLink class="nav-link" href="weather">
<span class="bi bi-list-nested-nav-menu" aria-hidden="true"></span> Weather
</NavLink>
</div>
</nav>
</div>

105 changes: 105 additions & 0 deletions sandbox/BlazorApp1/Components/Layout/NavMenu.razor.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
.navbar-toggler {
appearance: none;
cursor: pointer;
width: 3.5rem;
height: 2.5rem;
color: white;
position: absolute;
top: 0.5rem;
right: 1rem;
border: 1px solid rgba(255, 255, 255, 0.1);
background: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 30 30'%3e%3cpath stroke='rgba%28255, 255, 255, 0.55%29' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/%3e%3c/svg%3e") no-repeat center/1.75rem rgba(255, 255, 255, 0.1);
}

.navbar-toggler:checked {
background-color: rgba(255, 255, 255, 0.5);
}

.top-row {
height: 3.5rem;
background-color: rgba(0,0,0,0.4);
}

.navbar-brand {
font-size: 1.1rem;
}

.bi {
display: inline-block;
position: relative;
width: 1.25rem;
height: 1.25rem;
margin-right: 0.75rem;
top: -1px;
background-size: cover;
}

.bi-house-door-fill-nav-menu {
background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='white' class='bi bi-house-door-fill' viewBox='0 0 16 16'%3E%3Cpath d='M6.5 14.5v-3.505c0-.245.25-.495.5-.495h2c.25 0 .5.25.5.5v3.5a.5.5 0 0 0 .5.5h4a.5.5 0 0 0 .5-.5v-7a.5.5 0 0 0-.146-.354L13 5.793V2.5a.5.5 0 0 0-.5-.5h-1a.5.5 0 0 0-.5.5v1.293L8.354 1.146a.5.5 0 0 0-.708 0l-6 6A.5.5 0 0 0 1.5 7.5v7a.5.5 0 0 0 .5.5h4a.5.5 0 0 0 .5-.5Z'/%3E%3C/svg%3E");
}

.bi-plus-square-fill-nav-menu {
background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='white' class='bi bi-plus-square-fill' viewBox='0 0 16 16'%3E%3Cpath d='M2 0a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2H2zm6.5 4.5v3h3a.5.5 0 0 1 0 1h-3v3a.5.5 0 0 1-1 0v-3h-3a.5.5 0 0 1 0-1h3v-3a.5.5 0 0 1 1 0z'/%3E%3C/svg%3E");
}

.bi-list-nested-nav-menu {
background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='white' class='bi bi-list-nested' viewBox='0 0 16 16'%3E%3Cpath fill-rule='evenodd' d='M4.5 11.5A.5.5 0 0 1 5 11h10a.5.5 0 0 1 0 1H5a.5.5 0 0 1-.5-.5zm-2-4A.5.5 0 0 1 3 7h10a.5.5 0 0 1 0 1H3a.5.5 0 0 1-.5-.5zm-2-4A.5.5 0 0 1 1 3h10a.5.5 0 0 1 0 1H1a.5.5 0 0 1-.5-.5z'/%3E%3C/svg%3E");
}

.nav-item {
font-size: 0.9rem;
padding-bottom: 0.5rem;
}

.nav-item:first-of-type {
padding-top: 1rem;
}

.nav-item:last-of-type {
padding-bottom: 1rem;
}

.nav-item ::deep .nav-link {
color: #d7d7d7;
background: none;
border: none;
border-radius: 4px;
height: 3rem;
display: flex;
align-items: center;
line-height: 3rem;
width: 100%;
}

.nav-item ::deep a.active {
background-color: rgba(255,255,255,0.37);
color: white;
}

.nav-item ::deep .nav-link:hover {
background-color: rgba(255,255,255,0.1);
color: white;
}

.nav-scrollable {
display: none;
}

.navbar-toggler:checked ~ .nav-scrollable {
display: block;
}

@media (min-width: 641px) {
.navbar-toggler {
display: none;
}

.nav-scrollable {
/* Never collapse the sidebar for wide screens */
display: block;

/* Allow sidebar to scroll for tall menus */
height: calc(100vh - 3.5rem);
overflow-y: auto;
}
}
20 changes: 20 additions & 0 deletions sandbox/BlazorApp1/Components/Pages/Counter.razor
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
@page "/counter"
@rendermode InteractiveServer
@using System.Threading;

<PageTitle>Counter</PageTitle>

<h1>Counter</h1>

<p role="status">Current count: @currentCount</p>

@* <button class="btn btn-primary" @onclick="IncrementCount">Click me</button> *@

@code {
// private int currentCount = 0;
// private void IncrementCount()
// {
// currentCount++;
// }
}
30 changes: 30 additions & 0 deletions sandbox/BlazorApp1/Components/Pages/Counter.razor.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
using Microsoft.AspNetCore.Components;
using R3;

namespace BlazorApp1.Components.Pages;

public partial class Counter : IDisposable
{
int currentCount = 0;
IDisposable? subscription;

// Inject R3 Custom TimeProvider
// builder.Services.AddScoped<TimeProvider>(_ => new SynchronizationContextTimerProvider())
[Inject]
public required TimeProvider TimeProvider { get; init; }

protected override void OnInitialized()
{
subscription = Observable.Interval(TimeSpan.FromSeconds(1), TimeProvider)
.Subscribe(_ =>
{
currentCount++;
StateHasChanged();
});
}

public void Dispose()
{
subscription?.Dispose();
}
}
Loading

0 comments on commit 2f21e01

Please sign in to comment.