@mui/x-data-grid 6.9.0 → 6.9.2

package/node/hooks/features/pagination/gridPaginationSelector.js

@@ -71,12 +71,16 @@ const gridPaginationRowRangeSelector = (0, _createSelector.createSelectorMemoize
   let topLevelRowAdded = 0;
   while (lastRowIndex < visibleSortedRowEntries.length && topLevelRowAdded <= topLevelRowsInCurrentPageCount) {
     const row = visibleSortedRowEntries[lastRowIndex];
-    const depth = rowTree[row.id].depth;
-    if (topLevelRowAdded < topLevelRowsInCurrentPageCount || depth > 0) {
+    const depth = rowTree[row.id]?.depth;
+    if (depth === undefined) {
       lastRowIndex += 1;
-    }
-    if (depth === 0) {
-      topLevelRowAdded += 1;
+    } else {
+      if (topLevelRowAdded < topLevelRowsInCurrentPageCount || depth > 0) {
+        lastRowIndex += 1;
+      }
+      if (depth === 0) {
+        topLevelRowAdded += 1;
+      }
     }
   }
   return {

package/node/hooks/features/rows/gridRowsUtils.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.buildRootGroup = exports.GRID_ROOT_GROUP_ID = void 0;
+exports.buildRootGroup = exports.GRID_ROOT_GROUP_ID = exports.GRID_ID_AUTOGENERATED = void 0;
 exports.calculatePinnedRowsHeight = calculatePinnedRowsHeight;
 exports.checkGridRowIdIsValid = checkGridRowIdIsValid;
 exports.createRowsInternalCache = void 0;
@@ -15,6 +15,8 @@ var _gridRowsSelector = require("./gridRowsSelector");
 var _densitySelector = require("../density/densitySelector");
 const GRID_ROOT_GROUP_ID = `auto-generated-group-node-root`;
 exports.GRID_ROOT_GROUP_ID = GRID_ROOT_GROUP_ID;
+const GRID_ID_AUTOGENERATED = Symbol('mui-autogenerated-id');
+exports.GRID_ID_AUTOGENERATED = GRID_ID_AUTOGENERATED;
 const buildRootGroup = () => ({
   type: 'group',
   id: GRID_ROOT_GROUP_ID,

package/node/hooks/features/rows/useGridParamsApi.js

@@ -7,6 +7,7 @@ exports.MissingRowIdError = void 0;
 exports.useGridParamsApi = useGridParamsApi;
 var React = _interopRequireWildcard(require("react"));
 var _domUtils = require("../../../utils/domUtils");
+var _gridRowsUtils = require("./gridRowsUtils");
 var _useGridApiMethod = require("../../utils/useGridApiMethod");
 var _gridFocusStateSelector = require("../focus/gridFocusStateSelector");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -22,7 +23,10 @@ class MissingRowIdError extends Error {}
  * TODO: Impossible priority - useGridFocus also needs to be after useGridParamsApi
  */
 exports.MissingRowIdError = MissingRowIdError;
-function useGridParamsApi(apiRef) {
+function useGridParamsApi(apiRef, props) {
+  const {
+    getRowId
+  } = props;
   const getColumnHeaderParams = React.useCallback(field => ({
     field,
     colDef: apiRef.current.getColumn(field)
@@ -106,6 +110,28 @@ function useGridParamsApi(apiRef) {
     }
     return colDef.valueGetter(getBaseCellParams(id, field));
   }, [apiRef, getBaseCellParams]);
+  const getRowValue = React.useCallback((row, colDef) => {
+    const id = _gridRowsUtils.GRID_ID_AUTOGENERATED in row ? row[_gridRowsUtils.GRID_ID_AUTOGENERATED] : getRowId?.(row) ?? row.id;
+    const field = colDef.field;
+    if (!colDef || !colDef.valueGetter) {
+      return row[field];
+    }
+    return colDef.valueGetter(getBaseCellParams(id, field));
+  }, [getBaseCellParams, getRowId]);
+  const getRowFormattedValue = React.useCallback((row, colDef) => {
+    const value = getRowValue(row, colDef);
+    if (!colDef || !colDef.valueFormatter) {
+      return value;
+    }
+    const id = (getRowId ? getRowId(row) : row.id) ?? row[_gridRowsUtils.GRID_ID_AUTOGENERATED];
+    const field = colDef.field;
+    return colDef.valueFormatter({
+      id,
+      field,
+      value,
+      api: apiRef.current
+    });
+  }, [apiRef, getRowId, getRowValue]);
   const getColumnHeaderElement = React.useCallback(field => {
     if (!apiRef.current.rootElementRef.current) {
       return null;
@@ -131,6 +157,8 @@ function useGridParamsApi(apiRef) {
     getCellValue,
     getCellParams,
     getCellElement,
+    getRowValue,
+    getRowFormattedValue,
     getRowParams,
     getRowElement,
     getColumnHeaderParams,

package/node/hooks/features/rows/useGridRows.js

@@ -56,8 +56,9 @@ const useGridRows = (apiRef, props) => {
     }
     const node = apiRef.current.getRowNode(id);
     if (node && (0, _gridRowsUtils.isAutoGeneratedRow)(node)) {
-      // TODO rows v6: Is it the best approach ?
-      return {};
+      return {
+        [_gridRowsUtils.GRID_ID_AUTOGENERATED]: id
+      };
     }
     return null;
   }, [apiRef]);

package/node/index.js

@@ -1,5 +1,5 @@
 /**
- * @mui/x-data-grid v6.9.0
+ * @mui/x-data-grid v6.9.2
  *
  * @license MIT
  * This source code is licensed under the MIT license found in the

package/node/internals/index.js

@@ -663,7 +663,7 @@ var _warning = require("../utils/warning");
 var _exportAs = require("../utils/exportAs");
 var _useGridPrivateApiContext = require("../hooks/utils/useGridPrivateApiContext");
 var _csvSerializer = require("../hooks/features/export/serializers/csvSerializer");
-var _utils3 = require("./utils");
+var _utils3 = require("../colDef/utils");
 Object.keys(_utils3).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
@@ -674,4 +674,16 @@ Object.keys(_utils3).forEach(function (key) {
       return _utils3[key];
     }
   });
+});
+var _utils4 = require("./utils");
+Object.keys(_utils4).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _utils4[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _utils4[key];
+    }
+  });
 });

package/node/joy/joySlots.js

@@ -19,11 +19,14 @@ var _Select = _interopRequireDefault(require("@mui/joy/Select"));
 var _Option = _interopRequireDefault(require("@mui/joy/Option"));
 var _Box = _interopRequireDefault(require("@mui/joy/Box"));
 var _Typography = _interopRequireDefault(require("@mui/joy/Typography"));
+var _CircularProgress = _interopRequireDefault(require("@mui/joy/CircularProgress"));
+var _Tooltip = _interopRequireDefault(require("@mui/joy/Tooltip"));
 var _utils = require("@mui/utils");
 var _icons = _interopRequireWildcard(require("./icons"));
 var _useGridApiContext = require("../hooks/utils/useGridApiContext");
 var _useGridRootProps = require("../hooks/utils/useGridRootProps");
 var _hooks = require("../hooks");
+var _GridOverlay = require("../components/containers/GridOverlay");
 var _jsxRuntime = require("react/jsx-runtime");
 const _excluded = ["touchRippleRef", "inputProps", "onChange", "color", "size", "checked", "sx", "value", "inputRef"],
   _excluded2 = ["onChange", "label", "placeholder", "value", "inputRef", "type", "size", "variant"],
@@ -304,7 +307,20 @@ const Pagination = /*#__PURE__*/React.forwardRef((props, ref) => {
   }, [apiRef]);
   const page = paginationModel.page <= lastPage ? paginationModel.page : lastPage;
   const pageSize = paginationModel.pageSize;
-  const pageSizeOptions = rootProps.pageSizeOptions?.includes(pageSize) ? rootProps.pageSizeOptions : [];
+  const isPageSizeIncludedInPageSizeOptions = () => {
+    for (let i = 0; i < rootProps.pageSizeOptions.length; i += 1) {
+      const option = rootProps.pageSizeOptions[i];
+      if (typeof option === 'number') {
+        if (option === pageSize) {
+          return true;
+        }
+      } else if (option.value === pageSize) {
+        return true;
+      }
+    }
+    return false;
+  };
+  const pageSizeOptions = isPageSizeIncludedInPageSizeOptions() ? rootProps.pageSizeOptions : [];
   const handleChangeRowsPerPage = (event, newValue) => {
     const newPageSize = Number(newValue);
     apiRef.current.setPageSize(newPageSize);
@@ -328,9 +344,9 @@ const Pagination = /*#__PURE__*/React.forwardRef((props, ref) => {
         value: pageSize,
         children: pageSizeOptions.map(option => {
           return /*#__PURE__*/(0, _jsxRuntime.jsx)(Option, {
-            value: option,
-            children: option
-          }, option);
+            value: typeof option !== 'number' && option.value ? option.value : option,
+            children: typeof option !== 'number' && option.label ? option.label : `${option}`
+          }, typeof option !== 'number' && option.label ? option.label : `${option}`);
         })
       })]
     }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Typography.default, {
@@ -375,6 +391,12 @@ const Pagination = /*#__PURE__*/React.forwardRef((props, ref) => {
     })]
   });
 });
+const LoadingOverlay = /*#__PURE__*/React.forwardRef((props, ref) => {
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_GridOverlay.GridOverlay, (0, _extends2.default)({}, props, {
+    ref: ref,
+    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_CircularProgress.default, {})
+  }));
+});
 const joySlots = (0, _extends2.default)({}, _icons.default, {
   baseCheckbox: Checkbox,
   baseTextField: TextField,
@@ -385,9 +407,9 @@ const joySlots = (0, _extends2.default)({}, _icons.default, {
   baseSelectOption: Option,
   baseInputLabel: InputLabel,
   baseFormControl: _FormControl.default,
-  // BaseTooltip: MUITooltip,
-  // BasePopper: MUIPopper,
-  pagination: Pagination
+  baseTooltip: _Tooltip.default,
+  pagination: Pagination,
+  loadingOverlay: LoadingOverlay
 });
 var _default = joySlots;
 exports.default = _default;

package/node/locales/esES.js

@@ -14,8 +14,8 @@ const esESGrid = {
   toolbarDensity: 'Densidad',
   toolbarDensityLabel: 'Densidad',
   toolbarDensityCompact: 'Compacta',
-  toolbarDensityStandard: 'Standard',
-  toolbarDensityComfortable: 'Comoda',
+  toolbarDensityStandard: 'Estándar',
+  toolbarDensityComfortable: 'Cómoda',
   // Columns selector toolbar button text
   toolbarColumns: 'Columnas',
   toolbarColumnsLabel: 'Seleccionar columnas',
@@ -43,7 +43,7 @@ const esESGrid = {
   columnsPanelHideAllButton: 'Ocultar todo',
   // Filter panel text
   filterPanelAddFilter: 'Agregar filtro',
-  // filterPanelRemoveAll: 'Remove all',
+  filterPanelRemoveAll: 'Remover todos',
   filterPanelDeleteIconLabel: 'Borrar',
   filterPanelLogicOperator: 'Operador lógico',
   filterPanelOperator: 'Operadores',

package/node/locales/huHU.js

@@ -66,34 +66,32 @@ const huHUGrid = {
   filterOperatorIsEmpty: 'üres',
   filterOperatorIsNotEmpty: 'nem üres',
   filterOperatorIsAnyOf: 'a következők egyike:',
-  // 'filterOperator=': '=',
-  // 'filterOperator!=': '!=',
-  // 'filterOperator>': '>',
-  // 'filterOperator>=': '>=',
-  // 'filterOperator<': '<',
-  // 'filterOperator<=': '<=',
-
+  'filterOperator=': '=',
+  'filterOperator!=': '!=',
+  'filterOperator>': '>',
+  'filterOperator>=': '>=',
+  'filterOperator<': '<',
+  'filterOperator<=': '<=',
   // Header filter operators text
-  // headerFilterOperatorContains: 'Contains',
-  // headerFilterOperatorEquals: 'Equals',
-  // headerFilterOperatorStartsWith: 'Starts with',
-  // headerFilterOperatorEndsWith: 'Ends with',
+  headerFilterOperatorContains: 'Tartalmazza:',
+  headerFilterOperatorEquals: 'Egyenlő ezzel:',
+  headerFilterOperatorStartsWith: 'Ezzel kezdődik:',
+  headerFilterOperatorEndsWith: 'Ezzel végződik:',
   // headerFilterOperatorIs: 'Is',
   // headerFilterOperatorNot: 'Is not',
-  // headerFilterOperatorAfter: 'Is after',
-  // headerFilterOperatorOnOrAfter: 'Is on or after',
-  // headerFilterOperatorBefore: 'Is before',
-  // headerFilterOperatorOnOrBefore: 'Is on or before',
-  // headerFilterOperatorIsEmpty: 'Is empty',
-  // headerFilterOperatorIsNotEmpty: 'Is not empty',
-  // headerFilterOperatorIsAnyOf: 'Is any of',
-  // 'headerFilterOperator=': 'Equals',
-  // 'headerFilterOperator!=': 'Not equals',
-  // 'headerFilterOperator>': 'Greater than',
-  // 'headerFilterOperator>=': 'Greater than or equal to',
-  // 'headerFilterOperator<': 'Less than',
-  // 'headerFilterOperator<=': 'Less than or equal to',
-
+  headerFilterOperatorAfter: 'Ezutáni:',
+  headerFilterOperatorOnOrAfter: 'Ekkozori vagy ezutáni:',
+  headerFilterOperatorBefore: 'Ezelőtti:',
+  headerFilterOperatorOnOrBefore: 'Ekkori vagy ezelőtti:',
+  headerFilterOperatorIsEmpty: 'Üres',
+  headerFilterOperatorIsNotEmpty: 'Nem üres',
+  headerFilterOperatorIsAnyOf: 'A következők egyike:',
+  'headerFilterOperator=': 'Egyenlő',
+  'headerFilterOperator!=': 'Nem egyenlő',
+  'headerFilterOperator>': 'Nagyobb mint',
+  'headerFilterOperator>=': 'Nagyobb vagy egyenlő',
+  'headerFilterOperator<': 'Kissebb mint',
+  'headerFilterOperator<=': 'Kissebb vagy enygenlő',
   // Filter values text
   filterValueAny: 'bármilyen',
   filterValueTrue: 'igaz',

package/node/locales/roRO.js

@@ -43,7 +43,7 @@ const roROGrid = {
   columnsPanelHideAllButton: 'Ascunde tot',
   // Filter panel text
   filterPanelAddFilter: 'Adăugare filtru',
-  // filterPanelRemoveAll: 'Remove all',
+  filterPanelRemoveAll: 'Șterge tot',
   filterPanelDeleteIconLabel: 'Ștergere',
   filterPanelLogicOperator: 'Operatori logici',
   filterPanelOperator: 'Operatori',
@@ -66,34 +66,32 @@ const roROGrid = {
   filterOperatorIsEmpty: 'este gol',
   filterOperatorIsNotEmpty: 'nu este gol',
   filterOperatorIsAnyOf: 'este una din valori',
-  // 'filterOperator=': '=',
-  // 'filterOperator!=': '!=',
-  // 'filterOperator>': '>',
-  // 'filterOperator>=': '>=',
-  // 'filterOperator<': '<',
-  // 'filterOperator<=': '<=',
-
+  'filterOperator=': '=',
+  'filterOperator!=': '!=',
+  'filterOperator>': '>',
+  'filterOperator>=': '>=',
+  'filterOperator<': '<',
+  'filterOperator<=': '<=',
   // Header filter operators text
-  // headerFilterOperatorContains: 'Contains',
-  // headerFilterOperatorEquals: 'Equals',
-  // headerFilterOperatorStartsWith: 'Starts with',
-  // headerFilterOperatorEndsWith: 'Ends with',
-  // headerFilterOperatorIs: 'Is',
-  // headerFilterOperatorNot: 'Is not',
-  // headerFilterOperatorAfter: 'Is after',
-  // headerFilterOperatorOnOrAfter: 'Is on or after',
-  // headerFilterOperatorBefore: 'Is before',
-  // headerFilterOperatorOnOrBefore: 'Is on or before',
-  // headerFilterOperatorIsEmpty: 'Is empty',
-  // headerFilterOperatorIsNotEmpty: 'Is not empty',
-  // headerFilterOperatorIsAnyOf: 'Is any of',
-  // 'headerFilterOperator=': 'Equals',
-  // 'headerFilterOperator!=': 'Not equals',
-  // 'headerFilterOperator>': 'Greater than',
-  // 'headerFilterOperator>=': 'Greater than or equal to',
-  // 'headerFilterOperator<': 'Less than',
-  // 'headerFilterOperator<=': 'Less than or equal to',
-
+  headerFilterOperatorContains: 'Conține',
+  headerFilterOperatorEquals: 'Egal cu',
+  headerFilterOperatorStartsWith: 'Începe cu',
+  headerFilterOperatorEndsWith: 'Se termină cu',
+  headerFilterOperatorIs: 'Este',
+  headerFilterOperatorNot: 'Nu este',
+  headerFilterOperatorAfter: 'Este după',
+  headerFilterOperatorOnOrAfter: 'Este la sau „după”',
+  headerFilterOperatorBefore: 'Este înainte de',
+  headerFilterOperatorOnOrBefore: 'este la sau înainte de',
+  headerFilterOperatorIsEmpty: 'Este gol',
+  headerFilterOperatorIsNotEmpty: 'Nu este gol',
+  headerFilterOperatorIsAnyOf: 'Este una din valori',
+  'headerFilterOperator=': 'Egal cu',
+  'headerFilterOperator!=': 'Nu este egal cu',
+  'headerFilterOperator>': 'Mai mare decât',
+  'headerFilterOperator>=': 'Mai mare sau egal cu',
+  'headerFilterOperator<': 'Mai mic decât',
+  'headerFilterOperator<=': 'Mai mic sau egal cu',
   // Filter values text
   filterValueAny: 'Aleatoriu',
   filterValueTrue: 'Da',
@@ -101,7 +99,7 @@ const roROGrid = {
   // Column menu text
   columnMenuLabel: 'Meniu',
   columnMenuShowColumns: 'Afișează toate coloanele',
-  // columnMenuManageColumns: 'Manage columns',
+  columnMenuManageColumns: 'Gestionează coloane',
   columnMenuFilter: 'Filtru',
   columnMenuHideColumn: 'Ascunde',
   columnMenuUnsort: 'Dezactivare sortare',
@@ -145,16 +143,14 @@ const roROGrid = {
   expandDetailPanel: 'Extindere',
   collapseDetailPanel: 'Restrângere',
   // Row reordering text
-  rowReorderingHeaderName: 'Reordonare rânduri'
-
+  rowReorderingHeaderName: 'Reordonare rânduri',
   // Aggregation
-  // aggregationMenuItemHeader: 'Aggregation',
-  // aggregationFunctionLabelSum: 'sum',
-  // aggregationFunctionLabelAvg: 'avg',
-  // aggregationFunctionLabelMin: 'min',
-  // aggregationFunctionLabelMax: 'max',
-  // aggregationFunctionLabelSize: 'size',
+  aggregationMenuItemHeader: 'Agregare',
+  aggregationFunctionLabelSum: 'Sumă',
+  aggregationFunctionLabelAvg: 'Medie',
+  aggregationFunctionLabelMin: 'Minim',
+  aggregationFunctionLabelMax: 'Maxim',
+  aggregationFunctionLabelSize: 'Numărul elementelor'
 };
-
 const roRO = (0, _getGridLocalization.getGridLocalization)(roROGrid, _locale.roRO);
 exports.roRO = roRO;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mui/x-data-grid",
-  "version": "6.9.0",
+  "version": "6.9.2",
   "description": "The community edition of the data grid component (MUI X).",
   "author": "MUI Team",
   "main": "./node/index.js",
@@ -36,7 +36,7 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.22.5",
-    "@mui/utils": "^5.13.1",
+    "@mui/utils": "^5.13.6",
     "clsx": "^1.2.1",
     "prop-types": "^15.8.1",
     "reselect": "^4.1.8"