Skip to content

bug(FullScreenService): sync fullscreen state with esc key event #5961

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 8 commits into from
May 4, 2025
Merged

bug(FullScreenService): sync fullscreen state with esc key event #5961

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
226d813
style: 移除不使用的样式
ArgoZhang May 4, 2025
4116d5c
feat: 增加 fullscreenchange 状态监控
ArgoZhang May 4, 2025
f768e6f
refactor: 精简代码
ArgoZhang May 4, 2025
952450f
refactor: 重构样式
ArgoZhang May 4, 2025
7a84864
doc: 更新文档
ArgoZhang May 4, 2025
0aebb99
chore: bump version 9.6.1-beta03
ArgoZhang May 4, 2025
39b181b
Merge branch 'chore-fs' into fix-fs
ArgoZhang May 4, 2025
f8162d8
chore: bump version 9.6.1-beta02
ArgoZhang May 4, 2025
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
2 changes: 1 addition & 1 deletion src/BootstrapBlazor/BootstrapBlazor.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">

<PropertyGroup>
<Version>9.6.1-beta01</Version>
<Version>9.6.1-beta02</Version>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/BootstrapBlazor/Components/FullScreen/FullScreenButton.razor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public partial class FullScreenButton
/// 获得/设置 退出全屏图标 默认 fa-solid fa-maximize
/// </summary>
[Parameter]
[Obsolete("已启用，请使用 Icon 参数 Please use Icon parameter")]
[Obsolete("已弃用，请使用 Icon 参数；Deprecated. Please use Icon parameter")]
[ExcludeFromCodeCoverage]
public string? FullScreenIcon { get => FullScreenExitIcon; set => FullScreenExitIcon = value; }

Expand Down
15 changes: 12 additions & 3 deletions src/BootstrapBlazor/Components/FullScreen/FullScreenButton.razor.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,17 @@
.bb-fs-on,
.bb-fs-open .bb-fs-off {
.bb-fs-on {
display: none;
}

.bb-fs-open .bb-fs-on {
.bb-fs-off {
display: inline-block;
}

:not(:root):fullscreen {
.bb-fs-on {
display: inline-block;
}

.bb-fs-off {
display: none;
}
}
5 changes: 0 additions & 5 deletions src/BootstrapBlazor/Components/Tab/Tab.razor.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,6 @@

.tabs-body-content {
background-color: var(--bs-body-bg);

&.bb-fs-open {
padding: var(--bb-tabs-body-padding);
overflow: auto;
}
}
}

Expand Down
14 changes: 0 additions & 14 deletions src/BootstrapBlazor/wwwroot/modules/fullscreen.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,24 +25,10 @@ export async function toggle(options) {

const enterFullscreen = async el => {
await el.requestFullscreen();

updateFullscreenState(el);
}

const exitFullscreen = async el => {
await document.exitFullscreen()

updateFullscreenState(el);
}

const updateFullscreenState = el => {
if (isFullscreen()) {
el.classList.add('bb-fs-open')
}
else {
el.classList.remove('bb-fs-open');
document.documentElement.classList.remove('bb-fs-open');
}
}

const isFullscreen = () => {
Expand Down