fix #1275

V4Fire · Jun 26, 2024 · dffd83b · dffd83b
1 parent 316e455
commit dffd83b
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,13 @@ Changelog
 
 _Note: Gaps between patch versions are faulty, broken or test releases._
 
+## v4.0.0-beta.?? (2024-06-??)
+
+#### :bug: Bug Fix
+
+* Fix hookChange event processing for activate/deactivate component `core/component/init`
+* Fix hookChange event should not bubble `bDynamicPage`
+
 ## v4.0.0-beta.106 (2024-06-25)
 
 #### :bug: Bug Fix

diff --git a/src/components/base/b-dynamic-page/CHANGELOG.md b/src/components/base/b-dynamic-page/CHANGELOG.md
@@ -9,6 +9,12 @@ Changelog
 > - :house: [Internal]
 > - :nail_care: [Polish]
 
+## v4.0.0-beta.?? (2024-06-??)
+
+#### :bug: Bug Fix
+
+* Fix hookChange event should not bubble
+
 ## v4.0.0-beta.98 (2024-05-21)
 
 #### :bug: Bug Fix

diff --git a/src/components/base/b-dynamic-page/b-dynamic-page.ts b/src/components/base/b-dynamic-page/b-dynamic-page.ts
@@ -301,8 +301,8 @@ export default class bDynamicPage extends iDynamicPage {
  return component.reload(params);
  }
 
- override canSelfDispatchEvent(_: string): boolean {
- return true;
+ override canSelfDispatchEvent(event: string): boolean {
+ return !/^(?:hook)(?::\w+(-\w+)*|-change)$/.test(event.dasherize());
  }
 
  /**

diff --git a/src/core/component/init/CHANGELOG.md b/src/core/component/init/CHANGELOG.md
@@ -9,6 +9,12 @@ Changelog
 > - :house: [Internal]
 > - :nail_care: [Polish]
 
+## v4.0.0-beta.?? (2024-06-??)
+
+#### :bug: Bug Fix
+
+* Fix hookChange event processing for activate/deactivate component
+
 ## v4.0.0-beta.91 (2024-04-19)
 
 #### :rocket: New Feature

diff --git a/src/core/component/init/states/created.ts b/src/core/component/init/states/created.ts
@@ -94,8 +94,8 @@ export function createdState(component: ComponentInterface): void {
  onActivation(normalParent.hook);
  }
 
- normalParent.$on('on-hook-change', onActivation);
- $a.worker(() => normalParent.$off('on-hook-change', onActivation));
+ normalParent.$on('onHookChange', onActivation);
+ $a.worker(() => normalParent.$off('onHookChange', onActivation));
  }
  }