@elderbyte/ngx-starter 20.9.0 → 20.9.1

package/fesm2022/elderbyte-ngx-starter.mjs

@@ -16816,14 +16816,7 @@ class ElderTableRowDirective {
         this.entity$ = toObservable(this.entity);
         if (activationModel) {
             this.enableRowFocus(true);
-            this.activationModel.itemActivationEvents.subscribe({
-                next: (event) => this.handleActivationEvent(event),
-            });
         }
-        effect(() => {
-            const entity = this.entity();
-            this.updateRowActivation();
-        });
     }
     /***************************************************************************
      *                                                                         *
@@ -16832,6 +16825,18 @@ class ElderTableRowDirective {
      **************************************************************************/
     ngOnInit() {
         this.bindHighlightSelection();
+        if (this.activationModel) {
+            // Delay subscription to ngOnInit to ensure that the entity input is available.
+            this.activationModel.itemActivationEvents
+                .pipe(takeUntilDestroyed(this.destroyRef))
+                .subscribe({
+                next: (event) => this.handleActivationEvent(event, this.entity()),
+            });
+        }
+        // Delay subscription to ngOnInit to ensure that the entity input is available.
+        this.entity$.pipe(takeUntilDestroyed(this.destroyRef)).subscribe({
+            next: (entity) => this.updateRowActivation(entity),
+        });
     }
     bindHighlightSelection() {
         this.highlightSelection$
@@ -16904,34 +16909,33 @@ class ElderTableRowDirective {
      * Private methods                                                         *
      *                                                                         *
      **************************************************************************/
-    handleActivationEvent(event) {
-        const activated = this.updateRowActivation();
+    handleActivationEvent(event, entity) {
+        const activated = this.updateRowActivation(entity);
         if (activated) {
             if (!this.hasFocus) {
                 this.bringToView();
             }
         }
         if (event.focus) {
-            if (this.isItemActive()) {
+            if (this.isItemActive(entity)) {
                 this.focus();
             }
         }
     }
-    isItemActive() {
+    isItemActive(entity) {
         if (this.activationModel) {
-            const entity = untracked(this.entity);
             if (entity) {
                 return this.activationModel.isItemActive(entity);
             }
         }
         return false;
     }
-    updateRowActivation() {
-        if (this.isItemActive()) {
+    updateRowActivation(entity) {
+        if (this.isItemActive(entity)) {
             if (!this.activated) {
                 this.activated = true;
                 this.logger.debug('Activated row: ', {
-                    entity: untracked(this.entity),
+                    entity: entity,
                     activeItem: this.activationModel.activeItem,
                     row: this,
                 });