@mui/x-data-grid 5.6.1 → 5.9.0

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

@@ -9,11 +9,11 @@ import { useGridApiMethod } from '../../utils/useGridApiMethod';
 import { useGridLogger } from '../../utils/useGridLogger';
 import { gridColumnLookupSelector } from '../columns/gridColumnsSelector';
 import { gridSortedRowEntriesSelector, gridSortedRowIdsSelector, gridSortModelSelector } from './gridSortingSelector';
-import { gridRowIdsSelector, gridRowGroupingNameSelector, gridRowTreeSelector } from '../rows';
+import { gridRowIdsSelector, gridRowTreeSelector } from '../rows';
 import { useFirstRender } from '../../utils/useFirstRender';
+import { useGridRegisterStrategyProcessor, GRID_DEFAULT_STRATEGY } from '../../core/strategyProcessing';
 import { buildAggregatedSortingApplier, mergeStateWithSortModel, getNextGridSortDirection, sanitizeSortModel } from './gridSortingUtils';
-import { useGridRegisterPreProcessor } from '../../core/preProcessing';
-import { useGridRegisterSortingMethod } from './useGridRegisterSortingMethod';
+import { useGridRegisterPipeProcessor } from '../../core/pipeProcessing';
 export var sortingStateInitializer = function sortingStateInitializer(state, props) {
   var _ref, _props$sortModel, _props$initialState, _props$initialState$s;
 
@@ -32,8 +32,6 @@ export var sortingStateInitializer = function sortingStateInitializer(state, pro
 
 export var useGridSorting = function useGridSorting(apiRef, props) {
   var logger = useGridLogger(apiRef, 'useGridSorting');
-  var sortingMethodCollectionRef = React.useRef({});
-  var lastSortingMethodApplied = React.useRef(null);
   apiRef.current.unstable_updateControlState({
     stateId: 'sortModel',
     propModel: props.sortModel,
@@ -88,29 +86,19 @@ export var useGridSorting = function useGridSorting(apiRef, props) {
    */
 
   var applySorting = React.useCallback(function () {
-    if (props.sortingMode === GridFeatureModeConstant.server) {
-      logger.debug('Skipping sorting rows as sortingMode = server');
-      apiRef.current.setState(function (state) {
+    apiRef.current.setState(function (state) {
+      if (props.sortingMode === GridFeatureModeConstant.server) {
+        logger.debug('Skipping sorting rows as sortingMode = server');
         return _extends({}, state, {
           sorting: _extends({}, state.sorting, {
             sortedRows: gridRowIdsSelector(state, apiRef.current.instanceId)
           })
         });
-      });
-      return;
-    }
-
-    apiRef.current.setState(function (state) {
-      var rowGroupingName = gridRowGroupingNameSelector(state, apiRef.current.instanceId);
-      var sortingMethod = sortingMethodCollectionRef.current[rowGroupingName];
-
-      if (!sortingMethod) {
-        throw new Error('MUI: Invalid sorting method.');
       }
 
       var sortModel = gridSortModelSelector(state, apiRef.current.instanceId);
       var sortRowList = buildAggregatedSortingApplier(sortModel, apiRef);
-      var sortedRows = sortingMethod({
+      var sortedRows = apiRef.current.unstable_applyStrategyProcessor('sorting', {
         sortRowList: sortRowList
       });
       return _extends({}, state, {
@@ -119,6 +107,7 @@ export var useGridSorting = function useGridSorting(apiRef, props) {
         })
       });
     });
+    apiRef.current.publishEvent(GridEvents.sortedRowsSet);
     apiRef.current.forceUpdate();
   }, [apiRef, logger, props.sortingMode]);
   var setSortModel = React.useCallback(function (model) {
@@ -215,9 +204,9 @@ export var useGridSorting = function useGridSorting(apiRef, props) {
     var rowTree = gridRowTreeSelector(apiRef);
     return params.sortRowList(Object.values(rowTree));
   }, [apiRef]);
-  useGridRegisterPreProcessor(apiRef, 'exportState', stateExportPreProcessing);
-  useGridRegisterPreProcessor(apiRef, 'restoreState', stateRestorePreProcessing);
-  useGridRegisterSortingMethod(apiRef, 'none', flatSortingMethod);
+  useGridRegisterPipeProcessor(apiRef, 'exportState', stateExportPreProcessing);
+  useGridRegisterPipeProcessor(apiRef, 'restoreState', stateRestorePreProcessing);
+  useGridRegisterStrategyProcessor(apiRef, GRID_DEFAULT_STRATEGY, 'sorting', flatSortingMethod);
   /**
    * EVENTS
    */
@@ -250,15 +239,8 @@ export var useGridSorting = function useGridSorting(apiRef, props) {
       }
     }
   }, [apiRef]);
-  var handlePreProcessorRegister = React.useCallback(function (name) {
-    if (name !== 'sortingMethod') {
-      return;
-    }
-
-    sortingMethodCollectionRef.current = apiRef.current.unstable_applyPreProcessors('sortingMethod', {});
-    var rowGroupingName = gridRowGroupingNameSelector(apiRef);
-
-    if (lastSortingMethodApplied.current !== sortingMethodCollectionRef.current[rowGroupingName]) {
+  var handleStrategyProcessorChange = React.useCallback(function (methodName) {
+    if (methodName === 'sorting') {
       apiRef.current.applySorting();
     }
   }, [apiRef]);
@@ -266,15 +248,12 @@ export var useGridSorting = function useGridSorting(apiRef, props) {
   useGridApiEventHandler(apiRef, GridEvents.columnHeaderKeyDown, handleColumnHeaderKeyDown);
   useGridApiEventHandler(apiRef, GridEvents.rowsSet, apiRef.current.applySorting);
   useGridApiEventHandler(apiRef, GridEvents.columnsChange, handleColumnsChange);
-  useGridApiEventHandler(apiRef, GridEvents.preProcessorRegister, handlePreProcessorRegister);
+  useGridApiEventHandler(apiRef, GridEvents.activeStrategyProcessorChange, handleStrategyProcessorChange);
   /**
    * 1ST RENDER
    */
 
   useFirstRender(function () {
-    // 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/legacy/hooks/features/statePersistence/useGridStatePersistence.js

@@ -2,11 +2,11 @@ import * as React from 'react';
 import { useGridApiMethod } from '../../utils';
 export var useGridStatePersistence = function useGridStatePersistence(apiRef) {
   var exportState = React.useCallback(function () {
-    var stateToExport = apiRef.current.unstable_applyPreProcessors('exportState', {});
+    var stateToExport = apiRef.current.unstable_applyPipeProcessors('exportState', {});
     return stateToExport;
   }, [apiRef]);
   var restoreState = React.useCallback(function (stateToRestore) {
-    var response = apiRef.current.unstable_applyPreProcessors('restoreState', {
+    var response = apiRef.current.unstable_applyPipeProcessors('restoreState', {
       callbacks: []
     }, {
       stateToRestore: stateToRestore

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

@@ -3,6 +3,7 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 var _excluded = ["style"];
 import * as React from 'react';
+import * as ReactDOM from 'react-dom';
 import { useForkRef } from '@mui/material/utils';
 import { useGridApiContext } from '../../utils/useGridApiContext';
 import { useGridRootProps } from '../../utils/useGridRootProps';
@@ -17,8 +18,9 @@ import { useGridApiEventHandler } from '../../utils/useGridApiEventHandler';
 import { clamp } from '../../../utils/utils';
 import { selectedIdsLookupSelector } from '../selection/gridSelectionSelector';
 import { gridRowsMetaSelector } from '../rows/gridRowsMetaSelector';
+import { getFirstNonSpannedColumnToRender } from '../columns/gridColumnsUtils'; // Uses binary search to avoid looping through all possible positions
+
 import { jsx as _jsx } from "react/jsx-runtime";
-// Uses binary search to avoid looping through all possible positions
 export function getIndexFromScroll(offset, positions) {
   var sliceStart = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
   var sliceEnd = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : positions.length;
@@ -35,9 +37,15 @@ export function getIndexFromScroll(offset, positions) {
   var itemOffset = positions[pivot];
   return offset <= itemOffset ? getIndexFromScroll(offset, positions, sliceStart, pivot) : getIndexFromScroll(offset, positions, pivot + 1, sliceEnd);
 }
+export var getRenderableIndexes = function getRenderableIndexes(_ref) {
+  var firstIndex = _ref.firstIndex,
+      lastIndex = _ref.lastIndex,
+      buffer = _ref.buffer,
+      minFirstIndex = _ref.minFirstIndex,
+      maxLastIndex = _ref.maxLastIndex;
+  return [clamp(firstIndex - buffer, minFirstIndex, maxLastIndex), clamp(lastIndex + buffer, minFirstIndex, maxLastIndex)];
+};
 export var useGridVirtualScroller = function useGridVirtualScroller(props) {
-  var _currentPage$range2;
-
   var apiRef = useGridApiContext();
   var rootProps = useGridRootProps();
   var visibleColumns = useGridSelector(apiRef, gridVisibleColumnDefinitionsSelector);
@@ -89,9 +97,9 @@ export var useGridVirtualScroller = function useGridVirtualScroller(props) {
       };
     }
 
-    var _ref = scrollPosition.current,
-        top = _ref.top,
-        left = _ref.left;
+    var _ref2 = scrollPosition.current,
+        top = _ref2.top,
+        left = _ref2.left;
     var firstRowIndex = getIndexFromScroll(top, rowsMeta.positions);
     var lastRowIndex = rootProps.autoHeight ? firstRowIndex + currentPage.rows.length : getIndexFromScroll(top + rootRef.current.clientHeight, rowsMeta.positions);
     var firstColumnIndex = getIndexFromScroll(left, columnPositions);
@@ -121,28 +129,17 @@ export var useGridVirtualScroller = function useGridVirtualScroller(props) {
     }
   }, []);
   useGridApiEventHandler(apiRef, GridEvents.resize, handleResize);
-
-  var getRenderableIndexes = function getRenderableIndexes(_ref2) {
-    var firstIndex = _ref2.firstIndex,
-        lastIndex = _ref2.lastIndex,
-        buffer = _ref2.buffer,
-        minFirstIndex = _ref2.minFirstIndex,
-        maxLastIndex = _ref2.maxLastIndex;
-    return [clamp(firstIndex - buffer, minFirstIndex, maxLastIndex), clamp(lastIndex + buffer, minFirstIndex, maxLastIndex)];
-  };
-
   var updateRenderZonePosition = React.useCallback(function (nextRenderContext) {
-    var _currentPage$range;
-
     var _getRenderableIndexes = 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
     }),
-        _getRenderableIndexes2 = _slicedToArray(_getRenderableIndexes, 1),
-        firstRowToRender = _getRenderableIndexes2[0];
+        _getRenderableIndexes2 = _slicedToArray(_getRenderableIndexes, 2),
+        firstRowToRender = _getRenderableIndexes2[0],
+        lastRowToRender = _getRenderableIndexes2[1];
 
     var _getRenderableIndexes3 = getRenderableIndexes({
       firstIndex: nextRenderContext.firstColumnIndex,
@@ -152,8 +149,15 @@ export var useGridVirtualScroller = function useGridVirtualScroller(props) {
       buffer: rootProps.columnBuffer
     }),
         _getRenderableIndexes4 = _slicedToArray(_getRenderableIndexes3, 1),
-        firstColumnToRender = _getRenderableIndexes4[0];
-
+        initialFirstColumnToRender = _getRenderableIndexes4[0];
+
+    var firstColumnToRender = getFirstNonSpannedColumnToRender({
+      firstColumnToRender: initialFirstColumnToRender,
+      apiRef: apiRef,
+      firstRowToRender: firstRowToRender,
+      lastRowToRender: lastRowToRender,
+      visibleRows: currentPage.rows
+    });
     var top = gridRowsMetaSelector(apiRef.current.state).positions[firstRowToRender];
     var left = gridColumnPositionsSelector(apiRef)[firstColumnToRender]; // Call directly the selector because it might be outdated when this method is called
 
@@ -165,19 +169,22 @@ export var useGridVirtualScroller = function useGridVirtualScroller(props) {
         left: 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(function () {
+    if (renderContext) {
+      updateRenderZonePosition(renderContext);
+    }
+  }, [renderContext, updateRenderZonePosition]);
   var updateRenderContext = React.useCallback(function (nextRenderContext) {
     setRenderContext(nextRenderContext);
-    updateRenderZonePosition(nextRenderContext);
     prevRenderContext.current = nextRenderContext;
-  }, [setRenderContext, prevRenderContext, updateRenderZonePosition]);
+  }, [setRenderContext, prevRenderContext]);
   React.useEffect(function () {
     if (containerWidth == null) {
       return;
     }
 
     var initialRenderContext = computeRenderContext();
-    prevRenderContext.current = initialRenderContext;
     updateRenderContext(initialRenderContext);
     var _ref3 = scrollPosition.current,
         top = _ref3.top,
@@ -203,18 +210,23 @@ export var useGridVirtualScroller = function useGridVirtualScroller(props) {
 
 
     var nextRenderContext = disableVirtualization ? prevRenderContext.current : computeRenderContext();
-    var rowsScrolledSincePreviousRender = Math.abs(nextRenderContext.firstRowIndex - prevRenderContext.current.firstRowIndex);
-    var columnsScrolledSincePreviousRender = Math.abs(nextRenderContext.firstColumnIndex - prevRenderContext.current.firstColumnIndex);
-    var 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
+    var topRowsScrolledSincePreviousRender = Math.abs(nextRenderContext.firstRowIndex - prevRenderContext.current.firstRowIndex);
+    var bottomRowsScrolledSincePreviousRender = Math.abs(nextRenderContext.lastRowIndex - prevRenderContext.current.lastRowIndex);
+    var topColumnsScrolledSincePreviousRender = Math.abs(nextRenderContext.firstColumnIndex - prevRenderContext.current.firstColumnIndex);
+    var bottomColumnsScrolledSincePreviousRender = Math.abs(nextRenderContext.lastColumnIndex - prevRenderContext.current.lastColumnIndex);
+    var 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(GridEvents.rowsScroll, {
       top: scrollTop,
       left: scrollLeft,
       renderContext: shouldSetState ? nextRenderContext : prevRenderContext.current
-    });
+    }, event);
 
     if (shouldSetState) {
-      updateRenderContext(nextRenderContext);
+      // Prevents batching render context changes
+      ReactDOM.flushSync(function () {
+        updateRenderContext(nextRenderContext);
+      });
       prevTotalWidth.current = columnsTotalWidth;
     }
   };
@@ -249,6 +261,18 @@ export var useGridVirtualScroller = function useGridVirtualScroller(props) {
         firstRowToRender = _getRenderableIndexes6[0],
         lastRowToRender = _getRenderableIndexes6[1];
 
+    var renderedRows = [];
+
+    for (var i = firstRowToRender; i < lastRowToRender; i += 1) {
+      var row = currentPage.rows[i];
+      renderedRows.push(row);
+      apiRef.current.unstable_calculateColSpan({
+        rowId: row.id,
+        minFirstColumn: minFirstColumn,
+        maxLastColumn: maxLastColumn
+      });
+    }
+
     var _getRenderableIndexes7 = getRenderableIndexes({
       firstIndex: nextRenderContext.firstColumnIndex,
       lastIndex: nextRenderContext.lastColumnIndex,
@@ -257,20 +281,26 @@ export var useGridVirtualScroller = function useGridVirtualScroller(props) {
       buffer: columnBuffer
     }),
         _getRenderableIndexes8 = _slicedToArray(_getRenderableIndexes7, 2),
-        firstColumnToRender = _getRenderableIndexes8[0],
+        initialFirstColumnToRender = _getRenderableIndexes8[0],
         lastColumnToRender = _getRenderableIndexes8[1];
 
-    var renderedRows = currentPage.rows.slice(firstRowToRender, lastRowToRender);
+    var firstColumnToRender = getFirstNonSpannedColumnToRender({
+      firstColumnToRender: initialFirstColumnToRender,
+      apiRef: apiRef,
+      firstRowToRender: firstRowToRender,
+      lastRowToRender: lastRowToRender,
+      visibleRows: currentPage.rows
+    });
     var renderedColumns = visibleColumns.slice(firstColumnToRender, lastColumnToRender);
     var rows = [];
 
-    for (var i = 0; i < renderedRows.length; i += 1) {
+    for (var _i = 0; _i < renderedRows.length; _i += 1) {
       var _rootProps$components;
 
-      var _renderedRows$i = renderedRows[i],
-          _id = _renderedRows$i.id,
-          _model = _renderedRows$i.model;
-      var lastVisibleRowIndex = firstRowToRender + i === currentPage.rows.length - 1;
+      var _renderedRows$_i = renderedRows[_i],
+          _id = _renderedRows$_i.id,
+          _model = _renderedRows$_i.model;
+      var lastVisibleRowIndex = firstRowToRender + _i === currentPage.rows.length - 1;
       var targetRowHeight = apiRef.current.unstable_getRowHeight(_id);
       var isSelected = void 0;
 
@@ -297,7 +327,7 @@ export var useGridVirtualScroller = function useGridVirtualScroller(props) {
         firstColumnToRender: firstColumnToRender,
         lastColumnToRender: lastColumnToRender,
         selected: isSelected,
-        index: currentPage.range.firstRowIndex + firstRowToRender + i,
+        index: currentPage.range.firstRowIndex + firstRowToRender + _i,
         containerWidth: availableSpace,
         isLastVisible: lastVisibleRowIndex
       }, typeof getRowProps === 'function' ? getRowProps(_id, _model) : {}, (_rootProps$components = rootProps.componentsProps) == null ? void 0 : _rootProps$components.row), _id));

package/legacy/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/legacy/internals/index.js

@@ -3,30 +3,31 @@ export { GridVirtualScrollerContent } from '../components/virtualization/GridVir
 export { GridVirtualScrollerRenderZone } from '../components/virtualization/GridVirtualScrollerRenderZone';
 export { GridColumnHeaders } from '../components/columnHeaders/GridColumnHeaders';
 export { GridColumnHeadersInner } from '../components/columnHeaders/GridColumnHeadersInner';
-export { useGridRegisterPreProcessor } from '../hooks/core/preProcessing';
+export { useGridRegisterPipeProcessor } from '../hooks/core/pipeProcessing';
+export { useGridRegisterStrategyProcessor } from '../hooks/core/strategyProcessing';
 export { useGridInitialization } from '../hooks/core/useGridInitialization';
 export { useGridClipboard } from '../hooks/features/clipboard/useGridClipboard';
 export { useGridColumnHeaders } from '../hooks/features/columnHeaders/useGridColumnHeaders';
 export { useGridColumnMenu, columnMenuStateInitializer } from '../hooks/features/columnMenu/useGridColumnMenu';
 export { useGridColumns, columnsStateInitializer } from '../hooks/features/columns/useGridColumns';
+export { useGridColumnSpanning } from '../hooks/features/columns/useGridColumnSpanning';
 export { useGridDensity, densityStateInitializer } from '../hooks/features/density/useGridDensity';
 export { useGridCsvExport } from '../hooks/features/export/useGridCsvExport';
 export { useGridPrintExport } from '../hooks/features/export/useGridPrintExport';
 export { useGridFilter, filterStateInitializer } from '../hooks/features/filter/useGridFilter';
-export { useGridRegisterFilteringMethod } from '../hooks/features/filter/useGridRegisterFilteringMethod';
 export { useGridFocus, focusStateInitializer } from '../hooks/features/focus/useGridFocus';
-export { useGridKeyboard } from '../hooks/features/keyboard/useGridKeyboard';
-export { useGridKeyboardNavigation } from '../hooks/features/keyboard/useGridKeyboardNavigation';
+export { useGridKeyboardNavigation } from '../hooks/features/keyboardNavigation/useGridKeyboardNavigation';
 export { useGridPagination, paginationStateInitializer } from '../hooks/features/pagination/useGridPagination';
 export { useGridPreferencesPanel, preferencePanelStateInitializer } from '../hooks/features/preferencesPanel/useGridPreferencesPanel';
-export { useGridEditing, editingStateInitializer } from '../hooks/features/editRows/useGridEditing';
+export { useGridEditing as useGridEditing_new, editingStateInitializer as editingStateInitializer_new } from '../hooks/features/editRows/useGridEditing.new';
+export { useGridEditing as useGridEditing_old, editingStateInitializer as editingStateInitializer_old } from '../hooks/features/editRows/useGridEditing.old';
 export { useGridRows, rowsStateInitializer } from '../hooks/features/rows/useGridRows';
+export { useGridRowsPreProcessors } from '../hooks/features/rows/useGridRowsPreProcessors';
 export { useGridRowsMeta, rowsMetaStateInitializer } from '../hooks/features/rows/useGridRowsMeta';
 export { useGridParamsApi } from '../hooks/features/rows/useGridParamsApi';
 export { useGridSelection, selectionStateInitializer } from '../hooks/features/selection/useGridSelection';
 export { useGridSelectionPreProcessors } from '../hooks/features/selection/useGridSelectionPreProcessors';
 export { useGridSorting, sortingStateInitializer } from '../hooks/features/sorting/useGridSorting';
-export { useGridRegisterSortingMethod } from '../hooks/features/sorting/useGridRegisterSortingMethod';
 export { useGridScroll } from '../hooks/features/scroll/useGridScroll';
 export { useGridEvents } from '../hooks/features/events/useGridEvents';
 export { useGridDimensions } from '../hooks/features/dimensions/useGridDimensions';

package/legacy/locales/arSD.js

@@ -6,21 +6,21 @@ var 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: 'اظهر الفلاتر',
+  toolbarFilters: 'المُرشِحات',
+  toolbarFiltersLabel: 'إظهار المرشِحات',
+  toolbarFiltersTooltipHide: 'إخفاء المرشِحات',
+  toolbarFiltersTooltipShow: 'اظهر المرشِحات',
   toolbarFiltersTooltipActive: function toolbarFiltersTooltipActive(count) {
-    return count !== 1 ? "".concat(count, " \u0641\u0644\u0627\u062A\u0631 \u0646\u0634\u0637\u0629") : "".concat(count, " \u0641\u0644\u0627\u062A\u0631 \u0646\u0634\u0637\u0629");
+    return count !== 1 ? "".concat(count, " \u0645\u0646 \u0627\u0644\u0645\u0631\u0634\u0650\u062D\u0627\u062A \u0627\u0644\u0646\u0634\u0637\u0629") : "\u0645\u0631\u0634\u0650\u062D \u0646\u0634\u0637";
   },
   // Export selector toolbar button text
   toolbarExport: 'تصدير',
@@ -28,57 +28,57 @@ var arSDGrid = {
   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: function columnHeaderFiltersTooltipActive(count) {
-    return count !== 1 ? "".concat(count, " \u0641\u0644\u0627\u062A\u0631 \u0646\u0634\u0637\u0629") : "".concat(count, " \u0641\u0644\u0627\u062A\u0631 \u0646\u0634\u0637\u0629");
+    return count !== 1 ? "".concat(count, " \u0645\u0646 \u0627\u0644\u0645\u0631\u0634\u0650\u062D\u0627\u062A \u0627\u0644\u0646\u0634\u0637\u0629") : "\u0645\u0631\u0634\u0650\u062D \u0646\u0634\u0637";
   },
-  columnHeaderFiltersLabel: 'اظهر الفلاتر',
-  columnHeaderSortIconLabel: 'ترتيب',
+  columnHeaderFiltersLabel: 'إظهار المرشحات',
+  columnHeaderSortIconLabel: 'فرز',
   // Rows selected footer text
   footerRowSelected: function footerRowSelected(count) {
-    return count !== 1 ? "".concat(count.toLocaleString(), " \u0635\u0641\u0648\u0641 \u0645\u062E\u062A\u0627\u0631\u0629") : "".concat(count.toLocaleString(), " \u0635\u0641\u0648\u0641 \u0645\u062E\u062A\u0627\u0631\u0629");
+    return count !== 1 ? "\u062A\u0645 \u062A\u062D\u062F\u064A\u062F ".concat(count.toLocaleString(), " \u0645\u0646 \u0627\u0644\u0635\u0641\u0648\u0641") : "\u062A\u0645 \u062A\u062D\u062F\u064A\u062F \u0635\u0641 \u0648\u0627\u062D\u062F";
   },
   // Total row amount footer text
   footerTotalRows: 'إجمالي الصفوف:',
@@ -87,30 +87,34 @@ var arSDGrid = {
     return "".concat(visibleCount.toLocaleString(), " \u0645\u0646 ").concat(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: function groupColumn(name) {
+    return "\u062A\u062C\u0645\u064A\u0639 \u062D\u0633\u0628 ".concat(name);
+  },
+  unGroupColumn: function unGroupColumn(name) {
+    return "\u0625\u064A\u0642\u0627\u0641 \u0627\u0644\u062A\u062C\u0645\u064A\u0639 \u062D\u0633\u0628 ".concat(name);
+  },
   // Master/detail
-  // expandDetailPanel: 'Expand',
-  // collapseDetailPanel: 'Collapse',
-
+  expandDetailPanel: 'توسيع',
+  collapseDetailPanel: 'طوي'
 };
 export var arSD = getGridLocalization(arSDGrid, arSDCore);