@redsift/table 11.2.0 → 11.2.1

package/index.d.ts

@@ -1,5 +1,5 @@
 import * as _mui_x_data_grid_pro from '@mui/x-data-grid-pro';
-import { GridColumnTypesRecord, GridFilterItem, GridCellParams, GridFilterOperator, GridFilterInputValue, GridFilterInputMultipleValue, DataGridProProps, GridPinnedColumns, GridPaginationModel, GridFilterModel, GridSortModel, GridSortItem, GridColumnVisibilityModel, GridSlotsComponent, GridRowSelectionModel, GridApiPro as GridApiPro$1, GridRowParams, GridToolbarExportProps, GridToolbarFilterButtonProps, GridToolbarColumnsButton, GridToolbarDensitySelector } from '@mui/x-data-grid-pro';
+import { GridColumnTypesRecord, GridFilterItem, GridCellParams, GridFilterOperator, GridFilterInputValue, GridFilterInputMultipleValue, DataGridProProps, GridPaginationModel, GridFilterModel, GridSortModel, GridSortItem, GridColumnVisibilityModel, GridPinnedColumns, GridSlotsComponent, GridRowSelectionModel, GridApiPro as GridApiPro$1, GridRowParams, GridToolbarExportProps, GridToolbarFilterButtonProps, GridToolbarColumnsButton, GridToolbarDensitySelector } from '@mui/x-data-grid-pro';
 export { GridAlignment, GridColDef, GridFilterItem, GridFilterModel, getGridBooleanOperators, getGridDateOperators, getGridSingleSelectOperators } from '@mui/x-data-grid-pro';
 import { GridInitialStatePro } from '@mui/x-data-grid-pro/models/gridStatePro';
 import React, { ReactNode, ComponentProps, MutableRefObject, RefObject } from 'react';
@@ -155,8 +155,6 @@ interface StatefulDataGridProps extends DataGridProps {
         search: string;
         historyReplace: (newSearch: string) => void;
     };
-    /** Pinned custom columns. */
-    pinnedCustomColumns?: Required<GridPinnedColumns>;
     /** Local Storage version, to upgrade when we want to force a clean out. */
     localStorageVersion?: number;
 }
@@ -179,15 +177,15 @@ declare const isValueValid: (value: OperatorValue, field: string, columns: DataG
 declare const getFilterModelFromString: (searchString: string, columns: DataGridProps['columns']) => GridFilterModel | 'invalid';
 declare const getSearchParamsFromFilterModel: (filterModel: GridFilterModel) => URLSearchParams;
 /** SORT */
-declare const getSortingFromString: (searchString: string, columns: DataGridProps['columns']) => GridSortModel | null;
+declare const getSortingFromString: (searchString: string, columns: DataGridProps['columns']) => GridSortModel | 'invalid';
 declare const getSearchParamsFromSorting: (sorting: GridSortItem[]) => URLSearchParams;
 /** PAGINATION */
-declare const getPaginationFromString: (searchString: string) => ExtendedGridPaginationModel | null;
+declare const getPaginationFromString: (searchString: string) => ExtendedGridPaginationModel | 'invalid';
 declare const getSearchParamsFromPagination: (pagination: ExtendedGridPaginationModel) => URLSearchParams;
 /** COLUMN VISIBILITY */
 declare const getSearchParamsFromColumnVisibility: (columnVisibility: GridColumnVisibilityModel, columns: DataGridProps['columns']) => URLSearchParams;
-declare const getColumnVisibilityFromString: (notParsed: string, tableColumns: DataGridProps['columns']) => GridColumnVisibilityModel | null;
-declare const getPinnedColumnsFromString: (notParsed: string, tableColumns: DataGridProps['columns']) => PinnedColumns | null;
+declare const getColumnVisibilityFromString: (notParsed: string, tableColumns: DataGridProps['columns']) => GridColumnVisibilityModel | 'invalid';
+declare const getPinnedColumnsFromString: (notParsed: string, tableColumns: DataGridProps['columns']) => PinnedColumns | 'invalid';
 declare const getSearchParamsFromPinnedColumns: (pinnedColumns: GridPinnedColumns) => URLSearchParams;
 declare const getSearchParamsFromTab: (search: string) => URLSearchParams;
 type FinalSearchInput = {

package/index.js

@@ -1,4 +1,4 @@
-import { GRID_DETAIL_PANEL_TOGGLE_COL_DEF, getGridNumericOperators as getGridNumericOperators$1, GridFilterInputValue, GridFilterInputMultipleValue, getGridStringOperators as getGridStringOperators$1, getGridBooleanOperators, getGridDateOperators, getGridSingleSelectOperators, GridLogicOperator, GridToolbarContainer, GridToolbarFilterButton, GridToolbarColumnsButton, GridToolbarDensitySelector, GridToolbarExport, gridExpandedSortedRowIdsSelector, gridPaginatedVisibleSortedGridRowEntriesSelector, gridPaginatedVisibleSortedGridRowIdsSelector, gridFilteredSortedRowEntriesSelector, gridFilteredSortedRowIdsSelector, useGridApiRef, DataGridPro, GRID_CHECKBOX_SELECTION_COL_DEF } from '@mui/x-data-grid-pro';
+import { GRID_DETAIL_PANEL_TOGGLE_COL_DEF, getGridNumericOperators as getGridNumericOperators$1, GridFilterInputValue, GridFilterInputMultipleValue, getGridStringOperators as getGridStringOperators$1, getGridBooleanOperators, getGridDateOperators, getGridSingleSelectOperators, GridLogicOperator, GridToolbarContainer, GridToolbarFilterButton, GridToolbarColumnsButton, GridToolbarDensitySelector, GridToolbarExport, gridExpandedSortedRowIdsSelector, gridPaginatedVisibleSortedGridRowEntriesSelector, gridPaginatedVisibleSortedGridRowIdsSelector, gridFilteredSortedRowEntriesSelector, gridFilteredSortedRowIdsSelector, useGridApiRef, DataGridPro } from '@mui/x-data-grid-pro';
 export { getGridBooleanOperators, getGridDateOperators, getGridSingleSelectOperators } from '@mui/x-data-grid-pro';
 import * as React from 'react';
 import React__default, { Children, isValidElement, cloneElement, forwardRef, useLayoutEffect, useEffect, useRef, useContext, useState, useCallback, createElement, useMemo } from 'react';
@@ -18247,7 +18247,7 @@ const getFilterModel = (search, columns, localStorageFilters, setLocalStorageFil
 
 const getSortingFromString = (searchString, columns) => {
   if (!searchString) {
-    return null;
+    return 'invalid';
   }
   const searchParams = new URLSearchParams(searchString);
   const value = searchParams.get('_sortColumn');
@@ -18262,7 +18262,7 @@ const getSortingFromString = (searchString, columns) => {
       sort: order
     }];
   }
-  return null;
+  return 'invalid';
 };
 const getSearchParamsFromSorting = sorting => {
   const searchParams = new URLSearchParams();
@@ -18274,9 +18274,10 @@ const getSearchParamsFromSorting = sorting => {
 // - 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 SortModel
-const getSortModel = (search, columns, localStorageSorting, setLocalStorageSorting) => {
+const getSortModel = (search, columns, localStorageSorting, setLocalStorageSorting, initialState) => {
+  var _initialState$sorting;
   const sorting = getSortingFromString(search, columns);
-  if (sorting) {
+  if (sorting !== 'invalid') {
     const searchFromSortModel = getSearchParamsFromSorting(sorting);
     const searchString = urlSearchParamsToString(searchFromSortModel);
     if (searchString !== localStorageSorting) {
@@ -18285,30 +18286,22 @@ const getSortModel = (search, columns, localStorageSorting, setLocalStorageSorti
     return sorting;
   }
   const sortModelFromLocalStorage = getSortingFromString(localStorageSorting, columns);
-  if (sortModelFromLocalStorage) {
+  if (sortModelFromLocalStorage !== 'invalid') {
     return sortModelFromLocalStorage;
   }
-  return [];
+  return initialState !== null && initialState !== void 0 && (_initialState$sorting = initialState.sorting) !== null && _initialState$sorting !== void 0 && _initialState$sorting.sortModel ? initialState.sorting.sortModel : [];
 };
 
 /** PAGINATION */
 
 const getPaginationFromString = searchString => {
   if (!searchString) {
-    return {
-      page: 0,
-      pageSize: 25,
-      direction: 'next'
-    };
+    return 'invalid';
   }
   const searchParams = new URLSearchParams(searchString);
   const value = searchParams.get('_pagination');
   if (value === '' || value === null || value === '[]') {
-    return {
-      page: 0,
-      pageSize: 25,
-      direction: 'next'
-    };
+    return 'invalid';
   }
   const pagination = value.slice(1, value.length - 1).split(',');
   const page = parseFloat(pagination[0]);
@@ -18321,11 +18314,7 @@ const getPaginationFromString = searchString => {
       direction: direction
     };
   }
-  return {
-    page: 0,
-    pageSize: 25,
-    direction: 'next'
-  };
+  return 'invalid';
 };
 const getSearchParamsFromPagination = pagination => {
   const searchParams = new URLSearchParams();
@@ -18337,9 +18326,9 @@ const getSearchParamsFromPagination = pagination => {
 // - 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 PaginationModel
-const getPaginationModel = (search, localStoragePagination, setLocalStoragePagination) => {
+const getPaginationModel = (search, localStoragePagination, setLocalStoragePagination, initialState) => {
   const pagination = getPaginationFromString(search);
-  if (pagination) {
+  if (pagination !== 'invalid') {
     const searchFromPaginationModel = getSearchParamsFromPagination(pagination);
     const searchString = urlSearchParamsToString(searchFromPaginationModel);
     if (searchString !== localStoragePagination) {
@@ -18348,10 +18337,14 @@ const getPaginationModel = (search, localStoragePagination, setLocalStoragePagin
     return pagination;
   }
   const paginationModelFromLocalStorage = getPaginationFromString(localStoragePagination);
-  if (paginationModelFromLocalStorage) {
+  if (paginationModelFromLocalStorage !== 'invalid') {
     return paginationModelFromLocalStorage;
   }
-  return {
+  return initialState !== null && initialState !== void 0 && initialState.pagination ? _objectSpread2({
+    page: 0,
+    pageSize: 25,
+    direction: 'next'
+  }, initialState.pagination) : {
     page: 0,
     pageSize: 25,
     direction: 'next'
@@ -18393,7 +18386,7 @@ const getSearchParamsFromColumnVisibility = (columnVisibility, columns) => {
 };
 const getColumnVisibilityFromString = (notParsed, tableColumns) => {
   if (!notParsed || notParsed.length === 1 && notParsed[0] === '?') {
-    return null;
+    return 'invalid';
   }
   // remove the initial ? if present
   const parsed = notParsed[0] === '?' ? notParsed.slice(1) : notParsed;
@@ -18430,7 +18423,7 @@ const getColumnVisibilityFromString = (notParsed, tableColumns) => {
     }
   }
   if (visibleColumnsCount === 0 && !exist) {
-    return null;
+    return 'invalid';
   }
   return visibility;
 };
@@ -18441,9 +18434,10 @@ const getColumnVisibilityFromString = (notParsed, tableColumns) => {
 // - if we don't have that, return an empty ColumnVisibilityModel (which is all columns)
 // NOTE: the `defaultHidden` is a custom field and not standard DataGrid
 // The reason is the following bug: https://github.com/mui/mui-x/issues/8407
-const getColumnsVisibility = (search, columns, localStorageColumnsVisibility, setLocalStorageColumnsVisibility) => {
+const getColumnsVisibility = (search, columns, localStorageColumnsVisibility, setLocalStorageColumnsVisibility, initialState) => {
+  var _initialState$columns;
   const columnVisibility = getColumnVisibilityFromString(search, columns);
-  if (columnVisibility) {
+  if (columnVisibility !== 'invalid') {
     const searchColumnVisibility = getSearchParamsFromColumnVisibility(columnVisibility, columns);
     if (searchColumnVisibility.toString() !== localStorageColumnsVisibility) {
       setLocalStorageColumnsVisibility(searchColumnVisibility.toString());
@@ -18451,9 +18445,12 @@ const getColumnsVisibility = (search, columns, localStorageColumnsVisibility, se
     return columnVisibility;
   }
   const columnVisibilityFromLocalStorage = getColumnVisibilityFromString(localStorageColumnsVisibility, columns);
-  if (columnVisibilityFromLocalStorage) {
+  if (columnVisibilityFromLocalStorage !== 'invalid') {
     return columnVisibilityFromLocalStorage;
   }
+  if (initialState !== null && initialState !== void 0 && (_initialState$columns = initialState.columns) !== null && _initialState$columns !== void 0 && _initialState$columns.columnVisibilityModel) {
+    return initialState.columns.columnVisibilityModel;
+  }
 
   // No columns in URL or localStorage, just show them all expect the hidden ones
   const res = {};
@@ -18466,7 +18463,7 @@ const getColumnsVisibility = (search, columns, localStorageColumnsVisibility, se
 };
 const getPinnedColumnsFromString = (notParsed, tableColumns) => {
   if (!notParsed || notParsed.length === 1 && notParsed[0] === '?') {
-    return null;
+    return 'invalid';
   }
   // remove the initial ? if present
   const parsed = notParsed[0] === '?' ? notParsed.slice(1) : notParsed;
@@ -18493,13 +18490,10 @@ const getPinnedColumnsFromString = (notParsed, tableColumns) => {
       pinnedColumns['right'] = columns;
     }
   }
-  if (pinnedColumns.left || pinnedColumns.right) {
-    return {
-      left: pinnedColumns['left'] || [],
-      right: pinnedColumns['right'] || []
-    };
-  }
-  return null;
+  return pinnedColumns['left'] || pinnedColumns['right'] ? {
+    left: pinnedColumns['left'] || [],
+    right: pinnedColumns['right'] || []
+  } : 'invalid';
 };
 const getSearchParamsFromPinnedColumns = pinnedColumns => {
   var _pinnedColumns$left, _pinnedColumns$right;
@@ -18515,9 +18509,9 @@ const getSearchParamsFromPinnedColumns = pinnedColumns => {
 // - 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 ColumnVisibilityModel (which is all columns)
-const getPinnedColumns = (search, columns, localStoragePinnedColumns, setLocalStoragePinnedColumns) => {
+const getPinnedColumns = (search, columns, localStoragePinnedColumns, setLocalStoragePinnedColumns, initialState) => {
   const pinnedColumns = getPinnedColumnsFromString(search, columns);
-  if (pinnedColumns) {
+  if (pinnedColumns !== 'invalid') {
     const searchPinnedColumns = getSearchParamsFromPinnedColumns(pinnedColumns);
     if (searchPinnedColumns.toString() !== localStoragePinnedColumns) {
       setLocalStoragePinnedColumns(searchPinnedColumns.toString());
@@ -18525,9 +18519,15 @@ const getPinnedColumns = (search, columns, localStoragePinnedColumns, setLocalSt
     return pinnedColumns;
   }
   const pinnedColumnsFromLocalStorage = getPinnedColumnsFromString(localStoragePinnedColumns, columns);
-  if (pinnedColumnsFromLocalStorage) {
+  if (pinnedColumnsFromLocalStorage !== 'invalid') {
     return pinnedColumnsFromLocalStorage;
   }
+  if (initialState !== null && initialState !== void 0 && initialState.pinnedColumns) {
+    return {
+      left: (initialState === null || initialState === void 0 ? void 0 : initialState.pinnedColumns['left']) || [],
+      right: (initialState === null || initialState === void 0 ? void 0 : initialState.pinnedColumns['right']) || []
+    };
+  }
 
   // No pinnedColumn in URL or localStorage, TODO: decide what is the default state
   const res = {
@@ -18583,10 +18583,10 @@ const getModelsParsedOrUpdateLocalStorage = (search, columns, historyReplace, in
     setLocalStoragePinnedColumns
   } = localStorage;
   const filterModel = getFilterModel(search, columns, localStorageFilters, setLocalStorageFilters, initialState);
-  const sortModel = getSortModel(search, columns, localStorageSorting, setLocalStorageSorting);
-  const paginationModel = getPaginationModel(search, localStoragePagination, setLocalStoragePagination);
-  const columnVisibilityModel = getColumnsVisibility(search, columns, localStorageColumnsVisibility, setLocalStorageColumnsVisibility);
-  const pinnedColumnsModel = getPinnedColumns(search, columns, localStoragePinnedColumns, setLocalStoragePinnedColumns);
+  const sortModel = getSortModel(search, columns, localStorageSorting, setLocalStorageSorting, initialState);
+  const paginationModel = getPaginationModel(search, localStoragePagination, setLocalStoragePagination, initialState);
+  const columnVisibilityModel = getColumnsVisibility(search, columns, localStorageColumnsVisibility, setLocalStorageColumnsVisibility, initialState);
+  const pinnedColumnsModel = getPinnedColumns(search, columns, localStoragePinnedColumns, setLocalStoragePinnedColumns, initialState);
   const finalSearch = getFinalSearch({
     search,
     filterModel,
@@ -27479,13 +27479,13 @@ const useFetchState = (defaultValue, key) => {
 
 // import useLocalStorage from './useLocalStorage';
 
-const useTableStates = (id, version, customDefaults) => {
+const useTableStates = (id, version) => {
   const [paginationModel, setPaginationModel] = useFetchState('', buildStorageKey({
     id,
     version,
     category: PAGINATION_MODEL_KEY
   }));
-  const [sortModel, setSortModel] = useFetchState(customDefaults && customDefaults[SORT_MODEL_KEY] ? customDefaults[SORT_MODEL_KEY] : '', buildStorageKey({
+  const [sortModel, setSortModel] = useFetchState('', buildStorageKey({
     id,
     version,
     category: SORT_MODEL_KEY
@@ -27500,7 +27500,7 @@ const useTableStates = (id, version, customDefaults) => {
     version,
     category: VISIBILITY_MODEL_KEY
   }));
-  const [pinnedColumns, setPinnedColumns] = useFetchState(customDefaults ? customDefaults[PINNED_COLUMNS] : '_pinnedColumnsLeft=[]&_pinnedColumnsRight=[]', buildStorageKey({
+  const [pinnedColumns, setPinnedColumns] = useFetchState('_pinnedColumnsLeft=[]&_pinnedColumnsRight=[]', buildStorageKey({
     id,
     version,
     category: PINNED_COLUMNS
@@ -27538,10 +27538,6 @@ const useStatefulTable = props => {
     onPaginationModelChange: propsOnPaginationModelChange,
     onPinnedColumnsChange: propsOnPinnedColumnsChange,
     onSortModelChange: propsOnSortModelChange,
-    pinnedCustomColumns = {
-      left: [],
-      right: []
-    },
     useRouter,
     localStorageVersion = 2
   } = props;
@@ -27551,11 +27547,6 @@ const useStatefulTable = props => {
     historyReplace
   } = useRouter();
   const id = pathname;
-  const customDefaults = useMemo(() => {
-    return {
-      pinnedColumns: `_pinnedColumnsLeft=[${[GRID_CHECKBOX_SELECTION_COL_DEF.field, ...pinnedCustomColumns.left].join(',')}]&_pinnedColumnsRight=[${pinnedCustomColumns.right.join(',')}]`
-    };
-  }, [pinnedCustomColumns]);
 
   // States and setters persisted in the local storage for this table
   const {
@@ -27571,7 +27562,7 @@ const useStatefulTable = props => {
     setPinnedColumns,
     dimensionModel,
     setDimensionModel
-  } = useTableStates(id, localStorageVersion, customDefaults);
+  } = useTableStates(id, localStorageVersion);
 
   // clearing up old version keys, triggering only on first render
   useEffect(() => clearPreviousVersionStorage(id, localStorageVersion), [id, localStorageVersion]);
@@ -27688,7 +27679,7 @@ const useStatefulTable = props => {
   };
 };
 
-const _excluded$1 = ["apiRef", "autoHeight", "className", "columns", "slots", "slotProps", "filterModel", "columnVisibilityModel", "pinnedColumns", "sortModel", "paginationModel", "height", "hideToolbar", "initialState", "isRowSelectable", "license", "localStorageVersion", "onFilterModelChange", "rowSelectionModel", "onColumnWidthChange", "onPaginationModelChange", "onRowSelectionModelChange", "onColumnVisibilityModelChange", "onPinnedColumnsChange", "onSortModelChange", "pagination", "paginationPlacement", "paginationProps", "pinnedCustomColumns", "rows", "pageSizeOptions", "sx", "theme", "useRouter", "paginationMode", "rowCount"];
+const _excluded$1 = ["apiRef", "autoHeight", "className", "columns", "slots", "slotProps", "filterModel", "columnVisibilityModel", "pinnedColumns", "sortModel", "paginationModel", "height", "hideToolbar", "initialState", "isRowSelectable", "license", "localStorageVersion", "onFilterModelChange", "rowSelectionModel", "onColumnWidthChange", "onPaginationModelChange", "onRowSelectionModelChange", "onColumnVisibilityModelChange", "onPinnedColumnsChange", "onSortModelChange", "pagination", "paginationPlacement", "paginationProps", "rows", "pageSizeOptions", "sx", "theme", "useRouter", "paginationMode", "rowCount"];
 const COMPONENT_NAME$1 = 'DataGrid';
 const CLASSNAME$1 = 'redsift-datagrid';
 const StatefulDataGrid = /*#__PURE__*/forwardRef((props, ref) => {
@@ -27722,7 +27713,6 @@ const StatefulDataGrid = /*#__PURE__*/forwardRef((props, ref) => {
       pagination,
       paginationPlacement = 'both',
       paginationProps,
-      pinnedCustomColumns,
       rows,
       pageSizeOptions,
       sx,
@@ -27780,7 +27770,6 @@ const StatefulDataGrid = /*#__PURE__*/forwardRef((props, ref) => {
     onPaginationModelChange: controlledOnPaginationModelChange,
     onPinnedColumnsChange: controlledOnPinnedColumnsChange,
     onSortModelChange: controlledOnSortModelChange,
-    pinnedCustomColumns,
     useRouter: useRouter,
     localStorageVersion
   });