Skip to content

[Blazor] Some of the default UI styling is not accessible in dark mode #57142

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Aug 5, 2024
Merged

[Blazor] Some of the default UI styling is not accessible in dark mode #57142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
60ff58e
Fix npm workspace
javiercn Jul 30, 2024
c8a4010
Improve dark mode for Blazor templates and built-ins
javiercn Aug 2, 2024
c88cdc9
Fixes
javiercn Aug 2, 2024
42931f3
Fixes
javiercn Aug 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions eng/Npm.Workspace.nodeproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,14 @@

<Target Name="Build">
<PropertyGroup>
<PackageVersion>$(VersionPrefix)$(VersionSuffix)</PackageVersion>
<PackageVersion>$(VersionPrefix)</PackageVersion>
<PackageVersion Condition="'$(VersionSuffix)' != ''">$(VersionPrefix)-$(VersionSuffix)</PackageVersion>
</PropertyGroup>
<MakeDir Directories="$(IntermediateOutputPath)" Condition="!Exists('$(IntermediateOutputPath)')" />

<Message Text="Building NPM packages..." Importance="high" />

<Exec
<Exec Condition="'$(ContinuousIntegrationBuild)' == 'true'"
Command="node $(MSBuildThisFileDirectory)scripts/npm/pack-workspace.mjs --update-versions $(RepoRoot)package.json $(PackageVersion) $(PackageOutputPath) $(IntermediateOutputPath)"
EnvironmentVariables="$(_NpmAdditionalEnvironmentVariables)" />

Expand All @@ -52,7 +53,8 @@

<Target Name="Pack">
<PropertyGroup>
<PackageVersion>$(VersionPrefix)$(VersionSuffix)</PackageVersion>
<PackageVersion>$(VersionPrefix)</PackageVersion>
<PackageVersion Condition="'$(VersionSuffix)' != ''">$(VersionPrefix)-$(VersionSuffix)</PackageVersion>
</PropertyGroup>
<Message Text="Packing NPM packages..." Importance="high" />
<MakeDir Directories="$(PackageOutputPath)" Condition="!Exists('$(PackageOutputPath)')" />
Expand Down
2 changes: 1 addition & 1 deletion src/Components/Web.JS/dist/Release/blazor.server.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/Components/Web.JS/dist/Release/blazor.web.js
View file
Open in desktop

Large diffs are not rendered by default.

23 changes: 13 additions & 10 deletions src/Components/Web.JS/src/Platform/Circuits/DefaultReconnectDisplay.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ export class DefaultReconnectDisplay implements ReconnectDisplay {

overlay: HTMLDivElement;

host: HTMLDivElement;

dialog: HTMLDivElement;

rejoiningAnimation: HTMLDivElement;
Expand All @@ -36,10 +38,15 @@ export class DefaultReconnectDisplay implements ReconnectDisplay {

this.overlay = this.document.createElement('div');
this.overlay.className = DefaultReconnectDisplay.ReconnectOverlayClassName;
this.overlay.id = dialogId;

this.dialog = this.document.createElement('div');
this.host = this.document.createElement('div');
this.host.id = dialogId;

const shadow = this.host.attachShadow({ mode: 'open' });
this.dialog = document.createElement('div');
this.dialog.className = DefaultReconnectDisplay.ReconnectDialogClassName;
shadow.appendChild(this.style);
shadow.appendChild(this.overlay);

this.rejoiningAnimation = document.createElement('div');
this.rejoiningAnimation.className = DefaultReconnectDisplay.RejoiningAnimationClassName;
Expand Down Expand Up @@ -71,18 +78,14 @@ export class DefaultReconnectDisplay implements ReconnectDisplay {
}

show(): void {
if (!this.document.contains(this.overlay)) {
this.document.body.appendChild(this.overlay);
}

if (!this.document.contains(this.style)) {
this.document.body.appendChild(this.style);
if (!this.document.contains(this.host)) {
this.document.body.appendChild(this.host);
}

this.reloadButton.style.display = 'none';
this.rejoiningAnimation.style.display = 'block';
this.status.innerHTML = 'Rejoining the server...';
this.overlay.style.display = 'block';
this.host.style.display = 'block';
this.overlay.classList.add(DefaultReconnectDisplay.ReconnectVisibleClassName);
}

Expand All @@ -96,7 +99,7 @@ export class DefaultReconnectDisplay implements ReconnectDisplay {
}

hide(): void {
this.overlay.style.display = 'none';
this.host.style.display = 'none';
this.overlay.classList.remove(DefaultReconnectDisplay.ReconnectVisibleClassName);
}

Expand Down