@mui/x-data-grid 5.6.1 → 5.7.0

package/legacy/hooks/features/focus/useGridFocus.js

@@ -7,6 +7,9 @@ import { useGridLogger } from '../../utils/useGridLogger';
 import { useGridApiEventHandler } from '../../utils/useGridApiEventHandler';
 import { isNavigationKey } from '../../../utils/keyboardUtils';
 import { gridFocusCellSelector } from './gridFocusStateSelector';
+import { gridVisibleColumnDefinitionsSelector } from '../columns/gridColumnsSelector';
+import { getVisibleRows } from '../../utils/useGridVisibleRows';
+import { clamp } from '../../../utils/utils';
 export var focusStateInitializer = function focusStateInitializer(state) {
   return _extends({}, state, {
     focus: {
@@ -89,6 +92,38 @@ export var useGridFocus = function useGridFocus(apiRef, props) {
     });
     apiRef.current.forceUpdate();
   }, [apiRef, logger]);
+  var moveFocusToRelativeCell = React.useCallback(function (id, field, direction) {
+    var columnIndexToFocus = apiRef.current.getColumnIndex(field);
+    var rowIndexToFocus = apiRef.current.getRowIndexRelativeToVisibleRows(id);
+    var visibleColumns = gridVisibleColumnDefinitionsSelector(apiRef);
+
+    if (direction === 'right') {
+      columnIndexToFocus += 1;
+    } else if (direction === 'left') {
+      columnIndexToFocus -= 1;
+    } else {
+      rowIndexToFocus += 1;
+    }
+
+    if (columnIndexToFocus >= visibleColumns.length) {
+      // Go to next row if we are at the last column
+      rowIndexToFocus += 1;
+      columnIndexToFocus = 0;
+    } else if (columnIndexToFocus < 0) {
+      // Go to previous row if we are at the first column
+      rowIndexToFocus -= 1;
+      columnIndexToFocus = visibleColumns.length - 1;
+    }
+
+    var currentPage = getVisibleRows(apiRef, {
+      pagination: props.pagination,
+      paginationMode: props.paginationMode
+    });
+    rowIndexToFocus = clamp(rowIndexToFocus, currentPage.range.firstRowIndex, currentPage.range.lastRowIndex);
+    var rowToFocus = currentPage.rows[rowIndexToFocus];
+    var columnToFocus = visibleColumns[columnIndexToFocus];
+    apiRef.current.setCellFocus(rowToFocus.id, columnToFocus.field);
+  }, [apiRef, props.pagination, props.paginationMode]);
   var handleCellDoubleClick = React.useCallback(function (_ref) {
     var id = _ref.id,
         field = _ref.field;
@@ -184,7 +219,8 @@ export var useGridFocus = function useGridFocus(apiRef, props) {
   }, [apiRef]);
   useGridApiMethod(apiRef, {
     setCellFocus: setCellFocus,
-    setColumnHeaderFocus: setColumnHeaderFocus
+    setColumnHeaderFocus: setColumnHeaderFocus,
+    unstable_moveFocusToRelativeCell: moveFocusToRelativeCell
   }, 'GridFocusApi');
   React.useEffect(function () {
     var cell = gridFocusCellSelector(apiRef);

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

@@ -6,7 +6,7 @@ import { GridEvents } from '../../../models/events';
 import { checkGridRowIdIsValid } from '../../../models/gridRows';
 import { useGridApiMethod } from '../../utils/useGridApiMethod';
 import { useGridLogger } from '../../utils/useGridLogger';
-import { gridRowCountSelector, gridRowsLookupSelector, gridRowTreeSelector, gridRowIdsSelector } from './gridRowsSelector';
+import { gridRowCountSelector, gridRowsLookupSelector, gridRowTreeSelector, gridRowIdsSelector, gridRowGroupingNameSelector } from './gridRowsSelector';
 import { GridSignature, useGridApiEventHandler } from '../../utils/useGridApiEventHandler';
 import { useGridVisibleRows } from '../../utils/useGridVisibleRows';
 
@@ -47,7 +47,7 @@ var convertGridRowsPropToState = function convertGridRowsPropToState(_ref) {
 var getRowsStateFromCache = function getRowsStateFromCache(rowsCache, previousTree, apiRef, rowCountProp) {
   var value = rowsCache.state.value;
   var rowCount = rowCountProp != null ? rowCountProp : 0;
-  var groupingResponse = apiRef.current.unstable_groupRows(_extends({}, value, {
+  var groupingResponse = apiRef.current.unstable_applyStrategyProcessor('rowTreeCreation', _extends({}, value, {
     previousTree: previousTree
   }));
   var dataTopLevelRowCount = groupingResponse.treeDepth === 1 ? groupingResponse.ids.length : Object.values(groupingResponse.tree).filter(function (node) {
@@ -81,10 +81,6 @@ export var rowsStateInitializer = function rowsStateInitializer(state, props, ap
 
   });
 };
-/**
- * @requires useGridRowGroupsPreProcessing (method)
- */
-
 export var useGridRows = function useGridRows(apiRef, props) {
   if (process.env.NODE_ENV !== 'production') {
     // Freeze rows for immutability
@@ -107,9 +103,6 @@ export var useGridRows = function useGridRows(apiRef, props) {
       return acc;
     }, {});
   }, [currentPage.rows]);
-  var getRowIndexRelativeToVisibleRows = React.useCallback(function (id) {
-    return lookup[id];
-  }, [lookup]);
   var throttledRowsChange = React.useCallback(function (newState, throttle) {
     var run = function run() {
       rowsCache.current.timeout = null;
@@ -144,6 +137,10 @@ export var useGridRows = function useGridRows(apiRef, props) {
 
     run();
   }, [props.throttleRowsMs, props.rowCount, apiRef]);
+  /**
+   * API METHODS
+   */
+
   var setRows = React.useCallback(function (rows) {
     logger.debug("Updating all rows, new length ".concat(rows.length));
     throttledRowsChange(convertGridRowsPropToState({
@@ -156,7 +153,7 @@ export var useGridRows = function useGridRows(apiRef, props) {
     if (props.signature === GridSignature.DataGrid && updates.length > 1) {
       // TODO: Add test with direct call to `apiRef.current.updateRows` in DataGrid after enabling the `apiRef` on the free plan.
       throw new Error(["MUI: You can't update several rows at once in `apiRef.current.updateRows` on the DataGrid.", 'You need to upgrade to the DataGridPro component to unlock this feature.'].join('\n'));
-    } // we removes duplicate updates. A server can batch updates, and send several updates for the same row in one fn call.
+    } // we remove duplicate updates. A server can batch updates, and send several updates for the same row in one fn call.
 
 
     var uniqUpdates = new Map();
@@ -218,6 +215,9 @@ export var useGridRows = function useGridRows(apiRef, props) {
   var getAllRowIds = React.useCallback(function () {
     return gridRowIdsSelector(apiRef);
   }, [apiRef]);
+  var getRowIndexRelativeToVisibleRows = React.useCallback(function (id) {
+    return lookup[id];
+  }, [lookup]);
   var setRowChildrenExpansion = React.useCallback(function (id, isExpanded) {
     var currentNode = apiRef.current.getRowNode(id);
 
@@ -244,6 +244,61 @@ export var useGridRows = function useGridRows(apiRef, props) {
 
     return (_gridRowTreeSelector$ = gridRowTreeSelector(apiRef)[id]) != null ? _gridRowTreeSelector$ : null;
   }, [apiRef]);
+  var rowApi = {
+    getRow: getRow,
+    getRowModels: getRowModels,
+    getRowsCount: getRowsCount,
+    getAllRowIds: getAllRowIds,
+    setRows: setRows,
+    updateRows: updateRows,
+    setRowChildrenExpansion: setRowChildrenExpansion,
+    getRowNode: getRowNode,
+    getRowIndexRelativeToVisibleRows: getRowIndexRelativeToVisibleRows
+  };
+  /**
+   * EVENTS
+   */
+
+  var groupRows = React.useCallback(function () {
+    logger.info("Row grouping pre-processing have changed, regenerating the row tree");
+    var rows;
+
+    if (rowsCache.current.state.rowsBeforePartialUpdates === props.rows) {
+      // The `props.rows` has not changed since the last row grouping
+      // We can keep the potential updates stored in `inputRowsAfterUpdates` on the new grouping
+      rows = undefined;
+    } else {
+      // The `props.rows` has changed since the last row grouping
+      // We must use the new `props.rows` on the new grouping
+      // This occurs because this event is triggered before the `useEffect` on the rows when both the grouping pre-processing and the rows changes on the same render
+      rows = props.rows;
+    }
+
+    throttledRowsChange(convertGridRowsPropToState({
+      rows: rows,
+      getRowId: props.getRowId,
+      prevState: rowsCache.current.state
+    }), false);
+  }, [logger, throttledRowsChange, props.getRowId, props.rows]);
+  var handleStrategyProcessorChange = React.useCallback(function (methodName) {
+    if (methodName === 'rowTreeCreation') {
+      groupRows();
+    }
+  }, [groupRows]);
+  var handleStrategyActivityChange = React.useCallback(function () {
+    // `rowTreeCreation` is the only processor ran when `strategyAvailabilityChange` is fired.
+    // All the other processors listen to `rowsSet` which will be published by the `groupRows` method below.
+    if (apiRef.current.unstable_getActiveStrategy('rowTree') !== gridRowGroupingNameSelector(apiRef)) {
+      groupRows();
+    }
+  }, [apiRef, groupRows]);
+  useGridApiEventHandler(apiRef, GridEvents.activeStrategyProcessorChange, handleStrategyProcessorChange);
+  useGridApiEventHandler(apiRef, GridEvents.strategyAvailabilityChange, handleStrategyActivityChange);
+  useGridApiMethod(apiRef, rowApi, 'GridRowApi');
+  /**
+   * EFFECTS
+   */
+
   React.useEffect(function () {
     return function () {
       if (rowsCache.current.timeout !== null) {
@@ -273,38 +328,4 @@ export var useGridRows = function useGridRows(apiRef, props) {
       prevState: rowsCache.current.state
     }), false);
   }, [props.rows, props.rowCount, props.getRowId, logger, throttledRowsChange]);
-  var handleGroupRows = React.useCallback(function () {
-    logger.info("Row grouping pre-processing have changed, regenerating the row tree");
-    var rows;
-
-    if (rowsCache.current.state.rowsBeforePartialUpdates === props.rows) {
-      // The `props.rows` has not changed since the last row grouping
-      // We can keep the potential updates stored in `inputRowsAfterUpdates` on the new grouping
-      rows = undefined;
-    } else {
-      // The `props.rows` has changed since the last row grouping
-      // We must use the new `props.rows` on the new grouping
-      // This occurs because this event is triggered before the `useEffect` on the rows when both the grouping pre-processing and the rows changes on the same render
-      rows = props.rows;
-    }
-
-    throttledRowsChange(convertGridRowsPropToState({
-      rows: rows,
-      getRowId: props.getRowId,
-      prevState: rowsCache.current.state
-    }), false);
-  }, [logger, throttledRowsChange, props.getRowId, props.rows]);
-  useGridApiEventHandler(apiRef, GridEvents.rowGroupsPreProcessingChange, handleGroupRows);
-  var rowApi = {
-    getRow: getRow,
-    getRowModels: getRowModels,
-    getRowsCount: getRowsCount,
-    getAllRowIds: getAllRowIds,
-    setRows: setRows,
-    updateRows: updateRows,
-    setRowChildrenExpansion: setRowChildrenExpansion,
-    getRowNode: getRowNode,
-    getRowIndexRelativeToVisibleRows: getRowIndexRelativeToVisibleRows
-  };
-  useGridApiMethod(apiRef, rowApi, 'GridRowApi');
 };

package/legacy/hooks/features/rows/useGridRowsPreProcessors.js

@@ -0,0 +1,36 @@
+import { GRID_DEFAULT_STRATEGY, useGridRegisterStrategyProcessor } from '../../core/strategyProcessing';
+
+var flatRowTreeCreationMethod = function flatRowTreeCreationMethod(_ref) {
+  var ids = _ref.ids,
+      idRowsLookup = _ref.idRowsLookup,
+      previousTree = _ref.previousTree;
+  var tree = {};
+
+  for (var i = 0; i < ids.length; i += 1) {
+    var rowId = ids[i];
+
+    if (previousTree && previousTree[rowId]) {
+      tree[rowId] = previousTree[rowId];
+    } else {
+      tree[rowId] = {
+        id: rowId,
+        depth: 0,
+        parent: null,
+        groupingKey: '',
+        groupingField: null
+      };
+    }
+  }
+
+  return {
+    groupingName: GRID_DEFAULT_STRATEGY,
+    tree: tree,
+    treeDepth: 1,
+    idRowsLookup: idRowsLookup,
+    ids: ids
+  };
+};
+
+export var useGridRowsPreProcessors = function useGridRowsPreProcessors(apiRef) {
+  useGridRegisterStrategyProcessor(apiRef, GRID_DEFAULT_STRATEGY, 'rowTreeCreation', flatRowTreeCreationMethod);
+};

package/legacy/hooks/features/selection/useGridSelection.js

@@ -79,6 +79,10 @@ export var useGridSelection = function useGridSelection(apiRef, props) {
         return rowId === endId;
       });
 
+      if (startIndex === endIndex) {
+        return;
+      }
+
       if (startIndex > endIndex) {
         endId = visibleRowIds[endIndex + 1];
       } else {

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';
 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,
@@ -101,16 +99,9 @@ export var useGridSorting = function useGridSorting(apiRef, props) {
     }
 
     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, {
@@ -217,7 +208,7 @@ export var useGridSorting = function useGridSorting(apiRef, props) {
   }, [apiRef]);
   useGridRegisterPreProcessor(apiRef, 'exportState', stateExportPreProcessing);
   useGridRegisterPreProcessor(apiRef, 'restoreState', stateRestorePreProcessing);
-  useGridRegisterSortingMethod(apiRef, 'none', flatSortingMethod);
+  useGridRegisterStrategyProcessor(apiRef, GRID_DEFAULT_STRATEGY, 'sorting', flatSortingMethod);
   /**
    * EVENTS
    */
@@ -250,15 +241,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 +250,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/virtualization/useGridVirtualScroller.js

@@ -203,9 +203,11 @@ 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,

package/legacy/index.js

@@ -1,4 +1,4 @@
-/** @license MUI v5.6.1
+/** @license MUI v5.7.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

@@ -4,6 +4,7 @@ export { GridVirtualScrollerRenderZone } from '../components/virtualization/Grid
 export { GridColumnHeaders } from '../components/columnHeaders/GridColumnHeaders';
 export { GridColumnHeadersInner } from '../components/columnHeaders/GridColumnHeadersInner';
 export { useGridRegisterPreProcessor } from '../hooks/core/preProcessing';
+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';
@@ -13,20 +14,20 @@ export { useGridDensity, densityStateInitializer } from '../hooks/features/densi
 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 { 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);