@mui/x-data-grid 5.6.1 → 5.9.0

package/node/hooks/features/sorting/useGridSorting.js

@@ -31,11 +31,11 @@ var _rows = require("../rows");
 
 var _useFirstRender = require("../../utils/useFirstRender");
 
-var _gridSortingUtils = require("./gridSortingUtils");
+var _strategyProcessing = require("../../core/strategyProcessing");
 
-var _preProcessing = require("../../core/preProcessing");
+var _gridSortingUtils = require("./gridSortingUtils");
 
-var _useGridRegisterSortingMethod = require("./useGridRegisterSortingMethod");
+var _pipeProcessing = require("../../core/pipeProcessing");
 
 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); }
 
@@ -62,8 +62,6 @@ exports.sortingStateInitializer = sortingStateInitializer;
 
 const useGridSorting = (apiRef, props) => {
   const logger = (0, _useGridLogger.useGridLogger)(apiRef, 'useGridSorting');
-  const sortingMethodCollectionRef = React.useRef({});
-  const lastSortingMethodApplied = React.useRef(null);
   apiRef.current.unstable_updateControlState({
     stateId: 'sortModel',
     propModel: props.sortModel,
@@ -113,27 +111,19 @@ const useGridSorting = (apiRef, props) => {
    */
 
   const applySorting = React.useCallback(() => {
-    if (props.sortingMode === _gridFeatureMode.GridFeatureModeConstant.server) {
-      logger.debug('Skipping sorting rows as sortingMode = server');
-      apiRef.current.setState(state => (0, _extends2.default)({}, state, {
-        sorting: (0, _extends2.default)({}, state.sorting, {
-          sortedRows: (0, _rows.gridRowIdsSelector)(state, apiRef.current.instanceId)
-        })
-      }));
-      return;
-    }
-
     apiRef.current.setState(state => {
-      const rowGroupingName = (0, _rows.gridRowGroupingNameSelector)(state, apiRef.current.instanceId);
-      const sortingMethod = sortingMethodCollectionRef.current[rowGroupingName];
-
-      if (!sortingMethod) {
-        throw new Error('MUI: Invalid sorting method.');
+      if (props.sortingMode === _gridFeatureMode.GridFeatureModeConstant.server) {
+        logger.debug('Skipping sorting rows as sortingMode = server');
+        return (0, _extends2.default)({}, state, {
+          sorting: (0, _extends2.default)({}, state.sorting, {
+            sortedRows: (0, _rows.gridRowIdsSelector)(state, apiRef.current.instanceId)
+          })
+        });
       }
 
       const sortModel = (0, _gridSortingSelector.gridSortModelSelector)(state, apiRef.current.instanceId);
       const sortRowList = (0, _gridSortingUtils.buildAggregatedSortingApplier)(sortModel, apiRef);
-      const sortedRows = sortingMethod({
+      const sortedRows = apiRef.current.unstable_applyStrategyProcessor('sorting', {
         sortRowList
       });
       return (0, _extends2.default)({}, state, {
@@ -142,6 +132,7 @@ const useGridSorting = (apiRef, props) => {
         })
       });
     });
+    apiRef.current.publishEvent(_events.GridEvents.sortedRowsSet);
     apiRef.current.forceUpdate();
   }, [apiRef, logger, props.sortingMode]);
   const setSortModel = React.useCallback(model => {
@@ -228,9 +219,9 @@ const useGridSorting = (apiRef, props) => {
     const rowTree = (0, _rows.gridRowTreeSelector)(apiRef);
     return params.sortRowList(Object.values(rowTree));
   }, [apiRef]);
-  (0, _preProcessing.useGridRegisterPreProcessor)(apiRef, 'exportState', stateExportPreProcessing);
-  (0, _preProcessing.useGridRegisterPreProcessor)(apiRef, 'restoreState', stateRestorePreProcessing);
-  (0, _useGridRegisterSortingMethod.useGridRegisterSortingMethod)(apiRef, 'none', flatSortingMethod);
+  (0, _pipeProcessing.useGridRegisterPipeProcessor)(apiRef, 'exportState', stateExportPreProcessing);
+  (0, _pipeProcessing.useGridRegisterPipeProcessor)(apiRef, 'restoreState', stateRestorePreProcessing);
+  (0, _strategyProcessing.useGridRegisterStrategyProcessor)(apiRef, _strategyProcessing.GRID_DEFAULT_STRATEGY, 'sorting', flatSortingMethod);
   /**
    * EVENTS
    */
@@ -262,15 +253,8 @@ const useGridSorting = (apiRef, props) => {
       }
     }
   }, [apiRef]);
-  const handlePreProcessorRegister = React.useCallback(name => {
-    if (name !== 'sortingMethod') {
-      return;
-    }
-
-    sortingMethodCollectionRef.current = apiRef.current.unstable_applyPreProcessors('sortingMethod', {});
-    const rowGroupingName = (0, _rows.gridRowGroupingNameSelector)(apiRef);
-
-    if (lastSortingMethodApplied.current !== sortingMethodCollectionRef.current[rowGroupingName]) {
+  const handleStrategyProcessorChange = React.useCallback(methodName => {
+    if (methodName === 'sorting') {
       apiRef.current.applySorting();
     }
   }, [apiRef]);
@@ -278,15 +262,12 @@ const useGridSorting = (apiRef, props) => {
   (0, _useGridApiEventHandler.useGridApiEventHandler)(apiRef, _events.GridEvents.columnHeaderKeyDown, handleColumnHeaderKeyDown);
   (0, _useGridApiEventHandler.useGridApiEventHandler)(apiRef, _events.GridEvents.rowsSet, apiRef.current.applySorting);
   (0, _useGridApiEventHandler.useGridApiEventHandler)(apiRef, _events.GridEvents.columnsChange, handleColumnsChange);
-  (0, _useGridApiEventHandler.useGridApiEventHandler)(apiRef, _events.GridEvents.preProcessorRegister, handlePreProcessorRegister);
+  (0, _useGridApiEventHandler.useGridApiEventHandler)(apiRef, _events.GridEvents.activeStrategyProcessorChange, handleStrategyProcessorChange);
   /**
    * 1ST RENDER
    */
 
   (0, _useFirstRender.useFirstRender)(() => {
-    // This line of pre-processor initialization should always come after the registration of `flatSortingMethod`
-    // Otherwise on the 1st render there would be no sorting method registered
-    sortingMethodCollectionRef.current = apiRef.current.unstable_applyPreProcessors('sortingMethod', {});
     apiRef.current.applySorting();
   });
   /**

package/node/hooks/features/statePersistence/useGridStatePersistence.js

@@ -15,11 +15,11 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 
 const useGridStatePersistence = apiRef => {
   const exportState = React.useCallback(() => {
-    const stateToExport = apiRef.current.unstable_applyPreProcessors('exportState', {});
+    const stateToExport = apiRef.current.unstable_applyPipeProcessors('exportState', {});
     return stateToExport;
   }, [apiRef]);
   const restoreState = React.useCallback(stateToRestore => {
-    const response = apiRef.current.unstable_applyPreProcessors('restoreState', {
+    const response = apiRef.current.unstable_applyPipeProcessors('restoreState', {
       callbacks: []
     }, {
       stateToRestore

package/node/hooks/features/virtualization/useGridVirtualScroller.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getIndexFromScroll = getIndexFromScroll;
-exports.useGridVirtualScroller = void 0;
+exports.useGridVirtualScroller = exports.getRenderableIndexes = void 0;
 
 var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
 
@@ -14,6 +14,8 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 
 var React = _interopRequireWildcard(require("react"));
 
+var ReactDOM = _interopRequireWildcard(require("react-dom"));
+
 var _utils = require("@mui/material/utils");
 
 var _useGridApiContext = require("../../utils/useGridApiContext");
@@ -42,6 +44,8 @@ var _gridSelectionSelector = require("../selection/gridSelectionSelector");
 
 var _gridRowsMetaSelector = require("../rows/gridRowsMetaSelector");
 
+var _gridColumnsUtils = require("../columns/gridColumnsUtils");
+
 var _jsxRuntime = require("react/jsx-runtime");
 
 const _excluded = ["style"];
@@ -65,9 +69,19 @@ function getIndexFromScroll(offset, positions, sliceStart = 0, sliceEnd = positi
   return offset <= itemOffset ? getIndexFromScroll(offset, positions, sliceStart, pivot) : getIndexFromScroll(offset, positions, pivot + 1, sliceEnd);
 }
 
-const useGridVirtualScroller = props => {
-  var _currentPage$range2;
+const getRenderableIndexes = ({
+  firstIndex,
+  lastIndex,
+  buffer,
+  minFirstIndex,
+  maxLastIndex
+}) => {
+  return [(0, _utils2.clamp)(firstIndex - buffer, minFirstIndex, maxLastIndex), (0, _utils2.clamp)(lastIndex + buffer, minFirstIndex, maxLastIndex)];
+};
+
+exports.getRenderableIndexes = getRenderableIndexes;
 
+const useGridVirtualScroller = props => {
   const apiRef = (0, _useGridApiContext.useGridApiContext)();
   const rootProps = (0, _useGridRootProps.useGridRootProps)();
   const visibleColumns = (0, _useGridSelector.useGridSelector)(apiRef, _gridColumnsSelector.gridVisibleColumnDefinitionsSelector);
@@ -142,34 +156,28 @@ const useGridVirtualScroller = props => {
     }
   }, []);
   (0, _useGridApiEventHandler.useGridApiEventHandler)(apiRef, _events.GridEvents.resize, handleResize);
-
-  const getRenderableIndexes = ({
-    firstIndex,
-    lastIndex,
-    buffer,
-    minFirstIndex,
-    maxLastIndex
-  }) => {
-    return [(0, _utils2.clamp)(firstIndex - buffer, minFirstIndex, maxLastIndex), (0, _utils2.clamp)(lastIndex + buffer, minFirstIndex, maxLastIndex)];
-  };
-
   const updateRenderZonePosition = React.useCallback(nextRenderContext => {
-    var _currentPage$range;
-
-    const [firstRowToRender] = getRenderableIndexes({
+    const [firstRowToRender, lastRowToRender] = getRenderableIndexes({
       firstIndex: nextRenderContext.firstRowIndex,
       lastIndex: nextRenderContext.lastRowIndex,
       minFirstIndex: 0,
-      maxLastIndex: ((_currentPage$range = currentPage.range) == null ? void 0 : _currentPage$range.lastRowIndex) || 0,
+      maxLastIndex: currentPage.rows.length,
       buffer: rootProps.rowBuffer
     });
-    const [firstColumnToRender] = getRenderableIndexes({
+    const [initialFirstColumnToRender] = getRenderableIndexes({
       firstIndex: nextRenderContext.firstColumnIndex,
       lastIndex: nextRenderContext.lastColumnIndex,
       minFirstIndex: renderZoneMinColumnIndex,
       maxLastIndex: renderZoneMaxColumnIndex,
       buffer: rootProps.columnBuffer
     });
+    const firstColumnToRender = (0, _gridColumnsUtils.getFirstNonSpannedColumnToRender)({
+      firstColumnToRender: initialFirstColumnToRender,
+      apiRef,
+      firstRowToRender,
+      lastRowToRender,
+      visibleRows: currentPage.rows
+    });
     const top = (0, _gridRowsMetaSelector.gridRowsMetaSelector)(apiRef.current.state).positions[firstRowToRender];
     const left = (0, _gridColumnsSelector.gridColumnPositionsSelector)(apiRef)[firstColumnToRender]; // Call directly the selector because it might be outdated when this method is called
 
@@ -181,19 +189,22 @@ const useGridVirtualScroller = props => {
         left
       });
     }
-  }, [apiRef, (_currentPage$range2 = currentPage.range) == null ? void 0 : _currentPage$range2.lastRowIndex, onRenderZonePositioning, renderZoneMaxColumnIndex, renderZoneMinColumnIndex, rootProps.columnBuffer, rootProps.rowBuffer]);
+  }, [apiRef, currentPage.rows, onRenderZonePositioning, renderZoneMinColumnIndex, renderZoneMaxColumnIndex, rootProps.columnBuffer, rootProps.rowBuffer]);
+  React.useLayoutEffect(() => {
+    if (renderContext) {
+      updateRenderZonePosition(renderContext);
+    }
+  }, [renderContext, updateRenderZonePosition]);
   const updateRenderContext = React.useCallback(nextRenderContext => {
     setRenderContext(nextRenderContext);
-    updateRenderZonePosition(nextRenderContext);
     prevRenderContext.current = nextRenderContext;
-  }, [setRenderContext, prevRenderContext, updateRenderZonePosition]);
+  }, [setRenderContext, prevRenderContext]);
   React.useEffect(() => {
     if (containerWidth == null) {
       return;
     }
 
     const initialRenderContext = computeRenderContext();
-    prevRenderContext.current = initialRenderContext;
     updateRenderContext(initialRenderContext);
     const {
       top,
@@ -221,18 +232,23 @@ const useGridVirtualScroller = props => {
 
 
     const nextRenderContext = disableVirtualization ? prevRenderContext.current : computeRenderContext();
-    const rowsScrolledSincePreviousRender = Math.abs(nextRenderContext.firstRowIndex - prevRenderContext.current.firstRowIndex);
-    const columnsScrolledSincePreviousRender = Math.abs(nextRenderContext.firstColumnIndex - prevRenderContext.current.firstColumnIndex);
-    const shouldSetState = rowsScrolledSincePreviousRender >= rootProps.rowThreshold || columnsScrolledSincePreviousRender >= rootProps.columnThreshold || prevTotalWidth.current !== columnsTotalWidth; // TODO v6: rename event to a wider name, it's not only fired for row scrolling
+    const topRowsScrolledSincePreviousRender = Math.abs(nextRenderContext.firstRowIndex - prevRenderContext.current.firstRowIndex);
+    const bottomRowsScrolledSincePreviousRender = Math.abs(nextRenderContext.lastRowIndex - prevRenderContext.current.lastRowIndex);
+    const topColumnsScrolledSincePreviousRender = Math.abs(nextRenderContext.firstColumnIndex - prevRenderContext.current.firstColumnIndex);
+    const bottomColumnsScrolledSincePreviousRender = Math.abs(nextRenderContext.lastColumnIndex - prevRenderContext.current.lastColumnIndex);
+    const shouldSetState = topRowsScrolledSincePreviousRender >= rootProps.rowThreshold || bottomRowsScrolledSincePreviousRender >= rootProps.rowThreshold || topColumnsScrolledSincePreviousRender >= rootProps.columnThreshold || bottomColumnsScrolledSincePreviousRender >= rootProps.columnThreshold || prevTotalWidth.current !== columnsTotalWidth; // TODO v6: rename event to a wider name, it's not only fired for row scrolling
 
     apiRef.current.publishEvent(_events.GridEvents.rowsScroll, {
       top: scrollTop,
       left: scrollLeft,
       renderContext: shouldSetState ? nextRenderContext : prevRenderContext.current
-    });
+    }, event);
 
     if (shouldSetState) {
-      updateRenderContext(nextRenderContext);
+      // Prevents batching render context changes
+      ReactDOM.flushSync(() => {
+        updateRenderContext(nextRenderContext);
+      });
       prevTotalWidth.current = columnsTotalWidth;
     }
   };
@@ -260,14 +276,32 @@ const useGridVirtualScroller = props => {
       maxLastIndex: currentPage.rows.length,
       buffer: rowBuffer
     });
-    const [firstColumnToRender, lastColumnToRender] = getRenderableIndexes({
+    const renderedRows = [];
+
+    for (let i = firstRowToRender; i < lastRowToRender; i += 1) {
+      const row = currentPage.rows[i];
+      renderedRows.push(row);
+      apiRef.current.unstable_calculateColSpan({
+        rowId: row.id,
+        minFirstColumn,
+        maxLastColumn
+      });
+    }
+
+    const [initialFirstColumnToRender, lastColumnToRender] = getRenderableIndexes({
       firstIndex: nextRenderContext.firstColumnIndex,
       lastIndex: nextRenderContext.lastColumnIndex,
       minFirstIndex: minFirstColumn,
       maxLastIndex: maxLastColumn,
       buffer: columnBuffer
     });
-    const renderedRows = currentPage.rows.slice(firstRowToRender, lastRowToRender);
+    const firstColumnToRender = (0, _gridColumnsUtils.getFirstNonSpannedColumnToRender)({
+      firstColumnToRender: initialFirstColumnToRender,
+      apiRef,
+      firstRowToRender,
+      lastRowToRender,
+      visibleRows: currentPage.rows
+    });
     const renderedColumns = visibleColumns.slice(firstColumnToRender, lastColumnToRender);
     const rows = [];
 

package/node/index.js

@@ -1,4 +1,4 @@
-/** @license MUI v5.6.1
+/** @license MUI v5.9.0
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

package/node/internals/index.js

@@ -63,12 +63,18 @@ Object.defineProperty(exports, "densityStateInitializer", {
     return _useGridDensity.densityStateInitializer;
   }
 });
-Object.defineProperty(exports, "editingStateInitializer", {
+Object.defineProperty(exports, "editingStateInitializer_new", {
   enumerable: true,
   get: function () {
     return _useGridEditing.editingStateInitializer;
   }
 });
+Object.defineProperty(exports, "editingStateInitializer_old", {
+  enumerable: true,
+  get: function () {
+    return _useGridEditing2.editingStateInitializer;
+  }
+});
 Object.defineProperty(exports, "filterStateInitializer", {
   enumerable: true,
   get: function () {
@@ -153,6 +159,12 @@ Object.defineProperty(exports, "useGridColumnMenu", {
     return _useGridColumnMenu.useGridColumnMenu;
   }
 });
+Object.defineProperty(exports, "useGridColumnSpanning", {
+  enumerable: true,
+  get: function () {
+    return _useGridColumnSpanning.useGridColumnSpanning;
+  }
+});
 Object.defineProperty(exports, "useGridColumns", {
   enumerable: true,
   get: function () {
@@ -177,12 +189,18 @@ Object.defineProperty(exports, "useGridDimensions", {
     return _useGridDimensions.useGridDimensions;
   }
 });
-Object.defineProperty(exports, "useGridEditing", {
+Object.defineProperty(exports, "useGridEditing_new", {
   enumerable: true,
   get: function () {
     return _useGridEditing.useGridEditing;
   }
 });
+Object.defineProperty(exports, "useGridEditing_old", {
+  enumerable: true,
+  get: function () {
+    return _useGridEditing2.useGridEditing;
+  }
+});
 Object.defineProperty(exports, "useGridEvents", {
   enumerable: true,
   get: function () {
@@ -213,12 +231,6 @@ Object.defineProperty(exports, "useGridInitializeState", {
     return _useGridInitializeState.useGridInitializeState;
   }
 });
-Object.defineProperty(exports, "useGridKeyboard", {
-  enumerable: true,
-  get: function () {
-    return _useGridKeyboard.useGridKeyboard;
-  }
-});
 Object.defineProperty(exports, "useGridKeyboardNavigation", {
   enumerable: true,
   get: function () {
@@ -249,22 +261,16 @@ Object.defineProperty(exports, "useGridPrintExport", {
     return _useGridPrintExport.useGridPrintExport;
   }
 });
-Object.defineProperty(exports, "useGridRegisterFilteringMethod", {
+Object.defineProperty(exports, "useGridRegisterPipeProcessor", {
   enumerable: true,
   get: function () {
-    return _useGridRegisterFilteringMethod.useGridRegisterFilteringMethod;
+    return _pipeProcessing.useGridRegisterPipeProcessor;
   }
 });
-Object.defineProperty(exports, "useGridRegisterPreProcessor", {
+Object.defineProperty(exports, "useGridRegisterStrategyProcessor", {
   enumerable: true,
   get: function () {
-    return _preProcessing.useGridRegisterPreProcessor;
-  }
-});
-Object.defineProperty(exports, "useGridRegisterSortingMethod", {
-  enumerable: true,
-  get: function () {
-    return _useGridRegisterSortingMethod.useGridRegisterSortingMethod;
+    return _strategyProcessing.useGridRegisterStrategyProcessor;
   }
 });
 Object.defineProperty(exports, "useGridRows", {
@@ -279,6 +285,12 @@ Object.defineProperty(exports, "useGridRowsMeta", {
     return _useGridRowsMeta.useGridRowsMeta;
   }
 });
+Object.defineProperty(exports, "useGridRowsPreProcessors", {
+  enumerable: true,
+  get: function () {
+    return _useGridRowsPreProcessors.useGridRowsPreProcessors;
+  }
+});
 Object.defineProperty(exports, "useGridScroll", {
   enumerable: true,
   get: function () {
@@ -332,7 +344,9 @@ var _GridColumnHeaders = require("../components/columnHeaders/GridColumnHeaders"
 
 var _GridColumnHeadersInner = require("../components/columnHeaders/GridColumnHeadersInner");
 
-var _preProcessing = require("../hooks/core/preProcessing");
+var _pipeProcessing = require("../hooks/core/pipeProcessing");
+
+var _strategyProcessing = require("../hooks/core/strategyProcessing");
 
 var _useGridInitialization = require("../hooks/core/useGridInitialization");
 
@@ -344,6 +358,8 @@ var _useGridColumnMenu = require("../hooks/features/columnMenu/useGridColumnMenu
 
 var _useGridColumns = require("../hooks/features/columns/useGridColumns");
 
+var _useGridColumnSpanning = require("../hooks/features/columns/useGridColumnSpanning");
+
 var _useGridDensity = require("../hooks/features/density/useGridDensity");
 
 var _useGridCsvExport = require("../hooks/features/export/useGridCsvExport");
@@ -352,22 +368,22 @@ var _useGridPrintExport = require("../hooks/features/export/useGridPrintExport")
 
 var _useGridFilter = require("../hooks/features/filter/useGridFilter");
 
-var _useGridRegisterFilteringMethod = require("../hooks/features/filter/useGridRegisterFilteringMethod");
-
 var _useGridFocus = require("../hooks/features/focus/useGridFocus");
 
-var _useGridKeyboard = require("../hooks/features/keyboard/useGridKeyboard");
-
-var _useGridKeyboardNavigation = require("../hooks/features/keyboard/useGridKeyboardNavigation");
+var _useGridKeyboardNavigation = require("../hooks/features/keyboardNavigation/useGridKeyboardNavigation");
 
 var _useGridPagination = require("../hooks/features/pagination/useGridPagination");
 
 var _useGridPreferencesPanel = require("../hooks/features/preferencesPanel/useGridPreferencesPanel");
 
-var _useGridEditing = require("../hooks/features/editRows/useGridEditing");
+var _useGridEditing = require("../hooks/features/editRows/useGridEditing.new");
+
+var _useGridEditing2 = require("../hooks/features/editRows/useGridEditing.old");
 
 var _useGridRows = require("../hooks/features/rows/useGridRows");
 
+var _useGridRowsPreProcessors = require("../hooks/features/rows/useGridRowsPreProcessors");
+
 var _useGridRowsMeta = require("../hooks/features/rows/useGridRowsMeta");
 
 var _useGridParamsApi = require("../hooks/features/rows/useGridParamsApi");
@@ -378,8 +394,6 @@ var _useGridSelectionPreProcessors = require("../hooks/features/selection/useGri
 
 var _useGridSorting = require("../hooks/features/sorting/useGridSorting");
 
-var _useGridRegisterSortingMethod = require("../hooks/features/sorting/useGridRegisterSortingMethod");
-
 var _useGridScroll = require("../hooks/features/scroll/useGridScroll");
 
 var _useGridEvents = require("../hooks/features/events/useGridEvents");

package/node/locales/arSD.js

@@ -15,104 +15,104 @@ const arSDGrid = {
   noResultsOverlayLabel: 'لم يتم العثور على نتائج.',
   errorOverlayDefaultLabel: 'حدث خطأ.',
   // Density selector toolbar button text
-  toolbarDensity: 'كثافة',
-  toolbarDensityLabel: 'كثافة',
-  toolbarDensityCompact: 'مدمج',
-  toolbarDensityStandard: 'المعيار',
+  toolbarDensity: 'الكثافة',
+  toolbarDensityLabel: 'الكثافة',
+  toolbarDensityCompact: 'مضغوط',
+  toolbarDensityStandard: 'قياسي',
   toolbarDensityComfortable: 'مريح',
   // Columns selector toolbar button text
   toolbarColumns: 'الأعمدة',
-  toolbarColumnsLabel: 'حدد الأعمدة',
+  toolbarColumnsLabel: 'حدد أعمدة',
   // Filters toolbar button text
-  toolbarFilters: 'الفلاتر',
-  toolbarFiltersLabel: 'اظهر الفلاتر',
-  toolbarFiltersTooltipHide: 'إخفاء الفلاتر',
-  toolbarFiltersTooltipShow: 'اظهر الفلاتر',
-  toolbarFiltersTooltipActive: count => count !== 1 ? `${count} فلاتر نشطة` : `${count} فلاتر نشطة`,
+  toolbarFilters: 'المُرشِحات',
+  toolbarFiltersLabel: 'إظهار المرشِحات',
+  toolbarFiltersTooltipHide: 'إخفاء المرشِحات',
+  toolbarFiltersTooltipShow: 'اظهر المرشِحات',
+  toolbarFiltersTooltipActive: count => count !== 1 ? `${count} من المرشِحات النشطة` : `مرشِح نشط`,
   // Export selector toolbar button text
   toolbarExport: 'تصدير',
   toolbarExportLabel: 'تصدير',
   toolbarExportCSV: 'تنزيل كملف CSV',
   // toolbarExportPrint: 'Print',
   // Columns panel text
-  columnsPanelTextFieldLabel: 'ايجاد عمود',
+  columnsPanelTextFieldLabel: 'البحث عن العمود',
   columnsPanelTextFieldPlaceholder: 'عنوان العمود',
   columnsPanelDragIconLabel: 'إعادة ترتيب العمود',
-  columnsPanelShowAllButton: 'عرض الكل',
-  columnsPanelHideAllButton: 'اخفاء الكل',
+  columnsPanelShowAllButton: 'إظهار الكل',
+  columnsPanelHideAllButton: 'إخفاء الكل',
   // Filter panel text
-  filterPanelAddFilter: 'اضف فلتر',
+  filterPanelAddFilter: 'إضافة مرشِح',
   filterPanelDeleteIconLabel: 'حذف',
-  // filterPanelLinkOperator: 'Logic operator',
-  filterPanelOperators: 'العاملين',
+  filterPanelLinkOperator: 'عامل منطقي',
+  filterPanelOperators: 'عامل',
   // TODO v6: rename to filterPanelOperator
   filterPanelOperatorAnd: 'و',
-  filterPanelOperatorOr: 'او',
+  filterPanelOperatorOr: 'أو',
   filterPanelColumns: 'الأعمدة',
-  filterPanelInputLabel: 'قيمة',
-  filterPanelInputPlaceholder: 'قيمة التصفية',
+  filterPanelInputLabel: 'القيمة',
+  filterPanelInputPlaceholder: 'ترشِيح قيمة',
   // Filter operators text
-  filterOperatorContains: 'يحتوي على',
+  filterOperatorContains: 'يحتوي',
   filterOperatorEquals: 'يساوي',
-  filterOperatorStartsWith: 'يبدأ ب',
+  filterOperatorStartsWith: 'يبدأ بـ',
   filterOperatorEndsWith: 'ينتهي بـ',
   filterOperatorIs: 'يكون',
   filterOperatorNot: 'ليس',
-  filterOperatorAfter: 'يكون بعد',
-  filterOperatorOnOrAfter: 'في أو بعد',
-  filterOperatorBefore: 'يكون',
-  filterOperatorOnOrBefore: 'في أو قبل',
-  filterOperatorIsEmpty: 'فارغ',
-  filterOperatorIsNotEmpty: 'ليس فارغا',
-  // filterOperatorIsAnyOf: 'is any of',
+  filterOperatorAfter: 'بعد',
+  filterOperatorOnOrAfter: 'عند أو بعد',
+  filterOperatorBefore: 'بعد',
+  filterOperatorOnOrBefore: 'عند أو قبل',
+  filterOperatorIsEmpty: 'خالي',
+  filterOperatorIsNotEmpty: 'غير خالي',
+  filterOperatorIsAnyOf: 'أي من',
   // Filter values text
   filterValueAny: 'أي',
-  filterValueTrue: 'صحيح',
-  filterValueFalse: 'خاطئة',
+  filterValueTrue: 'صائب',
+  filterValueFalse: 'خاطئ',
   // Column menu text
   columnMenuLabel: 'القائمة',
   columnMenuShowColumns: 'إظهار الأعمدة',
-  columnMenuFilter: 'فلتر',
+  columnMenuFilter: 'المرشِح',
   columnMenuHideColumn: 'إخفاء',
-  columnMenuUnsort: 'غير مرتب',
-  columnMenuSortAsc: 'الترتيب حسب ASC',
-  columnMenuSortDesc: 'الترتيب حسب DESC',
+  columnMenuUnsort: 'الغاء الفرز',
+  columnMenuSortAsc: 'الفرز تصاعدياً',
+  columnMenuSortDesc: 'الفرز تنازلياً',
   // Column header text
-  columnHeaderFiltersTooltipActive: count => count !== 1 ? `${count} فلاتر نشطة` : `${count} فلاتر نشطة`,
-  columnHeaderFiltersLabel: 'اظهر الفلاتر',
-  columnHeaderSortIconLabel: 'ترتيب',
+  columnHeaderFiltersTooltipActive: count => count !== 1 ? `${count} من المرشِحات النشطة` : `مرشِح نشط`,
+  columnHeaderFiltersLabel: 'إظهار المرشحات',
+  columnHeaderSortIconLabel: 'فرز',
   // Rows selected footer text
-  footerRowSelected: count => count !== 1 ? `${count.toLocaleString()} صفوف مختارة` : `${count.toLocaleString()} صفوف مختارة`,
+  footerRowSelected: count => count !== 1 ? `تم تحديد ${count.toLocaleString()} من الصفوف` : `تم تحديد صف واحد`,
   // Total row amount footer text
   footerTotalRows: 'إجمالي الصفوف:',
   // Total visible row amount footer text
   footerTotalVisibleRows: (visibleCount, totalCount) => `${visibleCount.toLocaleString()} من ${totalCount.toLocaleString()}`,
   // Checkbox selection text
-  checkboxSelectionHeaderName: 'تحديد',
-  // checkboxSelectionSelectAllRows: 'Select all rows',
-  // checkboxSelectionUnselectAllRows: 'Unselect all rows',
-  // checkboxSelectionSelectRow: 'Select row',
-  // checkboxSelectionUnselectRow: 'Unselect row',
+  checkboxSelectionHeaderName: 'تحديد خانة الاختيار',
+  checkboxSelectionSelectAllRows: 'تحديد كل الصفوف',
+  checkboxSelectionUnselectAllRows: 'الغاء تحديد كل الصفوف',
+  checkboxSelectionSelectRow: 'تحديد صف',
+  checkboxSelectionUnselectRow: 'الغاء تحديد الصف',
   // Boolean cell text
-  booleanCellTrueLabel: 'صحيح',
-  booleanCellFalseLabel: 'خاطئة' // Actions cell more text
-  // actionsCellMore: 'more',
+  booleanCellTrueLabel: 'نعم',
+  booleanCellFalseLabel: 'لا',
+  // Actions cell more text
+  actionsCellMore: 'المزيد',
   // Column pinning text
-  // pinToLeft: 'Pin to left',
-  // pinToRight: 'Pin to right',
-  // unpin: 'Unpin',
+  pinToLeft: 'التدبيس يميناً',
+  pinToRight: 'التدبيس يساراً',
+  unpin: 'الغاء التدبيس',
   // Tree Data
-  // treeDataGroupingHeaderName: 'Group',
-  // treeDataExpand: 'see children',
-  // treeDataCollapse: 'hide children',
+  treeDataGroupingHeaderName: 'تجميع',
+  treeDataExpand: 'رؤية الأبناء',
+  treeDataCollapse: 'إخفاء الأبناء',
   // Grouping columns
-  // groupingColumnHeaderName: 'Group',
-  // groupColumn: name => `Group by ${name}`,
-  // unGroupColumn: name => `Stop grouping by ${name}`,
+  groupingColumnHeaderName: 'تجميع',
+  groupColumn: name => `تجميع حسب ${name}`,
+  unGroupColumn: name => `إيقاف التجميع حسب ${name}`,
   // Master/detail
-  // expandDetailPanel: 'Expand',
-  // collapseDetailPanel: 'Collapse',
-
+  expandDetailPanel: 'توسيع',
+  collapseDetailPanel: 'طوي'
 };
 const arSD = (0, _getGridLocalization.getGridLocalization)(arSDGrid, _locale.arSD);
 exports.arSD = arSD;