twico-ui 1.22.2 → 1.22.3

package/dist/index.mjs

@@ -9340,6 +9340,7 @@ function Datatable({
     }
   };
   const stateReadyRef = React51__default.useRef(false);
+  const stateRestoredRef = React51__default.useRef(false);
   const onStateChangeRef = React51__default.useRef(onStateChange);
   onStateChangeRef.current = onStateChange;
   React51__default.useEffect(() => {
@@ -9355,7 +9356,7 @@ function Datatable({
     }
     return void 0;
   }, [filters, sort, quick, pageVal, sizeVal, order, widths, hidden, pins, density, fWidths, fPanelSize, stateKey]);
-  React51__default.useEffect(() => {
+  const restoreState = () => {
     let saved = null;
     if (stateKey) {
       try {
@@ -9366,8 +9367,22 @@ function Datatable({
     }
     if (!saved && initialState) saved = initialState;
     if (saved) applyState(saved);
-    stateReadyRef.current = true;
+    stateRestoredRef.current = true;
+  };
+  React51__default.useEffect(() => {
+    if (columns.length) {
+      restoreState();
+      stateReadyRef.current = true;
+    }
+    return () => {
+      stateReadyRef.current = false;
+    };
   }, []);
+  React51__default.useEffect(() => {
+    if (stateRestoredRef.current || !columns.length) return;
+    restoreState();
+    stateReadyRef.current = true;
+  }, [columns.length]);
   const rootRef = React51__default.useRef(null);
   const [compact, setCompact] = React51__default.useState(false);
   React51__default.useEffect(() => {
@@ -9440,20 +9455,19 @@ function Datatable({
   React51__default.useEffect(() => {
     setOrder((prev) => mergeColOrder(prev, columns.map((c) => c.field).filter(Boolean)));
   }, [columns]);
-  const densitySyncedRef = React51__default.useRef(false);
+  const densityPropRef = React51__default.useRef(densityProp);
   React51__default.useEffect(() => {
-    if (densitySyncedRef.current) setDensity(densityProp);
-    else densitySyncedRef.current = true;
+    if (densityPropRef.current === densityProp) return;
+    densityPropRef.current = densityProp;
+    setDensity(densityProp);
   }, [densityProp]);
   React51__default.useEffect(() => {
     setAggOn(showAggregation);
   }, [showAggregation]);
-  const pageSizeSyncedRef = React51__default.useRef(false);
+  const pageSizePropRef = React51__default.useRef(pageSize);
   React51__default.useEffect(() => {
-    if (!pageSizeSyncedRef.current) {
-      pageSizeSyncedRef.current = true;
-      return;
-    }
+    if (pageSizePropRef.current === pageSize) return;
+    pageSizePropRef.current = pageSize;
     if (pageSizeControlled) return;
     setInternalRpp(pageSize > 0 ? pageSize : 10);
     setInternalPage(0);