@redsift/table 12.5.8-muiv8-alpha.2 → 12.5.8-muiv8-alpha.4

package/_internal/StatefulDataGrid2.js

@@ -1565,7 +1565,7 @@ const isValueValid = (value, field, columns, operator) => {
 
 // example:
 // unicodeDomain[contains]=a&unicodeDomain[contains]=dsa&logicOperator=and&tab=ignored
-const getFilterModelFromString = (searchString, columns) => {
+const getFilterModelFromString = (searchString, columns, previousModel) => {
   if (!searchString) {
     return 'invalid';
   }
@@ -1595,6 +1595,21 @@ const getFilterModelFromString = (searchString, columns) => {
     }
   }
   let id = 5000;
+
+  // Positional id-reuse map keyed by `${field}|${operator}` (decoded operator, matching
+  // the item we push below). FIFO per key so duplicate field+operator items map by order.
+  // Reusing the id of a previously parsed/emitted item keeps `item.id` stable across the
+  // URL write→parse roundtrip (the URL never carries the id), so MUI's GridFilterForm
+  // React key does not change and the filter panel input keeps focus. (DS-81)
+  const previousIdsByKey = new Map();
+  if (previousModel) {
+    for (const prev of previousModel.items) {
+      if (prev.id === undefined) continue;
+      const key = `${prev.field}|${prev.operator}`;
+      const bucket = previousIdsByKey.get(key);
+      if (bucket) bucket.push(prev.id);else previousIdsByKey.set(key, [prev.id]);
+    }
+  }
   const fields = columns.map(column => column.field);
   let isInvalid = false;
   const items = [];
@@ -1630,10 +1645,13 @@ const getFilterModelFromString = (searchString, columns) => {
       isInvalid = true;
       return;
     }
+    const finalOperator = columnType === 'number' && Object.keys(numberOperatorDecoder).includes(operator) ? numberOperatorDecoder[operator] : operator;
+    const reuseBucket = previousIdsByKey.get(`${field}|${finalOperator}`);
+    const stableId = reuseBucket && reuseBucket.length > 0 ? reuseBucket.shift() : id;
     items.push({
       field,
-      operator: columnType === 'number' && Object.keys(numberOperatorDecoder).includes(operator) ? numberOperatorDecoder[operator] : operator,
-      id,
+      operator: finalOperator,
+      id: stableId,
       value: listOperators.includes(operator) && decodedValue === '' ? [] : decodedValue,
       type
     });
@@ -1727,7 +1745,7 @@ const getSearchParamsFromFilterModel = filterModel => {
 // - if we have something in the URL, use that info
 // - if we don't have that, use the localStorage and update the URL
 // - if we don't have that, return an empty FilterModel
-const getFilterModel = (search, columns, localStorageFilters, setLocalStorageFilters, initialState, isNewVersion) => {
+const getFilterModel = (search, columns, localStorageFilters, setLocalStorageFilters, initialState, isNewVersion, previousModel) => {
   const defaultValue = initialState && initialState.filter && initialState.filter.filterModel ? initialState.filter.filterModel : {
     items: [],
     logicOperator: GridLogicOperator.And
@@ -1745,7 +1763,7 @@ const getFilterModel = (search, columns, localStorageFilters, setLocalStorageFil
     persistDefaultFilters();
     return defaultValue;
   }
-  const filterModelFromSearch = getFilterModelFromString(search, columns);
+  const filterModelFromSearch = getFilterModelFromString(search, columns, previousModel);
   if (filterModelFromSearch !== 'invalid') {
     const searchFromFilterModel = getSearchParamsFromFilterModel(filterModelFromSearch);
     const searchString = urlSearchParamsToString(searchFromFilterModel);
@@ -2610,7 +2628,7 @@ const getFinalSearch = _ref3 => {
   return new URLSearchParams([...searchParams, ...filterModelSearch, ...sortModelSearch, ...paginationModelSearch, ...tabSearch, ...pinnedColumnsModelSearch, ...columnVisibilityModelSearch, ...densitySearch, ...columnOrderSearch, ...rowGroupingSearch, ...aggregationSearch, ...pivotSearch, ...pivotActiveSearch]);
 };
 /** Return the state of the table given the URL and the local storage state */
-const getModelsParsedOrUpdateLocalStorage = (search, localStorageVersion, columns, initialState, localStorage) => {
+const getModelsParsedOrUpdateLocalStorage = (search, localStorageVersion, columns, initialState, localStorage, previousFilterModel) => {
   var _initialState$columns6, _initialState$columns7;
   // Decompress any compressed params in the search string before processing
   const decompressedSearch = decompressSearchParams(search);
@@ -2657,7 +2675,7 @@ const getModelsParsedOrUpdateLocalStorage = (search, localStorageVersion, column
     localStoragePivotActive,
     setLocalStoragePivotActive
   } = localStorage;
-  const filterModel = getFilterModel(decodedSearch, columns, localStorageFilters, setLocalStorageFilters, initialState, isNewVersion);
+  const filterModel = getFilterModel(decodedSearch, columns, localStorageFilters, setLocalStorageFilters, initialState, isNewVersion, previousFilterModel);
   const sortModel = getSortModel(decodedSearch, columns, localStorageSorting, setLocalStorageSorting, initialState, isNewVersion);
   const paginationModel = getPaginationModel(decodedSearch, localStoragePagination, setLocalStoragePagination, initialState, isNewVersion);
   const columnVisibilityModel = getColumnsVisibility(decodedSearch, columns, localStorageColumnsVisibility, setLocalStorageColumnsVisibility, initialState, isNewVersion);
@@ -3085,6 +3103,11 @@ const useStatefulTable = props => {
       [field]: newWidth
     }));
   }, [dimensionModel, setDimensionModel]);
+
+  // Source of ids for content-matching in the parser, so item.id is stable across the
+  // URL write→parse roundtrip (DS-81). Holds MUI's just-emitted model (random placeholder
+  // id) after onFilterModelChange, then the stabilised parsed model each render.
+  const filterIdSourceRef = useRef(undefined);
   const {
     filterModel: filterParsed,
     sortModel: sortModelParsed,
@@ -3121,7 +3144,7 @@ const useStatefulTable = props => {
     setLocalStoragePivot,
     localStoragePivotActive: localStoragePivotActive,
     setLocalStoragePivotActive: setLocalStoragePivotActive
-  });
+  }, filterIdSourceRef.current);
 
   // Sync URL in an effect rather than during render to comply with React rules
   useEffect(() => {
@@ -3136,6 +3159,10 @@ const useStatefulTable = props => {
   if (!isDeepEqual(filterParsedRef.current, filterParsed)) {
     filterParsedRef.current = filterParsed;
   }
+  // Keep the id source in sync with the stabilised parsed model so re-parses triggered
+  // by unrelated state (pagination/sort/visibility) reuse the same ids (DS-81). The parse
+  // call above reads the ref before this write (read-before-write within the render).
+  filterIdSourceRef.current = filterParsed;
   const sortModelParsedRef = useRef(sortModelParsed);
   if (!isDeepEqual(sortModelParsedRef.current, sortModelParsed)) {
     sortModelParsedRef.current = sortModelParsed;
@@ -3292,6 +3319,10 @@ const useStatefulTable = props => {
       });
       if (isDeepEqual(filterModel, lastEmittedFilterRef.current)) return;
       lastEmittedFilterRef.current = filterModel;
+      // Capture MUI's just-emitted model (carrying the placeholder's random id) so the
+      // next render's URL re-parse reuses that id and the GridFilterForm key — and thus
+      // the value input's focus — survives the write→parse roundtrip (DS-81).
+      filterIdSourceRef.current = filterModel;
       updateUrl(buildModel({
         filterModel
       }), search, localStorageVersion, historyReplace, columns);