From 226d81344987c9adb92a272cd086c4d5f8d7e9a6 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Sun, 4 May 2025 15:03:00 +0800 Subject: [PATCH 1/7] =?UTF-8?q?style:=20=E7=A7=BB=E9=99=A4=E4=B8=8D?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E7=9A=84=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BootstrapBlazor/Components/Tab/Tab.razor.scss | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/BootstrapBlazor/Components/Tab/Tab.razor.scss b/src/BootstrapBlazor/Components/Tab/Tab.razor.scss index 55c3799230f..915da74b3e5 100644 --- a/src/BootstrapBlazor/Components/Tab/Tab.razor.scss +++ b/src/BootstrapBlazor/Components/Tab/Tab.razor.scss @@ -36,11 +36,6 @@ .tabs-body-content { background-color: var(--bs-body-bg); - - &.bb-fs-open { - padding: var(--bb-tabs-body-padding); - overflow: auto; - } } } From 4116d5ca8cdae3da078b956d6e34b2a599779af3 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Sun, 4 May 2025 15:03:22 +0800 Subject: [PATCH 2/7] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=20fullscreenchan?= =?UTF-8?q?ge=20=E7=8A=B6=E6=80=81=E7=9B=91=E6=8E=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BootstrapBlazor/wwwroot/modules/fullscreen.js | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/BootstrapBlazor/wwwroot/modules/fullscreen.js b/src/BootstrapBlazor/wwwroot/modules/fullscreen.js index 8775531a88b..44a884a5429 100644 --- a/src/BootstrapBlazor/wwwroot/modules/fullscreen.js +++ b/src/BootstrapBlazor/wwwroot/modules/fullscreen.js @@ -1,6 +1,16 @@ -import { isElement } from "./utility.js" +import { isElement, registerBootstrapBlazorModule } from "./utility.js" +import EventHandler from "./event-handler.js" export async function toggle(options) { + registerBootstrapBlazorModule("FullScreen", null, () => { + EventHandler.on(document, "fullscreenchange", () => { + if (document.fullscreenElement === null) { + [...document.querySelectorAll('.bb-fs-open')].forEach(el => { + el.classList.remove('bb-fs-open'); + }) + } + }); + }) let el = null; options = options || {}; if (options.id) { From f768e6f632afc1a11b29bc5cb49307e669b2f574 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Sun, 4 May 2025 15:19:28 +0800 Subject: [PATCH 3/7] =?UTF-8?q?refactor:=20=E7=B2=BE=E7=AE=80=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wwwroot/modules/fullscreen.js | 26 +------------------ 1 file changed, 1 insertion(+), 25 deletions(-) diff --git a/src/BootstrapBlazor/wwwroot/modules/fullscreen.js b/src/BootstrapBlazor/wwwroot/modules/fullscreen.js index 44a884a5429..addbca44456 100644 --- a/src/BootstrapBlazor/wwwroot/modules/fullscreen.js +++ b/src/BootstrapBlazor/wwwroot/modules/fullscreen.js @@ -1,16 +1,6 @@ -import { isElement, registerBootstrapBlazorModule } from "./utility.js" -import EventHandler from "./event-handler.js" +import { isElement } from "./utility.js" export async function toggle(options) { - registerBootstrapBlazorModule("FullScreen", null, () => { - EventHandler.on(document, "fullscreenchange", () => { - if (document.fullscreenElement === null) { - [...document.querySelectorAll('.bb-fs-open')].forEach(el => { - el.classList.remove('bb-fs-open'); - }) - } - }); - }) let el = null; options = options || {}; if (options.id) { @@ -35,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 = () => { From 952450fde72380e39710b122bae406313d707d6b Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Sun, 4 May 2025 15:19:41 +0800 Subject: [PATCH 4/7] =?UTF-8?q?refactor:=20=E9=87=8D=E6=9E=84=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FullScreen/FullScreenButton.razor.scss | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/BootstrapBlazor/Components/FullScreen/FullScreenButton.razor.scss b/src/BootstrapBlazor/Components/FullScreen/FullScreenButton.razor.scss index 3d12b68bd97..db5692c7a8f 100644 --- a/src/BootstrapBlazor/Components/FullScreen/FullScreenButton.razor.scss +++ b/src/BootstrapBlazor/Components/FullScreen/FullScreenButton.razor.scss @@ -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; + } +} From 7a84864b24523ce93eb0deff60b224dcd2ecb53a Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Sun, 4 May 2025 15:19:48 +0800 Subject: [PATCH 5/7] =?UTF-8?q?doc:=20=E6=9B=B4=E6=96=B0=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Components/FullScreen/FullScreenButton.razor.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/BootstrapBlazor/Components/FullScreen/FullScreenButton.razor.cs b/src/BootstrapBlazor/Components/FullScreen/FullScreenButton.razor.cs index 41484efee98..6425e54b2d5 100644 --- a/src/BootstrapBlazor/Components/FullScreen/FullScreenButton.razor.cs +++ b/src/BootstrapBlazor/Components/FullScreen/FullScreenButton.razor.cs @@ -14,7 +14,7 @@ public partial class FullScreenButton /// 获得/设置 退出全屏图标 默认 fa-solid fa-maximize /// [Parameter] - [Obsolete("已启用，请使用 Icon 参数 Please use Icon parameter")] + [Obsolete("已弃用，请使用 Icon 参数；Deprecated. Please use Icon parameter")] [ExcludeFromCodeCoverage] public string? FullScreenIcon { get => FullScreenExitIcon; set => FullScreenExitIcon = value; } From 0aebb99b52622c83ee2859c6fda2961f90559271 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Sun, 4 May 2025 15:23:55 +0800 Subject: [PATCH 6/7] chore: bump version 9.6.1-beta03 --- src/BootstrapBlazor/BootstrapBlazor.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/BootstrapBlazor/BootstrapBlazor.csproj b/src/BootstrapBlazor/BootstrapBlazor.csproj index 0e6eb0e364b..d7b84e4d7b4 100644 --- a/src/BootstrapBlazor/BootstrapBlazor.csproj +++ b/src/BootstrapBlazor/BootstrapBlazor.csproj @@ -1,7 +1,7 @@  - 9.6.1-beta01 + 9.6.1-beta03 From f8162d8191c946b6d1c1cc7ef1503862dbdcce90 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Sun, 4 May 2025 15:26:23 +0800 Subject: [PATCH 7/7] chore: bump version 9.6.1-beta02 Co-Authored-By: WarriorBlue <15247822+warriorblue@users.noreply.github.com> --- src/BootstrapBlazor/BootstrapBlazor.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/BootstrapBlazor/BootstrapBlazor.csproj b/src/BootstrapBlazor/BootstrapBlazor.csproj index d7b84e4d7b4..1a7f7ef8660 100644 --- a/src/BootstrapBlazor/BootstrapBlazor.csproj +++ b/src/BootstrapBlazor/BootstrapBlazor.csproj @@ -1,7 +1,7 @@  - 9.6.1-beta03 + 9.6.1-beta02