@shival99/z-ui 2.0.44 → 2.0.46

package/fesm2022/shival99-z-ui-components-z-table.mjs

@@ -4874,96 +4874,45 @@ class ZTableComponent {
         }
         return !this.hasBodyRowSpan();
     }, ...(ngDevMode ? [{ debugName: "isRowDragEnabled" }] : []));
-    actionColumnInfo = linkedSignal({ ...(ngDevMode ? { debugName: "actionColumnInfo" } : {}), source: () => ({
-            columns: this.zConfig().columns ?? [],
-            isPending: this.isLoading() || this.isProcessing(),
-            rows: this._actionColumnRows(),
-        }),
-        computation: ({ columns, isPending, rows }, previous) => {
-            const findActionColumn = (cols) => {
-                for (const col of cols) {
-                    if (isBodyConfig(col.body)) {
-                        const actionConfig = this._getActionColumnConfig(col.body);
-                        if (actionConfig) {
-                            const actionKeys = Array.isArray(actionConfig.actions)
-                                ? actionConfig.actions.map(action => action.key)
-                                : ['dynamic'];
-                            const schemaKey = JSON.stringify([
-                                col.id,
-                                col.size,
-                                col.minSize,
-                                col.maxSize,
-                                actionConfig.maxVisible ?? Z_TABLE_DEFAULT_MAX_VISIBLE_ACTIONS,
-                                actionKeys,
-                            ]);
-                            return { columnId: col.id, config: actionConfig, schemaKey };
-                        }
-                    }
-                    if (col.columns?.length) {
-                        const found = findActionColumn(col.columns);
-                        if (found) {
-                            return found;
-                        }
+    actionColumnInfo = computed(() => {
+        const columns = this.zConfig().columns ?? [];
+        const findActionColumn = (cols) => {
+            for (const col of cols) {
+                if (isBodyConfig(col.body)) {
+                    const actionConfig = this._getActionColumnConfig(col.body);
+                    if (actionConfig) {
+                        return { columnId: col.id, config: actionConfig };
                     }
                 }
-                return null;
-            };
-            const actionCol = findActionColumn(columns);
-            if (!actionCol) {
-                return null;
-            }
-            const previousValue = previous?.value;
-            if (previousValue?.schemaKey === actionCol.schemaKey && (isPending || rows.length === 0)) {
-                return {
-                    ...previousValue,
-                    config: actionCol.config,
-                };
-            }
-            const { config } = actionCol;
-            const maxVisible = config.maxVisible ?? Z_TABLE_DEFAULT_MAX_VISIBLE_ACTIONS;
-            let buttonCount = 0;
-            for (const row of rows) {
-                const actions = typeof config.actions === 'function' ? config.actions(row) : config.actions;
-                const visibleActions = actions.filter(action => {
-                    if (typeof action.hidden === 'function') {
-                        return !action.hidden(row);
+                if (col.columns?.length) {
+                    const found = findActionColumn(col.columns);
+                    if (found) {
+                        return found;
                     }
-                    return !action.hidden;
-                });
-                const rowButtonCount = visibleActions.length > maxVisible ? 1 : visibleActions.length;
-                buttonCount = Math.max(buttonCount, rowButtonCount);
-                if (buttonCount === maxVisible) {
-                    break;
                 }
             }
-            if (rows.length === 0 && Array.isArray(config.actions)) {
-                const possibleVisibleCount = config.actions.filter(action => action.hidden !== true).length;
-                buttonCount = possibleVisibleCount > maxVisible ? 1 : possibleVisibleCount;
-            }
-            if (rows.length === 0 && typeof config.actions === 'function') {
-                buttonCount = maxVisible;
-            }
-            const buttonWidth = Z_TABLE_DEFAULT_ACTION_BUTTON_WIDTH;
-            const gap = 4;
-            const padding = 16;
-            const width = buttonCount * buttonWidth + Math.max(0, buttonCount - 1) * gap + padding;
-            return {
-                columnId: actionCol.columnId,
-                config: actionCol.config,
-                schemaKey: actionCol.schemaKey,
-                width,
-            };
-        } });
-    _actionColumnRows = computed(() => {
-        const data = this._data();
-        const config = this.zConfig();
-        if (config.mode === 'server' || !config.pagination?.enabled) {
-            return data;
+            return null;
+        };
+        const actionCol = findActionColumn(columns);
+        if (!actionCol) {
+            return null;
         }
-        const { pageIndex, pageSize } = this.pagination();
-        const start = Math.max(0, pageIndex - 1) * pageSize;
-        return data.slice(start, start + pageSize);
-    }, ...(ngDevMode ? [{ debugName: "_actionColumnRows" }] : []));
+        const { config } = actionCol;
+        const maxVisible = config.maxVisible ?? Z_TABLE_DEFAULT_MAX_VISIBLE_ACTIONS;
+        const possibleActionCount = Array.isArray(config.actions)
+            ? config.actions.filter(action => action.hidden !== true).length
+            : maxVisible;
+        const buttonCount = Math.min(possibleActionCount, maxVisible);
+        const buttonWidth = Z_TABLE_DEFAULT_ACTION_BUTTON_WIDTH;
+        const gap = 4;
+        const padding = 16;
+        const width = buttonCount * buttonWidth + Math.max(0, buttonCount - 1) * gap + padding;
+        return {
+            columnId: actionCol.columnId,
+            config: actionCol.config,
+            width,
+        };
+    }, ...(ngDevMode ? [{ debugName: "actionColumnInfo" }] : []));
     _fixedColumnPinning = computed(() => {
         const actionColumnId = this.actionColumnInfo()?.columnId;
         const configuredColumnIds = new Set();
@@ -7105,7 +7054,7 @@ class ZTableComponent {
             showVerticalBorder: this.showVerticalBorder(),
         };
         try {
-            ZCacheService.set(`table-config-${key}`, config);
+            ZCacheService.set(this._getConfigCacheKey(key), config);
         }
         catch (error) {
             console.error('Failed to save table config:', error);
@@ -7134,12 +7083,22 @@ class ZTableComponent {
             return false;
         }
         try {
-            const config = ZCacheService.get(`table-config-${key}`);
+            const cacheKey = this._getConfigCacheKey(key);
+            let config = ZCacheService.get(cacheKey);
+            if (!config) {
+                const legacyCacheKey = `table-config-${key}`;
+                const legacyConfig = ZCacheService.get(legacyCacheKey);
+                if (legacyConfig && this._isColumnConfigValid(legacyConfig.columnInfo)) {
+                    config = legacyConfig;
+                    ZCacheService.set(cacheKey, legacyConfig);
+                    ZCacheService.delete(legacyCacheKey);
+                }
+            }
             if (!config) {
                 return false;
             }
             if (!this._isColumnConfigValid(config.columnInfo)) {
-                ZCacheService.delete(`table-config-${key}`);
+                ZCacheService.delete(cacheKey);
                 return false;
             }
             if (config.columnOrder && config.columnOrder.length > 0) {
@@ -7171,6 +7130,20 @@ class ZTableComponent {
             return false;
         }
     }
+    _getConfigCacheKey(key) {
+        const collectSchema = (columns) => columns.map(column => [
+            column.id,
+            column.accessorKey ?? '',
+            column.columns ? collectSchema(column.columns) : null,
+        ]);
+        const schema = JSON.stringify(collectSchema(this.zConfig().columns ?? []));
+        let fingerprint = 2166136261;
+        for (let index = 0; index < schema.length; index++) {
+            fingerprint ^= schema.charCodeAt(index);
+            fingerprint = Math.imul(fingerprint, 16777619);
+        }
+        return `table-config-${key}-${(fingerprint >>> 0).toString(36)}`;
+    }
     /**
      * Validates cached column info against current config.
      * Returns false if columns have been added/removed/renamed since cache was saved,