npm - @elliemae/ds-data-table - Versions diffs - 3.0.0-next.46 → 3.0.0-next.49 - Mend

@elliemae/ds-data-table 3.0.0-next.46 → 3.0.0-next.49

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (309) hide show

package/dist/esm/configs/useDatatableConfig.js.map CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../scripts/build/transpile/react-shim.js", "../../../src/configs/useDatatableConfig.tsx"],
-  "sourcesContent": ["import * as React from 'react';\nexport { React };\n", "import { useEffect, useMemo, useRef, useState } from 'react';\nimport { useVirtual } from 'react-virtual';\nimport { columnsToGrid } from '../helpers/columnsToGrid';\nimport { TypescriptColumn, TypescriptContext, TypescriptProps } from '../types/props';\nimport { useRowFlattenization } from './useRowFlattenization';\nimport { usePaginationConfig } from './usePaginationConfig';\nimport { useTableColsWithAddons } from './useTableColsWithAddons';\nimport { ColsLayoutStyle } from './constants';\n\nexport const useDatatableConfig = (props: TypescriptProps): TypescriptContext => {\n  const virtualListRef = useRef<HTMLDivElement>(null);\n  const columnHeaderRef = useRef<HTMLDivElement>(null);\n\n  // ===========================================================================\n  // Column config\n  // ===========================================================================\n  const tableColsWithAddons = useTableColsWithAddons(props);\n\n  const visibleColumns = useMemo(\n    () => tableColsWithAddons.filter((col: TypescriptColumn) => !props.hiddenColumns.includes(col.accessor)),\n    [props.hiddenColumns, tableColsWithAddons],\n  );\n\n  // ===========================================================================\n  // Virtualization\n  // ===========================================================================\n\n  const [dataLength, setDataLength] = useState(1);\n\n  // estimateSize should not be really required given what was stated on\n  // https://github.com/tannerlinsley/react-virtual/issues/23\n  const virtualListHelpers = useVirtual({\n    size: dataLength,\n    parentRef: virtualListRef,\n    overscan: 15,\n    paddingStart: columnHeaderRef.current?.getBoundingClientRect()?.height ?? 24,\n  });\n\n  // ===========================================================================\n  // Action ref setup\n  // ===========================================================================\n  useEffect(() => {\n    if (props.actionRef) {\n      props.actionRef.current.scrollToIndex = virtualListHelpers.scrollToIndex;\n      props.actionRef.current.scrollToOffset = virtualListHelpers.scrollToOffset;\n    }\n  }, [props.actionRef, virtualListHelpers.scrollToIndex, virtualListHelpers.scrollToOffset]);\n\n  // ===========================================================================\n  // Data flattenization and pagination\n  // ===========================================================================\n\n  const [flattenedData, allDataFlattened] = useRowFlattenization(props);\n\n  const [paginatedData, paginationHelpers] = usePaginationConfig(props, flattenedData);\n\n  // Redo virtualization until we match the lengths\n  if (dataLength !== (paginatedData || flattenedData).length) setDataLength((paginatedData || flattenedData).length);\n\n  // ===========================================================================\n  // Layout config\n  // ===========================================================================\n\n  const [gridLayout, setGridLayout] = useState(columnsToGrid(visibleColumns, props.colsLayoutStyle));\n\n  const totalColumnsWidth = useMemo(\n    () =>\n      props.colsLayoutStyle === ColsLayoutStyle.Fixed\n        ? gridLayout.reduce((acc: number, cur: string) => acc + Number.parseInt(cur, 10), 0)\n        : '100%',\n    [props.colsLayoutStyle, gridLayout],\n  );\n\n  const layoutHelpers = useMemo(\n    () => ({\n      gridLayout,\n      setGridLayout,\n      totalColumnsWidth,\n    }),\n    [gridLayout, setGridLayout, totalColumnsWidth],\n  );\n\n  const ctx = useMemo(\n    () => ({\n      tableProps: props,\n      layoutHelpers,\n      paginationHelpers,\n      visibleColumns,\n      virtualListHelpers,\n      flattenedData: paginatedData || flattenedData,\n      allDataFlattened,\n      virtualListRef,\n      columnHeaderRef,\n    }),\n    [\n      props,\n      layoutHelpers,\n      paginationHelpers,\n      visibleColumns,\n      virtualListHelpers,\n      paginatedData,\n      flattenedData,\n      allDataFlattened,\n      virtualListRef,\n      columnHeaderRef,\n    ],\n  );\n\n  return ctx;\n};\n"],
-  "mappings": "AAAA;ACAA;AACA;AACA;AAEA;AACA;AACA;AACA;AAEO,MAAM,qBAAqB,CAAC,UAA8C;AAC/E,QAAM,iBAAiB,OAAuB,IAAI;AAClD,QAAM,kBAAkB,OAAuB,IAAI;AAKnD,QAAM,sBAAsB,uBAAuB,KAAK;AAExD,QAAM,iBAAiB,QACrB,MAAM,oBAAoB,OAAO,CAAC,QAA0B,CAAC,MAAM,cAAc,SAAS,IAAI,QAAQ,CAAC,GACvG,CAAC,MAAM,eAAe,mBAAmB,CAC3C;AAMA,QAAM,CAAC,YAAY,iBAAiB,SAAS,CAAC;AAI9C,QAAM,qBAAqB,WAAW;AAAA,IACpC,MAAM;AAAA,IACN,WAAW;AAAA,IACX,UAAU;AAAA,IACV,cAAc,gBAAgB,SAAS,sBAAsB,GAAG,UAAU;AAAA,EAC5E,CAAC;AAKD,YAAU,MAAM;AACd,QAAI,MAAM,WAAW;AACnB,YAAM,UAAU,QAAQ,gBAAgB,mBAAmB;AAC3D,YAAM,UAAU,QAAQ,iBAAiB,mBAAmB;AAAA,IAC9D;AAAA,EACF,GAAG,CAAC,MAAM,WAAW,mBAAmB,eAAe,mBAAmB,cAAc,CAAC;AAMzF,QAAM,CAAC,eAAe,oBAAoB,qBAAqB,KAAK;AAEpE,QAAM,CAAC,eAAe,qBAAqB,oBAAoB,OAAO,aAAa;AAGnF,MAAI,eAAgB,kBAAiB,eAAe;AAAQ,kBAAe,kBAAiB,eAAe,MAAM;AAMjH,QAAM,CAAC,YAAY,iBAAiB,SAAS,cAAc,gBAAgB,MAAM,eAAe,CAAC;AAEjG,QAAM,oBAAoB,QACxB,MACE,MAAM,oBAAoB,gBAAgB,QACtC,WAAW,OAAO,CAAC,KAAa,QAAgB,MAAM,OAAO,SAAS,KAAK,EAAE,GAAG,CAAC,IACjF,QACN,CAAC,MAAM,iBAAiB,UAAU,CACpC;AAEA,QAAM,gBAAgB,QACpB,MAAO;AAAA,IACL;AAAA,IACA;AAAA,IACA;AAAA,EACF,IACA,CAAC,YAAY,eAAe,iBAAiB,CAC/C;AAEA,QAAM,MAAM,QACV,MAAO;AAAA,IACL,YAAY;AAAA,IACZ;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA,eAAe,iBAAiB;AAAA,IAChC;AAAA,IACA;AAAA,IACA;AAAA,EACF,IACA;AAAA,IACE;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF,CACF;AAEA,SAAO;AACT;",
+  "sourcesContent": ["import * as React from 'react';\nexport { React };\n", "import { useEffect, useMemo, useRef, useState } from 'react';\nimport { useVirtual } from 'react-virtual';\nimport { columnsToGrid } from '../helpers/columnsToGrid';\nimport { TypescriptColumn, TypescriptContext, TypescriptProps } from '../types/props';\nimport { useRowFlattenization } from './useRowFlattenization';\nimport { usePaginationConfig } from './usePaginationConfig';\nimport { useTableColsWithAddons } from './useTableColsWithAddons';\nimport { ColsLayoutStyle } from './constants';\n\nexport const useDatatableConfig = (props: TypescriptProps): TypescriptContext => {\n  const virtualListRef = useRef<HTMLDivElement>(null);\n  const columnHeaderRef = useRef<HTMLDivElement>(null);\n\n  // ===========================================================================\n  // Column config\n  // ===========================================================================\n  const tableColsWithAddons = useTableColsWithAddons(props);\n\n  const visibleColumns = useMemo(\n    () => tableColsWithAddons.filter((col: TypescriptColumn) => !props.hiddenColumns.includes(col.accessor)),\n    [props.hiddenColumns, tableColsWithAddons],\n  );\n\n  // ===========================================================================\n  // Virtualization\n  // ===========================================================================\n\n  const [dataLength, setDataLength] = useState(1);\n\n  // estimateSize should not be really required given what was stated on\n  // https://github.com/tannerlinsley/react-virtual/issues/23\n  const virtualListHelpers = useVirtual({\n    size: dataLength,\n    parentRef: virtualListRef,\n    overscan: 15,\n    paddingStart: columnHeaderRef.current?.getBoundingClientRect()?.height ?? 24,\n  });\n\n  // ===========================================================================\n  // Action ref setup\n  // ===========================================================================\n  useEffect(() => {\n    if (props.actionRef) {\n      props.actionRef.current.scrollToIndex = virtualListHelpers.scrollToIndex;\n      props.actionRef.current.scrollToOffset = virtualListHelpers.scrollToOffset;\n    }\n  }, [props.actionRef, virtualListHelpers.scrollToIndex, virtualListHelpers.scrollToOffset]);\n\n  // ===========================================================================\n  // Data flattenization and pagination\n  // ===========================================================================\n\n  const [flattenedData, allDataFlattened] = useRowFlattenization(props);\n\n  const [paginatedData, paginationHelpers] = usePaginationConfig(props, flattenedData);\n\n  // Redo virtualization until we match the lengths\n  if (dataLength !== (paginatedData || flattenedData).length) setDataLength((paginatedData || flattenedData).length);\n\n  // ===========================================================================\n  // Layout config\n  // ===========================================================================\n\n  const [gridLayout, setGridLayout] = useState(columnsToGrid(visibleColumns, props.colsLayoutStyle));\n\n  // We need to listen and update the state based on this props\n  useEffect(() => {\n    setGridLayout(columnsToGrid(visibleColumns, props.colsLayoutStyle));\n  }, [visibleColumns, props.colsLayoutStyle]);\n\n  const totalColumnsWidth = useMemo(\n    () =>\n      props.colsLayoutStyle === ColsLayoutStyle.Fixed\n        ? gridLayout.reduce((acc: number, cur: string) => acc + Number.parseInt(cur, 10), 0)\n        : '100%',\n    [props.colsLayoutStyle, gridLayout],\n  );\n\n  const layoutHelpers = useMemo(\n    () => ({\n      gridLayout,\n      setGridLayout,\n      totalColumnsWidth,\n    }),\n    [gridLayout, setGridLayout, totalColumnsWidth],\n  );\n\n  const ctx = useMemo(\n    () => ({\n      tableProps: props,\n      layoutHelpers,\n      paginationHelpers,\n      visibleColumns,\n      virtualListHelpers,\n      flattenedData: paginatedData || flattenedData,\n      allDataFlattened,\n      virtualListRef,\n      columnHeaderRef,\n    }),\n    [\n      props,\n      layoutHelpers,\n      paginationHelpers,\n      visibleColumns,\n      virtualListHelpers,\n      paginatedData,\n      flattenedData,\n      allDataFlattened,\n      virtualListRef,\n      columnHeaderRef,\n    ],\n  );\n\n  return ctx;\n};\n"],
+  "mappings": "AAAA;ACAA;AACA;AACA;AAEA;AACA;AACA;AACA;AAEO,MAAM,qBAAqB,CAAC,UAA8C;AAC/E,QAAM,iBAAiB,OAAuB,IAAI;AAClD,QAAM,kBAAkB,OAAuB,IAAI;AAKnD,QAAM,sBAAsB,uBAAuB,KAAK;AAExD,QAAM,iBAAiB,QACrB,MAAM,oBAAoB,OAAO,CAAC,QAA0B,CAAC,MAAM,cAAc,SAAS,IAAI,QAAQ,CAAC,GACvG,CAAC,MAAM,eAAe,mBAAmB,CAC3C;AAMA,QAAM,CAAC,YAAY,iBAAiB,SAAS,CAAC;AAI9C,QAAM,qBAAqB,WAAW;AAAA,IACpC,MAAM;AAAA,IACN,WAAW;AAAA,IACX,UAAU;AAAA,IACV,cAAc,gBAAgB,SAAS,sBAAsB,GAAG,UAAU;AAAA,EAC5E,CAAC;AAKD,YAAU,MAAM;AACd,QAAI,MAAM,WAAW;AACnB,YAAM,UAAU,QAAQ,gBAAgB,mBAAmB;AAC3D,YAAM,UAAU,QAAQ,iBAAiB,mBAAmB;AAAA,IAC9D;AAAA,EACF,GAAG,CAAC,MAAM,WAAW,mBAAmB,eAAe,mBAAmB,cAAc,CAAC;AAMzF,QAAM,CAAC,eAAe,oBAAoB,qBAAqB,KAAK;AAEpE,QAAM,CAAC,eAAe,qBAAqB,oBAAoB,OAAO,aAAa;AAGnF,MAAI,eAAgB,kBAAiB,eAAe;AAAQ,kBAAe,kBAAiB,eAAe,MAAM;AAMjH,QAAM,CAAC,YAAY,iBAAiB,SAAS,cAAc,gBAAgB,MAAM,eAAe,CAAC;AAGjG,YAAU,MAAM;AACd,kBAAc,cAAc,gBAAgB,MAAM,eAAe,CAAC;AAAA,EACpE,GAAG,CAAC,gBAAgB,MAAM,eAAe,CAAC;AAE1C,QAAM,oBAAoB,QACxB,MACE,MAAM,oBAAoB,gBAAgB,QACtC,WAAW,OAAO,CAAC,KAAa,QAAgB,MAAM,OAAO,SAAS,KAAK,EAAE,GAAG,CAAC,IACjF,QACN,CAAC,MAAM,iBAAiB,UAAU,CACpC;AAEA,QAAM,gBAAgB,QACpB,MAAO;AAAA,IACL;AAAA,IACA;AAAA,IACA;AAAA,EACF,IACA,CAAC,YAAY,eAAe,iBAAiB,CAC/C;AAEA,QAAM,MAAM,QACV,MAAO;AAAA,IACL,YAAY;AAAA,IACZ;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA,eAAe,iBAAiB;AAAA,IAChC;AAAA,IACA;AAAA,IACA;AAAA,EACF,IACA;AAAA,IACE;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF,CACF;AAEA,SAAO;AACT;",
   "names": []
 }

package/dist/esm/exported-related/EditableCell.js CHANGED Viewed

@@ -4,7 +4,7 @@ import PropTypes from "prop-types";
 import { StyledPencilIcon, StyledEditableContainer } from "../styled";
 import { DataTableContext } from "../DataTableContext";
 const EditableCell = (props) => {
-  const { StandardRender, EditableRenderer, cell, isRowSelected, setValue } = props;
+  const { StandardRender, EditableRenderer, cell, isRowSelected } = props;
   const { virtualListHelpers } = useContext(DataTableContext);
   const [isEditing, setIsEditing] = useState(false);
   const [lastIsEditing, setLastIsEditing] = useState(false);

package/dist/esm/exported-related/EditableCell.js.map CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../scripts/build/transpile/react-shim.js", "../../../src/exported-related/EditableCell.tsx"],
-  "sourcesContent": ["import * as React from 'react';\nexport { React };\n", "/* eslint-disable react/prop-types */\nimport React, { useState, useCallback, useContext, useLayoutEffect } from 'react';\nimport PropTypes from 'prop-types';\nimport { StyledPencilIcon, StyledEditableContainer } from '../styled';\nimport { DataTableContext } from '../DataTableContext';\n\nexport const EditableCell: React.ComponentType<any> = (props) => {\n  const { StandardRender, EditableRenderer, cell, isRowSelected, setValue } = props;\n  const { virtualListHelpers } = useContext(DataTableContext);\n\n  const [isEditing, setIsEditing] = useState(false);\n  const [lastIsEditing, setLastIsEditing] = useState(false);\n  // When an editable cell is switched on-off, we recalculate the height of the rows\n  useLayoutEffect(() => {\n    if (isEditing !== lastIsEditing) {\n      virtualListHelpers.measure();\n      setLastIsEditing(isEditing);\n    }\n    // eslint-disable-next-line react-hooks/exhaustive-deps\n  }, [isEditing]);\n\n  const handleCellClick = useCallback(\n    (e: React.KeyboardEvent) => {\n      if (!isEditing) {\n        e.stopPropagation();\n        setIsEditing(true);\n      }\n    },\n    [isEditing],\n  );\n\n  const handleOnKeyDown = useCallback(\n    (e: React.KeyboardEvent) => {\n      if (isEditing) {\n        e.stopPropagation();\n        if (['Enter', 'Escape'].includes(e.code)) {\n          setIsEditing(false);\n        }\n      } else if (['Enter', 'Space'].includes(e.code)) {\n        handleCellClick(e);\n      }\n    },\n    [isEditing, handleCellClick, setIsEditing],\n  );\n\n  const handleOnBlur = useCallback(\n    (event: EventTarget) => {\n      if (isEditing && !event.currentTarget?.contains(event.relatedTarget)) {\n        // Not triggered when swapping focus between children\n        setIsEditing(false);\n      }\n    },\n    [isEditing],\n  );\n  const cols = !isEditing ? ['auto', 'min-content'] : ['auto'];\n  return (\n    <StyledEditableContainer\n      cols={cols}\n      tabIndex={isRowSelected && !isEditing ? 0 : -1}\n      ref={cell.ref}\n      onClick={handleCellClick}\n      onKeyDown={handleOnKeyDown}\n      onBlur={handleOnBlur}\n      shouldDisplayEditIcon={cell.column.alwaysDisplayEditIcon}\n      role=\"cell\"\n      aria-labelledby={isEditing ? undefined : cell.id}\n    >\n      {!isEditing ? StandardRender : EditableRenderer}\n      {!isEditing && <StyledPencilIcon />}\n      <span id={cell.id} style={{ display: 'none' }} aria-hidden=\"true\">\n        {cell.value}, editable cell. To edit the content&apos;s of this cell, press the Enter key\n      </span>\n    </StyledEditableContainer>\n  );\n};\n\nEditableCell.propTypes = {\n  StandardRender: PropTypes.oneOfType([PropTypes.func, PropTypes.object]).isRequired,\n  EditableRenderer: PropTypes.oneOfType([PropTypes.func, PropTypes.object]).isRequired,\n  cell: PropTypes.object.isRequired,\n};\n"],
-  "mappings": "AAAA;ACCA;AACA;AACA;AACA;AAEO,MAAM,eAAyC,CAAC,UAAU;AAC/D,QAAM,EAAE,gBAAgB,kBAAkB,MAAM,eAAe,aAAa;AAC5E,QAAM,EAAE,uBAAuB,WAAW,gBAAgB;AAE1D,QAAM,CAAC,WAAW,gBAAgB,SAAS,KAAK;AAChD,QAAM,CAAC,eAAe,oBAAoB,SAAS,KAAK;AAExD,kBAAgB,MAAM;AACpB,QAAI,cAAc,eAAe;AAC/B,yBAAmB,QAAQ;AAC3B,uBAAiB,SAAS;AAAA,IAC5B;AAAA,EAEF,GAAG,CAAC,SAAS,CAAC;AAEd,QAAM,kBAAkB,YACtB,CAAC,MAA2B;AAC1B,QAAI,CAAC,WAAW;AACd,QAAE,gBAAgB;AAClB,mBAAa,IAAI;AAAA,IACnB;AAAA,EACF,GACA,CAAC,SAAS,CACZ;AAEA,QAAM,kBAAkB,YACtB,CAAC,MAA2B;AAC1B,QAAI,WAAW;AACb,QAAE,gBAAgB;AAClB,UAAI,CAAC,SAAS,QAAQ,EAAE,SAAS,EAAE,IAAI,GAAG;AACxC,qBAAa,KAAK;AAAA,MACpB;AAAA,IACF,WAAW,CAAC,SAAS,OAAO,EAAE,SAAS,EAAE,IAAI,GAAG;AAC9C,sBAAgB,CAAC;AAAA,IACnB;AAAA,EACF,GACA,CAAC,WAAW,iBAAiB,YAAY,CAC3C;AAEA,QAAM,eAAe,YACnB,CAAC,UAAuB;AACtB,QAAI,aAAa,CAAC,MAAM,eAAe,SAAS,MAAM,aAAa,GAAG;AAEpE,mBAAa,KAAK;AAAA,IACpB;AAAA,EACF,GACA,CAAC,SAAS,CACZ;AACA,QAAM,OAAO,CAAC,YAAY,CAAC,QAAQ,aAAa,IAAI,CAAC,MAAM;AAC3D,SACE,qCAAC;AAAA,IACC;AAAA,IACA,UAAU,iBAAiB,CAAC,YAAY,IAAI;AAAA,IAC5C,KAAK,KAAK;AAAA,IACV,SAAS;AAAA,IACT,WAAW;AAAA,IACX,QAAQ;AAAA,IACR,uBAAuB,KAAK,OAAO;AAAA,IACnC,MAAK;AAAA,IACL,mBAAiB,YAAY,SAAY,KAAK;AAAA,KAE7C,CAAC,YAAY,iBAAiB,kBAC9B,CAAC,aAAa,qCAAC,sBAAiB,GACjC,qCAAC;AAAA,IAAK,IAAI,KAAK;AAAA,IAAI,OAAO,EAAE,SAAS,OAAO;AAAA,IAAG,eAAY;AAAA,KACxD,KAAK,OAAM,0EACd,CACF;AAEJ;AAEA,aAAa,YAAY;AAAA,EACvB,gBAAgB,UAAU,UAAU,CAAC,UAAU,MAAM,UAAU,MAAM,CAAC,EAAE;AAAA,EACxE,kBAAkB,UAAU,UAAU,CAAC,UAAU,MAAM,UAAU,MAAM,CAAC,EAAE;AAAA,EAC1E,MAAM,UAAU,OAAO;AACzB;",
+  "sourcesContent": ["import * as React from 'react';\nexport { React };\n", "/* eslint-disable react/prop-types */\nimport React, { useState, useCallback, useContext, useLayoutEffect } from 'react';\nimport PropTypes from 'prop-types';\nimport { StyledPencilIcon, StyledEditableContainer } from '../styled';\nimport { DataTableContext } from '../DataTableContext';\n\nexport const EditableCell: React.ComponentType<any> = (props) => {\n  const { StandardRender, EditableRenderer, cell, isRowSelected } = props;\n  const { virtualListHelpers } = useContext(DataTableContext);\n\n  const [isEditing, setIsEditing] = useState(false);\n  const [lastIsEditing, setLastIsEditing] = useState(false);\n  // When an editable cell is switched on-off, we recalculate the height of the rows\n  useLayoutEffect(() => {\n    if (isEditing !== lastIsEditing) {\n      virtualListHelpers.measure();\n      setLastIsEditing(isEditing);\n    }\n    // eslint-disable-next-line react-hooks/exhaustive-deps\n  }, [isEditing]);\n\n  const handleCellClick = useCallback(\n    (e: React.KeyboardEvent) => {\n      if (!isEditing) {\n        e.stopPropagation();\n        setIsEditing(true);\n      }\n    },\n    [isEditing],\n  );\n\n  const handleOnKeyDown = useCallback(\n    (e: React.KeyboardEvent) => {\n      if (isEditing) {\n        e.stopPropagation();\n        if (['Enter', 'Escape'].includes(e.code)) {\n          setIsEditing(false);\n        }\n      } else if (['Enter', 'Space'].includes(e.code)) {\n        handleCellClick(e);\n      }\n    },\n    [isEditing, handleCellClick, setIsEditing],\n  );\n\n  const handleOnBlur = useCallback(\n    (event: EventTarget) => {\n      if (isEditing && !event.currentTarget?.contains(event.relatedTarget)) {\n        // Not triggered when swapping focus between children\n        setIsEditing(false);\n      }\n    },\n    [isEditing],\n  );\n  const cols = !isEditing ? ['auto', 'min-content'] : ['auto'];\n  return (\n    <StyledEditableContainer\n      cols={cols}\n      tabIndex={isRowSelected && !isEditing ? 0 : -1}\n      ref={cell.ref}\n      onClick={handleCellClick}\n      onKeyDown={handleOnKeyDown}\n      onBlur={handleOnBlur}\n      shouldDisplayEditIcon={cell.column.alwaysDisplayEditIcon}\n      role=\"cell\"\n      aria-labelledby={isEditing ? undefined : cell.id}\n    >\n      {!isEditing ? StandardRender : EditableRenderer}\n      {!isEditing && <StyledPencilIcon />}\n      <span id={cell.id} style={{ display: 'none' }} aria-hidden=\"true\">\n        {cell.value}, editable cell. To edit the content&apos;s of this cell, press the Enter key\n      </span>\n    </StyledEditableContainer>\n  );\n};\n\nEditableCell.propTypes = {\n  StandardRender: PropTypes.oneOfType([PropTypes.func, PropTypes.object]).isRequired,\n  EditableRenderer: PropTypes.oneOfType([PropTypes.func, PropTypes.object]).isRequired,\n  cell: PropTypes.object.isRequired,\n};\n"],
+  "mappings": "AAAA;ACCA;AACA;AACA;AACA;AAEO,MAAM,eAAyC,CAAC,UAAU;AAC/D,QAAM,EAAE,gBAAgB,kBAAkB,MAAM,kBAAkB;AAClE,QAAM,EAAE,uBAAuB,WAAW,gBAAgB;AAE1D,QAAM,CAAC,WAAW,gBAAgB,SAAS,KAAK;AAChD,QAAM,CAAC,eAAe,oBAAoB,SAAS,KAAK;AAExD,kBAAgB,MAAM;AACpB,QAAI,cAAc,eAAe;AAC/B,yBAAmB,QAAQ;AAC3B,uBAAiB,SAAS;AAAA,IAC5B;AAAA,EAEF,GAAG,CAAC,SAAS,CAAC;AAEd,QAAM,kBAAkB,YACtB,CAAC,MAA2B;AAC1B,QAAI,CAAC,WAAW;AACd,QAAE,gBAAgB;AAClB,mBAAa,IAAI;AAAA,IACnB;AAAA,EACF,GACA,CAAC,SAAS,CACZ;AAEA,QAAM,kBAAkB,YACtB,CAAC,MAA2B;AAC1B,QAAI,WAAW;AACb,QAAE,gBAAgB;AAClB,UAAI,CAAC,SAAS,QAAQ,EAAE,SAAS,EAAE,IAAI,GAAG;AACxC,qBAAa,KAAK;AAAA,MACpB;AAAA,IACF,WAAW,CAAC,SAAS,OAAO,EAAE,SAAS,EAAE,IAAI,GAAG;AAC9C,sBAAgB,CAAC;AAAA,IACnB;AAAA,EACF,GACA,CAAC,WAAW,iBAAiB,YAAY,CAC3C;AAEA,QAAM,eAAe,YACnB,CAAC,UAAuB;AACtB,QAAI,aAAa,CAAC,MAAM,eAAe,SAAS,MAAM,aAAa,GAAG;AAEpE,mBAAa,KAAK;AAAA,IACpB;AAAA,EACF,GACA,CAAC,SAAS,CACZ;AACA,QAAM,OAAO,CAAC,YAAY,CAAC,QAAQ,aAAa,IAAI,CAAC,MAAM;AAC3D,SACE,qCAAC;AAAA,IACC;AAAA,IACA,UAAU,iBAAiB,CAAC,YAAY,IAAI;AAAA,IAC5C,KAAK,KAAK;AAAA,IACV,SAAS;AAAA,IACT,WAAW;AAAA,IACX,QAAQ;AAAA,IACR,uBAAuB,KAAK,OAAO;AAAA,IACnC,MAAK;AAAA,IACL,mBAAiB,YAAY,SAAY,KAAK;AAAA,KAE7C,CAAC,YAAY,iBAAiB,kBAC9B,CAAC,aAAa,qCAAC,sBAAiB,GACjC,qCAAC;AAAA,IAAK,IAAI,KAAK;AAAA,IAAI,OAAO,EAAE,SAAS,OAAO;AAAA,IAAG,eAAY;AAAA,KACxD,KAAK,OAAM,0EACd,CACF;AAEJ;AAEA,aAAa,YAAY;AAAA,EACvB,gBAAgB,UAAU,UAAU,CAAC,UAAU,MAAM,UAAU,MAAM,CAAC,EAAE;AAAA,EACxE,kBAAkB,UAAU,UAAU,CAAC,UAAU,MAAM,UAAU,MAAM,CAAC,EAAE;AAAA,EAC1E,MAAM,UAAU,OAAO;AACzB;",
   "names": []
 }

package/dist/esm/exported-related/FilterPopover.js CHANGED Viewed

@@ -18,7 +18,7 @@ var __spreadValues = (a, b) => {
 };
 var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 import * as React from "react";
-import React2, { useEffect, useRef, useState } from "react";
+import React2, { useCallback, useEffect, useState } from "react";
 import { DSButton } from "@elliemae/ds-button";
 import { DSPopperJS } from "@elliemae/ds-popperjs";
 import styled from "styled-components";
@@ -35,6 +35,14 @@ const Button = styled(DSButton)`
 const PopperContent = styled.div`
   background-color: #fff;
 `;
+const ButtonTrap = ({ cb }) => /* @__PURE__ */ React2.createElement("span", {
+  "aria-hidden": "true",
+  tabIndex: 0,
+  onFocus: (e) => {
+    e.stopPropagation();
+    cb();
+  }
+});
 const FilterPopover = ({
   column,
   columnId,
@@ -51,7 +59,6 @@ const FilterPopover = ({
     hideFilterButton: true,
     hideFilterMenu: true
   };
-  const popperRef = useRef(null);
   const { patchHeaderFilterButtonAndMenu, patchHeader } = useDispatchHeadersActions();
   const isIconVisible = !hideFilterButton || !hideFilterMenu;
   const isMenuOpen = !hideFilterMenu;
@@ -75,6 +82,10 @@ const FilterPopover = ({
     e.stopPropagation();
   };
   const [referenceElement, setReferenceElement] = useState(null);
+  const buttonTrapCallback = useCallback(() => {
+    patchHeader(columnId, { hideFilterMenu: true, hideFilterButton: false });
+    referenceElement?.focus();
+  }, [columnId, patchHeader, referenceElement]);
   return /* @__PURE__ */ React2.createElement("div", {
     onClick: (e) => e.stopPropagation(),
     onKeyDown: (e) => {
@@ -87,12 +98,7 @@ const FilterPopover = ({
         e.preventDefault();
       }
     },
-    style: { display: "flex" },
-    onBlur: (e) => {
-      if (e.target !== referenceElement && !popperRef.current?.contains(e.relatedTarget)) {
-        referenceElement?.focus();
-      }
-    }
+    style: { display: "flex" }
   }, /* @__PURE__ */ React2.createElement(FilterButton, {
     hide: !isIconVisible,
     "data-testid": DATA_TESTID.DATA_TABLE_FILTER_BUTTON
@@ -123,20 +129,11 @@ const FilterPopover = ({
       minWidth: column.ref?.current?.offsetWidth ?? "0px"
     }),
     placementOrderPreference: ["bottom-end"]
-  }, /* @__PURE__ */ React2.createElement(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
-  }, menuContent)));
+  }, /* @__PURE__ */ React2.createElement(PopperContent, null, /* @__PURE__ */ React2.createElement(ButtonTrap, {
+    cb: buttonTrapCallback
+  }), menuContent, /* @__PURE__ */ React2.createElement(ButtonTrap, {
+    cb: buttonTrapCallback
+  }))));
 };
 export {
   FilterPopover

package/dist/esm/exported-related/FilterPopover.js.map CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../scripts/build/transpile/react-shim.js", "../../../src/exported-related/FilterPopover.tsx"],
-  "sourcesContent": ["import * as React from 'react';\nexport { React };\n", "/* eslint-disable react/prop-types */\n/* eslint-disable jsx-a11y/no-static-element-interactions */\nimport React, { MutableRefObject, useEffect, useRef, useState } from 'react';\nimport { DSButton } from '@elliemae/ds-button';\nimport { DSPopperJS } from '@elliemae/ds-popperjs';\nimport styled from 'styled-components';\nimport { useDispatchHeadersActions } from '../redux/reducers';\nimport { DATA_TESTID } from '../configs/constants';\nimport { TypescriptColumn } from '../types/props';\n\nconst FilterButton = styled.span<{ hide: boolean }>`\n  display: inline-grid;\n  ${(props) => (props.hide ? 'opacity: 0; display: none; width: 0;' : '')}\n`;\n\nconst Button = styled(DSButton)`\n  position: relative;\n  justify-self: flex-end;\n`;\n\nconst PopperContent = styled.div`\n  background-color: #fff;\n`;\ninterface FilterPopoverProps {\n  column: TypescriptColumn;\n  columnId: string;\n  triggerIcon: JSX.Element;\n  menuContent: JSX.Element;\n  onTriggerClick?: (id: string, e: UIEvent) => void;\n  onClickOutsideMenu?: (id: string, e: UIEvent) => void;\n  reduxHeader: { hideFilterButton: boolean; hideFilterMenu: boolean; withTabStops: boolean };\n  innerRef: MutableRefObject<HTMLDivElement>;\n  ariaLabel: string;\n  customStyles?: React.CSSProperties;\n}\n\nexport const FilterPopover: React.ComponentType<FilterPopoverProps> = ({\n  column,\n  columnId,\n  triggerIcon,\n  menuContent,\n  onTriggerClick = () => null,\n  onClickOutsideMenu = () => null,\n  reduxHeader,\n  innerRef,\n  ariaLabel,\n  customStyles,\n}) => {\n  const { hideFilterButton, hideFilterMenu } = reduxHeader || {\n    hideFilterButton: true,\n    hideFilterMenu: true,\n  };\n  const popperRef = useRef(null);\n  const { patchHeaderFilterButtonAndMenu, patchHeader } = useDispatchHeadersActions();\n  const isIconVisible = !hideFilterButton || !hideFilterMenu;\n  const isMenuOpen = !hideFilterMenu;\n\n  const handleClickOutsideMenu = (e) => {\n    onClickOutsideMenu(columnId, e);\n    if (isMenuOpen) patchHeaderFilterButtonAndMenu(columnId, true);\n  };\n\n  useEffect(() => {\n    const closeMenu = () => {\n      patchHeaderFilterButtonAndMenu(columnId, true);\n    };\n    window.addEventListener('blur', closeMenu);\n\n    return () => {\n      window.removeEventListener('blur', closeMenu);\n    };\n  }, [columnId, patchHeaderFilterButtonAndMenu]);\n\n  const handleTriggerClick = (e) => {\n    onTriggerClick(columnId, e);\n    patchHeaderFilterButtonAndMenu(columnId, false);\n    e.stopPropagation();\n  };\n\n  const [referenceElement, setReferenceElement] = useState(null);\n\n  return (\n    <div\n      // This is here to prevent propagation, and not trigger the sort functionality\n      onClick={(e) => e.stopPropagation()}\n      onKeyDown={(e) => {\n        e.stopPropagation();\n        if (e.code === 'Escape') {\n          patchHeader(columnId, { hideFilterMenu: true, hideFilterButton: false });\n          referenceElement.focus();\n        }\n        // Stop propagation for some reason is not enough to prevent scrolling of the datatable\n        // so we just prevent default behaviour in this case\n        if (['ArrowUp', 'ArrowDown'].includes(e.code)) {\n          e.preventDefault();\n        }\n      }}\n      style={{ display: 'flex' }}\n      onBlur={(e) => {\n        if (e.target !== referenceElement && !popperRef.current?.contains(e.relatedTarget)) {\n          referenceElement?.focus();\n        }\n      }}\n    >\n      <FilterButton hide={!isIconVisible} data-testid={DATA_TESTID.DATA_TABLE_FILTER_BUTTON}>\n        <Button\n          onClick={handleTriggerClick}\n          buttonType=\"text\"\n          aria-label={ariaLabel}\n          aria-hidden=\"true\"\n          size=\"s\"\n          leftIcon={triggerIcon}\n          // implement treeview mergerefs\n          innerRef={(_ref) => {\n            if (isIconVisible) setReferenceElement(_ref);\n            innerRef.current = _ref;\n          }}\n          tabIndex={reduxHeader?.withTabStops ? 0 : -1}\n        />\n      </FilterButton>\n      {referenceElement && (\n        <DSPopperJS\n          referenceElement={referenceElement}\n          showPopover={isMenuOpen}\n          closeContextMenu={handleClickOutsideMenu}\n          data-testid={DATA_TESTID.DATA_TABLE_FILTER_MENU_CONTENT}\n          startPlacementPreference=\"bottom-end\"\n          customOffset={[5, 4]}\n          withoutArrow\n          zIndex={10}\n          withoutAnimation\n          extraPopperStyles={{\n            ...customStyles,\n            minWidth: column.ref?.current?.offsetWidth ?? '0px',\n          }}\n          placementOrderPreference={['bottom-end']}\n        >\n          <PopperContent\n            onKeyDown={(e) => {\n              if (e.code === 'Tab') {\n                setTimeout(() => {\n                  if (!popperRef?.current?.contains(document.activeElement)) {\n                    patchHeader(columnId, { hideFilterMenu: true, hideFilterButton: false });\n                    e.preventDefault();\n                    referenceElement.focus();\n                  }\n                });\n              }\n            }}\n            ref={popperRef}\n          >\n            {menuContent}\n          </PopperContent>\n        </DSPopperJS>\n      )}\n    </div>\n  );\n};\n"],
-  "mappings": "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",
+  "sourcesContent": ["import * as React from 'react';\nexport { React };\n", "/* eslint-disable react/prop-types */\n/* eslint-disable jsx-a11y/no-static-element-interactions */\nimport React, { MutableRefObject, useCallback, useEffect, useState } from 'react';\nimport { DSButton } from '@elliemae/ds-button';\nimport { DSPopperJS } from '@elliemae/ds-popperjs';\nimport styled from 'styled-components';\nimport { useDispatchHeadersActions } from '../redux/reducers';\nimport { DATA_TESTID } from '../configs/constants';\nimport { TypescriptColumn } from '../types/props';\n\nconst FilterButton = styled.span<{ hide: boolean }>`\n  display: inline-grid;\n  ${(props) => (props.hide ? 'opacity: 0; display: none; width: 0;' : '')}\n`;\n\nconst Button = styled(DSButton)`\n  position: relative;\n  justify-self: flex-end;\n`;\n\nconst PopperContent = styled.div`\n  background-color: #fff;\n`;\ninterface FilterPopoverProps {\n  column: TypescriptColumn;\n  columnId: string;\n  triggerIcon: JSX.Element;\n  menuContent: JSX.Element;\n  onTriggerClick?: (id: string, e: UIEvent) => void;\n  onClickOutsideMenu?: (id: string, e: UIEvent) => void;\n  reduxHeader: { hideFilterButton: boolean; hideFilterMenu: boolean; withTabStops: boolean };\n  innerRef: MutableRefObject<HTMLDivElement>;\n  ariaLabel: string;\n  customStyles?: React.CSSProperties;\n}\n\nconst ButtonTrap = ({ cb }) => (\n  <span\n    aria-hidden=\"true\"\n    tabIndex={0}\n    onFocus={(e) => {\n      e.stopPropagation();\n      cb();\n    }}\n  />\n);\n\nexport const FilterPopover: React.ComponentType<FilterPopoverProps> = ({\n  column,\n  columnId,\n  triggerIcon,\n  menuContent,\n  onTriggerClick = () => null,\n  onClickOutsideMenu = () => null,\n  reduxHeader,\n  innerRef,\n  ariaLabel,\n  customStyles,\n}) => {\n  const { hideFilterButton, hideFilterMenu } = reduxHeader || {\n    hideFilterButton: true,\n    hideFilterMenu: true,\n  };\n  const { patchHeaderFilterButtonAndMenu, patchHeader } = useDispatchHeadersActions();\n  const isIconVisible = !hideFilterButton || !hideFilterMenu;\n  const isMenuOpen = !hideFilterMenu;\n\n  const handleClickOutsideMenu = (e) => {\n    onClickOutsideMenu(columnId, e);\n    if (isMenuOpen) patchHeaderFilterButtonAndMenu(columnId, true);\n  };\n\n  useEffect(() => {\n    const closeMenu = () => {\n      patchHeaderFilterButtonAndMenu(columnId, true);\n    };\n    window.addEventListener('blur', closeMenu);\n\n    return () => {\n      window.removeEventListener('blur', closeMenu);\n    };\n  }, [columnId, patchHeaderFilterButtonAndMenu]);\n\n  const handleTriggerClick = (e) => {\n    onTriggerClick(columnId, e);\n    patchHeaderFilterButtonAndMenu(columnId, false);\n    e.stopPropagation();\n  };\n\n  const [referenceElement, setReferenceElement] = useState(null);\n\n  const buttonTrapCallback = useCallback(() => {\n    patchHeader(columnId, { hideFilterMenu: true, hideFilterButton: false });\n    referenceElement?.focus();\n  }, [columnId, patchHeader, referenceElement]);\n  return (\n    <div\n      // This is here to prevent propagation, and not trigger the sort functionality\n      onClick={(e) => e.stopPropagation()}\n      onKeyDown={(e) => {\n        e.stopPropagation();\n        if (e.code === 'Escape') {\n          patchHeader(columnId, { hideFilterMenu: true, hideFilterButton: false });\n          referenceElement.focus();\n        }\n        // Stop propagation for some reason is not enough to prevent scrolling of the datatable\n        // so we just prevent default behaviour in this case\n        if (['ArrowUp', 'ArrowDown'].includes(e.code)) {\n          e.preventDefault();\n        }\n      }}\n      style={{ display: 'flex' }}\n    >\n      <FilterButton hide={!isIconVisible} data-testid={DATA_TESTID.DATA_TABLE_FILTER_BUTTON}>\n        <Button\n          onClick={handleTriggerClick}\n          buttonType=\"text\"\n          aria-label={ariaLabel}\n          aria-hidden=\"true\"\n          size=\"s\"\n          leftIcon={triggerIcon}\n          // implement treeview mergerefs\n          innerRef={(_ref) => {\n            if (isIconVisible) setReferenceElement(_ref);\n            innerRef.current = _ref;\n          }}\n          tabIndex={reduxHeader?.withTabStops ? 0 : -1}\n        />\n      </FilterButton>\n      {referenceElement && (\n        <DSPopperJS\n          referenceElement={referenceElement}\n          showPopover={isMenuOpen}\n          closeContextMenu={handleClickOutsideMenu}\n          data-testid={DATA_TESTID.DATA_TABLE_FILTER_MENU_CONTENT}\n          startPlacementPreference=\"bottom-end\"\n          customOffset={[5, 4]}\n          withoutArrow\n          zIndex={10}\n          withoutAnimation\n          extraPopperStyles={{\n            ...customStyles,\n            minWidth: column.ref?.current?.offsetWidth ?? '0px',\n          }}\n          placementOrderPreference={['bottom-end']}\n        >\n          <PopperContent>\n            <ButtonTrap cb={buttonTrapCallback} />\n            {menuContent}\n            <ButtonTrap cb={buttonTrapCallback} />\n          </PopperContent>\n        </DSPopperJS>\n      )}\n    </div>\n  );\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;AAAA;ACEA;AACA;AACA;AACA;AACA;AACA;AAGA,MAAM,eAAe,OAAO;AAAA;AAAA,IAExB,CAAC,UAAW,MAAM,OAAO,yCAAyC;AAAA;AAGtE,MAAM,SAAS,OAAO,QAAQ;AAAA;AAAA;AAAA;AAK9B,MAAM,gBAAgB,OAAO;AAAA;AAAA;AAgB7B,MAAM,aAAa,CAAC,EAAE,SACpB,qCAAC;AAAA,EACC,eAAY;AAAA,EACZ,UAAU;AAAA,EACV,SAAS,CAAC,MAAM;AACd,MAAE,gBAAgB;AAClB,OAAG;AAAA,EACL;AAAA,CACF;AAGK,MAAM,gBAAyD,CAAC;AAAA,EACrE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA,iBAAiB,MAAM;AAAA,EACvB,qBAAqB,MAAM;AAAA,EAC3B;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,MACI;AACJ,QAAM,EAAE,kBAAkB,mBAAmB,eAAe;AAAA,IAC1D,kBAAkB;AAAA,IAClB,gBAAgB;AAAA,EAClB;AACA,QAAM,EAAE,gCAAgC,gBAAgB,0BAA0B;AAClF,QAAM,gBAAgB,CAAC,oBAAoB,CAAC;AAC5C,QAAM,aAAa,CAAC;AAEpB,QAAM,yBAAyB,CAAC,MAAM;AACpC,uBAAmB,UAAU,CAAC;AAC9B,QAAI;AAAY,qCAA+B,UAAU,IAAI;AAAA,EAC/D;AAEA,YAAU,MAAM;AACd,UAAM,YAAY,MAAM;AACtB,qCAA+B,UAAU,IAAI;AAAA,IAC/C;AACA,WAAO,iBAAiB,QAAQ,SAAS;AAEzC,WAAO,MAAM;AACX,aAAO,oBAAoB,QAAQ,SAAS;AAAA,IAC9C;AAAA,EACF,GAAG,CAAC,UAAU,8BAA8B,CAAC;AAE7C,QAAM,qBAAqB,CAAC,MAAM;AAChC,mBAAe,UAAU,CAAC;AAC1B,mCAA+B,UAAU,KAAK;AAC9C,MAAE,gBAAgB;AAAA,EACpB;AAEA,QAAM,CAAC,kBAAkB,uBAAuB,SAAS,IAAI;AAE7D,QAAM,qBAAqB,YAAY,MAAM;AAC3C,gBAAY,UAAU,EAAE,gBAAgB,MAAM,kBAAkB,MAAM,CAAC;AACvE,sBAAkB,MAAM;AAAA,EAC1B,GAAG,CAAC,UAAU,aAAa,gBAAgB,CAAC;AAC5C,SACE,qCAAC;AAAA,IAEC,SAAS,CAAC,MAAM,EAAE,gBAAgB;AAAA,IAClC,WAAW,CAAC,MAAM;AAChB,QAAE,gBAAgB;AAClB,UAAI,EAAE,SAAS,UAAU;AACvB,oBAAY,UAAU,EAAE,gBAAgB,MAAM,kBAAkB,MAAM,CAAC;AACvE,yBAAiB,MAAM;AAAA,MACzB;AAGA,UAAI,CAAC,WAAW,WAAW,EAAE,SAAS,EAAE,IAAI,GAAG;AAC7C,UAAE,eAAe;AAAA,MACnB;AAAA,IACF;AAAA,IACA,OAAO,EAAE,SAAS,OAAO;AAAA,KAEzB,qCAAC;AAAA,IAAa,MAAM,CAAC;AAAA,IAAe,eAAa,YAAY;AAAA,KAC3D,qCAAC;AAAA,IACC,SAAS;AAAA,IACT,YAAW;AAAA,IACX,cAAY;AAAA,IACZ,eAAY;AAAA,IACZ,MAAK;AAAA,IACL,UAAU;AAAA,IAEV,UAAU,CAAC,SAAS;AAClB,UAAI;AAAe,4BAAoB,IAAI;AAC3C,eAAS,UAAU;AAAA,IACrB;AAAA,IACA,UAAU,aAAa,eAAe,IAAI;AAAA,GAC5C,CACF,GACC,oBACC,qCAAC;AAAA,IACC;AAAA,IACA,aAAa;AAAA,IACb,kBAAkB;AAAA,IAClB,eAAa,YAAY;AAAA,IACzB,0BAAyB;AAAA,IACzB,cAAc,CAAC,GAAG,CAAC;AAAA,IACnB,cAAY;AAAA,IACZ,QAAQ;AAAA,IACR,kBAAgB;AAAA,IAChB,mBAAmB,iCACd,eADc;AAAA,MAEjB,UAAU,OAAO,KAAK,SAAS,eAAe;AAAA,IAChD;AAAA,IACA,0BAA0B,CAAC,YAAY;AAAA,KAEvC,qCAAC,qBACC,qCAAC;AAAA,IAAW,IAAI;AAAA,GAAoB,GACnC,aACD,qCAAC;AAAA,IAAW,IAAI;AAAA,GAAoB,CACtC,CACF,CAEJ;AAEJ;",
   "names": []
 }

package/dist/esm/exported-related/RowRenderer/DefaultRowContentRenderer.js CHANGED Viewed

@@ -18,7 +18,7 @@ var __spreadValues = (a, b) => {
 };
 var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 import * as React from "react";
-import React2, { useMemo, useLayoutEffect, useRef } from "react";
+import React2, { useMemo, useCallback, useLayoutEffect, useRef } from "react";
 import { INTERNAL_COLUMNS } from "../../addons/Columns";
 import { DATA_TESTID } from "../../configs/constants";
 import { Cells } from "../../parts/Cells";
@@ -55,7 +55,7 @@ const DefaultRowContentRenderer = (props) => {
   const isDragging = draggableProps && draggableProps.isDragging;
   useLayoutEffect(() => {
     if (row.uid === focusedRowId) {
-      rowRef.current.focus({ preventScroll: true });
+      rowRef.current?.focus();
     }
   }, [focusedRowId, row.uid]);
   const gridTemplateColProps = useMemo(() => ({
@@ -75,12 +75,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__ */ React2.createElement(React2.Fragment, null, /* @__PURE__ */ React2.createElement(StyledCellContainer, __spreadProps(__spreadValues({
       ref: rowRef,
       key: row.uid,
-      tabIndex: 0,
+      tabIndex: disabledRows[row.uid] ? -1 : 0,
       role: "row",
       "aria-rowindex": row.realIndex + 1,
       "aria-label": ariaLabelMessage(row, selection?.[row.uid] === true),
@@ -98,7 +104,8 @@ const DefaultRowContentRenderer = (props) => {
       isDragging,
       selected: noSelectionColumn && selection?.[row.uid] === true,
       disabled: disabledRows[row.uid],
-      "data-testid": DATA_TESTID.DATA_TABLE_ROW_CONTENT
+      "data-testid": DATA_TESTID.DATA_TABLE_ROW_CONTENT,
+      onMouseDown: handleSelectDisableRow
     }), /* @__PURE__ */ React2.createElement(Cells, {
       row,
       isRowSelected: selectedRowId === row.uid,
@@ -110,10 +117,10 @@ const DefaultRowContentRenderer = (props) => {
     })));
   }, [
     row,
+    disabledRows,
     selection,
     isExpandable,
     expandedRows,
-    disabledRows,
     gridTemplateColProps,
     backgroundColor,
     compact,
@@ -122,6 +129,7 @@ const DefaultRowContentRenderer = (props) => {
     isDragging,
     isDragOverlay,
     noSelectionColumn,
+    handleSelectDisableRow,
     selectedRowId,
     detailsIndent
   ]);

package/dist/esm/exported-related/RowRenderer/DefaultRowContentRenderer.js.map CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../../scripts/build/transpile/react-shim.js", "../../../../src/exported-related/RowRenderer/DefaultRowContentRenderer.tsx"],
-  "sourcesContent": ["import * as React from 'react';\nexport { React };\n", "/* eslint-disable max-lines */\n/* eslint-disable react/prop-types */\nimport React, { useMemo, useLayoutEffect, useRef } from 'react';\nimport { INTERNAL_COLUMNS } from '../../addons/Columns';\nimport { DATA_TESTID } from '../../configs/constants';\nimport { Cells } from '../../parts/Cells';\nimport { DropIndicatorPosition } from '../../parts/HoC/SortableItemContext';\nimport { RowVariantProps } from '../../parts/RowVariants/types';\nimport { StyledCellContainer } from '../../styled';\nimport { TypescriptRow } from '../../types/props';\n\nconst DetailsWrapper = (props) => (\n  // This can be further customized\n  // eslint-disable-next-line react/prop-types\n  // eslint-disable-next-line jsx-a11y/no-static-element-interactions\n  <div\n    data-role=\"detail-view\"\n    style={{\n      borderTop: '1px solid #EBEDF0',\n      borderBottom: '1px solid #EBEDF0',\n    }}\n    onClick={(e) => e.stopPropagation()}\n    onKeyDown={(e) => e.stopPropagation()}\n  >\n    {props.children}\n  </div>\n);\n\nconst ariaLabelMessage = (row: TypescriptRow, selected: boolean) =>\n  `Row number ${row.realIndex + 1}${row.parentIndex !== null ? `, child of row number ${row.parentIndex + 1}` : ''}. ${\n    selected ? 'Selected. ' : ''\n  }To interact with the cells press enter`;\n\nexport const DefaultRowContentRenderer: React.ComponentType<RowVariantProps> = (props) => {\n  const {\n    row,\n    ctx: {\n      tableProps: { isExpandable, colsLayoutStyle, selection, noSelectionColumn, expandedRows, disabledRows },\n      layoutHelpers: { gridLayout },\n      visibleColumns,\n    },\n    draggableProps,\n    isDragOverlay,\n    backgroundColor = 'white',\n    dropIndicatorPosition,\n    focusedRowId,\n    selectedRowId,\n    compact,\n  } = props;\n\n  const rowRef = useRef<HTMLDivElement>(null);\n  const isDndActive = draggableProps && draggableProps.active;\n  const isDragging = draggableProps && draggableProps.isDragging;\n\n  useLayoutEffect(() => {\n    if (row.uid === focusedRowId) {\n      rowRef.current.focus({ preventScroll: true });\n    }\n  }, [focusedRowId, row.uid]);\n\n  const gridTemplateColProps = useMemo(\n    () => ({\n      cols: isDragOverlay ? ['24px', 'auto'] : gridLayout,\n      isExpandable,\n      colLayoutStyle: colsLayoutStyle,\n    }),\n    [isDragOverlay, gridLayout, colsLayoutStyle, isExpandable],\n  );\n\n  const detailsIndent = useMemo(() => {\n    let padding = 0;\n    for (let i = 0; i < visibleColumns.length; i += 1) {\n      if (INTERNAL_COLUMNS.includes(visibleColumns[i].id)) {\n        padding += visibleColumns[i].width;\n      } else {\n        padding += row.depth * 32 + 15;\n        break;\n      }\n    }\n    return padding;\n  }, [row.depth, visibleColumns]);\n\n  const PureRowContent = useMemo(() => {\n    const DetailsView = row.original.tableRowDetails;\n    return (\n      <>\n        <StyledCellContainer\n          ref={rowRef}\n          key={row.uid}\n          tabIndex={0}\n          role=\"row\"\n          aria-rowindex={row.realIndex + 1}\n          aria-label={ariaLabelMessage(row, selection?.[row.uid] === true)}\n          aria-level={row.depth + 1}\n          aria-selected={selection?.[row.uid] === true}\n          aria-expanded={isExpandable ? expandedRows[row.uid] === true : undefined}\n          aria-disabled={disabledRows[row.uid]}\n          {...gridTemplateColProps}\n          backgroundColor={backgroundColor}\n          height={compact ? '24px' : 'auto'}\n          minHeight={compact ? '24px' : '36px'}\n          isDropIndicatorPositionInside={dropIndicatorPosition === DropIndicatorPosition.Inside}\n          shouldDisplayHover={!isDndActive && !isDragging && !isDragOverlay}\n          isDragOverlay={isDragOverlay}\n          isDragging={isDragging}\n          selected={noSelectionColumn && selection?.[row.uid] === true}\n          disabled={disabledRows[row.uid]}\n          data-testid={DATA_TESTID.DATA_TABLE_ROW_CONTENT}\n        >\n          <Cells row={row} isRowSelected={selectedRowId === row.uid} isDragOverlay={isDragOverlay} key={row.uid} />\n        </StyledCellContainer>\n        {isExpandable && row.isExpanded && DetailsView && (\n          <DetailsWrapper>\n            <DetailsView row={row} detailsIndent={detailsIndent} />\n          </DetailsWrapper>\n        )}\n      </>\n    );\n  }, [\n    row,\n    selection,\n    isExpandable,\n    expandedRows,\n    disabledRows,\n    gridTemplateColProps,\n    backgroundColor,\n    compact,\n    dropIndicatorPosition,\n    isDndActive,\n    isDragging,\n    isDragOverlay,\n    noSelectionColumn,\n    selectedRowId,\n    detailsIndent,\n  ]);\n\n  return PureRowContent;\n};\n"],
-  "mappings": "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",
+  "sourcesContent": ["import * as React from 'react';\nexport { React };\n", "/* eslint-disable complexity */\n/* eslint-disable max-lines */\n/* eslint-disable react/prop-types */\nimport React, { useMemo, useCallback, useLayoutEffect, useRef } from 'react';\nimport { INTERNAL_COLUMNS } from '../../addons/Columns';\nimport { DATA_TESTID } from '../../configs/constants';\nimport { Cells } from '../../parts/Cells';\nimport { DropIndicatorPosition } from '../../parts/HoC/SortableItemContext';\nimport { RowVariantProps } from '../../parts/RowVariants/types';\nimport { StyledCellContainer } from '../../styled';\nimport { TypescriptRow } from '../../types/props';\n\nconst DetailsWrapper = (props) => (\n  // This can be further customized\n  // eslint-disable-next-line jsx-a11y/no-static-element-interactions\n  <div\n    data-role=\"detail-view\"\n    style={{\n      borderTop: '1px solid #EBEDF0',\n      borderBottom: '1px solid #EBEDF0',\n    }}\n    onClick={(e) => e.stopPropagation()}\n    onKeyDown={(e) => e.stopPropagation()}\n  >\n    {props.children}\n  </div>\n);\n\nconst ariaLabelMessage = (row: TypescriptRow, selected: boolean) =>\n  `Row number ${row.realIndex + 1}${row.parentIndex !== null ? `, child of row number ${row.parentIndex + 1}` : ''}. ${\n    selected ? 'Selected. ' : ''\n  }To interact with the cells press enter`;\n\nexport const DefaultRowContentRenderer: React.ComponentType<RowVariantProps> = (props) => {\n  const {\n    row,\n    ctx: {\n      tableProps: { isExpandable, colsLayoutStyle, selection, noSelectionColumn, expandedRows, disabledRows },\n      layoutHelpers: { gridLayout },\n      visibleColumns,\n    },\n    draggableProps,\n    isDragOverlay,\n    backgroundColor = 'white',\n    dropIndicatorPosition,\n    focusedRowId,\n    selectedRowId,\n    compact,\n  } = props;\n\n  const rowRef = useRef<HTMLDivElement>(null);\n  const isDndActive = draggableProps && draggableProps.active;\n  const isDragging = draggableProps && draggableProps.isDragging;\n\n  useLayoutEffect(() => {\n    if (row.uid === focusedRowId) {\n      rowRef.current?.focus();\n    }\n  }, [focusedRowId, row.uid]);\n\n  const gridTemplateColProps = useMemo(\n    () => ({\n      cols: isDragOverlay ? ['24px', 'auto'] : gridLayout,\n      isExpandable,\n      colLayoutStyle: colsLayoutStyle,\n    }),\n    [isDragOverlay, gridLayout, colsLayoutStyle, isExpandable],\n  );\n\n  const detailsIndent = useMemo(() => {\n    let padding = 0;\n    for (let i = 0; i < visibleColumns.length; i += 1) {\n      if (INTERNAL_COLUMNS.includes(visibleColumns[i].id)) {\n        padding += visibleColumns[i].width;\n      } else {\n        padding += row.depth * 32 + 15;\n        break;\n      }\n    }\n    return padding;\n  }, [row.depth, visibleColumns]);\n\n  const handleSelectDisableRow = useCallback(\n    (e) => {\n      if (disabledRows[row.uid]) {\n        e.preventDefault();\n        e.stopPropagation();\n      }\n    },\n    [disabledRows, row.uid],\n  );\n  const PureRowContent = useMemo(() => {\n    const DetailsView = row.original.tableRowDetails;\n    return (\n      <>\n        <StyledCellContainer\n          ref={rowRef}\n          key={row.uid}\n          tabIndex={disabledRows[row.uid] ? -1 : 0}\n          role=\"row\"\n          aria-rowindex={row.realIndex + 1}\n          aria-label={ariaLabelMessage(row, selection?.[row.uid] === true)}\n          aria-level={row.depth + 1}\n          aria-selected={selection?.[row.uid] === true}\n          aria-expanded={isExpandable ? expandedRows[row.uid] === true : undefined}\n          aria-disabled={disabledRows[row.uid]}\n          {...gridTemplateColProps}\n          backgroundColor={backgroundColor}\n          height={compact ? '24px' : 'auto'}\n          minHeight={compact ? '24px' : '36px'}\n          isDropIndicatorPositionInside={dropIndicatorPosition === DropIndicatorPosition.Inside}\n          shouldDisplayHover={!isDndActive && !isDragging && !isDragOverlay}\n          isDragOverlay={isDragOverlay}\n          isDragging={isDragging}\n          selected={noSelectionColumn && selection?.[row.uid] === true}\n          disabled={disabledRows[row.uid]}\n          data-testid={DATA_TESTID.DATA_TABLE_ROW_CONTENT}\n          onMouseDown={handleSelectDisableRow}\n        >\n          <Cells row={row} isRowSelected={selectedRowId === row.uid} isDragOverlay={isDragOverlay} key={row.uid} />\n        </StyledCellContainer>\n        {isExpandable && row.isExpanded && DetailsView && (\n          <DetailsWrapper>\n            <DetailsView row={row} detailsIndent={detailsIndent} />\n          </DetailsWrapper>\n        )}\n      </>\n    );\n  }, [\n    row,\n    disabledRows,\n    selection,\n    isExpandable,\n    expandedRows,\n    gridTemplateColProps,\n    backgroundColor,\n    compact,\n    dropIndicatorPosition,\n    isDndActive,\n    isDragging,\n    isDragOverlay,\n    noSelectionColumn,\n    handleSelectDisableRow,\n    selectedRowId,\n    detailsIndent,\n  ]);\n\n  return PureRowContent;\n};\n"],
+  "mappings": "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",
   "names": []
 }

package/dist/esm/exported-related/RowRenderer/useRowRendererHandlers.js CHANGED Viewed

@@ -12,11 +12,21 @@ const useRowRendererHandlers = ({
   selectedRowId
 }) => {
   const {
-    tableProps: { onRowClick, onRowFocus },
+    tableProps: { onRowClick, onRowFocus, disabledRows },
     virtualListHelpers: { scrollToIndex }
   } = useContext(DataTableContext);
+  const isOptionFocuseable = (opt) => !disabledRows[opt.uid];
+  const findInCircularList = (list, from, criteria, step = 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;
+  };
   const { setSelectedRowId, setFocusedRowId } = useDispatchRowsActions();
   const handleItemClick = useCallback((e, { original, uid } = row) => {
+    if (disabledRows[uid])
+      return;
     onRowClick(original, e, uid);
     onRowFocus({
       itemIndex,
@@ -25,7 +35,7 @@ const useRowRendererHandlers = ({
       }) => scrollToIndex(itemIndex, opts),
       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) {
@@ -49,25 +59,37 @@ const useRowRendererHandlers = ({
     }
     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, handleOnBlur, handleOnFocus };
 };
 export {

package/dist/esm/exported-related/RowRenderer/useRowRendererHandlers.js.map CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../../scripts/build/transpile/react-shim.js", "../../../../src/exported-related/RowRenderer/useRowRendererHandlers.tsx"],
-  "sourcesContent": ["import * as React from 'react';\nexport { React };\n", "import React, { useCallback, useContext } from 'react';\nimport { DATA_TESTID } from '../../configs/constants';\nimport { DataTableContext } from '../../DataTableContext';\nimport { SortableItemContextType } from '../../parts/HoC/SortableItemContext';\nimport { useDispatchRowsActions } from '../../redux/reducers';\nimport { TypescriptRow } from '../../types/props';\n\nexport const useRowRendererHandlers = ({\n  row,\n  itemIndex,\n  items,\n  draggableProps,\n  isDragOverlay,\n  selectedRowId,\n}: {\n  row: TypescriptRow;\n  itemIndex: number;\n  items: TypescriptRow[];\n  draggableProps: SortableItemContextType['draggableProps'];\n  isDragOverlay: boolean;\n  selectedRowId: string;\n}): {\n  handleItemClick: React.MouseEventHandler;\n  handleKeyDown: React.KeyboardEventHandler;\n  handleOnBlur: React.FocusEventHandler;\n  handleOnFocus: React.FocusEventHandler;\n} => {\n  const {\n    tableProps: { onRowClick, onRowFocus },\n    virtualListHelpers: { scrollToIndex },\n  } = useContext(DataTableContext);\n\n  const { setSelectedRowId, setFocusedRowId } = useDispatchRowsActions();\n\n  const handleItemClick = useCallback(\n    (e, { original, uid } = row) => {\n      // setSelectedRowId(null);\n      onRowClick(original, e, uid);\n      onRowFocus(\n        {\n          itemIndex,\n          scrollToItem: (\n            opts: { align: 'auto' | 'start' | 'center' | 'end' } = {\n              align: 'start',\n            },\n          ) => scrollToIndex(itemIndex, opts),\n          original,\n        },\n        e,\n      );\n    },\n    [row, onRowClick, onRowFocus, itemIndex, scrollToIndex],\n  );\n\n  const isActive = draggableProps && draggableProps.active;\n\n  const handleKeyDown = useCallback(\n    (e: React.KeyboardEvent) => {\n      if (isDragOverlay || isActive) {\n        e.preventDefault();\n        return;\n      }\n      if (e.code === 'Enter') {\n        e.preventDefault();\n        if (selectedRowId !== row.uid) {\n          setSelectedRowId(row.uid);\n          setTimeout(() => {\n            const focuseableCell = row.cells.find((cell) => cell.ref.current !== null);\n            if (focuseableCell) focuseableCell.ref.current.focus();\n          });\n        }\n      }\n      if (e.code === 'Space') {\n        e.preventDefault();\n        handleItemClick(e, row);\n      }\n      if (e.code === 'ArrowDown') {\n        e.preventDefault();\n        if (itemIndex + 1 < items.length) setFocusedRowId(items[itemIndex + 1].uid);\n      }\n      if (e.code === 'ArrowUp') {\n        e.preventDefault();\n        if (itemIndex - 1 >= 0) setFocusedRowId(items[itemIndex - 1].uid);\n      }\n    },\n    [isDragOverlay, isActive, selectedRowId, row, setSelectedRowId, handleItemClick, itemIndex, items, setFocusedRowId],\n  );\n\n  const handleOnBlur = useCallback(\n    (e) => {\n      if (e.relatedTarget?.getAttribute('data-testid') === 'data-table-row-content') {\n        setSelectedRowId(null);\n      }\n    },\n    [setSelectedRowId],\n  );\n\n  const handleOnFocus: React.FocusEventHandler = useCallback(\n    (e) => {\n      if (e.target && e.target.getAttribute('data-testid') === DATA_TESTID.DATA_TABLE_ROW_CONTENT) {\n        setFocusedRowId(row.uid);\n      }\n    },\n    [row.uid, setFocusedRowId],\n  );\n\n  return { handleItemClick, handleKeyDown, handleOnBlur, handleOnFocus };\n};\n"],
-  "mappings": "AAAA;ACAA;AACA;AACA;AAEA;AAGO,MAAM,yBAAyB,CAAC;AAAA,EACrC;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,MAaG;AACH,QAAM;AAAA,IACJ,YAAY,EAAE,YAAY;AAAA,IAC1B,oBAAoB,EAAE;AAAA,MACpB,WAAW,gBAAgB;AAE/B,QAAM,EAAE,kBAAkB,oBAAoB,uBAAuB;AAErE,QAAM,kBAAkB,YACtB,CAAC,GAAG,EAAE,UAAU,QAAQ,QAAQ;AAE9B,eAAW,UAAU,GAAG,GAAG;AAC3B,eACE;AAAA,MACE;AAAA,MACA,cAAc,CACZ,OAAuD;AAAA,QACrD,OAAO;AAAA,MACT,MACG,cAAc,WAAW,IAAI;AAAA,MAClC;AAAA,IACF,GACA,CACF;AAAA,EACF,GACA,CAAC,KAAK,YAAY,YAAY,WAAW,aAAa,CACxD;AAEA,QAAM,WAAW,kBAAkB,eAAe;AAElD,QAAM,gBAAgB,YACpB,CAAC,MAA2B;AAC1B,QAAI,iBAAiB,UAAU;AAC7B,QAAE,eAAe;AACjB;AAAA,IACF;AACA,QAAI,EAAE,SAAS,SAAS;AACtB,QAAE,eAAe;AACjB,UAAI,kBAAkB,IAAI,KAAK;AAC7B,yBAAiB,IAAI,GAAG;AACxB,mBAAW,MAAM;AACf,gBAAM,iBAAiB,IAAI,MAAM,KAAK,CAAC,SAAS,KAAK,IAAI,YAAY,IAAI;AACzE,cAAI;AAAgB,2BAAe,IAAI,QAAQ,MAAM;AAAA,QACvD,CAAC;AAAA,MACH;AAAA,IACF;AACA,QAAI,EAAE,SAAS,SAAS;AACtB,QAAE,eAAe;AACjB,sBAAgB,GAAG,GAAG;AAAA,IACxB;AACA,QAAI,EAAE,SAAS,aAAa;AAC1B,QAAE,eAAe;AACjB,UAAI,YAAY,IAAI,MAAM;AAAQ,wBAAgB,MAAM,YAAY,GAAG,GAAG;AAAA,IAC5E;AACA,QAAI,EAAE,SAAS,WAAW;AACxB,QAAE,eAAe;AACjB,UAAI,YAAY,KAAK;AAAG,wBAAgB,MAAM,YAAY,GAAG,GAAG;AAAA,IAClE;AAAA,EACF,GACA,CAAC,eAAe,UAAU,eAAe,KAAK,kBAAkB,iBAAiB,WAAW,OAAO,eAAe,CACpH;AAEA,QAAM,eAAe,YACnB,CAAC,MAAM;AACL,QAAI,EAAE,eAAe,aAAa,aAAa,MAAM,0BAA0B;AAC7E,uBAAiB,IAAI;AAAA,IACvB;AAAA,EACF,GACA,CAAC,gBAAgB,CACnB;AAEA,QAAM,gBAAyC,YAC7C,CAAC,MAAM;AACL,QAAI,EAAE,UAAU,EAAE,OAAO,aAAa,aAAa,MAAM,YAAY,wBAAwB;AAC3F,sBAAgB,IAAI,GAAG;AAAA,IACzB;AAAA,EACF,GACA,CAAC,IAAI,KAAK,eAAe,CAC3B;AAEA,SAAO,EAAE,iBAAiB,eAAe,cAAc,cAAc;AACvE;",
+  "sourcesContent": ["import * as React from 'react';\nexport { React };\n", "/* eslint-disable complexity */\nimport React, { useCallback, useContext } from 'react';\nimport { DATA_TESTID } from '../../configs/constants';\nimport { DataTableContext } from '../../DataTableContext';\nimport { SortableItemContextType } from '../../parts/HoC/SortableItemContext';\nimport { useDispatchRowsActions } from '../../redux/reducers';\nimport { TypescriptRow } from '../../types/props';\n\nexport const useRowRendererHandlers = ({\n  row,\n  itemIndex,\n  items,\n  draggableProps,\n  isDragOverlay,\n  selectedRowId,\n}: {\n  row: TypescriptRow;\n  itemIndex: number;\n  items: TypescriptRow[];\n  draggableProps: SortableItemContextType['draggableProps'];\n  isDragOverlay: boolean;\n  selectedRowId: string;\n}): {\n  handleItemClick: React.MouseEventHandler;\n  handleKeyDown: React.KeyboardEventHandler;\n  handleOnBlur: React.FocusEventHandler;\n  handleOnFocus: React.FocusEventHandler;\n} => {\n  const {\n    tableProps: { onRowClick, onRowFocus, disabledRows },\n    virtualListHelpers: { scrollToIndex },\n  } = useContext(DataTableContext);\n\n  const isOptionFocuseable = (opt): boolean => !disabledRows[opt.uid];\n\n  const findInCircularList = (\n    list,\n    from: number,\n    criteria: (item) => boolean,\n    step = 1,\n    // eslint-disable-next-line max-params\n  ): number => {\n    for (\n      let i = (from + step + list.length) % list.length;\n      i !== from && from > -1;\n      i = (i + step + list.length) % list.length\n    ) {\n      if (criteria(list[i])) return i;\n    }\n    return from; // return same item\n  };\n\n  const { setSelectedRowId, setFocusedRowId } = useDispatchRowsActions();\n\n  const handleItemClick = useCallback(\n    (e, { original, uid } = row) => {\n      // setSelectedRowId(null);\n      if (disabledRows[uid]) return;\n      onRowClick(original, e, uid);\n      onRowFocus(\n        {\n          itemIndex,\n          scrollToItem: (\n            opts: { align: 'auto' | 'start' | 'center' | 'end' } = {\n              align: 'start',\n            },\n          ) => scrollToIndex(itemIndex, opts),\n          original,\n        },\n        e,\n      );\n    },\n    [row, disabledRows, onRowClick, onRowFocus, itemIndex, scrollToIndex],\n  );\n\n  const isActive = draggableProps && draggableProps.active;\n\n  const handleKeyDown = useCallback(\n    (e: React.KeyboardEvent) => {\n      if (isDragOverlay || isActive) {\n        e.preventDefault();\n        return;\n      }\n      if (e.code === 'Enter') {\n        e.preventDefault();\n        if (selectedRowId !== row.uid) {\n          setSelectedRowId(row.uid);\n          setTimeout(() => {\n            const focuseableCell = row.cells.find((cell) => cell.ref.current !== null);\n            if (focuseableCell) focuseableCell.ref.current.focus();\n          });\n        }\n      }\n      if (e.code === 'Space') {\n        e.preventDefault();\n        handleItemClick(e, row);\n      }\n      if (e.code === 'ArrowDown') {\n        e.preventDefault();\n        e.stopPropagation();\n        const next = findInCircularList(items, itemIndex, isOptionFocuseable);\n        setFocusedRowId(items[next].uid);\n      }\n      if (e.code === 'ArrowUp') {\n        e.preventDefault();\n        const prev = findInCircularList(items, itemIndex, isOptionFocuseable, -1);\n        setFocusedRowId(items[prev].uid);\n      }\n    },\n    [\n      isDragOverlay,\n      isActive,\n      selectedRowId,\n      row,\n      setSelectedRowId,\n      handleItemClick,\n      items,\n      itemIndex,\n      isOptionFocuseable,\n      setFocusedRowId,\n    ],\n  );\n\n  const handleOnBlur = useCallback(\n    (e) => {\n      if (e.relatedTarget?.getAttribute('data-testid') === 'data-table-row-content') {\n        setSelectedRowId(null);\n      }\n    },\n    [setSelectedRowId],\n  );\n\n  const handleOnFocus: React.FocusEventHandler = useCallback(\n    (e) => {\n      if (\n        !disabledRows[row.uid] &&\n        e.target &&\n        e.target.getAttribute('data-testid') === DATA_TESTID.DATA_TABLE_ROW_CONTENT\n      ) {\n        setFocusedRowId(row.uid);\n      }\n    },\n    [row.uid, setFocusedRowId, disabledRows],\n  );\n\n  return { handleItemClick, handleKeyDown, handleOnBlur, handleOnFocus };\n};\n"],
+  "mappings": "AAAA;ACCA;AACA;AACA;AAEA;AAGO,MAAM,yBAAyB,CAAC;AAAA,EACrC;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,MAaG;AACH,QAAM;AAAA,IACJ,YAAY,EAAE,YAAY,YAAY;AAAA,IACtC,oBAAoB,EAAE;AAAA,MACpB,WAAW,gBAAgB;AAE/B,QAAM,qBAAqB,CAAC,QAAiB,CAAC,aAAa,IAAI;AAE/D,QAAM,qBAAqB,CACzB,MACA,MACA,UACA,OAAO,MAEI;AACX,aACM,IAAK,QAAO,OAAO,KAAK,UAAU,KAAK,QAC3C,MAAM,QAAQ,OAAO,IACrB,IAAK,KAAI,OAAO,KAAK,UAAU,KAAK,QACpC;AACA,UAAI,SAAS,KAAK,EAAE;AAAG,eAAO;AAAA,IAChC;AACA,WAAO;AAAA,EACT;AAEA,QAAM,EAAE,kBAAkB,oBAAoB,uBAAuB;AAErE,QAAM,kBAAkB,YACtB,CAAC,GAAG,EAAE,UAAU,QAAQ,QAAQ;AAE9B,QAAI,aAAa;AAAM;AACvB,eAAW,UAAU,GAAG,GAAG;AAC3B,eACE;AAAA,MACE;AAAA,MACA,cAAc,CACZ,OAAuD;AAAA,QACrD,OAAO;AAAA,MACT,MACG,cAAc,WAAW,IAAI;AAAA,MAClC;AAAA,IACF,GACA,CACF;AAAA,EACF,GACA,CAAC,KAAK,cAAc,YAAY,YAAY,WAAW,aAAa,CACtE;AAEA,QAAM,WAAW,kBAAkB,eAAe;AAElD,QAAM,gBAAgB,YACpB,CAAC,MAA2B;AAC1B,QAAI,iBAAiB,UAAU;AAC7B,QAAE,eAAe;AACjB;AAAA,IACF;AACA,QAAI,EAAE,SAAS,SAAS;AACtB,QAAE,eAAe;AACjB,UAAI,kBAAkB,IAAI,KAAK;AAC7B,yBAAiB,IAAI,GAAG;AACxB,mBAAW,MAAM;AACf,gBAAM,iBAAiB,IAAI,MAAM,KAAK,CAAC,SAAS,KAAK,IAAI,YAAY,IAAI;AACzE,cAAI;AAAgB,2BAAe,IAAI,QAAQ,MAAM;AAAA,QACvD,CAAC;AAAA,MACH;AAAA,IACF;AACA,QAAI,EAAE,SAAS,SAAS;AACtB,QAAE,eAAe;AACjB,sBAAgB,GAAG,GAAG;AAAA,IACxB;AACA,QAAI,EAAE,SAAS,aAAa;AAC1B,QAAE,eAAe;AACjB,QAAE,gBAAgB;AAClB,YAAM,OAAO,mBAAmB,OAAO,WAAW,kBAAkB;AACpE,sBAAgB,MAAM,MAAM,GAAG;AAAA,IACjC;AACA,QAAI,EAAE,SAAS,WAAW;AACxB,QAAE,eAAe;AACjB,YAAM,OAAO,mBAAmB,OAAO,WAAW,oBAAoB,EAAE;AACxE,sBAAgB,MAAM,MAAM,GAAG;AAAA,IACjC;AAAA,EACF,GACA;AAAA,IACE;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF,CACF;AAEA,QAAM,eAAe,YACnB,CAAC,MAAM;AACL,QAAI,EAAE,eAAe,aAAa,aAAa,MAAM,0BAA0B;AAC7E,uBAAiB,IAAI;AAAA,IACvB;AAAA,EACF,GACA,CAAC,gBAAgB,CACnB;AAEA,QAAM,gBAAyC,YAC7C,CAAC,MAAM;AACL,QACE,CAAC,aAAa,IAAI,QAClB,EAAE,UACF,EAAE,OAAO,aAAa,aAAa,MAAM,YAAY,wBACrD;AACA,sBAAgB,IAAI,GAAG;AAAA,IACzB;AAAA,EACF,GACA,CAAC,IAAI,KAAK,iBAAiB,YAAY,CACzC;AAEA,SAAO,EAAE,iBAAiB,eAAe,cAAc,cAAc;AACvE;",
   "names": []
 }

package/dist/esm/exported-related/Toolbar/Toolbar.js CHANGED Viewed

@@ -49,22 +49,15 @@ const ToolbarPosition = styled.div`
 `;
 const Toolbar = ({ children }) => {
   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__ */ React2.createElement(ToolbarPosition, {
     ref: toolbarRef
   }, /* @__PURE__ */ React2.createElement(ToolbarWrapper, {
     onMouseEnter: () => setShow(true),
-    onMouseLeave: () => setShow(clicked)
+    onMouseLeave: () => setShow(false)
   }, show && /* @__PURE__ */ React2.createElement(ToolbarBtns, null, children), /* @__PURE__ */ React2.createElement(DSButtonV2, {
     buttonType: "icon",
     className: "toolbar-trigger",

package/dist/esm/exported-related/Toolbar/Toolbar.js.map CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../../scripts/build/transpile/react-shim.js", "../../../../src/exported-related/Toolbar/Toolbar.tsx"],
-  "sourcesContent": ["import * as React from 'react';\nexport { React };\n", "import React, { useCallback, useRef, useState } from 'react';\nimport styled from 'styled-components';\nimport { DSButtonV2 } from '@elliemae/ds-button';\nimport { MoreOptionsVert } from '@elliemae/ds-icons';\nimport { useOnClickOutside } from '@elliemae/ds-utilities';\nimport { DATA_TESTID } from '../../configs/constants';\n\nconst ToolbarBtns = styled.div`\n  & > .em-ds-toolbar {\n    box-shadow: none;\n  }\n`;\n\nconst ToolbarWrapper = styled.div`\n  display: flex;\n  align-items: center;\n  height: 36px;\n  margin-right: 1px;\n  pointer-events: all;\n  &:hover {\n    box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.13), 0 1px 2px 0 rgba(0, 0, 0, 0.2);\n    & > .toolbar-trigger {\n      border: none;\n    }\n  }\n`;\n\nconst ToolbarPosition = styled.div`\n  display: flex;\n  justify-content: flex-end;\n  align-items: center;\n  pointer-events: none;\n  background: white;\n  height: 28px;\n  margin-top: 4px;\n  width: 100%;\n  padding-left: 4px;\n  &:hover {\n    z-index: 1;\n  }\n  :after {\n    content: '';\n    position: absolute;\n    left: 0px;\n    top: 4px;\n    bottom: 4px;\n    width: 1px;\n    background-color: ${(props) => props.theme.colors.neutral['080']};\n    z-index: 7;\n  }\n`;\n\n// eslint-disable-next-line react/prop-types\nexport const Toolbar: React.ComponentType = ({ children }) => {\n  const [show, setShow] = useState(false);\n  const [clicked, setClicked] = useState(false);\n\n  const toolbarRef = useRef(null);\n\n  const handleOnClickOutside = useCallback(() => {\n    setShow(false);\n    setClicked(false);\n  }, []);\n\n  const handleOnClick = useCallback(() => {\n    setShow(true);\n    setClicked(true);\n  }, []);\n\n  useOnClickOutside(toolbarRef, handleOnClickOutside);\n\n  return (\n    <ToolbarPosition ref={toolbarRef}>\n      <ToolbarWrapper onMouseEnter={() => setShow(true)} onMouseLeave={() => setShow(clicked)}>\n        {show && <ToolbarBtns>{children}</ToolbarBtns>}\n        <DSButtonV2\n          buttonType=\"icon\"\n          className=\"toolbar-trigger\"\n          data-testid={DATA_TESTID.DATA_TABLE_TOOLBAR_TRIGGER}\n          onClick={handleOnClick}\n          onKeyDown={(e) => ['Enter', 'Space'].includes(e.code) && handleOnClick()}\n          tabIndex={0}\n        >\n          <MoreOptionsVert />\n        </DSButtonV2>\n      </ToolbarWrapper>\n    </ToolbarPosition>\n  );\n};\n"],
-  "mappings": "AAAA;ACAA;AACA;AACA;AACA;AACA;AACA;AAEA,MAAM,cAAc,OAAO;AAAA;AAAA;AAAA;AAAA;AAM3B,MAAM,iBAAiB,OAAO;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAc9B,MAAM,kBAAkB,OAAO;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,wBAoBP,CAAC,UAAU,MAAM,MAAM,OAAO,QAAQ;AAAA;AAAA;AAAA;AAMvD,MAAM,UAA+B,CAAC,EAAE,eAAe;AAC5D,QAAM,CAAC,MAAM,WAAW,SAAS,KAAK;AACtC,QAAM,CAAC,SAAS,cAAc,SAAS,KAAK;AAE5C,QAAM,aAAa,OAAO,IAAI;AAE9B,QAAM,uBAAuB,YAAY,MAAM;AAC7C,YAAQ,KAAK;AACb,eAAW,KAAK;AAAA,EAClB,GAAG,CAAC,CAAC;AAEL,QAAM,gBAAgB,YAAY,MAAM;AACtC,YAAQ,IAAI;AACZ,eAAW,IAAI;AAAA,EACjB,GAAG,CAAC,CAAC;AAEL,oBAAkB,YAAY,oBAAoB;AAElD,SACE,qCAAC;AAAA,IAAgB,KAAK;AAAA,KACpB,qCAAC;AAAA,IAAe,cAAc,MAAM,QAAQ,IAAI;AAAA,IAAG,cAAc,MAAM,QAAQ,OAAO;AAAA,KACnF,QAAQ,qCAAC,mBAAa,QAAS,GAChC,qCAAC;AAAA,IACC,YAAW;AAAA,IACX,WAAU;AAAA,IACV,eAAa,YAAY;AAAA,IACzB,SAAS;AAAA,IACT,WAAW,CAAC,MAAM,CAAC,SAAS,OAAO,EAAE,SAAS,EAAE,IAAI,KAAK,cAAc;AAAA,IACvE,UAAU;AAAA,KAEV,qCAAC,qBAAgB,CACnB,CACF,CACF;AAEJ;",
+  "sourcesContent": ["import * as React from 'react';\nexport { React };\n", "import React, { useCallback, useRef, useState } from 'react';\nimport styled from 'styled-components';\nimport { DSButtonV2 } from '@elliemae/ds-button';\nimport { MoreOptionsVert } from '@elliemae/ds-icons';\nimport { useOnClickOutside } from '@elliemae/ds-utilities';\nimport { DATA_TESTID } from '../../configs/constants';\n\nconst ToolbarBtns = styled.div`\n  & > .em-ds-toolbar {\n    box-shadow: none;\n  }\n`;\n\nconst ToolbarWrapper = styled.div`\n  display: flex;\n  align-items: center;\n  height: 36px;\n  margin-right: 1px;\n  pointer-events: all;\n  &:hover {\n    box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.13), 0 1px 2px 0 rgba(0, 0, 0, 0.2);\n    & > .toolbar-trigger {\n      border: none;\n    }\n  }\n`;\n\nconst ToolbarPosition = styled.div`\n  display: flex;\n  justify-content: flex-end;\n  align-items: center;\n  pointer-events: none;\n  background: white;\n  height: 28px;\n  margin-top: 4px;\n  width: 100%;\n  padding-left: 4px;\n  &:hover {\n    z-index: 1;\n  }\n  :after {\n    content: '';\n    position: absolute;\n    left: 0px;\n    top: 4px;\n    bottom: 4px;\n    width: 1px;\n    background-color: ${(props) => props.theme.colors.neutral['080']};\n    z-index: 7;\n  }\n`;\n\n// eslint-disable-next-line react/prop-types\nexport const Toolbar: React.ComponentType = ({ children }) => {\n  const [show, setShow] = useState(false);\n\n  const toolbarRef = useRef(null);\n\n  const handleOnClickOutside = useCallback(() => setShow(false), []);\n\n  const handleOnClick = useCallback(() => setShow(true), []);\n\n  useOnClickOutside(toolbarRef, handleOnClickOutside);\n\n  return (\n    <ToolbarPosition ref={toolbarRef}>\n      <ToolbarWrapper onMouseEnter={() => setShow(true)} onMouseLeave={() => setShow(false)}>\n        {show && <ToolbarBtns>{children}</ToolbarBtns>}\n        <DSButtonV2\n          buttonType=\"icon\"\n          className=\"toolbar-trigger\"\n          data-testid={DATA_TESTID.DATA_TABLE_TOOLBAR_TRIGGER}\n          onClick={handleOnClick}\n          onKeyDown={(e) => ['Enter', 'Space'].includes(e.code) && handleOnClick()}\n          tabIndex={0}\n        >\n          <MoreOptionsVert />\n        </DSButtonV2>\n      </ToolbarWrapper>\n    </ToolbarPosition>\n  );\n};\n"],
+  "mappings": "AAAA;ACAA;AACA;AACA;AACA;AACA;AACA;AAEA,MAAM,cAAc,OAAO;AAAA;AAAA;AAAA;AAAA;AAM3B,MAAM,iBAAiB,OAAO;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAc9B,MAAM,kBAAkB,OAAO;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,wBAoBP,CAAC,UAAU,MAAM,MAAM,OAAO,QAAQ;AAAA;AAAA;AAAA;AAMvD,MAAM,UAA+B,CAAC,EAAE,eAAe;AAC5D,QAAM,CAAC,MAAM,WAAW,SAAS,KAAK;AAEtC,QAAM,aAAa,OAAO,IAAI;AAE9B,QAAM,uBAAuB,YAAY,MAAM,QAAQ,KAAK,GAAG,CAAC,CAAC;AAEjE,QAAM,gBAAgB,YAAY,MAAM,QAAQ,IAAI,GAAG,CAAC,CAAC;AAEzD,oBAAkB,YAAY,oBAAoB;AAElD,SACE,qCAAC;AAAA,IAAgB,KAAK;AAAA,KACpB,qCAAC;AAAA,IAAe,cAAc,MAAM,QAAQ,IAAI;AAAA,IAAG,cAAc,MAAM,QAAQ,KAAK;AAAA,KACjF,QAAQ,qCAAC,mBAAa,QAAS,GAChC,qCAAC;AAAA,IACC,YAAW;AAAA,IACX,WAAU;AAAA,IACV,eAAa,YAAY;AAAA,IACzB,SAAS;AAAA,IACT,WAAW,CAAC,MAAM,CAAC,SAAS,OAAO,EAAE,SAAS,EAAE,IAAI,KAAK,cAAc;AAAA,IACvE,UAAU;AAAA,KAEV,qCAAC,qBAAgB,CACnB,CACF,CACF;AAEJ;",
   "names": []
 }

package/dist/esm/parts/Cells/Cell.js CHANGED Viewed

@@ -44,7 +44,7 @@ const Cell = ({
 }) => {
   const ctx = useContext(DataTableContext);
   const {
-    tableProps: { cellRendererProps }
+    tableProps: { cellRendererProps, disabledRows }
   } = ctx;
   const { draggableProps } = useContext(SortableItemContext);
   const [appliedTextWrap, cellStyle] = useCellStyle(column, shouldAddExpandCell);
@@ -87,7 +87,7 @@ const Cell = ({
       }, cellProps));
     return null;
   }, [DefaultCellContentJSX, cellProps, column]);
-  return /* @__PURE__ */ React2.createElement(PureStandardCell, __spreadValues({}, cellProps), column.editable ? EditableContentJSX : DefaultCellContentJSX);
+  return /* @__PURE__ */ React2.createElement(PureStandardCell, __spreadValues({}, cellProps), column.editable && !disabledRows[row.uid] ? EditableContentJSX : DefaultCellContentJSX);
 };
 var Cell_default = Cell;
 export {

package/dist/esm/parts/Cells/Cell.js.map CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../../scripts/build/transpile/react-shim.js", "../../../../src/parts/Cells/Cell.tsx"],
-  "sourcesContent": ["import * as React from 'react';\nexport { React };\n", "/* eslint-disable max-lines */\n/* eslint-disable react/prop-types */\nimport React, { useContext, useMemo, memo } from 'react';\nimport { SimpleTruncatedTooltipText } from '@elliemae/ds-truncated-tooltip-text';\nimport { Grid } from '@elliemae/ds-grid';\nimport { StyledCell, StyledCellContent } from '../../styled';\nimport { outOfTheBoxEditables } from '../../addons/Editables';\nimport { DataTableContext } from '../../DataTableContext';\nimport { TypescriptColumn, TypescriptRow } from '../../types/props';\nimport { SortableItemContext } from '../HoC/SortableItemContext';\nimport { expandRowColumn } from '../../addons/Columns';\nimport { DATA_TESTID } from '../../configs/constants';\nimport { useCellStyle } from './useCellStyle';\n\nconst PureStandardCell = memo<{ cellStyle: unknown; column: TypescriptColumn }>(({ cellStyle, children, column }) => (\n  <StyledCell column={column} style={cellStyle} role=\"cell\" data-testid={DATA_TESTID.DATA_TABLE_CELL}>\n    {children}\n  </StyledCell>\n));\n\ninterface CellProps {\n  cell: any;\n  column: TypescriptColumn;\n  row: TypescriptRow;\n  isRowSelected: boolean;\n  shouldAddExpandCell: boolean;\n  isDragOverlay: boolean;\n}\n\nconst Cell: React.ComponentType<CellProps> = ({\n  cell,\n  column,\n  row,\n  isRowSelected,\n  shouldAddExpandCell,\n  isDragOverlay,\n}) => {\n  const ctx = useContext(DataTableContext);\n  const {\n    tableProps: { cellRendererProps },\n  } = ctx;\n  const { draggableProps } = useContext(SortableItemContext);\n\n  const [appliedTextWrap, cellStyle] = useCellStyle(column, shouldAddExpandCell);\n\n  const cellProps = useMemo(\n    () => ({\n      ...cellRendererProps,\n      cell,\n      row,\n      isRowSelected,\n      ctx,\n      draggableProps,\n      isDragOverlay,\n      role: 'cell',\n      cellStyle,\n      column,\n    }),\n    [cellRendererProps, cell, row, isRowSelected, ctx, draggableProps, isDragOverlay, cellStyle, column],\n  );\n\n  const CellComponent = cell.render;\n\n  const pureCellContent = useMemo(() => {\n    if (shouldAddExpandCell) {\n      return (\n        <Grid cols={['min-content', 'auto']} alignItems=\"center\" height=\"100%\">\n          {shouldAddExpandCell && <expandRowColumn.Cell {...cellProps} />}\n          <CellComponent {...cellProps} />\n        </Grid>\n      );\n    }\n    return <CellComponent {...cellProps} />;\n  }, [CellComponent, cellProps, shouldAddExpandCell]);\n\n  const DefaultCellContentJSX = useMemo(\n    () => (\n      <StyledCellContent>\n        {appliedTextWrap === 'truncate' ? <SimpleTruncatedTooltipText value={pureCellContent} /> : pureCellContent}\n      </StyledCellContent>\n    ),\n    [appliedTextWrap, pureCellContent],\n  );\n\n  const EditableContentJSX = useMemo(() => {\n    if (typeof column.editable === 'string') {\n      const { EditableComponent } = outOfTheBoxEditables?.[column.editable];\n      if (EditableComponent) return <EditableComponent {...cellProps} DefaultCellRender={DefaultCellContentJSX} />;\n    }\n    if (typeof column.editable === 'function')\n      return column.editable({\n        DefaultCellRender: DefaultCellContentJSX,\n        ...cellProps,\n      }) as JSX.Element;\n\n    return null;\n  }, [DefaultCellContentJSX, cellProps, column]);\n\n  return (\n    <PureStandardCell {...cellProps}>{column.editable ? EditableContentJSX : DefaultCellContentJSX}</PureStandardCell>\n  );\n};\n\nexport { Cell };\nexport default Cell;\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;AAAA;ACEA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AAEA,MAAM,mBAAmB,KAAuD,CAAC,EAAE,WAAW,UAAU,aACtG,qCAAC;AAAA,EAAW;AAAA,EAAgB,OAAO;AAAA,EAAW,MAAK;AAAA,EAAO,eAAa,YAAY;AAAA,GAChF,QACH,CACD;AAWD,MAAM,OAAuC,CAAC;AAAA,EAC5C;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,MACI;AACJ,QAAM,MAAM,WAAW,gBAAgB;AACvC,QAAM;AAAA,IACJ,YAAY,EAAE;AAAA,MACZ;AACJ,QAAM,EAAE,mBAAmB,WAAW,mBAAmB;AAEzD,QAAM,CAAC,iBAAiB,aAAa,aAAa,QAAQ,mBAAmB;AAE7E,QAAM,YAAY,QAChB,MAAO,iCACF,oBADE;AAAA,IAEL;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA,MAAM;AAAA,IACN;AAAA,IACA;AAAA,EACF,IACA,CAAC,mBAAmB,MAAM,KAAK,eAAe,KAAK,gBAAgB,eAAe,WAAW,MAAM,CACrG;AAEA,QAAM,gBAAgB,KAAK;AAE3B,QAAM,kBAAkB,QAAQ,MAAM;AACpC,QAAI,qBAAqB;AACvB,aACE,qCAAC;AAAA,QAAK,MAAM,CAAC,eAAe,MAAM;AAAA,QAAG,YAAW;AAAA,QAAS,QAAO;AAAA,SAC7D,uBAAuB,qCAAC,gBAAgB,MAAhB,mBAAyB,UAAW,GAC7D,qCAAC,kCAAkB,UAAW,CAChC;AAAA,IAEJ;AACA,WAAO,qCAAC,kCAAkB,UAAW;AAAA,EACvC,GAAG,CAAC,eAAe,WAAW,mBAAmB,CAAC;AAElD,QAAM,wBAAwB,QAC5B,MACE,qCAAC,yBACE,oBAAoB,aAAa,qCAAC;AAAA,IAA2B,OAAO;AAAA,GAAiB,IAAK,eAC7F,GAEF,CAAC,iBAAiB,eAAe,CACnC;AAEA,QAAM,qBAAqB,QAAQ,MAAM;AACvC,QAAI,OAAO,OAAO,aAAa,UAAU;AACvC,YAAM,EAAE,sBAAsB,uBAAuB,OAAO;AAC5D,UAAI;AAAmB,eAAO,qCAAC,oDAAsB,YAAtB;AAAA,UAAiC,mBAAmB;AAAA,UAAuB;AAAA,IAC5G;AACA,QAAI,OAAO,OAAO,aAAa;AAC7B,aAAO,OAAO,SAAS;AAAA,QACrB,mBAAmB;AAAA,SAChB,UACJ;AAEH,WAAO;AAAA,EACT,GAAG,CAAC,uBAAuB,WAAW,MAAM,CAAC;AAE7C,SACE,qCAAC,qCAAqB,YAAY,OAAO,WAAW,qBAAqB,qBAAsB;AAEnG;AAGA,IAAO,eAAQ;",
+  "sourcesContent": ["import * as React from 'react';\nexport { React };\n", "/* eslint-disable max-lines */\n/* eslint-disable react/prop-types */\nimport React, { useContext, useMemo, memo } from 'react';\nimport { SimpleTruncatedTooltipText } from '@elliemae/ds-truncated-tooltip-text';\nimport { Grid } from '@elliemae/ds-grid';\nimport { StyledCell, StyledCellContent } from '../../styled';\nimport { outOfTheBoxEditables } from '../../addons/Editables';\nimport { DataTableContext } from '../../DataTableContext';\nimport { TypescriptColumn, TypescriptRow } from '../../types/props';\nimport { SortableItemContext } from '../HoC/SortableItemContext';\nimport { expandRowColumn } from '../../addons/Columns';\nimport { DATA_TESTID } from '../../configs/constants';\nimport { useCellStyle } from './useCellStyle';\n\nconst PureStandardCell = memo<{ cellStyle: unknown; column: TypescriptColumn }>(({ cellStyle, children, column }) => (\n  <StyledCell column={column} style={cellStyle} role=\"cell\" data-testid={DATA_TESTID.DATA_TABLE_CELL}>\n    {children}\n  </StyledCell>\n));\n\ninterface CellProps {\n  cell: any;\n  column: TypescriptColumn;\n  row: TypescriptRow;\n  isRowSelected: boolean;\n  shouldAddExpandCell: boolean;\n  isDragOverlay: boolean;\n}\n\nconst Cell: React.ComponentType<CellProps> = ({\n  cell,\n  column,\n  row,\n  isRowSelected,\n  shouldAddExpandCell,\n  isDragOverlay,\n}) => {\n  const ctx = useContext(DataTableContext);\n  const {\n    tableProps: { cellRendererProps, disabledRows },\n  } = ctx;\n  const { draggableProps } = useContext(SortableItemContext);\n\n  const [appliedTextWrap, cellStyle] = useCellStyle(column, shouldAddExpandCell);\n\n  const cellProps = useMemo(\n    () => ({\n      ...cellRendererProps,\n      cell,\n      row,\n      isRowSelected,\n      ctx,\n      draggableProps,\n      isDragOverlay,\n      role: 'cell',\n      cellStyle,\n      column,\n    }),\n    [cellRendererProps, cell, row, isRowSelected, ctx, draggableProps, isDragOverlay, cellStyle, column],\n  );\n\n  const CellComponent = cell.render;\n\n  const pureCellContent = useMemo(() => {\n    if (shouldAddExpandCell) {\n      return (\n        <Grid cols={['min-content', 'auto']} alignItems=\"center\" height=\"100%\">\n          {shouldAddExpandCell && <expandRowColumn.Cell {...cellProps} />}\n          <CellComponent {...cellProps} />\n        </Grid>\n      );\n    }\n    return <CellComponent {...cellProps} />;\n  }, [CellComponent, cellProps, shouldAddExpandCell]);\n\n  const DefaultCellContentJSX = useMemo(\n    () => (\n      <StyledCellContent>\n        {appliedTextWrap === 'truncate' ? <SimpleTruncatedTooltipText value={pureCellContent} /> : pureCellContent}\n      </StyledCellContent>\n    ),\n    [appliedTextWrap, pureCellContent],\n  );\n\n  const EditableContentJSX = useMemo(() => {\n    if (typeof column.editable === 'string') {\n      const { EditableComponent } = outOfTheBoxEditables?.[column.editable];\n      if (EditableComponent) return <EditableComponent {...cellProps} DefaultCellRender={DefaultCellContentJSX} />;\n    }\n    if (typeof column.editable === 'function')\n      return column.editable({\n        DefaultCellRender: DefaultCellContentJSX,\n        ...cellProps,\n      }) as JSX.Element;\n\n    return null;\n  }, [DefaultCellContentJSX, cellProps, column]);\n\n  return (\n    <PureStandardCell {...cellProps}>\n      {column.editable && !disabledRows[row.uid] ? EditableContentJSX : DefaultCellContentJSX}\n    </PureStandardCell>\n  );\n};\n\nexport { Cell };\nexport default Cell;\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;AAAA;ACEA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AAEA,MAAM,mBAAmB,KAAuD,CAAC,EAAE,WAAW,UAAU,aACtG,qCAAC;AAAA,EAAW;AAAA,EAAgB,OAAO;AAAA,EAAW,MAAK;AAAA,EAAO,eAAa,YAAY;AAAA,GAChF,QACH,CACD;AAWD,MAAM,OAAuC,CAAC;AAAA,EAC5C;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,MACI;AACJ,QAAM,MAAM,WAAW,gBAAgB;AACvC,QAAM;AAAA,IACJ,YAAY,EAAE,mBAAmB;AAAA,MAC/B;AACJ,QAAM,EAAE,mBAAmB,WAAW,mBAAmB;AAEzD,QAAM,CAAC,iBAAiB,aAAa,aAAa,QAAQ,mBAAmB;AAE7E,QAAM,YAAY,QAChB,MAAO,iCACF,oBADE;AAAA,IAEL;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA,MAAM;AAAA,IACN;AAAA,IACA;AAAA,EACF,IACA,CAAC,mBAAmB,MAAM,KAAK,eAAe,KAAK,gBAAgB,eAAe,WAAW,MAAM,CACrG;AAEA,QAAM,gBAAgB,KAAK;AAE3B,QAAM,kBAAkB,QAAQ,MAAM;AACpC,QAAI,qBAAqB;AACvB,aACE,qCAAC;AAAA,QAAK,MAAM,CAAC,eAAe,MAAM;AAAA,QAAG,YAAW;AAAA,QAAS,QAAO;AAAA,SAC7D,uBAAuB,qCAAC,gBAAgB,MAAhB,mBAAyB,UAAW,GAC7D,qCAAC,kCAAkB,UAAW,CAChC;AAAA,IAEJ;AACA,WAAO,qCAAC,kCAAkB,UAAW;AAAA,EACvC,GAAG,CAAC,eAAe,WAAW,mBAAmB,CAAC;AAElD,QAAM,wBAAwB,QAC5B,MACE,qCAAC,yBACE,oBAAoB,aAAa,qCAAC;AAAA,IAA2B,OAAO;AAAA,GAAiB,IAAK,eAC7F,GAEF,CAAC,iBAAiB,eAAe,CACnC;AAEA,QAAM,qBAAqB,QAAQ,MAAM;AACvC,QAAI,OAAO,OAAO,aAAa,UAAU;AACvC,YAAM,EAAE,sBAAsB,uBAAuB,OAAO;AAC5D,UAAI;AAAmB,eAAO,qCAAC,oDAAsB,YAAtB;AAAA,UAAiC,mBAAmB;AAAA,UAAuB;AAAA,IAC5G;AACA,QAAI,OAAO,OAAO,aAAa;AAC7B,aAAO,OAAO,SAAS;AAAA,QACrB,mBAAmB;AAAA,SAChB,UACJ;AAEH,WAAO;AAAA,EACT,GAAG,CAAC,uBAAuB,WAAW,MAAM,CAAC;AAE7C,SACE,qCAAC,qCAAqB,YACnB,OAAO,YAAY,CAAC,aAAa,IAAI,OAAO,qBAAqB,qBACpE;AAEJ;AAGA,IAAO,eAAQ;",
   "names": []
 }

package/dist/esm/parts/FilterBar/FiltersBar.js CHANGED Viewed

@@ -1,6 +1,5 @@
 import * as React from "react";
-import React2, { useCallback, useContext, useMemo, useRef } from "react";
-import { DSButtonV2 } from "@elliemae/ds-button";
+import React2, { useCallback, useContext, useMemo, useRef, useState } from "react";
 import { MoreOptionsVert } from "@elliemae/ds-icons";
 import { FILTER_TYPES } from "../../exported-related";
 import {
@@ -28,6 +27,7 @@ const FiltersBar = () => {
     tableProps: { width, filterBarProps, onFiltersChange, filters },
     visibleColumns
   } = useContext(DataTableContext);
+  const [isOpen, setIsOpen] = useState(false);
   const pillGroupRefs = useMemo(() => {
     const refs = [];
     for (let i = 0; i < filters.length; i += 1)
@@ -37,7 +37,30 @@ const FiltersBar = () => {
   const dropdownMenuRef = useRef(null);
   const removeAllFilters = useCallback(() => {
     onFiltersChange([]);
-  }, [onFiltersChange]);
+    filterBarProps?.onClearAllFiltersClick?.();
+  }, [onFiltersChange, filterBarProps?.onClearAllFiltersClick]);
+  const onFilterBarClose = useCallback(() => {
+    filterBarProps?.onDropdownMenuToggle?.(false, "onClose");
+    setIsOpen(false);
+  }, [filterBarProps?.onDropdownMenuToggle]);
+  const onFilterBarOpen = useCallback(() => {
+    filterBarProps?.onDropdownMenuToggle?.(true, "onOpen");
+    setIsOpen(true);
+  }, [filterBarProps?.onDropdownMenuToggle]);
+  const onFilterBarOnClickOutside = useCallback(() => {
+    filterBarProps?.onDropdownMenuToggle?.(false, "onClickOutside");
+    filterBarProps?.onDropdownMenuClickOutside?.();
+    setIsOpen(false);
+  }, [filterBarProps?.onDropdownMenuToggle, filterBarProps?.onDropdownMenuClickOutside]);
+  const onTriggerClick = useCallback(() => {
+    filterBarProps?.onDropdownMenuTriggerClick?.();
+    onFilterBarOpen();
+  }, [filterBarProps?.onDropdownMenuTriggerClick]);
+  const finalIsOpen = useMemo(() => {
+    if (typeof filterBarProps?.isDropdownMenuOpen === "boolean")
+      return filterBarProps.isDropdownMenuOpen;
+    return isOpen;
+  }, [filterBarProps?.isDropdownMenuOpen, isOpen]);
   return /* @__PURE__ */ React2.createElement(StyledWrapper, {
     width,
     "aria-live": "polite",
@@ -65,6 +88,9 @@ const FiltersBar = () => {
     });
   }), /* @__PURE__ */ React2.createElement(StyledDropdownMenu, {
     preventOverflow: "scrollParent",
+    isOpen: finalIsOpen,
+    onClose: onFilterBarClose,
+    onClickOutsideMenu: onFilterBarOnClickOutside,
     options: [
       {
         id: "__internal__option__clear__filters",
@@ -78,8 +104,10 @@ const FiltersBar = () => {
         "data-testid": DATA_TESTID.DATA_TABLE_FILTER_BAR_DD_MENU_BUTTON
       },
       buttonType: "icon",
-      innerRef: dropdownMenuRef
-    }, /* @__PURE__ */ React2.createElement(MoreOptionsVert, null))
+      innerRef: dropdownMenuRef,
+      onClick: onTriggerClick,
+      icon: /* @__PURE__ */ React2.createElement(MoreOptionsVert, null)
+    })
   }));
 };
 export {