@react-fabric/data 1.0.0-beta.4 → 1.0.0-beta.6

package/dist/cjs/checklist/CheckList.js

@@ -2,8 +2,8 @@
 
 var _toConsumableArray = require('@babel/runtime/helpers/toConsumableArray');
 var _slicedToArray = require('@babel/runtime/helpers/slicedToArray');
-var _objectWithoutProperties = require('@babel/runtime/helpers/objectWithoutProperties');
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
+var _objectWithoutProperties = require('@babel/runtime/helpers/objectWithoutProperties');
 var core = require('@react-fabric/core');
 var utilities = require('@react-fabric/utilities');
 var react = require('react');
@@ -11,10 +11,11 @@ var reactI18next = require('react-i18next');
 var useSelectableList = require('../hooks/useSelectableList.js');
 var jsxRuntime = require('react/jsx-runtime');
 
-var _excluded = ["items", "maxCount", "allowNegative", "emptyMessage", "sortItems"];
+var _excluded = ["id", "allowNegative", "selected", "icon", "label", "isDisabled", "onClick", "badge"],
+  _excluded2 = ["items", "maxCount", "allowNegative", "emptyMessage", "sortItems", "selected", "nonselected", "onChange", "onClick"];
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-var CheckItem = /*#__PURE__*/react.memo(function (_ref) {
+var CheckItem = function CheckItem(_ref) {
   var id = _ref.id,
     allowNegative = _ref.allowNegative,
     selected = _ref.selected,
@@ -22,8 +23,9 @@ var CheckItem = /*#__PURE__*/react.memo(function (_ref) {
     label = _ref.label,
     isDisabled = _ref.isDisabled,
     _onClick = _ref.onClick,
-    badge = _ref.badge;
-  return /*#__PURE__*/jsxRuntime.jsxs("div", {
+    badge = _ref.badge,
+    aria = _objectWithoutProperties(_ref, _excluded);
+  return /*#__PURE__*/jsxRuntime.jsxs("div", _objectSpread(_objectSpread({
     role: "none",
     className: "ax-checkList__item",
     "data-disabled": isDisabled,
@@ -32,7 +34,8 @@ var CheckItem = /*#__PURE__*/react.memo(function (_ref) {
     },
     onContextMenu: function onContextMenu(e) {
       return [allowNegative && _onClick(id, true), e.preventDefault()];
-    },
+    }
+  }, aria), {}, {
     children: [!allowNegative && /*#__PURE__*/jsxRuntime.jsx(core.Icon, {
       "data-type": "checkbox",
       className: "ax-checkList__checkbox",
@@ -67,9 +70,8 @@ var CheckItem = /*#__PURE__*/react.memo(function (_ref) {
     }), /*#__PURE__*/jsxRuntime.jsx("label", {
       children: label
     }), /*#__PURE__*/jsxRuntime.jsx(core.Badge, _objectSpread({}, badge))]
-  });
-});
-CheckItem.displayName = "CheckItem";
+  }));
+};
 var CheckList = function CheckList(_ref2) {
   var _ref2$items = _ref2.items,
     items = _ref2$items === void 0 ? [] : _ref2$items,
@@ -79,12 +81,20 @@ var CheckList = function CheckList(_ref2) {
     emptyMessage = _ref2.emptyMessage,
     _ref2$sortItems = _ref2.sortItems,
     sortItems = _ref2$sortItems === void 0 ? true : _ref2$sortItems,
-    props = _objectWithoutProperties(_ref2, _excluded);
+    selected = _ref2.selected,
+    nonselected = _ref2.nonselected,
+    onChange = _ref2.onChange,
+    onClick = _ref2.onClick,
+    aria = _objectWithoutProperties(_ref2, _excluded2);
   var _useTranslation = reactI18next.useTranslation("data"),
     t = _useTranslation.t;
-  var _useSelectableList = useSelectableList.useSelectableList(_objectSpread({
-      items: items
-    }, props)),
+  var _useSelectableList = useSelectableList.useSelectableList({
+      items: items,
+      selected: selected,
+      nonselected: nonselected,
+      onChange: onChange,
+      onClick: onClick
+    }),
     selection = _useSelectableList.selection,
     toggleSelection = _useSelectableList.toggleSelection;
   var _useState = react.useState(false),
@@ -105,8 +115,7 @@ var CheckList = function CheckList(_ref2) {
       return 0;
     }).slice(0, !showMore && maxCount > 0 ? maxCount : undefined);
   }, [items, selection, maxCount, showMore, sortItems]);
-  return /*#__PURE__*/jsxRuntime.jsxs("div", {
-    className: "ax-checkList",
+  return /*#__PURE__*/jsxRuntime.jsxs("div", _objectSpread(_objectSpread({}, aria), {}, {
     children: [listItems.map(function (item, index) {
       return /*#__PURE__*/react.createElement(CheckItem, _objectSpread(_objectSpread({}, item), {}, {
         key: index,
@@ -128,7 +137,7 @@ var CheckList = function CheckList(_ref2) {
       className: "text-sm",
       message: emptyMessage !== null && emptyMessage !== void 0 ? emptyMessage : t("checkList.empty")
     })]
-  });
+  }));
 };
 
 exports.CheckList = CheckList;

package/dist/cjs/histogram/Histogram.js

@@ -1,6 +1,8 @@
 'use strict';
 
+var _defineProperty = require('@babel/runtime/helpers/defineProperty');
 var _toConsumableArray = require('@babel/runtime/helpers/toConsumableArray');
+var _objectWithoutProperties = require('@babel/runtime/helpers/objectWithoutProperties');
 var core = require('@react-fabric/core');
 var utilities = require('@react-fabric/utilities');
 var classNames = require('classnames');
@@ -9,6 +11,9 @@ var reactI18next = require('react-i18next');
 var Histogram_module = require('./Histogram.module.css');
 var jsxRuntime = require('react/jsx-runtime');
 
+var _excluded = ["items", "total", "color", "sortBy", "emptyTitle", "emptyMessage", "onClick"];
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var emptyIcon = "M20.84 22.73L11.11 13H3V11H9.11L6.11 8H3V6H4.11L1.11 3L2.39 1.73L22.11 21.46L20.84 22.73M15 11H14.2L15 11.8V11M21 8V6H9.2L11.2 8H21M3 18H9V16H3V18Z";
 var Histogram = function Histogram(_ref) {
   var _ref$items = _ref.items,
@@ -20,7 +25,8 @@ var Histogram = function Histogram(_ref) {
     sortBy = _ref$sortBy === void 0 ? "count" : _ref$sortBy,
     emptyTitle = _ref.emptyTitle,
     emptyMessage = _ref.emptyMessage,
-    _onClick = _ref.onClick;
+    _onClick = _ref.onClick,
+    aria = _objectWithoutProperties(_ref, _excluded);
   var _useTranslation = reactI18next.useTranslation("data"),
     t = _useTranslation.t;
   var maxTotal = react.useMemo(function () {
@@ -32,8 +38,9 @@ var Histogram = function Histogram(_ref) {
   var sorted = react.useMemo(function () {
     return items.sort(utilities.compareValues(sortBy === "label" ? "asc" : "desc", sortBy));
   }, [items, sortBy]);
-  return /*#__PURE__*/jsxRuntime.jsxs("div", {
-    className: Histogram_module.histogram,
+  return /*#__PURE__*/jsxRuntime.jsxs("div", _objectSpread(_objectSpread({
+    className: Histogram_module.histogram
+  }, aria), {}, {
     style: {
       "--color": "var(--".concat(color, ")")
     },
@@ -49,6 +56,7 @@ var Histogram = function Histogram(_ref) {
         role: "none",
         "data-disabled": item.count === 0 || item.disabled,
         className: classNames("relative cursor-pointer flex flex-nowrap items-center select-none overflow-hidden min-h-6 my-px", Histogram_module.histoLabel, (item.count === 0 || item.disabled) && "pointer-events-none"),
+        "data-testid": item.id,
         onClick: function onClick(e) {
           return [_onClick === null || _onClick === void 0 ? void 0 : _onClick(item.id), e.stopPropagation()];
         },
@@ -83,7 +91,7 @@ var Histogram = function Histogram(_ref) {
         })]
       }, item.id);
     })]
-  });
+  }));
 };
 
 exports.Histogram = Histogram;

package/dist/cjs/table/BodyCell.js

@@ -1,5 +1,7 @@
 'use strict';
 
+var date = require('@react-fabric/date');
+var utilities = require('@react-fabric/utilities');
 var classNames = require('classnames');
 var react = require('react');
 var Context = require('./Context.js');
@@ -30,15 +32,45 @@ var jsxRuntime = require('react/jsx-runtime');
  */
 
 var BodyCell = function BodyCell(_ref) {
-  var _column$minWidth, _column$maxWidth, _column$renderer, _column$renderer2;
+  var _column$minWidth, _column$maxWidth;
   var column = _ref.column,
-    item = _ref.item;
+    item = _ref.item,
+    index = _ref.index;
   var _useTableContext = Context.useTableContext(),
     widths = _useTableContext.widths;
   var width = react.useMemo(function () {
     var _widths$get;
     return (_widths$get = widths.get(column.id.toString())) !== null && _widths$get !== void 0 ? _widths$get : column.width;
   }, [widths, column]);
+  var content = react.useMemo(function () {
+    var value = utilities.getByPath(item, column.id.toString());
+    if (column.renderer != null) {
+      return column.renderer(item[column.id], item, index);
+    }
+    if (column.dataType === "boolean") {
+      var _column$valueMap;
+      var map = (_column$valueMap = column.valueMap) !== null && _column$valueMap !== void 0 ? _column$valueMap : {
+        "true": "Yes",
+        "false": "no"
+      };
+      return map["".concat(utilities.isTrue(value) ? "true" : "false")];
+    }
+    if (column.valueMap != null) {
+      if (column.dataType === "string" && value in column.valueMap) {
+        return column.valueMap[value];
+      }
+    }
+    if (column.dataType === "date") {
+      return /*#__PURE__*/jsxRuntime.jsx(date.DateDisplay, {
+        date: value,
+        format: column.format
+      });
+    }
+    if (column.dataType === "number") {
+      return utilities.Format.number(value, column.format);
+    }
+    return value !== null && value !== void 0 ? value : "";
+  }, [item, column]);
   return /*#__PURE__*/jsxRuntime.jsx("div", {
     className: "overflow-hidden bg-inherit start-0",
     style: {
@@ -48,7 +80,7 @@ var BodyCell = function BodyCell(_ref) {
     },
     children: /*#__PURE__*/jsxRuntime.jsx("div", {
       className: classNames("px-2 py-1 border-e truncate", column.align === "center" && "text-center", column.align === "end" && "text-end"),
-      children: (_column$renderer = (_column$renderer2 = column.renderer) === null || _column$renderer2 === void 0 ? void 0 : _column$renderer2.call(column, item[column.id], item)) !== null && _column$renderer !== void 0 ? _column$renderer : item[column.id]
+      children: content
     })
   });
 };

package/dist/cjs/table/BodyRow.js

@@ -0,0 +1,107 @@
+'use strict';
+
+var classNames = require('classnames');
+var BodyCell = require('./BodyCell.js');
+var CheckboxCell = require('./CheckboxCell.js');
+var core = require('@react-fabric/core');
+var jsxRuntime = require('react/jsx-runtime');
+
+/*
+ * React Fabric
+ * @version: 1.0.0
+ *
+ *
+ * The MIT License (MIT)
+ * Copyright (c) 2024 Adarsh Pastakia
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software
+ * and associated documentation files (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial
+ * portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+ * TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+var BodyRow = function BodyRow(_ref) {
+  var _state$start, _state$cols, _state$end;
+  var rowKey = _ref.rowKey,
+    index = _ref.index,
+    data = _ref.data,
+    keyProperty = _ref.keyProperty,
+    measureElement = _ref.measureElement,
+    state = _ref.state,
+    hideableColumns = _ref.hideableColumns,
+    wrapperStart = _ref.wrapperStart,
+    wrapperEnd = _ref.wrapperEnd,
+    onRowClick = _ref.onRowClick,
+    checkableRows = _ref.checkableRows,
+    checked = _ref.checked,
+    toggleChecked = _ref.toggleChecked,
+    canExpand = _ref.canExpand,
+    expanded = _ref.expanded,
+    toggleExpand = _ref.toggleExpand,
+    expandRow = _ref.expandRow;
+  return /*#__PURE__*/jsxRuntime.jsxs("div", {
+    ref: measureElement,
+    "data-index": index,
+    className: index % 2 ? "bg-even" : "bg-odd",
+    children: [/*#__PURE__*/jsxRuntime.jsxs("div", {
+      role: "none",
+      "data-row": index,
+      className: classNames("flex flex-nowrap datatable-row data-[hilight]:outline-1 -outline-offset-1 outline-primary-500", onRowClick && "hover:bg-primary-50 active:bg-primary-100"),
+      onClick: function onClick() {
+        return checkableRows && keyProperty && !onRowClick ? toggleChecked(data[keyProperty]) : onRowClick === null || onRowClick === void 0 ? void 0 : onRowClick(data);
+      },
+      children: [/*#__PURE__*/jsxRuntime.jsxs("div", {
+        className: wrapperStart,
+        children: [!!canExpand && /*#__PURE__*/jsxRuntime.jsx("div", {
+          className: classNames("group font-medium w-6 flex flex-nowrap text-start items-center", !canExpand(data) && "pointer-events-none opacity-35"),
+          children: /*#__PURE__*/jsxRuntime.jsx(core.Icon, {
+            className: "p-1 text-tint-700 hover:text-primary-600",
+            icon: expanded ? core.CoreIcons.collapse : core.CoreIcons.expand,
+            onClick: function onClick(e) {
+              return [keyProperty && toggleExpand(data[keyProperty]), e.stopPropagation()];
+            }
+          })
+        }), checkableRows && keyProperty && /*#__PURE__*/jsxRuntime.jsx(CheckboxCell.CheckboxCell, {
+          onClick: function onClick() {
+            return toggleChecked(data[keyProperty]);
+          },
+          state: checked
+        }), (_state$start = state.start) === null || _state$start === void 0 ? void 0 : _state$start.map(function (col, ids) {
+          return /*#__PURE__*/jsxRuntime.jsx(BodyCell.BodyCell, {
+            column: col,
+            item: data,
+            index: ids
+          }, "".concat(String(rowKey), ":").concat(ids));
+        })]
+      }), (_state$cols = state.cols) === null || _state$cols === void 0 ? void 0 : _state$cols.map(function (col, idc) {
+        return /*#__PURE__*/jsxRuntime.jsx(BodyCell.BodyCell, {
+          column: col,
+          item: data,
+          index: idc
+        }, "".concat(String(rowKey), ":").concat(idc));
+      }), /*#__PURE__*/jsxRuntime.jsxs("div", {
+        className: wrapperEnd,
+        children: [(_state$end = state.end) === null || _state$end === void 0 ? void 0 : _state$end.map(function (col, ide) {
+          return /*#__PURE__*/jsxRuntime.jsx(BodyCell.BodyCell, {
+            column: col,
+            item: data,
+            index: ide
+          }, "".concat(String(rowKey), ":").concat(ide));
+        }), hideableColumns && /*#__PURE__*/jsxRuntime.jsx("div", {
+          className: "w-6"
+        })]
+      })]
+    }), expanded && expandRow(data)]
+  });
+};
+
+exports.BodyRow = BodyRow;

package/dist/cjs/table/HeaderCell.js

@@ -38,7 +38,8 @@ var HeaderCell = function HeaderCell(_ref) {
     rtlFlip = _ref.rtlFlip;
     _ref.actions;
     _ref.locked;
-    var sortable = _ref.sortable,
+    var tooltip = _ref.tooltip,
+    sortable = _ref.sortable,
     resizable = _ref.resizable,
     _width = _ref.width,
     maxWidth = _ref.maxWidth,
@@ -82,8 +83,8 @@ var HeaderCell = function HeaderCell(_ref) {
       maxWidth: maxWidth !== null && maxWidth !== void 0 ? maxWidth : types.COL_MAX_WIDTH
     },
     children: [/*#__PURE__*/jsxRuntime.jsx(core.Tooltip, {
-      content: label,
-      disabled: !label,
+      content: tooltip !== null && tooltip !== void 0 ? tooltip : label,
+      disabled: !(tooltip !== null && tooltip !== void 0 ? tooltip : label),
       children: /*#__PURE__*/jsxRuntime.jsxs("div", {
         className: "flex-initial px-2 py-1 text-sm truncate sticky start-0",
         children: [icon && /*#__PURE__*/jsxRuntime.jsx(core.Icon, {

package/dist/cjs/table/Table.js

@@ -2,11 +2,11 @@
 
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
 var core = require('@react-fabric/core');
-var classNames = require('classnames');
+var utilities = require('@react-fabric/utilities');
 var react = require('react');
 var reactI18next = require('react-i18next');
 var AddColumn = require('./AddColumn.js');
-var BodyCell = require('./BodyCell.js');
+var BodyRow = require('./BodyRow.js');
 var CheckboxCell = require('./CheckboxCell.js');
 var Context = require('./Context.js');
 var EmptyCell = require('./EmptyCell.js');
@@ -18,16 +18,21 @@ var jsxRuntime = require('react/jsx-runtime');
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var Table = function Table(_ref) {
-  var _state$start, _state$cols, _state$end, _items$, _state$start3, _state$cols3, _state$end3;
+  var _state$start, _state$cols, _state$end, _items$, _state$start2, _state$cols2, _state$end2;
   var ref = _ref.ref,
     data = _ref.data,
     columns = _ref.columns,
     keyProperty = _ref.keyProperty,
     checkableRows = _ref.checkableRows,
+    initialScroll = _ref.initialScroll,
     hideableColumns = _ref.hideableColumns,
     sort = _ref.sort,
     loading = _ref.loading,
+    emptyDisplay = _ref.emptyDisplay,
+    canExpand = _ref.canExpand,
+    children = _ref.children,
     onSort = _ref.onSort,
+    onScroll = _ref.onScroll,
     onRowClick = _ref.onRowClick,
     onCheckedChanged = _ref.onCheckedChanged;
   var _useTranslation = reactI18next.useTranslation("data"),
@@ -41,7 +46,10 @@ var Table = function Table(_ref) {
   var _useVirtualTable = useVirtualTable.useVirtualTable(data, keyProperty, fireCheckChanged),
     scrollerRef = _useVirtualTable.scrollerRef,
     items = _useVirtualTable.items,
+    top = _useVirtualTable.top,
     checkState = _useVirtualTable.checkState,
+    virtualizer = _useVirtualTable.virtualizer,
+    toggleExpand = _useVirtualTable.toggleExpand,
     toggleChecked = _useVirtualTable.toggleChecked,
     toggleAllChecked = _useVirtualTable.toggleAllChecked,
     getData = _useVirtualTable.getData,
@@ -54,35 +62,46 @@ var Table = function Table(_ref) {
   var wrapperEnd = react.useMemo(function () {
     return "bg-inherit sticky end-0 flex flex-nowrap z-1 border-s -ms-px";
   }, []);
+  react.useLayoutEffect(function () {
+    setTimeout(function () {
+      initialScroll && virtualizer.scrollToIndex(initialScroll, {
+        align: "start"
+      });
+    }, 100);
+  }, []);
   react.useImperativeHandle(ref, function () {
     return {
-      hilight: function hilight(row) {
-        var _refBody$current, _refBody$current2;
-        (_refBody$current = refBody.current) === null || _refBody$current === void 0 || _refBody$current.querySelectorAll(".datatable-row[data-hilight=\"true\"]").forEach(function (el) {
-          return el && (el.dataset.hilight = undefined);
-        });
-        var el = (_refBody$current2 = refBody.current) === null || _refBody$current2 === void 0 ? void 0 : _refBody$current2.querySelector("[data-row=\"".concat(row, "\"]"));
-        el === null || el === void 0 || el.scrollIntoView({
-          behavior: "smooth",
-          block: "center"
+      scrollTo: function scrollTo(row) {
+        virtualizer.scrollToIndex(row, {
+          align: "start"
         });
-        el && (el.dataset.hilight = "true");
       },
-      unhilight: function unhilight() {
-        var _refBody$current3;
-        (_refBody$current3 = refBody.current) === null || _refBody$current3 === void 0 || _refBody$current3.querySelectorAll(".datatable-row[data-hilight=\"true\"]").forEach(function (el) {
-          return el && (el.dataset.hilight = undefined);
+      hilight: function hilight(row) {
+        var _scrollerRef$current;
+        (_scrollerRef$current = scrollerRef.current) === null || _scrollerRef$current === void 0 || (_scrollerRef$current = _scrollerRef$current.querySelector(".hilight")) === null || _scrollerRef$current === void 0 || _scrollerRef$current.classList.remove("hilight", "ring-1");
+        virtualizer.scrollToIndex(Math.floor(row), {
+          align: "start"
         });
+        setTimeout(function () {
+          var _scrollerRef$current2;
+          (_scrollerRef$current2 = scrollerRef.current) === null || _scrollerRef$current2 === void 0 || (_scrollerRef$current2 = _scrollerRef$current2.querySelector("[data-index=\"".concat(row, "\"]"))) === null || _scrollerRef$current2 === void 0 || _scrollerRef$current2.classList.add("hilight", "ring-1");
+        }, 100);
       },
-      scrollTo: function scrollTo(row) {
-        var _refBody$current4;
-        var el = (_refBody$current4 = refBody.current) === null || _refBody$current4 === void 0 ? void 0 : _refBody$current4.querySelector("[data-row=\"".concat(row, "\"]"));
-        el === null || el === void 0 || el.scrollIntoView({
-          behavior: "smooth"
-        });
+      unhilight: function unhilight() {
+        var _scrollerRef$current3;
+        (_scrollerRef$current3 = scrollerRef.current) === null || _scrollerRef$current3 === void 0 || (_scrollerRef$current3 = _scrollerRef$current3.querySelector(".hilight")) === null || _scrollerRef$current3 === void 0 || _scrollerRef$current3.classList.remove("hilight", "ring-1");
       }
     };
   }, []);
+  react.useEffect(function () {
+    var handle = utilities.debounce(function (top) {
+      onScroll === null || onScroll === void 0 || onScroll(top !== null && top !== void 0 ? top : 0);
+    });
+    handle(top);
+    return function () {
+      handle.cancel();
+    };
+  }, [top]);
   return /*#__PURE__*/jsxRuntime.jsx(Context.TableProvider, {
     children: /*#__PURE__*/jsxRuntime.jsxs("div", {
       className: "grid area-content overflow-auto relative",
@@ -94,7 +113,9 @@ var Table = function Table(_ref) {
         className: "bg-base font-medium sticky top-0 area-head border-b select-none flex flex-nowrap z-2",
         children: [/*#__PURE__*/jsxRuntime.jsxs("div", {
           className: wrapperStart,
-          children: [checkableRows && /*#__PURE__*/jsxRuntime.jsx(CheckboxCell.CheckboxCell, {
+          children: [canExpand && /*#__PURE__*/jsxRuntime.jsx("div", {
+            className: "w-6"
+          }), checkableRows && /*#__PURE__*/jsxRuntime.jsx(CheckboxCell.CheckboxCell, {
             state: checkState.allChecked,
             onClick: toggleAllChecked
           }), (_state$start = state.start) === null || _state$start === void 0 ? void 0 : _state$start.map(function (col, idx) {
@@ -133,74 +154,55 @@ var Table = function Table(_ref) {
             height: (_items$ = items[0]) === null || _items$ === void 0 ? void 0 : _items$.start
           }
         }), items.map(function (_ref2) {
-          var _state$start2, _state$cols2, _state$end2;
           var index = _ref2.index,
             key = _ref2.key;
           var data = getData(index);
-          return /*#__PURE__*/jsxRuntime.jsxs("div", {
-            role: "none",
-            "data-row": index,
-            className: classNames("flex flex-nowrap datatable-row data-[hilight]:outline-1 -outline-offset-1 outline-primary-500", index % 2 ? "bg-even" : "bg-odd", onRowClick && "hover:bg-primary-50 active:bg-primary-100"),
-            onClick: function onClick() {
-              return checkableRows && keyProperty && !onRowClick ? toggleChecked(data[keyProperty]) : onRowClick === null || onRowClick === void 0 ? void 0 : onRowClick(data);
-            },
-            "data-index": index,
-            ref: measureElement,
-            children: [/*#__PURE__*/jsxRuntime.jsxs("div", {
-              className: wrapperStart,
-              children: [checkableRows && keyProperty && /*#__PURE__*/jsxRuntime.jsx(CheckboxCell.CheckboxCell, {
-                onClick: function onClick() {
-                  return toggleChecked(data[keyProperty]);
-                },
-                state: checkState.checked.includes(data[keyProperty]) ? 1 : 0
-              }), (_state$start2 = state.start) === null || _state$start2 === void 0 ? void 0 : _state$start2.map(function (col, ids) {
-                return /*#__PURE__*/jsxRuntime.jsx(BodyCell.BodyCell, {
-                  column: col,
-                  item: data
-                }, "".concat(key, ":").concat(ids));
-              })]
-            }), (_state$cols2 = state.cols) === null || _state$cols2 === void 0 ? void 0 : _state$cols2.map(function (col, idc) {
-              return /*#__PURE__*/jsxRuntime.jsx(BodyCell.BodyCell, {
-                column: col,
-                item: data
-              }, "".concat(key, ":").concat(idc));
-            }), /*#__PURE__*/jsxRuntime.jsxs("div", {
-              className: wrapperEnd,
-              children: [(_state$end2 = state.end) === null || _state$end2 === void 0 ? void 0 : _state$end2.map(function (col, ide) {
-                return /*#__PURE__*/jsxRuntime.jsx(BodyCell.BodyCell, {
-                  column: col,
-                  item: data
-                }, "".concat(key, ":").concat(ide));
-              }), hideableColumns && /*#__PURE__*/jsxRuntime.jsx("div", {
-                className: "w-6"
-              })]
-            })]
+          return /*#__PURE__*/jsxRuntime.jsx(BodyRow.BodyRow, {
+            rowKey: key,
+            index: index,
+            checkableRows: checkableRows,
+            checked: keyProperty && checkState.checked.includes(data[keyProperty]) ? 1 : 0,
+            expanded: !!keyProperty && checkState.expanded.includes(data[keyProperty]),
+            data: data,
+            hideableColumns: hideableColumns,
+            keyProperty: keyProperty,
+            measureElement: measureElement,
+            onRowClick: onRowClick,
+            state: state,
+            canExpand: canExpand,
+            toggleExpand: toggleExpand,
+            expandRow: children,
+            toggleChecked: toggleChecked,
+            wrapperEnd: wrapperEnd,
+            wrapperStart: wrapperStart
           }, key);
         }), /*#__PURE__*/jsxRuntime.jsxs("div", {
           className: "flex-1 flex flex-nowrap",
           children: [/*#__PURE__*/jsxRuntime.jsxs("div", {
             className: wrapperStart,
-            children: [checkableRows && /*#__PURE__*/jsxRuntime.jsx("div", {
+            children: [canExpand && /*#__PURE__*/jsxRuntime.jsx("div", {
+              className: "w-6"
+            }), checkableRows && /*#__PURE__*/jsxRuntime.jsx("div", {
               className: "w-6"
-            }), (_state$start3 = state.start) === null || _state$start3 === void 0 ? void 0 : _state$start3.map(function (col) {
+            }), (_state$start2 = state.start) === null || _state$start2 === void 0 ? void 0 : _state$start2.map(function (col) {
               return /*#__PURE__*/jsxRuntime.jsx(EmptyCell.EmptyCell, _objectSpread({}, col), String(col.id));
             })]
-          }), (_state$cols3 = state.cols) === null || _state$cols3 === void 0 ? void 0 : _state$cols3.map(function (col) {
+          }), (_state$cols2 = state.cols) === null || _state$cols2 === void 0 ? void 0 : _state$cols2.map(function (col) {
             return /*#__PURE__*/jsxRuntime.jsx(EmptyCell.EmptyCell, _objectSpread({}, col), String(col.id));
           }), /*#__PURE__*/jsxRuntime.jsxs("div", {
             className: wrapperEnd,
-            children: [(_state$end3 = state.end) === null || _state$end3 === void 0 ? void 0 : _state$end3.map(function (col) {
+            children: [(_state$end2 = state.end) === null || _state$end2 === void 0 ? void 0 : _state$end2.map(function (col) {
               return /*#__PURE__*/jsxRuntime.jsx(EmptyCell.EmptyCell, _objectSpread({}, col), String(col.id));
             }), hideableColumns && /*#__PURE__*/jsxRuntime.jsx("div", {
               className: "w-6"
             })]
           })]
         })]
-      }), !loading && data.length === 0 && /*#__PURE__*/jsxRuntime.jsx(core.EmptyContent, {
+      }), !loading && data.length === 0 && (emptyDisplay !== null && emptyDisplay !== void 0 ? emptyDisplay : /*#__PURE__*/jsxRuntime.jsx(core.EmptyContent, {
         size: "sm",
         className: "bg-dimmed",
         message: t("datagrid.empty")
-      })]
+      }))]
     })
   });
 };

package/dist/cjs/table/useVirtualTable.js

@@ -8,6 +8,7 @@ var react = require('react');
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var useVirtualTable = function useVirtualTable(data, keyProperty, onCheckChanged) {
+  var _virtualizer$range;
   // TODO: refactor data into item list, apply grouping if groupColumn provided
   // TODO: when grouping maintain map of group with children, {___GROUP___:true, label, items, open}
 
@@ -22,8 +23,12 @@ var useVirtualTable = function useVirtualTable(data, keyProperty, onCheckChanged
     }
   });
   var _useReducer = react.useReducer(function (state, action) {
+      if (action.type === "expand") {
+        if (state.expanded.includes(action.key)) state.expanded.splice(state.expanded.indexOf(action.key), 1);else state.expanded.push(action.key);
+      }
       if (action.type === "check") {
         if (state.checked.includes(action.key)) state.checked.splice(state.checked.indexOf(action.key), 1);else state.checked.push(action.key);
+        onCheckChanged === null || onCheckChanged === void 0 || onCheckChanged(state.checked);
       }
       if (action.type === "checkall") {
         if (state.allChecked !== 0) {
@@ -33,13 +38,14 @@ var useVirtualTable = function useVirtualTable(data, keyProperty, onCheckChanged
             return item[keyProperty];
           });
         }
+        onCheckChanged === null || onCheckChanged === void 0 || onCheckChanged(state.checked);
       }
-      onCheckChanged === null || onCheckChanged === void 0 || onCheckChanged(state.checked);
       return _objectSpread(_objectSpread({}, state), {}, {
         allChecked: state.checked.length === data.length ? 1 : state.checked.length ? 2 : 0
       });
     }, {
       checked: [],
+      expanded: [],
       allChecked: 0
     }),
     _useReducer2 = _slicedToArray(_useReducer, 2),
@@ -54,8 +60,16 @@ var useVirtualTable = function useVirtualTable(data, keyProperty, onCheckChanged
     items: virtualItems,
     checkState: state,
     getData: getData,
+    virtualizer: virtualizer,
+    top: (_virtualizer$range = virtualizer.range) === null || _virtualizer$range === void 0 ? void 0 : _virtualizer$range.startIndex,
     totalSize: virtualizer.getTotalSize,
     measureElement: virtualizer.measureElement,
+    toggleExpand: function toggleExpand(key) {
+      return dispatch({
+        type: "expand",
+        key: key
+      });
+    },
     toggleChecked: function toggleChecked(key) {
       return dispatch({
         type: "check",