From ce89c7a88f6f5901268fd1a4a98e9e61010b877a Mon Sep 17 00:00:00 2001 From: masumulu28 Date: Fri, 17 Mar 2023 14:07:06 +0300 Subject: [PATCH 1/4] keyboard options checked for close modal --- .../theme-shared/src/lib/components/modal/modal.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/modal/modal.component.ts b/npm/ng-packs/packages/theme-shared/src/lib/components/modal/modal.component.ts index 6c1027c66f..ebb0515a08 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/components/modal/modal.component.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/components/modal/modal.component.ts @@ -196,7 +196,7 @@ export class ModalComponent implements OnInit, OnDestroy, DismissableModal { .pipe( takeUntil(this.destroy$), debounceTime(150), - filter((key: KeyboardEvent) => key && key.key === 'Escape'), + filter((key: KeyboardEvent) => key && key.key === 'Escape' && this.options.keyboard), ) .subscribe(() => this.close()); } From b0f1789d5bb40506db2214069ae362cc32e4b335 Mon Sep 17 00:00:00 2001 From: masumulu28 Date: Fri, 17 Mar 2023 14:18:06 +0300 Subject: [PATCH 2/4] modal test updated --- .../theme-shared/src/lib/tests/modal.component.spec.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/npm/ng-packs/packages/theme-shared/src/lib/tests/modal.component.spec.ts b/npm/ng-packs/packages/theme-shared/src/lib/tests/modal.component.spec.ts index a875eb27c7..e89b1b2bb4 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/tests/modal.component.spec.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/tests/modal.component.spec.ts @@ -158,8 +158,9 @@ describe('ModalComponent', () => { spectator.dispatchKeyboardEvent(spectator.component.modalWindowRef, 'keyup', 'Escape'); await wait300ms(); + const { keyboard } = spectator.component.options; - expect(spectator.component.visible).toBe(false); + expect(spectator.component.visible).toBe(!keyboard); }); it('should not close when busy is true', async () => { From bbbb2f80191b59a009a63daad279e55838f72543 Mon Sep 17 00:00:00 2001 From: maliming Date: Mon, 20 Mar 2023 16:17:50 +0800 Subject: [PATCH 3/4] Compatible with `ExtraProperties`. Resolve #16006 --- .../bootstrap/dom-event-handlers.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/bootstrap/dom-event-handlers.js b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/bootstrap/dom-event-handlers.js index 009c32d253..2c8eb0e112 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/bootstrap/dom-event-handlers.js +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/bootstrap/dom-event-handlers.js @@ -87,6 +87,9 @@ } var name = $(this).attr("name"); var selectedTextInputName = name + "_Text"; + if(name.indexOf(".ExtraProperties[") > 0) { + selectedTextInputName = name.substring(0, name.length - 1) + "_Text]" + } var selectedTextInput = $('', { type: 'hidden', id: selectedTextInputName, From 0a05b72863ae82746267f724513cbd7f35c969aa Mon Sep 17 00:00:00 2001 From: maliming Date: Mon, 20 Mar 2023 16:50:38 +0800 Subject: [PATCH 4/4] Update dom-event-handlers.js --- .../bootstrap/dom-event-handlers.js | 1 + 1 file changed, 1 insertion(+) diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/bootstrap/dom-event-handlers.js b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/bootstrap/dom-event-handlers.js index fc8070fcf4..7f469e9179 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/bootstrap/dom-event-handlers.js +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/bootstrap/dom-event-handlers.js @@ -96,6 +96,7 @@ if(name.indexOf(".ExtraProperties[") > 0) { selectedTextInputName = name.substring(0, name.length - 1) + "_Text]" } + let selectedTextInput = $('', { type: 'hidden', id: selectedTextInputName, name: selectedTextInputName,