@redsift/table 12.5.4-muiv8-alpha.4 → 12.5.4

package/_internal/StatefulDataGrid2.js

@@ -2372,8 +2372,13 @@ const getModelsParsedOrUpdateLocalStorage = (search, localStorageVersion, column
   const decompressedSearch = decompressSearchParams(search);
   // Convert from display format (dot notation) to internal format (bracket notation) if needed
   const decodedSearch = getDecodedSearchFromUrl(decompressedSearch, columns);
-  const currentVersion = new URLSearchParams(decodedSearch).get('v');
-  const isNewVersion = !currentVersion || Number(currentVersion) !== localStorageVersion;
+  const decodedParams = new URLSearchParams(decodedSearch);
+  const currentVersion = decodedParams.get('v');
+  // Only treat as "new version reset" when the URL has params with a stale/missing version.
+  // An empty URL should fall through to the localStorage branch of each getter so persisted
+  // state is restored instead of being clobbered by defaults.
+  const hasUrlState = Array.from(decodedParams.keys()).length > 0;
+  const isNewVersion = hasUrlState && (!currentVersion || Number(currentVersion) !== localStorageVersion);
   const {
     localStorageFilters,
     setLocalStorageFilters,
@@ -3319,23 +3324,41 @@ const StatefulDataGrid = /*#__PURE__*/forwardRef((props, ref) => {
   }, [isDataSourceMode, onPaginationModelChange]);
 
   // In dataSource mode, pagination changes from our custom pagination slots
-  // (rendered outside MUI's pagination state) must:
-  //   1. Go through apiRef so MUI's internal page state updates and
-  //      dataSource.getRows() refetches with the new params.
-  //   2. Update URL/localStorage + local React state directly. We cannot rely
-  //      on MUI re-emitting onPaginationModelChange via apiRef.setPaginationModel
-  //      because in pivot/GroupedData strategy mode (and with paginationModel
-  //      passed via initialState rather than as a controlled prop) MUI does
-  //      not consistently fire the prop callback. The deep-equal guard in
-  //      useStatefulTable.onPaginationModelChange dedupes any re-emit MUI
-  //      does fire, so this is safe to call unconditionally.
+  // (rendered outside MUI's pagination state) route through apiRef so MUI's
+  // internal page state updates and dataSource.getRows() refetches with the
+  // new params. The `paginationModelChange` subscription below picks up the
+  // resulting state change and propagates it to URL/localStorage and local
+  // React state via wrappedOnPaginationModelChange.
   const dataSourcePaginationChange = useCallback(model => {
     var _apiRef$current;
     (_apiRef$current = apiRef.current) === null || _apiRef$current === void 0 ? void 0 : _apiRef$current.setPaginationModel(model);
-    wrappedOnPaginationModelChange(model, {
-      reason: 'setPaginationModel'
+  }, [apiRef]);
+
+  // In dataSource mode, subscribe to MUI's `paginationModelChange` event so
+  // URL state stays in sync with MUI's internal pagination regardless of how
+  // it changed (slot click, apiRef.setPaginationModel from consumer code,
+  // MUI internal updates, etc.). Relying on MUI's `onPaginationModelChange`
+  // prop callback alone is not sufficient: in pivot/GroupedData strategy mode
+  // and with `paginationModel` seeded via `initialState` (rather than as a
+  // controlled prop), the prop callback can be missed under certain
+  // re-render orderings. The event fires reliably whenever the internal
+  // state changes via `setState('setPaginationModel')`, see
+  // `useGridStateInitialization.setState` → `publishEvent(changeEvent, …)`.
+  // The deep-equal guard inside `useStatefulTable.onPaginationModelChange`
+  // dedupes any duplicate emits, so overlap with the prop callback is safe.
+  useEffect(() => {
+    if (!isDataSourceMode) return;
+    const api = apiRef.current;
+    if (!(api !== null && api !== void 0 && api.subscribeEvent)) return;
+    return api.subscribeEvent('paginationModelChange', model => {
+      wrappedOnPaginationModelChange({
+        page: model.page,
+        pageSize: model.pageSize
+      }, {
+        reason: 'paginationModelChange'
+      });
     });
-  }, [apiRef, wrappedOnPaginationModelChange]);
+  }, [isDataSourceMode, apiRef, wrappedOnPaginationModelChange]);
   const [rowSelectionModel, setRowSelectionModel] = useState(() => normalizeRowSelectionModel(propsRowSelectionModel));
   useEffect(() => {
     setRowSelectionModel(normalizeRowSelectionModel(propsRowSelectionModel));