@redsift/table 12.5.3 → 12.5.4-muiv8-alpha.0

package/_internal/StatefulDataGrid2.js

@@ -3044,9 +3044,19 @@ const useStatefulTable = props => {
     },
     sortModel: sortModelParsedRef.current,
     onPinnedColumnsChange: (pinnedColumns, details) => {
-      updateUrl(buildModel({
-        pinnedColumnsModel: pinnedColumns
-      }), search, localStorageVersion, historyReplace, columns);
+      var _apiRef$current$state2, _apiRef$current4, _apiRef$current4$stat, _apiRef$current4$stat2;
+      // While pivot mode is active, MUI Premium emits synthetic pinned-column
+      // models (e.g. `__row_group_by_columns_group__` for the grouping column)
+      // that must not be persisted to the URL / localStorage. Read the live
+      // grid state from apiRef rather than the parsed URL value because the
+      // URL lags by a tick during pivot enable/disable transitions. Consumer
+      // callbacks are always forwarded so observers can still react.
+      const pivotActiveLive = (_apiRef$current$state2 = (_apiRef$current4 = apiRef.current) === null || _apiRef$current4 === void 0 ? void 0 : (_apiRef$current4$stat = _apiRef$current4.state) === null || _apiRef$current4$stat === void 0 ? void 0 : (_apiRef$current4$stat2 = _apiRef$current4$stat.pivoting) === null || _apiRef$current4$stat2 === void 0 ? void 0 : _apiRef$current4$stat2.active) !== null && _apiRef$current$state2 !== void 0 ? _apiRef$current$state2 : pivotActiveParsed;
+      if (!pivotActiveLive) {
+        updateUrl(buildModel({
+          pinnedColumnsModel: pinnedColumns
+        }), search, localStorageVersion, historyReplace, columns);
+      }
       propsOnPinnedColumnsChange === null || propsOnPinnedColumnsChange === void 0 ? void 0 : propsOnPinnedColumnsChange(pinnedColumns, details);
     },
     pinnedColumns: pinnedColumnsModelRef.current,
@@ -3064,9 +3074,20 @@ const useStatefulTable = props => {
     },
     columnVisibilityModel: visibilityModelRef.current,
     onColumnVisibilityModelChange: (columnsVisibilityModel, details) => {
-      updateUrl(buildModel({
-        columnsModel: columnsVisibilityModel
-      }), search, localStorageVersion, historyReplace, columns);
+      var _apiRef$current$state3, _apiRef$current5, _apiRef$current5$stat, _apiRef$current5$stat2;
+      // While pivot mode is active, MUI Premium emits synthetic visibility
+      // models that whitelist only the pivot value fields (hiding every base
+      // column). Persisting that to the URL would re-hide all base columns
+      // on the next load (see getColumnVisibilityFromString whitelist logic).
+      // Read the live grid state rather than the parsed URL value because the
+      // URL lags by a tick during pivot enable/disable transitions. Consumer
+      // callbacks are always forwarded.
+      const pivotActiveLive = (_apiRef$current$state3 = (_apiRef$current5 = apiRef.current) === null || _apiRef$current5 === void 0 ? void 0 : (_apiRef$current5$stat = _apiRef$current5.state) === null || _apiRef$current5$stat === void 0 ? void 0 : (_apiRef$current5$stat2 = _apiRef$current5$stat.pivoting) === null || _apiRef$current5$stat2 === void 0 ? void 0 : _apiRef$current5$stat2.active) !== null && _apiRef$current$state3 !== void 0 ? _apiRef$current$state3 : pivotActiveParsed;
+      if (!pivotActiveLive) {
+        updateUrl(buildModel({
+          columnsModel: columnsVisibilityModel
+        }), search, localStorageVersion, historyReplace, columns);
+      }
       propsOnColumnVisibilityModelChange === null || propsOnColumnVisibilityModelChange === void 0 ? void 0 : propsOnColumnVisibilityModelChange(columnsVisibilityModel, details);
     },
     onColumnWidthChange: (params, event, details) => {
@@ -3484,15 +3505,11 @@ const StatefulDataGrid = /*#__PURE__*/forwardRef((props, ref) => {
     apiRef: apiRef,
     dataSource: dataSource,
     columns: columns,
-    columnVisibilityModel: columnVisibilityModel,
     onColumnVisibilityModelChange: onColumnVisibilityModelChange,
     onPinnedColumnsChange: onPinnedColumnsChange,
-    pinnedColumns: pinnedColumns,
     pageSizeOptions: pageSizeOptions,
     onColumnWidthChange: onColumnWidthChange,
-    rowGroupingModel: rowGroupingModel,
     onRowGroupingModelChange: onRowGroupingModelChange,
-    aggregationModel: aggregationModel,
     onAggregationModelChange: onAggregationModelChange,
     pivotModel: pivotModel,
     onPivotModelChange: onPivotModelChange,
@@ -3501,6 +3518,12 @@ const StatefulDataGrid = /*#__PURE__*/forwardRef((props, ref) => {
     // In dataSource mode: models are uncontrolled (MUI owns them),
     // onChange handlers are write-only for URL/localStorage persistence,
     // and initialState seeds MUI on mount from the persisted URL state.
+    // columnVisibilityModel / pinnedColumns / rowGroupingModel /
+    // aggregationModel are also uncontrolled here to avoid a controlled
+    // re-render race with consumer-side microtask-deferred history
+    // updates (otherwise user toggles flip back when MUI re-emits with
+    // the stale controlled value). Consumers needing programmatic
+    // changes should use the apiRef imperative API.
   }, isDataSourceMode ? {
     onFilterModelChange: onFilterModelChange,
     onSortModelChange: onSortModelChange,
@@ -3508,7 +3531,15 @@ const StatefulDataGrid = /*#__PURE__*/forwardRef((props, ref) => {
     initialState: _objectSpread2(_objectSpread2({}, initialState), {}, {
       density: controlledDensity,
       columns: _objectSpread2(_objectSpread2({}, initialState === null || initialState === void 0 ? void 0 : initialState.columns), {}, {
-        orderedFields: columnOrderModel
+        orderedFields: columnOrderModel,
+        columnVisibilityModel
+      }),
+      pinnedColumns,
+      rowGrouping: _objectSpread2(_objectSpread2({}, initialState === null || initialState === void 0 ? void 0 : initialState.rowGrouping), {}, {
+        model: rowGroupingModel
+      }),
+      aggregation: _objectSpread2(_objectSpread2({}, initialState === null || initialState === void 0 ? void 0 : initialState.aggregation), {}, {
+        model: aggregationModel
       }),
       filter: {
         filterModel
@@ -3524,6 +3555,10 @@ const StatefulDataGrid = /*#__PURE__*/forwardRef((props, ref) => {
       })
     })
   } : {
+    columnVisibilityModel,
+    pinnedColumns,
+    rowGroupingModel,
+    aggregationModel,
     filterModel,
     sortModel,
     paginationModel,