@elliemae/ds-data-table 2.4.2 → 2.4.3-rc.10

package/cjs/styled.js

@@ -63,14 +63,17 @@ const StyledFocusWithin = /*#__PURE__*/styled__default["default"](Grid__default[
 })([":focus-within{", "}"], props => props.hideFocus ? '' : styledFocusCss(props));
 const StyledDataTableWrapper = /*#__PURE__*/styled__default["default"].div.withConfig({
   componentId: "sc-38sgfo-1"
-})(["width:", ";height:", ";user-select:", ";"], props => sizeToCss.sizeToCss(props.width ?? ' 100%'), props => sizeToCss.sizeToCss(props.height ?? ' 100%'), _ref2 => {
+})(["width:", ";height:", ";"], props => sizeToCss.sizeToCss(props.width ?? ' 100%'), props => sizeToCss.sizeToCss(props.height ?? ' 100%'));
+const StyledDataTableContentWrapper = /*#__PURE__*/styled__default["default"].div.withConfig({
+  componentId: "sc-38sgfo-2"
+})(["user-select:", ";width:100%;height:100%;"], _ref2 => {
   let {
     noSelectionAllowed
   } = _ref2;
   return noSelectionAllowed ? 'none' : 'auto';
 });
 const StyledTableWrapper = /*#__PURE__*/styled__default["default"].div.withConfig({
-  componentId: "sc-38sgfo-2"
+  componentId: "sc-38sgfo-3"
 })(["display:inline-block;border-spacing:0;z-index:0;position:relative;", ""], _ref3 => {
   let {
     width = '100%',
@@ -82,7 +85,7 @@ const StyledTableWrapper = /*#__PURE__*/styled__default["default"].div.withConfi
   `;
 });
 const StyledTableContentWrapper = /*#__PURE__*/styled__default["default"].div.withConfig({
-  componentId: "sc-38sgfo-3"
+  componentId: "sc-38sgfo-4"
 })(["position:relative;", ""], _ref4 => {
   let {
     height = 'auto'
@@ -92,7 +95,7 @@ const StyledTableContentWrapper = /*#__PURE__*/styled__default["default"].div.wi
   `;
 });
 const StyledVirtualListWrapper = /*#__PURE__*/styled__default["default"].div.withConfig({
-  componentId: "sc-38sgfo-4"
+  componentId: "sc-38sgfo-5"
 })(["overflow:auto;", ""], _ref5 => {
   let {
     height = 'auto',
@@ -123,18 +126,17 @@ const getGridTemplateColumnsStyle = _ref6 => {
 };
 
 const StyledHeadWrapper = /*#__PURE__*/styled__default["default"].div.withConfig({
-  componentId: "sc-38sgfo-5"
+  componentId: "sc-38sgfo-6"
 })(["position:relative;position:sticky;top:0;z-index:4;background:white;width:", ";"], props => props.colsLayoutStyle === constants.ColsLayoutStyle.Fixed ? sizeToCss.sizeToCss(props.totalColumnsWidth) : '100%');
 const StyledHeadTr = /*#__PURE__*/styled__default["default"](Grid__default["default"]).withConfig({
-  componentId: "sc-38sgfo-6"
-})(["", ";", ";border-right:1px solid ", ";border-bottom:1px solid ", ";"], props => props.colsLayoutStyle === constants.ColsLayoutStyle.Auto ? 'width:100%' : '', props => getGridTemplateColumnsStyle({
+  componentId: "sc-38sgfo-7"
+})(["", ";", ";border-right:1px solid ", ";border-bottom:1px solid ", ";grid-auto-flow:column;"], props => props.colsLayoutStyle === constants.ColsLayoutStyle.Auto ? 'width:100%' : '', props => getGridTemplateColumnsStyle({
   cols: props.cols,
   isExpandable: props.isExpandable,
   colsLayoutStyle: props.colsLayoutStyle
 }), props => props.theme.colors.neutral['080'], props => props.theme.colors.neutral['080']);
-
 const StyledHeadTh = /*#__PURE__*/styled__default["default"].div.withConfig({
-  componentId: "sc-38sgfo-7"
+  componentId: "sc-38sgfo-8"
 })(["min-height:24px;line-height:normal;font-weight:600;text-transform:uppercase;font-size:0.923rem;text-align:left;", " color:#353c46;min-height:1.84615rem;position:sticky;z-index:", ";display:flex;justify-content:space-between;box-sizing:border-box;outline:none;", ":focus{&:after{display:block;content:' ';position:absolute;top:0;left:0;right:0;bottom:0;border:2px solid ", ";pointer-events:none;z-index:", ";}}"], cellPadding.columnPadding, zIndexInternalConfig.ZIndexDataTable.HEADER_ROW, props => props.isDraggingActive ? '' : `:hover {
           &:after {
             display: block;
@@ -151,85 +153,79 @@ const StyledHeadTh = /*#__PURE__*/styled__default["default"].div.withConfig({
           cursor: pointer;
         }`, props => props.theme.colors.brand[700], zIndexInternalConfig.ZIndexDataTable.FOCUS_BORDER);
 const StyledHeaderRightIconsWrapper = /*#__PURE__*/styled__default["default"].div.withConfig({
-  componentId: "sc-38sgfo-8"
+  componentId: "sc-38sgfo-9"
 })(["height:100%;display:flex;align-items:center;max-height:24px;"]);
 const StyledResizer = /*#__PURE__*/styled__default["default"].div.withConfig({
-  componentId: "sc-38sgfo-9"
-})(["display:inline-block;background:", ";width:4px;height:100%;position:absolute;right:0;top:0;z-index:1;touch-action:none;cursor:col-resize;"], _ref7 => {
-  let {
-    isResizing,
-    theme
-  } = _ref7;
-  return isResizing ? theme.colors.brand[600] : theme.colors.brand[400];
-}); // CELL ***********************************************************************/
+  componentId: "sc-38sgfo-10"
+})(["display:inline-block;background:transparent;width:4px;height:100%;position:absolute;right:0;top:0;z-index:1;touch-action:none;cursor:col-resize;"]); // CELL ***********************************************************************/
 
 const StyledActionCell = /*#__PURE__*/styled__default["default"].div.withConfig({
-  componentId: "sc-38sgfo-10"
+  componentId: "sc-38sgfo-11"
 })(["position:relative;position:sticky;display:inline-block;right:0;background:white;"]);
 const StyledCell = /*#__PURE__*/styled__default["default"].div.withConfig({
-  componentId: "sc-38sgfo-11"
+  componentId: "sc-38sgfo-12"
 })(["", " display:flex;align-items:center;width:100%;position:relative;"], cellPadding.cellPadding);
 const StyledCellContent = /*#__PURE__*/styled__default["default"].div.withConfig({
-  componentId: "sc-38sgfo-12"
+  componentId: "sc-38sgfo-13"
 })(["display:grid;justify-self:flex-end;flex:1 1 auto;width:100%;height:100%;align-items:center;"]);
 const StyledPencilIcon = /*#__PURE__*/styled__default["default"](dsIcons.EditPencil).withConfig({
-  componentId: "sc-38sgfo-13"
+  componentId: "sc-38sgfo-14"
 })([""]);
 const StyledEditableContainer = /*#__PURE__*/styled__default["default"](Grid__default["default"]).withConfig({
-  componentId: "sc-38sgfo-14"
-})(["width:100%;height:100%;align-items:center;& ", "{display:", ";}&:hover{", "{display:block;}}&:focus{", " ", "{display:block;}}outline:none;"], StyledPencilIcon, _ref8 => {
+  componentId: "sc-38sgfo-15"
+})(["width:100%;height:100%;align-items:center;& ", "{display:", ";}&:hover{", "{display:block;}}&:focus{", " ", "{display:block;}}outline:none;"], StyledPencilIcon, _ref7 => {
   let {
     shouldDisplayEditIcon
-  } = _ref8;
+  } = _ref7;
   return shouldDisplayEditIcon ? 'block' : 'none';
 }, StyledPencilIcon, styledFocusCss, StyledPencilIcon); // ROW ************************************************************************/
 
 const StyledFullsizeGrid = /*#__PURE__*/styled__default["default"](Grid__default["default"]).withConfig({
-  componentId: "sc-38sgfo-15"
+  componentId: "sc-38sgfo-16"
 })(["position:relative;z-index:", ";min-height:", ";height:", ";"], zIndexInternalConfig.ZIndexDataTable.ROW, props => props.minHeight || '36px', props => props.height || 'auto');
 const GroupHeaderContainer = /*#__PURE__*/styled__default["default"](Grid__default["default"]).withConfig({
-  componentId: "sc-38sgfo-16"
-})(["position:relative;background-color:", ";align-items:center;padding:0 ", ";border-top:1px solid ", ";grid-template-columns:min-content 1fr;"], _ref9 => {
+  componentId: "sc-38sgfo-17"
+})(["position:relative;background-color:", ";align-items:center;padding:0 ", ";border-top:1px solid ", ";grid-template-columns:min-content 1fr;"], _ref8 => {
   let {
     theme
-  } = _ref9;
+  } = _ref8;
   return theme.colors.brand[200];
-}, props => props.padding, _ref10 => {
+}, props => props.padding, _ref9 => {
   let {
     theme
-  } = _ref10;
+  } = _ref9;
   return theme.colors.brand[300];
 });
 const GroupHeaderTitle = /*#__PURE__*/styled__default["default"].span.withConfig({
-  componentId: "sc-38sgfo-17"
+  componentId: "sc-38sgfo-18"
 })(["font-weight:", ";font-size:12px;color:", ";"], props => props.theme.fontWeights.semibold, props => props.theme.colors.neutral[700]);
 const StyledCellContainer = /*#__PURE__*/styled__default["default"](Grid__default["default"]).withConfig({
-  componentId: "sc-38sgfo-18"
+  componentId: "sc-38sgfo-19"
 })(["position:relative;z-index:2;min-height:", ";height:", ";width:", ";", ";", ";background-color:", ";outline:none;:focus{", "}", " ", " box-shadow:0 2px 4px 0 ", ";opacity:", ";", " color:", ";"], props => props.minHeight || '36px', props => props.height || 'auto', props => props.colLayoutStyle === constants.ColsLayoutStyle.Fixed ? sizeToCss.sizeToCss(props.totalColumnsWidth) : '100%', props => props.isDragOverlay ? 'width: fit-content;' : '', props => getGridTemplateColumnsStyle({
   cols: props.cols,
   colsLayoutStyle: props.colLayoutStyle,
   isExpandable: props.isExpandable
-}), _ref11 => {
+}), _ref10 => {
   let {
     backgroundColor,
     isDragging,
     theme
-  } = _ref11;
+  } = _ref10;
   return isDragging ? theme.colors.neutral[100] : backgroundColor || 'white';
-}, props => props.isDragOverlay ? '' : styledFocusCss(props), _ref12 => {
+}, props => props.isDragOverlay ? '' : styledFocusCss(props), _ref11 => {
   let {
     isDropIndicatorPositionInside,
     theme
-  } = _ref12;
+  } = _ref11;
   if (!isDropIndicatorPositionInside) return '';
   return styledFocusCss({
     theme
   });
-}, _ref13 => {
+}, _ref12 => {
   let {
     shouldDisplayHover,
     theme
-  } = _ref13;
+  } = _ref12;
   return shouldDisplayHover ? `:hover {
             background-color: ${theme.colors.brand[200]};
           }` : '';
@@ -244,6 +240,7 @@ exports.StyledActionCell = StyledActionCell;
 exports.StyledCell = StyledCell;
 exports.StyledCellContainer = StyledCellContainer;
 exports.StyledCellContent = StyledCellContent;
+exports.StyledDataTableContentWrapper = StyledDataTableContentWrapper;
 exports.StyledDataTableWrapper = StyledDataTableWrapper;
 exports.StyledEditableContainer = StyledEditableContainer;
 exports.StyledFocusWithin = StyledFocusWithin;

package/esm/DataTable.js

@@ -17,6 +17,7 @@ import { useDatatableConfig } from './configs/useDatatableConfig.js';
 import './configs/useRowFlattenization.js';
 import { FiltersBar } from './parts/FilterBar/FiltersBar.js';
 import { DataTableSchema } from './DataTableSchema.js';
+import { StyledDataTableWrapper } from './styled.js';
 import { jsxs, jsx } from 'react/jsx-runtime';
 
 var _FiltersBar;
@@ -32,13 +33,21 @@ const DataTable = props => {
   const tableWrapperRef = useRef();
   const tableContentWrapperRef = useRef();
   const ctx = useDatatableConfig(props);
+  const {
+    tableProps: {
+      height,
+      width
+    }
+  } = ctx;
   return /*#__PURE__*/_jsx(Provider, {
     store: reduxStore
   }, void 0, /*#__PURE__*/_jsx(DataTableContext.Provider, {
     value: ctx
-  }, void 0, /*#__PURE__*/jsxs("div", {
+  }, void 0, /*#__PURE__*/jsxs(StyledDataTableWrapper, {
     ref: tableWrapperRef,
     "data-testid": DATA_TESTID.DATA_TABLE_WRAPPER,
+    height: height,
+    width: width,
     children: [withFilterBar ? _FiltersBar || (_FiltersBar = /*#__PURE__*/_jsx(FiltersBar, {})) : null, /*#__PURE__*/jsx(TableContent, {
       ref: tableContentWrapperRef
     })]

package/esm/DataTableSchema.js

@@ -53,6 +53,11 @@ const DataTableSchema = {
   withFilterBar: PropTypes.bool.description('Whether to display the filter bar'),
   filterBarProps: PropTypes.shape({
     customPillRenderer: PropTypes.oneOfType([PropTypes.func, PropTypes.element]).description('If you specify custom filters, you will need to render their pills here'),
+    isDropdownMenuOpen: PropTypes.bool.description('Wether the DropdownMenu is Open or not.'),
+    onDropdownMenuToggle: PropTypes.func.description('Callback to toggle the DropdownMenu.'),
+    onClearAllFiltersClick: PropTypes.func.description('Callback for Clear Al Filters option.'),
+    onDropdownMenuClickOutside: PropTypes.func.description('Callback triggered when clicking outside DropdownMenu.'),
+    onDropdownMenuTriggerClick: PropTypes.func.description('Callback triggered when clicking DropdownMenu ellipsis.'),
     extraOptions: PropTypes.arrayOf(PropTypes.shape({
       type: PropTypes.string,
       id: PropTypes.string,

package/esm/addons/Editables/ComboboxEditableCell/ComboboxEditableCell.js

@@ -14,7 +14,6 @@ import '@elliemae/ds-popperjs';
 import 'styled-components';
 import '../../../redux/reducers/index.js';
 import '../../../configs/constants.js';
-import 'react/jsx-runtime';
 import { EditableCell } from '../../../exported-related/EditableCell.js';
 import '@elliemae/ds-icons';
 import '@elliemae/ds-utilities';
@@ -23,6 +22,7 @@ import '../../../configs/useRowFlattenization.js';
 import 'core-js/modules/esnext.async-iterator.map.js';
 import 'core-js/modules/esnext.iterator.map.js';
 import '../../../styled.js';
+import 'react/jsx-runtime';
 import '@elliemae/ds-form';
 import '../../../parts/TableContent.js';
 import '@elliemae/ds-grid';

package/esm/addons/Editables/DateEditableCell/DateEditableCell.js

@@ -11,7 +11,6 @@ import '@elliemae/ds-popperjs';
 import 'styled-components';
 import '../../../redux/reducers/index.js';
 import '../../../configs/constants.js';
-import 'react/jsx-runtime';
 import { EditableCell } from '../../../exported-related/EditableCell.js';
 import '@elliemae/ds-icons';
 import '@elliemae/ds-utilities';
@@ -22,6 +21,7 @@ import '../../../configs/useRowFlattenization.js';
 import 'core-js/modules/esnext.async-iterator.map.js';
 import 'core-js/modules/esnext.iterator.map.js';
 import '../../../styled.js';
+import 'react/jsx-runtime';
 import '@elliemae/ds-form';
 import '../../../parts/TableContent.js';
 import '@elliemae/ds-grid';

package/esm/addons/Editables/TextEditableCell/TextEditableCell.js

@@ -11,7 +11,6 @@ import '@elliemae/ds-button';
 import '@elliemae/ds-popperjs';
 import '../../../redux/reducers/index.js';
 import '../../../configs/constants.js';
-import 'react/jsx-runtime';
 import { EditableCell } from '../../../exported-related/EditableCell.js';
 import '@elliemae/ds-icons';
 import '@elliemae/ds-utilities';
@@ -22,6 +21,7 @@ import '../../../configs/useRowFlattenization.js';
 import 'core-js/modules/esnext.async-iterator.map.js';
 import 'core-js/modules/esnext.iterator.map.js';
 import '../../../styled.js';
+import 'react/jsx-runtime';
 import '@elliemae/ds-form';
 import '../../../parts/TableContent.js';
 import '@elliemae/ds-grid';

package/esm/addons/Filters/Components/SelectFilter/BaseSelectFilter.js

@@ -51,6 +51,8 @@ import '../../../../exported-related/Filters/applyOutOfTheBoxFilters.js';
 import 'moment';
 import 'core-js/modules/esnext.async-iterator.some.js';
 import 'core-js/modules/esnext.iterator.some.js';
+import '../../../../redux/reducers/index.js';
+import { useDispatchHeadersActions } from '../../../../redux/reducers/headersReducers/useDispatchHeadersActions.js';
 
 var _SearchXsmall;
 const BaseSelectFilter = props => {
@@ -72,6 +74,9 @@ const BaseSelectFilter = props => {
     innerRef,
     onValueChange
   } = props;
+  const {
+    patchHeaderFilterButtonAndMenu
+  } = useDispatchHeadersActions();
   const filterOptions = useMemo(() => {
     // If the user didn't provide options, use the available ones
     if (!userFilterOptions) {
@@ -92,6 +97,7 @@ const BaseSelectFilter = props => {
 
   const handleOnChange = value => {
     onValueChange(type, value);
+    if (!isMulti) patchHeaderFilterButtonAndMenu(column.id, true);
   };
 
   const [filters, setFilteredOptions] = useState(filterOptions);

package/esm/addons/Filters/Components/SelectFilter/MultiSelectFilter.js

@@ -12,9 +12,9 @@ import '@elliemae/ds-popperjs';
 import 'styled-components';
 import '../../../../redux/reducers/index.js';
 import { DATA_TESTID } from '../../../../configs/constants.js';
-import 'react/jsx-runtime';
 import '../../../../styled.js';
 import '../../../../DataTableContext.js';
+import 'react/jsx-runtime';
 import '@elliemae/ds-icons';
 import '@elliemae/ds-utilities';
 import 'core-js/modules/esnext.async-iterator.reduce.js';

package/esm/addons/Filters/Components/SelectFilter/SingleSelectFilter.js

@@ -12,9 +12,9 @@ import '@elliemae/ds-popperjs';
 import 'styled-components';
 import '../../../../redux/reducers/index.js';
 import { DATA_TESTID } from '../../../../configs/constants.js';
-import 'react/jsx-runtime';
 import '../../../../styled.js';
 import '../../../../DataTableContext.js';
+import 'react/jsx-runtime';
 import '@elliemae/ds-icons';
 import '@elliemae/ds-utilities';
 import 'core-js/modules/esnext.async-iterator.reduce.js';

package/esm/configs/useDatatableConfig.js

@@ -50,7 +50,11 @@ const useDatatableConfig = props => {
   // Layout config
   // ===========================================================================
 
-  const [gridLayout, setGridLayout] = useState(columnsToGrid(visibleColumns, props.colsLayoutStyle));
+  const [gridLayout, setGridLayout] = useState(columnsToGrid(visibleColumns, props.colsLayoutStyle)); // We need to listen and update the state based on this props
+
+  useEffect(() => {
+    setGridLayout(columnsToGrid(visibleColumns, props.colsLayoutStyle));
+  }, [visibleColumns, props.colsLayoutStyle]);
   const totalColumnsWidth = useMemo(() => props.colsLayoutStyle === ColsLayoutStyle.Fixed ? gridLayout.reduce((acc, cur) => acc + Number.parseInt(cur, 10), 0) : '100%', [props.colsLayoutStyle, gridLayout]);
   const layoutHelpers = useMemo(() => ({
     gridLayout,

package/esm/exported-related/EditableCell.js

@@ -10,8 +10,7 @@ const EditableCell = props => {
     StandardRender,
     EditableRenderer,
     cell,
-    isRowSelected,
-    setValue
+    isRowSelected
   } = props;
   const {
     virtualListHelpers

package/esm/exported-related/FilterPopover.js

@@ -5,13 +5,12 @@ import 'core-js/modules/esnext.async-iterator.for-each.js';
 import 'core-js/modules/esnext.iterator.for-each.js';
 import _defineProperty from '@babel/runtime/helpers/esm/defineProperty';
 import _jsx from '@babel/runtime/helpers/esm/jsx';
-import { useRef, useEffect, useState } from 'react';
+import { useEffect, useState, useCallback } from 'react';
 import { DSButton } from '@elliemae/ds-button';
 import { DSPopperJS } from '@elliemae/ds-popperjs';
 import styled from 'styled-components';
 import '../redux/reducers/index.js';
 import { DATA_TESTID } from '../configs/constants.js';
-import { jsx } from 'react/jsx-runtime';
 import { useDispatchHeadersActions } from '../redux/reducers/headersReducers/useDispatchHeadersActions.js';
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
@@ -26,7 +25,22 @@ const Button = /*#__PURE__*/styled(DSButton).withConfig({
 const PopperContent = /*#__PURE__*/styled.div.withConfig({
   componentId: "sc-16i88ut-2"
 })(["background-color:#fff;"]);
-const FilterPopover = _ref2 => {
+
+const ButtonTrap = _ref2 => {
+  let {
+    cb
+  } = _ref2;
+  return /*#__PURE__*/_jsx("span", {
+    "aria-hidden": "true",
+    tabIndex: 0,
+    onFocus: e => {
+      e.stopPropagation();
+      cb();
+    }
+  });
+};
+
+const FilterPopover = _ref3 => {
   let {
     column,
     columnId,
@@ -38,7 +52,7 @@ const FilterPopover = _ref2 => {
     innerRef,
     ariaLabel,
     customStyles
-  } = _ref2;
+  } = _ref3;
   const {
     hideFilterButton,
     hideFilterMenu
@@ -46,7 +60,6 @@ const FilterPopover = _ref2 => {
     hideFilterButton: true,
     hideFilterMenu: true
   };
-  const popperRef = useRef(null);
   const {
     patchHeaderFilterButtonAndMenu,
     patchHeader
@@ -77,6 +90,13 @@ const FilterPopover = _ref2 => {
   };
 
   const [referenceElement, setReferenceElement] = useState(null);
+  const buttonTrapCallback = useCallback(() => {
+    patchHeader(columnId, {
+      hideFilterMenu: true,
+      hideFilterButton: false
+    });
+    referenceElement?.focus();
+  }, [columnId, patchHeader, referenceElement]);
   return /*#__PURE__*/_jsx("div", {
     // This is here to prevent propagation, and not trigger the sort functionality
     onClick: e => e.stopPropagation(),
@@ -99,11 +119,6 @@ const FilterPopover = _ref2 => {
     },
     style: {
       display: 'flex'
-    },
-    onBlur: e => {
-      if (e.target !== referenceElement && !popperRef.current?.contains(e.relatedTarget)) {
-        referenceElement?.focus();
-      }
     }
   }, void 0, /*#__PURE__*/_jsx(FilterButton, {
     hide: !isIconVisible,
@@ -135,24 +150,11 @@ const FilterPopover = _ref2 => {
       minWidth: column.ref?.current?.offsetWidth ?? '0px'
     }),
     placementOrderPreference: ['bottom-end']
-  }, void 0, /*#__PURE__*/jsx(PopperContent, {
-    onKeyDown: e => {
-      if (e.code === 'Tab') {
-        setTimeout(() => {
-          if (!popperRef?.current?.contains(document.activeElement)) {
-            patchHeader(columnId, {
-              hideFilterMenu: true,
-              hideFilterButton: false
-            });
-            e.preventDefault();
-            referenceElement.focus();
-          }
-        });
-      }
-    },
-    ref: popperRef,
-    children: menuContent
-  })));
+  }, void 0, /*#__PURE__*/_jsx(PopperContent, {}, void 0, /*#__PURE__*/_jsx(ButtonTrap, {
+    cb: buttonTrapCallback
+  }), menuContent, /*#__PURE__*/_jsx(ButtonTrap, {
+    cb: buttonTrapCallback
+  }))));
 };
 
 export { FilterPopover };

package/esm/exported-related/RowRenderer/DefaultRowContentRenderer.js

@@ -5,7 +5,7 @@ import 'core-js/modules/esnext.async-iterator.for-each.js';
 import 'core-js/modules/esnext.iterator.for-each.js';
 import _defineProperty from '@babel/runtime/helpers/esm/defineProperty';
 import _jsx from '@babel/runtime/helpers/esm/jsx';
-import { useRef, useLayoutEffect, useMemo } from 'react';
+import { useRef, useLayoutEffect, useMemo, useCallback } from 'react';
 import { INTERNAL_COLUMNS } from '../../addons/Columns/index.js';
 import { DATA_TESTID } from '../../configs/constants.js';
 import 'core-js/modules/esnext.async-iterator.reduce.js';
@@ -91,12 +91,18 @@ const DefaultRowContentRenderer = props => {
 
     return padding;
   }, [row.depth, visibleColumns]);
+  const handleSelectDisableRow = useCallback(e => {
+    if (disabledRows[row.uid]) {
+      e.preventDefault();
+      e.stopPropagation();
+    }
+  }, [disabledRows, row.uid]);
   const PureRowContent = useMemo(() => {
     const DetailsView = row.original.tableRowDetails;
     return /*#__PURE__*/jsxs(Fragment, {
       children: [/*#__PURE__*/jsx(StyledCellContainer, _objectSpread(_objectSpread({
         ref: rowRef,
-        tabIndex: 0,
+        tabIndex: disabledRows[row.uid] ? -1 : 0,
         role: "row",
         "aria-rowindex": row.realIndex + 1,
         "aria-label": ariaLabelMessage(row, selection?.[row.uid] === true),
@@ -115,6 +121,7 @@ const DefaultRowContentRenderer = props => {
         selected: noSelectionColumn && selection?.[row.uid] === true,
         disabled: disabledRows[row.uid],
         "data-testid": DATA_TESTID.DATA_TABLE_ROW_CONTENT,
+        onMouseDown: handleSelectDisableRow,
         children: /*#__PURE__*/_jsx(Cells, {
           row: row,
           isRowSelected: selectedRowId === row.uid,

package/esm/exported-related/RowRenderer/useRowRendererHandlers.js

@@ -44,12 +44,26 @@ const useRowRendererHandlers = _ref => {
   const {
     tableProps: {
       onRowClick,
-      onRowFocus
+      onRowFocus,
+      disabledRows
     },
     virtualListHelpers: {
       scrollToIndex
     }
   } = useContext(DataTableContext);
+
+  const isOptionFocuseable = opt => !disabledRows[opt.id];
+
+  const findInCircularList = function (list, from, criteria) {
+    let step = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 1;
+
+    for (let i = (from + step + list.length) % list.length; i !== from && from > -1; i = (i + step + list.length) % list.length) {
+      if (criteria(list[i])) return i;
+    }
+
+    return from; // return same item
+  };
+
   const {
     setSelectedRowId,
     setFocusedRowId
@@ -60,6 +74,7 @@ const useRowRendererHandlers = _ref => {
       uid
     } = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : row;
     // setSelectedRowId(null);
+    if (disabledRows[uid]) return;
     onRowClick(original, e, uid);
     onRowFocus({
       itemIndex,
@@ -71,7 +86,7 @@ const useRowRendererHandlers = _ref => {
       },
       original
     }, e);
-  }, [row, onRowClick, onRowFocus, itemIndex, scrollToIndex]);
+  }, [row, disabledRows, onRowClick, onRowFocus, itemIndex, scrollToIndex]);
   const isActive = draggableProps && draggableProps.active;
   const handleKeyDown = useCallback(e => {
     if (isDragOverlay || isActive) {
@@ -98,24 +113,27 @@ const useRowRendererHandlers = _ref => {
 
     if (e.code === 'ArrowDown') {
       e.preventDefault();
-      if (itemIndex + 1 < items.length) setFocusedRowId(items[itemIndex + 1].uid);
+      e.stopPropagation();
+      const next = findInCircularList(items, itemIndex, isOptionFocuseable);
+      setFocusedRowId(items[next].uid);
     }
 
     if (e.code === 'ArrowUp') {
       e.preventDefault();
-      if (itemIndex - 1 >= 0) setFocusedRowId(items[itemIndex - 1].uid);
+      const prev = findInCircularList(items, itemIndex, isOptionFocuseable, -1);
+      setFocusedRowId(items[prev].uid);
     }
-  }, [isDragOverlay, isActive, selectedRowId, row, setSelectedRowId, handleItemClick, itemIndex, items, setFocusedRowId]);
+  }, [isDragOverlay, isActive, selectedRowId, row, setSelectedRowId, handleItemClick, items, itemIndex, isOptionFocuseable, setFocusedRowId]);
   const handleOnBlur = useCallback(e => {
     if (e.relatedTarget?.getAttribute('data-testid') === 'data-table-row-content') {
       setSelectedRowId(null);
     }
   }, [setSelectedRowId]);
   const handleOnFocus = useCallback(e => {
-    if (e.target && e.target.getAttribute('data-testid') === DATA_TESTID.DATA_TABLE_ROW_CONTENT) {
+    if (!disabledRows[row.uid] && e.target && e.target.getAttribute('data-testid') === DATA_TESTID.DATA_TABLE_ROW_CONTENT) {
       setFocusedRowId(row.uid);
     }
-  }, [row.uid, setFocusedRowId]);
+  }, [row.uid, setFocusedRowId, disabledRows]);
   return {
     handleItemClick,
     handleKeyDown,

package/esm/exported-related/Toolbar/Toolbar.js

@@ -45,22 +45,15 @@ const Toolbar = _ref => {
     children
   } = _ref;
   const [show, setShow] = useState(false);
-  const [clicked, setClicked] = useState(false);
   const toolbarRef = useRef(null);
-  const handleOnClickOutside = useCallback(() => {
-    setShow(false);
-    setClicked(false);
-  }, []);
-  const handleOnClick = useCallback(() => {
-    setShow(true);
-    setClicked(true);
-  }, []);
+  const handleOnClickOutside = useCallback(() => setShow(false), []);
+  const handleOnClick = useCallback(() => setShow(true), []);
   useOnClickOutside(toolbarRef, handleOnClickOutside);
   return /*#__PURE__*/jsx(ToolbarPosition, {
     ref: toolbarRef,
     children: /*#__PURE__*/_jsx(ToolbarWrapper, {
       onMouseEnter: () => setShow(true),
-      onMouseLeave: () => setShow(clicked)
+      onMouseLeave: () => setShow(false)
     }, void 0, show && /*#__PURE__*/_jsx(ToolbarBtns, {}, void 0, children), /*#__PURE__*/_jsx(DSButton, {
       buttonType: "text",
       className: "toolbar-trigger",

package/esm/parts/Cells/Cell.js

@@ -63,7 +63,8 @@ const Cell = _ref2 => {
   const ctx = useContext(DataTableContext);
   const {
     tableProps: {
-      cellRendererProps
+      cellRendererProps,
+      disabledRows
     }
   } = ctx;
   const {
@@ -112,7 +113,7 @@ const Cell = _ref2 => {
     return null;
   }, [DefaultCellContentJSX, cellProps, column]);
   return /*#__PURE__*/jsx(PureStandardCell, _objectSpread(_objectSpread({}, cellProps), {}, {
-    children: column.editable ? EditableContentJSX : DefaultCellContentJSX
+    children: column.editable && !disabledRows[row.id] ? EditableContentJSX : DefaultCellContentJSX
   }));
 };