From 49aee1a71bfdd2f66e500f7a38b00886752792f8 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Sat, 8 Mar 2025 12:45:15 +0800 Subject: [PATCH 1/5] refactor: update ??= to ||= --- src/BootstrapBlazor/Components/Typed/Typed.razor.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/BootstrapBlazor/Components/Typed/Typed.razor.js b/src/BootstrapBlazor/Components/Typed/Typed.razor.js index 77bdab9eb44..fef645143f6 100644 --- a/src/BootstrapBlazor/Components/Typed/Typed.razor.js +++ b/src/BootstrapBlazor/Components/Typed/Typed.razor.js @@ -2,7 +2,7 @@ import Typed from '../../lib/typedjs/typed.module.js' const getOptions = (text, invoke, options, callbacks) => { - options ??= {}; + options ||= {}; if (text) { options.strings = [text]; From c546bfb613df193f975f857f0777d7786b11ab33 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Sat, 8 Mar 2025 12:51:42 +0800 Subject: [PATCH 2/5] =?UTF-8?q?refactor:=20=E7=A7=BB=E9=99=A4=20=3F=3F=3D?= =?UTF-8?q?=20=E8=A1=A8=E8=BE=BE=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BootstrapBlazor/wwwroot/modules/utility.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/BootstrapBlazor/wwwroot/modules/utility.js b/src/BootstrapBlazor/wwwroot/modules/utility.js index f9da376607f..f0fe3e1cf5f 100644 --- a/src/BootstrapBlazor/wwwroot/modules/utility.js +++ b/src/BootstrapBlazor/wwwroot/modules/utility.js @@ -809,8 +809,8 @@ const deepMerge = (obj1, obj2, skipNull = true) => { } export function registerBootstrapBlazorModule(name, identifier, callback) { - window.BootstrapBlazor ??= {}; - window.BootstrapBlazor[name] ??= { + window.BootstrapBlazor ||= {}; + window.BootstrapBlazor[name] ||= { _init: false, _items: [], register: function (id, cb) { From 5c08e72eb4a8bedf98596224ea9f5caa2467f61a Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Sat, 8 Mar 2025 12:52:04 +0800 Subject: [PATCH 3/5] =?UTF-8?q?refactor:=20=E7=A7=BB=E9=99=A4=20=3F.=20?= =?UTF-8?q?=E8=A1=A8=E8=BE=BE=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DateTimePicker/DateTimePicker.razor.js | 4 +++- .../Components/Table/Table.razor.js | 20 +++++++++++-------- .../wwwroot/modules/fullscreen.js | 5 +++-- 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/src/BootstrapBlazor/Components/DateTimePicker/DateTimePicker.razor.js b/src/BootstrapBlazor/Components/DateTimePicker/DateTimePicker.razor.js index 964cc685568..13d7cfa3603 100644 --- a/src/BootstrapBlazor/Components/DateTimePicker/DateTimePicker.razor.js +++ b/src/BootstrapBlazor/Components/DateTimePicker/DateTimePicker.razor.js @@ -13,7 +13,9 @@ export function init(id, invoke, options) { return el.classList.contains('disabled'); }, hideCallback: () => { - invoke?.invokeMethodAsync(options.triggerHideCallback); + if (invoke) { + invoke.invokeMethodAsync(options.triggerHideCallback); + } } }); const dateTimePicker = { diff --git a/src/BootstrapBlazor/Components/Table/Table.razor.js b/src/BootstrapBlazor/Components/Table/Table.razor.js index 7a2d55c18b3..6be8c44c291 100644 --- a/src/BootstrapBlazor/Components/Table/Table.razor.js +++ b/src/BootstrapBlazor/Components/Table/Table.razor.js @@ -425,18 +425,22 @@ const setExcelKeyboardListener = table => { } } else if (keyCode === KeyCodes.UP_ARROW) { - cells = tr.previousElementSibling?.children; - while (index < cells.length) { - if (activeCell(cells, index)) { - break; + cells = tr.previousElementSibling && tr.previousElementSibling.children; + if (cells) { + while (index < cells.length) { + if (activeCell(cells, index)) { + break; + } } } } else if (keyCode === KeyCodes.DOWN_ARROW) { - cells = tr.nextElementSibling?.children; - while (index < cells.length) { - if (activeCell(cells, index)) { - break; + cells = tr.nextElementSibling && tr.nextElementSibling.children; + if (cells) { + while (index < cells.length) { + if (activeCell(cells, index)) { + break; + } } } } diff --git a/src/BootstrapBlazor/wwwroot/modules/fullscreen.js b/src/BootstrapBlazor/wwwroot/modules/fullscreen.js index 695f772ae85..cd48ab351cf 100644 --- a/src/BootstrapBlazor/wwwroot/modules/fullscreen.js +++ b/src/BootstrapBlazor/wwwroot/modules/fullscreen.js @@ -2,10 +2,11 @@ export async function toggle(options) { let el = null; - if (options?.id) { + options = options || {}; + if (options.id) { el = document.getElementById(options.id); } - else if (options?.element && isElement(options.element)) { + else if (options.element && isElement(options.element)) { el = options.element; } else { From e1c2bd83764dcd7242524a0fef36f6993c619793 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Sat, 8 Mar 2025 13:02:13 +0800 Subject: [PATCH 4/5] =?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 --- src/BootstrapBlazor/wwwroot/modules/fullscreen.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/BootstrapBlazor/wwwroot/modules/fullscreen.js b/src/BootstrapBlazor/wwwroot/modules/fullscreen.js index cd48ab351cf..8775531a88b 100644 --- a/src/BootstrapBlazor/wwwroot/modules/fullscreen.js +++ b/src/BootstrapBlazor/wwwroot/modules/fullscreen.js @@ -6,7 +6,7 @@ export async function toggle(options) { if (options.id) { el = document.getElementById(options.id); } - else if (options.element && isElement(options.element)) { + else if (isElement(options.element)) { el = options.element; } else { From a4d616642f7ccf690714150011c7e7f97b1aa635 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Sat, 8 Mar 2025 13:05:17 +0800 Subject: [PATCH 5/5] =?UTF-8?q?refactor:=20=E9=87=8D=E6=9E=84=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BootstrapBlazor/wwwroot/modules/fullscreen.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/BootstrapBlazor/wwwroot/modules/fullscreen.js b/src/BootstrapBlazor/wwwroot/modules/fullscreen.js index 8775531a88b..d7bb0f555a1 100644 --- a/src/BootstrapBlazor/wwwroot/modules/fullscreen.js +++ b/src/BootstrapBlazor/wwwroot/modules/fullscreen.js @@ -2,7 +2,7 @@ export async function toggle(options) { let el = null; - options = options || {}; + options ||= {}; if (options.id) { el = document.getElementById(options.id); }