@toolbox-web/grid-angular 1.0.0-rc.2 → 1.0.1

package/fesm2022/toolbox-web-grid-angular.mjs

@@ -2644,10 +2644,16 @@ function provideGridIcons(icons) {
  */
 function injectGrid(selector = 'tbw-grid') {
     const elementRef = inject(ElementRef);
+    const destroyRef = inject(DestroyRef);
     // Reactive signals
     const isReady = signal(false, ...(ngDevMode ? [{ debugName: "isReady" }] : /* istanbul ignore next */ []));
     const config = signal(null, ...(ngDevMode ? [{ debugName: "config" }] : /* istanbul ignore next */ []));
     const element = signal(null, ...(ngDevMode ? [{ debugName: "element" }] : /* istanbul ignore next */ []));
+    // Track destruction so async work doesn't touch signals after teardown
+    let destroyed = false;
+    destroyRef.onDestroy(() => {
+        destroyed = true;
+    });
     // Initialize after render
     afterNextRender(() => {
         const gridElement = elementRef.nativeElement.querySelector(selector);
@@ -2656,13 +2662,22 @@ function injectGrid(selector = 'tbw-grid') {
             return;
         }
         element.set(gridElement);
-        // Wait for grid to be ready
-        gridElement.ready?.().then(async () => {
+        // Wait for grid to be ready. Use Promise.resolve to guard against
+        // gridElement.ready being undefined (would otherwise throw on .then).
+        Promise.resolve(gridElement.ready?.())
+            .then(async () => {
+            if (destroyed)
+                return;
             isReady.set(true);
             const effectiveConfig = await gridElement.getConfig?.();
+            if (destroyed)
+                return;
             if (effectiveConfig) {
                 config.set(effectiveConfig);
             }
+        })
+            .catch((err) => {
+            console.error('[injectGrid] Error waiting for grid to be ready:', err);
         });
     });
     // Computed visible columns