@react-spectrum/table 3.12.11-nightly.4685 → 3.12.11-nightly.4694

package/dist/TableViewLayout.mjs

@@ -0,0 +1,86 @@
+import {Rect as $5yFQM$Rect, LayoutInfo as $5yFQM$LayoutInfo} from "@react-stately/virtualizer";
+import {TableLayout as $5yFQM$TableLayout} from "@react-stately/layout";
+
+/*
+ * Copyright 2024 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */ 
+
+class $5fb43af69b290859$export$725d101278f5a47b extends (0, $5yFQM$TableLayout) {
+    buildCollection() {
+        let loadingState = this.collection.body.props.loadingState;
+        this.isLoading = loadingState === 'loading' || loadingState === 'loadingMore';
+        return super.buildCollection();
+    }
+    buildColumn(node, x, y) {
+        let res = super.buildColumn(node, x, y);
+        res.layoutInfo.allowOverflow = true; // for resizer nubbin
+        return res;
+    }
+    buildBody() {
+        let node = super.buildBody(0);
+        let { children: children, layoutInfo: layoutInfo } = node;
+        let width = node.layoutInfo.rect.width;
+        if (this.isLoading) {
+            // Add some margin around the loader to ensure that scrollbars don't flicker in and out.
+            let rect = new (0, $5yFQM$Rect)(40, 40, (width || this.virtualizer.visibleRect.width) - 80, children.length === 0 ? this.virtualizer.visibleRect.height - 80 : 60);
+            let loader = new (0, $5yFQM$LayoutInfo)('loader', 'loader', rect);
+            loader.parentKey = layoutInfo.key;
+            loader.isSticky = children.length === 0;
+            let node = {
+                layoutInfo: loader,
+                validRect: loader.rect
+            };
+            children.push(node);
+            this.layoutNodes.set(loader.key, node);
+            layoutInfo.rect.height = loader.rect.maxY;
+            width = Math.max(width, rect.width);
+        } else if (children.length === 0) {
+            let rect = new (0, $5yFQM$Rect)(40, 40, this.virtualizer.visibleRect.width - 80, this.virtualizer.visibleRect.height - 80);
+            let empty = new (0, $5yFQM$LayoutInfo)('empty', 'empty', rect);
+            empty.parentKey = layoutInfo.key;
+            empty.isSticky = true;
+            let node = {
+                layoutInfo: empty,
+                validRect: empty.rect
+            };
+            children.push(node);
+            layoutInfo.rect.height = empty.rect.maxY;
+            width = Math.max(width, rect.width);
+        }
+        return node;
+    }
+    buildRow(node, x, y) {
+        let res = super.buildRow(node, x, y);
+        res.layoutInfo.rect.height += 1; // for bottom border
+        return res;
+    }
+    getEstimatedRowHeight() {
+        return super.getEstimatedRowHeight() + 1; // for bottom border
+    }
+    isStickyColumn(node) {
+        var _node_props, _node_props1;
+        return ((_node_props = node.props) === null || _node_props === void 0 ? void 0 : _node_props.isDragButtonCell) || ((_node_props1 = node.props) === null || _node_props1 === void 0 ? void 0 : _node_props1.isSelectionCell);
+    }
+    getDropTargetFromPoint(x, y, isValidDropTarget) {
+        var _this_virtualizer_layout_getVisibleLayoutInfos_find;
+        // Offset for height of header row
+        y -= (_this_virtualizer_layout_getVisibleLayoutInfos_find = this.virtualizer.layout.getVisibleLayoutInfos(new (0, $5yFQM$Rect)(x, y, 1, 1)).find((info)=>info.type === 'headerrow')) === null || _this_virtualizer_layout_getVisibleLayoutInfos_find === void 0 ? void 0 : _this_virtualizer_layout_getVisibleLayoutInfos_find.rect.height;
+        return super.getDropTargetFromPoint(x, y, isValidDropTarget);
+    }
+    constructor(...args){
+        super(...args);
+        this.isLoading = false;
+    }
+}
+
+
+export {$5fb43af69b290859$export$725d101278f5a47b as TableViewLayout};
+//# sourceMappingURL=TableViewLayout.module.js.map

package/dist/TableViewLayout.module.js

@@ -0,0 +1,86 @@
+import {Rect as $5yFQM$Rect, LayoutInfo as $5yFQM$LayoutInfo} from "@react-stately/virtualizer";
+import {TableLayout as $5yFQM$TableLayout} from "@react-stately/layout";
+
+/*
+ * Copyright 2024 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */ 
+
+class $5fb43af69b290859$export$725d101278f5a47b extends (0, $5yFQM$TableLayout) {
+    buildCollection() {
+        let loadingState = this.collection.body.props.loadingState;
+        this.isLoading = loadingState === 'loading' || loadingState === 'loadingMore';
+        return super.buildCollection();
+    }
+    buildColumn(node, x, y) {
+        let res = super.buildColumn(node, x, y);
+        res.layoutInfo.allowOverflow = true; // for resizer nubbin
+        return res;
+    }
+    buildBody() {
+        let node = super.buildBody(0);
+        let { children: children, layoutInfo: layoutInfo } = node;
+        let width = node.layoutInfo.rect.width;
+        if (this.isLoading) {
+            // Add some margin around the loader to ensure that scrollbars don't flicker in and out.
+            let rect = new (0, $5yFQM$Rect)(40, 40, (width || this.virtualizer.visibleRect.width) - 80, children.length === 0 ? this.virtualizer.visibleRect.height - 80 : 60);
+            let loader = new (0, $5yFQM$LayoutInfo)('loader', 'loader', rect);
+            loader.parentKey = layoutInfo.key;
+            loader.isSticky = children.length === 0;
+            let node = {
+                layoutInfo: loader,
+                validRect: loader.rect
+            };
+            children.push(node);
+            this.layoutNodes.set(loader.key, node);
+            layoutInfo.rect.height = loader.rect.maxY;
+            width = Math.max(width, rect.width);
+        } else if (children.length === 0) {
+            let rect = new (0, $5yFQM$Rect)(40, 40, this.virtualizer.visibleRect.width - 80, this.virtualizer.visibleRect.height - 80);
+            let empty = new (0, $5yFQM$LayoutInfo)('empty', 'empty', rect);
+            empty.parentKey = layoutInfo.key;
+            empty.isSticky = true;
+            let node = {
+                layoutInfo: empty,
+                validRect: empty.rect
+            };
+            children.push(node);
+            layoutInfo.rect.height = empty.rect.maxY;
+            width = Math.max(width, rect.width);
+        }
+        return node;
+    }
+    buildRow(node, x, y) {
+        let res = super.buildRow(node, x, y);
+        res.layoutInfo.rect.height += 1; // for bottom border
+        return res;
+    }
+    getEstimatedRowHeight() {
+        return super.getEstimatedRowHeight() + 1; // for bottom border
+    }
+    isStickyColumn(node) {
+        var _node_props, _node_props1;
+        return ((_node_props = node.props) === null || _node_props === void 0 ? void 0 : _node_props.isDragButtonCell) || ((_node_props1 = node.props) === null || _node_props1 === void 0 ? void 0 : _node_props1.isSelectionCell);
+    }
+    getDropTargetFromPoint(x, y, isValidDropTarget) {
+        var _this_virtualizer_layout_getVisibleLayoutInfos_find;
+        // Offset for height of header row
+        y -= (_this_virtualizer_layout_getVisibleLayoutInfos_find = this.virtualizer.layout.getVisibleLayoutInfos(new (0, $5yFQM$Rect)(x, y, 1, 1)).find((info)=>info.type === 'headerrow')) === null || _this_virtualizer_layout_getVisibleLayoutInfos_find === void 0 ? void 0 : _this_virtualizer_layout_getVisibleLayoutInfos_find.rect.height;
+        return super.getDropTargetFromPoint(x, y, isValidDropTarget);
+    }
+    constructor(...args){
+        super(...args);
+        this.isLoading = false;
+    }
+}
+
+
+export {$5fb43af69b290859$export$725d101278f5a47b as TableViewLayout};
+//# sourceMappingURL=TableViewLayout.module.js.map

package/dist/TableViewLayout.module.js.map

@@ -0,0 +1 @@
+{"mappings":"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","sources":["packages/@react-spectrum/table/src/TableViewLayout.ts"],"sourcesContent":["/*\n * Copyright 2024 Adobe. All rights reserved.\n * This file is licensed to you under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License. You may obtain a copy\n * of the License at http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software distributed under\n * the License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS\n * OF ANY KIND, either express or implied. See the License for the specific language\n * governing permissions and limitations under the License.\n */\nimport {DropTarget} from '@react-types/shared';\nimport {GridNode} from '@react-types/grid';\nimport {LayoutInfo, Rect} from '@react-stately/virtualizer';\nimport {LayoutNode, TableLayout} from '@react-stately/layout';\n\nexport class TableViewLayout<T> extends TableLayout<T> {\n  private isLoading: boolean = false;\n\n  protected buildCollection(): LayoutNode[] {\n    let loadingState = this.collection.body.props.loadingState;\n    this.isLoading = loadingState === 'loading' || loadingState === 'loadingMore';\n    return super.buildCollection();\n  }\n\n  protected buildColumn(node: GridNode<T>, x: number, y: number): LayoutNode {\n    let res = super.buildColumn(node, x, y);\n    res.layoutInfo.allowOverflow = true; // for resizer nubbin\n    return res;\n  }\n\n  protected buildBody(): LayoutNode {\n    let node = super.buildBody(0);\n    let {children, layoutInfo} = node;\n    let width = node.layoutInfo.rect.width;\n\n    if (this.isLoading) {\n      // Add some margin around the loader to ensure that scrollbars don't flicker in and out.\n      let rect = new Rect(40, 40, (width || this.virtualizer.visibleRect.width) - 80, children.length === 0 ? this.virtualizer.visibleRect.height - 80 : 60);\n      let loader = new LayoutInfo('loader', 'loader', rect);\n      loader.parentKey = layoutInfo.key;\n      loader.isSticky = children.length === 0;\n      let node = {\n        layoutInfo: loader,\n        validRect: loader.rect\n      };\n      children.push(node);\n      this.layoutNodes.set(loader.key, node);\n      layoutInfo.rect.height = loader.rect.maxY;\n      width = Math.max(width, rect.width);\n    } else if (children.length === 0) {\n      let rect = new Rect(40, 40, this.virtualizer.visibleRect.width - 80, this.virtualizer.visibleRect.height - 80);\n      let empty = new LayoutInfo('empty', 'empty', rect);\n      empty.parentKey = layoutInfo.key;\n      empty.isSticky = true;\n      let node = {\n        layoutInfo: empty,\n        validRect: empty.rect\n      };\n      children.push(node);\n      layoutInfo.rect.height = empty.rect.maxY;\n      width = Math.max(width, rect.width);\n    }\n\n    return node;\n  }\n\n  protected buildRow(node: GridNode<T>, x: number, y: number): LayoutNode {\n    let res = super.buildRow(node, x, y);\n    res.layoutInfo.rect.height += 1; // for bottom border\n    return res;\n  }\n\n  protected getEstimatedRowHeight(): number {\n    return super.getEstimatedRowHeight() + 1; // for bottom border\n  }\n\n  protected isStickyColumn(node: GridNode<T>) {\n    return node.props?.isDragButtonCell || node.props?.isSelectionCell;\n  }\n\n  getDropTargetFromPoint(x: number, y: number, isValidDropTarget: (target: DropTarget) => boolean): DropTarget {\n    // Offset for height of header row\n    y -= this.virtualizer.layout.getVisibleLayoutInfos(new Rect(x, y, 1, 1)).find(info => info.type === 'headerrow')?.rect.height;\n    return super.getDropTargetFromPoint(x, y, isValidDropTarget);\n  }\n}\n"],"names":[],"version":3,"file":"TableViewLayout.module.js.map"}

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"mappings":";;;;AQoBA,oCAAoC,CAAC,CAAE,SAAQ,WAAW,CAAC,CAAC,EAAE,sBAAsB,EAAE,QAAQ,EAAE,iBAAiB,EAAE,UAAU;IAC3H;;;OAGG;IACH,OAAO,CAAC,EAAE,SAAS,GAAG,SAAS,GAAG,UAAU,CAAC;IAC7C;;;OAGG;IACH,YAAY,CAAC,EAAE,MAAM,GAAG,UAAU,CAAC;IACnC,oEAAoE;IACpE,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,iFAAiF;IACjF,gBAAgB,CAAC,EAAE,MAAM,IAAI,OAAO,CAAC;IACrC,sEAAsE;IACtE,QAAQ,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,IAAI,CAAC;IAC9B;;OAEG;IACH,aAAa,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,EAAE,UAAU,CAAC,KAAK,IAAI,CAAC;IACvD;;;;OAIG;IACH,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,EAAE,UAAU,CAAC,KAAK,IAAI,CAAC;IAClD;;;OAGG;IACH,WAAW,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,EAAE,UAAU,CAAC,KAAK,IAAI,CAAC;IACrD;;;OAGG;IACH,gBAAgB,CAAC,EAAE,gBAAgB,CAAC,kBAAkB,CAAC,CAAC;IACxD;;;;OAIG;IACH,6BAA6B,CAAC,EAAE,OAAO,CAAC;IACxC;;;;;OAKG;IACH,qBAAqB,CAAC,EAAE,KAAK,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC;IAC9C;;;;;OAKG;IACH,4BAA4B,CAAC,EAAE,KAAK,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC;IACrD;;;;;OAKG;IACH,yBAAyB,CAAC,EAAE,CAAC,IAAI,EAAE,GAAG,CAAC,GAAG,CAAC,KAAK,GAAG,CAAA;CACpD;AAWD;;GAEG;AACH,OAAA,MAAM,WAA0D,CAAC,CAAC,EAAE,KAAK,EAAE,mBAAmB,CAAC,CAAC,GAAG;IAAC,GAAG,CAAC,EAAE,OAAO,cAAc,CAAC,CAAA;CAAC,KAAK,YAAY,CAAC;AC9EnJ,OAAA,MAAM,QAA2B,CAAC,CAAC,EAAE,KAAK,EAAE,oBAAoB,CAAC,CAAC,KAAK,IAAI,OAAO,CAAC;AAGnF,OAAO,EACL,WAAW,EACX,SAAS,EACT,OAAO,EACP,GAAG,EACH,IAAI,EACL,MAAM,sBAAsB,CAAC;AAE9B,YAAY,EAAC,mBAAmB,EAAE,gBAAgB,EAAE,cAAc,EAAE,QAAQ,EAAE,SAAS,EAAC,MAAM,oBAAoB,CAAC","sources":["packages/@react-spectrum/table/src/packages/@react-spectrum/table/src/InsertionIndicator.tsx","packages/@react-spectrum/table/src/packages/@react-spectrum/table/src/Nubbin.tsx","packages/@react-spectrum/table/src/packages/@react-spectrum/table/src/Resizer.tsx","packages/@react-spectrum/table/src/packages/@react-spectrum/table/src/RootDropIndicator.tsx","packages/@react-spectrum/table/src/packages/@react-spectrum/table/src/DragPreview.tsx","packages/@react-spectrum/table/src/packages/@react-spectrum/table/src/TableViewBase.tsx","packages/@react-spectrum/table/src/packages/@react-spectrum/table/src/TableView.tsx","packages/@react-spectrum/table/src/packages/@react-spectrum/table/src/TreeGridTableView.tsx","packages/@react-spectrum/table/src/packages/@react-spectrum/table/src/TableViewWrapper.tsx","packages/@react-spectrum/table/src/packages/@react-spectrum/table/src/index.ts","packages/@react-spectrum/table/src/index.ts"],"sourcesContent":[null,null,null,null,null,null,null,null,null,null,"/*\n * Copyright 2020 Adobe. All rights reserved.\n * This file is licensed to you under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License. You may obtain a copy\n * of the License at http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software distributed under\n * the License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS\n * OF ANY KIND, either express or implied. See the License for the specific language\n * governing permissions and limitations under the License.\n */\n\n/// <reference types=\"css-module-types\" />\n\nexport {TableView} from './TableViewWrapper';\nimport {Column} from '@react-stately/table';\nimport {JSX} from 'react';\nimport {SpectrumColumnProps} from '@react-types/table';\n\n// Override TS for Column to support spectrum specific props.\nconst SpectrumColumn = Column as <T>(props: SpectrumColumnProps<T>) => JSX.Element;\nexport {SpectrumColumn as Column};\n\nexport {\n  TableHeader,\n  TableBody,\n  Section,\n  Row,\n  Cell\n} from '@react-stately/table';\n\nexport type {SpectrumColumnProps, TableHeaderProps, TableBodyProps, RowProps, CellProps} from '@react-types/table';\nexport type {SpectrumTableProps} from './TableViewWrapper';\n"],"names":[],"version":3,"file":"types.d.ts.map"}
+{"mappings":";;;;ASoBA,oCAAoC,CAAC,CAAE,SAAQ,WAAW,CAAC,CAAC,EAAE,sBAAsB,EAAE,QAAQ,EAAE,iBAAiB,EAAE,UAAU;IAC3H;;;OAGG;IACH,OAAO,CAAC,EAAE,SAAS,GAAG,SAAS,GAAG,UAAU,CAAC;IAC7C;;;OAGG;IACH,YAAY,CAAC,EAAE,MAAM,GAAG,UAAU,CAAC;IACnC,oEAAoE;IACpE,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,iFAAiF;IACjF,gBAAgB,CAAC,EAAE,MAAM,IAAI,OAAO,CAAC;IACrC,sEAAsE;IACtE,QAAQ,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,IAAI,CAAC;IAC9B;;OAEG;IACH,aAAa,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,EAAE,UAAU,CAAC,KAAK,IAAI,CAAC;IACvD;;;;OAIG;IACH,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,EAAE,UAAU,CAAC,KAAK,IAAI,CAAC;IAClD;;;OAGG;IACH,WAAW,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,EAAE,UAAU,CAAC,KAAK,IAAI,CAAC;IACrD;;;OAGG;IACH,gBAAgB,CAAC,EAAE,gBAAgB,CAAC,kBAAkB,CAAC,CAAC;IACxD;;;;OAIG;IACH,6BAA6B,CAAC,EAAE,OAAO,CAAC;IACxC;;;;;OAKG;IACH,qBAAqB,CAAC,EAAE,KAAK,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC;IAC9C;;;;;OAKG;IACH,4BAA4B,CAAC,EAAE,KAAK,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC;IACrD;;;;;OAKG;IACH,yBAAyB,CAAC,EAAE,CAAC,IAAI,EAAE,GAAG,CAAC,GAAG,CAAC,KAAK,GAAG,CAAA;CACpD;AAWD;;GAEG;AACH,OAAA,MAAM,WAA0D,CAAC,CAAC,EAAE,KAAK,EAAE,mBAAmB,CAAC,CAAC,GAAG;IAAC,GAAG,CAAC,EAAE,OAAO,cAAc,CAAC,CAAA;CAAC,KAAK,YAAY,CAAC;AC9EnJ,OAAA,MAAM,QAA2B,CAAC,CAAC,EAAE,KAAK,EAAE,oBAAoB,CAAC,CAAC,KAAK,IAAI,OAAO,CAAC;AAGnF,OAAO,EACL,WAAW,EACX,SAAS,EACT,OAAO,EACP,GAAG,EACH,IAAI,EACL,MAAM,sBAAsB,CAAC;AAE9B,YAAY,EAAC,mBAAmB,EAAE,gBAAgB,EAAE,cAAc,EAAE,QAAQ,EAAE,SAAS,EAAC,MAAM,oBAAoB,CAAC","sources":["packages/@react-spectrum/table/src/packages/@react-spectrum/table/src/InsertionIndicator.tsx","packages/@react-spectrum/table/src/packages/@react-spectrum/table/src/Nubbin.tsx","packages/@react-spectrum/table/src/packages/@react-spectrum/table/src/Resizer.tsx","packages/@react-spectrum/table/src/packages/@react-spectrum/table/src/RootDropIndicator.tsx","packages/@react-spectrum/table/src/packages/@react-spectrum/table/src/DragPreview.tsx","packages/@react-spectrum/table/src/packages/@react-spectrum/table/src/TableViewLayout.ts","packages/@react-spectrum/table/src/packages/@react-spectrum/table/src/TableViewBase.tsx","packages/@react-spectrum/table/src/packages/@react-spectrum/table/src/TableView.tsx","packages/@react-spectrum/table/src/packages/@react-spectrum/table/src/TreeGridTableView.tsx","packages/@react-spectrum/table/src/packages/@react-spectrum/table/src/TableViewWrapper.tsx","packages/@react-spectrum/table/src/packages/@react-spectrum/table/src/index.ts","packages/@react-spectrum/table/src/index.ts"],"sourcesContent":[null,null,null,null,null,null,null,null,null,null,null,"/*\n * Copyright 2020 Adobe. All rights reserved.\n * This file is licensed to you under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License. You may obtain a copy\n * of the License at http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software distributed under\n * the License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS\n * OF ANY KIND, either express or implied. See the License for the specific language\n * governing permissions and limitations under the License.\n */\n\n/// <reference types=\"css-module-types\" />\n\nexport {TableView} from './TableViewWrapper';\nimport {Column} from '@react-stately/table';\nimport {JSX} from 'react';\nimport {SpectrumColumnProps} from '@react-types/table';\n\n// Override TS for Column to support spectrum specific props.\nconst SpectrumColumn = Column as <T>(props: SpectrumColumnProps<T>) => JSX.Element;\nexport {SpectrumColumn as Column};\n\nexport {\n  TableHeader,\n  TableBody,\n  Section,\n  Row,\n  Cell\n} from '@react-stately/table';\n\nexport type {SpectrumColumnProps, TableHeaderProps, TableBodyProps, RowProps, CellProps} from '@react-types/table';\nexport type {SpectrumTableProps} from './TableViewWrapper';\n"],"names":[],"version":3,"file":"types.d.ts.map"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-spectrum/table",
-  "version": "3.12.11-nightly.4685+a48d1673f",
+  "version": "3.12.11-nightly.4694+b46d23b99",
   "description": "Spectrum UI components in React",
   "license": "Apache-2.0",
   "main": "dist/main.js",
@@ -36,37 +36,37 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/button": "3.0.0-nightly.2973+a48d1673f",
-    "@react-aria/focus": "3.0.0-nightly.2973+a48d1673f",
-    "@react-aria/i18n": "3.0.0-nightly.2973+a48d1673f",
-    "@react-aria/interactions": "3.0.0-nightly.2973+a48d1673f",
-    "@react-aria/overlays": "3.0.0-nightly.2973+a48d1673f",
-    "@react-aria/selection": "3.0.0-nightly.2973+a48d1673f",
-    "@react-aria/table": "3.14.2-nightly.4685+a48d1673f",
-    "@react-aria/utils": "3.0.0-nightly.2973+a48d1673f",
-    "@react-aria/virtualizer": "3.10.2-nightly.4685+a48d1673f",
-    "@react-aria/visually-hidden": "3.0.0-nightly.2973+a48d1673f",
-    "@react-spectrum/checkbox": "3.0.0-nightly.2973+a48d1673f",
-    "@react-spectrum/dnd": "3.3.11-nightly.4685+a48d1673f",
-    "@react-spectrum/layout": "3.6.6-nightly.4685+a48d1673f",
-    "@react-spectrum/menu": "3.19.2-nightly.4685+a48d1673f",
-    "@react-spectrum/progress": "3.0.0-nightly.2973+a48d1673f",
-    "@react-spectrum/tooltip": "3.0.0-nightly.2973+a48d1673f",
-    "@react-spectrum/utils": "3.0.0-nightly.2973+a48d1673f",
-    "@react-stately/flags": "3.0.4-nightly.4685+a48d1673f",
-    "@react-stately/layout": "3.13.10-nightly.4685+a48d1673f",
-    "@react-stately/table": "3.11.9-nightly.4685+a48d1673f",
-    "@react-stately/virtualizer": "3.7.2-nightly.4685+a48d1673f",
-    "@react-types/grid": "3.2.7-nightly.4685+a48d1673f",
-    "@react-types/shared": "3.0.0-nightly.2973+a48d1673f",
-    "@react-types/table": "3.9.6-nightly.4685+a48d1673f",
-    "@spectrum-icons/ui": "3.0.0-nightly.2973+a48d1673f",
+    "@react-aria/button": "3.0.0-nightly.2982+b46d23b99",
+    "@react-aria/focus": "3.0.0-nightly.2982+b46d23b99",
+    "@react-aria/i18n": "3.0.0-nightly.2982+b46d23b99",
+    "@react-aria/interactions": "3.0.0-nightly.2982+b46d23b99",
+    "@react-aria/overlays": "3.0.0-nightly.2982+b46d23b99",
+    "@react-aria/selection": "3.0.0-nightly.2982+b46d23b99",
+    "@react-aria/table": "3.14.2-nightly.4694+b46d23b99",
+    "@react-aria/utils": "3.0.0-nightly.2982+b46d23b99",
+    "@react-aria/virtualizer": "3.10.2-nightly.4694+b46d23b99",
+    "@react-aria/visually-hidden": "3.0.0-nightly.2982+b46d23b99",
+    "@react-spectrum/checkbox": "3.0.0-nightly.2982+b46d23b99",
+    "@react-spectrum/dnd": "3.3.11-nightly.4694+b46d23b99",
+    "@react-spectrum/layout": "3.6.6-nightly.4694+b46d23b99",
+    "@react-spectrum/menu": "3.19.2-nightly.4694+b46d23b99",
+    "@react-spectrum/progress": "3.0.0-nightly.2982+b46d23b99",
+    "@react-spectrum/tooltip": "3.0.0-nightly.2982+b46d23b99",
+    "@react-spectrum/utils": "3.0.0-nightly.2982+b46d23b99",
+    "@react-stately/flags": "3.0.4-nightly.4694+b46d23b99",
+    "@react-stately/layout": "3.13.10-nightly.4694+b46d23b99",
+    "@react-stately/table": "3.11.9-nightly.4694+b46d23b99",
+    "@react-stately/virtualizer": "3.7.2-nightly.4694+b46d23b99",
+    "@react-types/grid": "3.2.7-nightly.4694+b46d23b99",
+    "@react-types/shared": "3.0.0-nightly.2982+b46d23b99",
+    "@react-types/table": "3.9.6-nightly.4694+b46d23b99",
+    "@spectrum-icons/ui": "3.0.0-nightly.2982+b46d23b99",
     "@swc/helpers": "^0.5.0"
   },
   "devDependencies": {
-    "@adobe/spectrum-css-temp": "3.0.0-nightly.2973+a48d1673f",
-    "@react-aria/dnd": "3.6.2-nightly.4685+a48d1673f",
-    "@react-stately/dnd": "3.3.2-nightly.4685+a48d1673f"
+    "@adobe/spectrum-css-temp": "3.0.0-nightly.2982+b46d23b99",
+    "@react-aria/dnd": "3.6.2-nightly.4694+b46d23b99",
+    "@react-stately/dnd": "3.3.2-nightly.4694+b46d23b99"
   },
   "peerDependencies": {
     "@react-spectrum/provider": "^3.0.0",
@@ -76,5 +76,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "a48d1673f2144714e31712e38310a8801edab550"
+  "gitHead": "b46d23b9919eaec8ab1f621b52beced82e88b6ca"
 }

package/src/TableViewBase.tsx

@@ -48,8 +48,8 @@ import {DragPreview as SpectrumDragPreview} from './DragPreview';
 import {SpectrumTableProps} from './TableViewWrapper';
 import styles from '@adobe/spectrum-css-temp/components/table/vars.css';
 import stylesOverrides from './table.css';
-import {TableLayout} from '@react-stately/layout';
 import {TableState, TreeGridState, useTableColumnResizeState} from '@react-stately/table';
+import {TableViewLayout} from './TableViewLayout';
 import {Tooltip, TooltipTrigger} from '@react-spectrum/tooltip';
 import {useButton} from '@react-aria/button';
 import {useLocale, useLocalizedStringFormatter} from '@react-aria/i18n';
@@ -113,7 +113,7 @@ export interface TableContextValue<T> {
   dragAndDropHooks: DragAndDropHooks['dragAndDropHooks'],
   isTableDraggable: boolean,
   isTableDroppable: boolean,
-  layout: TableLayout<T>,
+  layout: TableViewLayout<T>,
   headerRowHovered: boolean,
   isInResizeMode: boolean,
   setIsInResizeMode: (val: boolean) => void,
@@ -185,7 +185,7 @@ function TableViewBase<T extends object>(props: TableBaseProps<T>, ref: DOMRef<H
   let bodyRef = useRef<HTMLDivElement>(undefined);
 
   let density = props.density || 'regular';
-  let layout = useMemo(() => new TableLayout({
+  let layout = useMemo(() => new TableViewLayout({
     // If props.rowHeight is auto, then use estimated heights based on scale, otherwise use fixed heights.
     rowHeight: props.overflowMode === 'wrap'
       ? null
@@ -198,9 +198,7 @@ function TableViewBase<T extends object>(props: TableBaseProps<T>, ref: DOMRef<H
       : DEFAULT_HEADER_HEIGHT[scale],
     estimatedHeadingHeight: props.overflowMode === 'wrap'
       ? DEFAULT_HEADER_HEIGHT[scale]
-      : null,
-    scrollContainer: 'body',
-    enableEmptyState: true
+      : null
   }),
     // don't recompute when state.collection changes, only used for initial value
     // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -494,7 +492,7 @@ function TableViewBase<T extends object>(props: TableBaseProps<T>, ref: DOMRef<H
 
 interface TableVirtualizerProps<T> extends HTMLAttributes<HTMLElement> {
   tableState: TableState<T>,
-  layout: TableLayout<T>,
+  layout: TableViewLayout<T>,
   collection: TableCollection<T>,
   focusedKey: Key | null,
   renderView: (type: string, content: GridNode<T>) => ReactElement,
@@ -552,11 +550,10 @@ function TableVirtualizer<T>(props: TableVirtualizerProps<T>) {
     getDefaultMinWidth
   }, tableState);
 
-  let state = useVirtualizerState<object, ReactNode, ReactNode>({
+  let state = useVirtualizerState<GridNode<unknown>, ReactNode>({
     layout,
     collection,
     renderView,
-    renderWrapper,
     onVisibleRectChange(rect) {
       bodyRef.current.scrollTop = rect.y;
       setScrollLeft(bodyRef.current, direction, rect.x);
@@ -625,6 +622,8 @@ function TableVirtualizer<T>(props: TableVirtualizerProps<T>) {
     scrollPadding = columnResizeState.getColumnWidth(firstColumn.key);
   }
 
+  let visibleViews = renderChildren(null, state.visibleViews, renderWrapper);
+
   return (
     <VirtualizerContext.Provider value={resizingColumn}>
       <FocusScope>
@@ -643,7 +642,7 @@ function TableVirtualizer<T>(props: TableVirtualizerProps<T>) {
             }}
             ref={headerRef}>
             <ResizeStateContext.Provider value={columnResizeState}>
-              {state.visibleViews[0]}
+              {visibleViews[0]}
             </ResizeStateContext.Provider>
           </div>
           <ScrollView
@@ -681,7 +680,7 @@ function TableVirtualizer<T>(props: TableVirtualizerProps<T>) {
             onScrollStart={state.startScrolling}
             onScrollEnd={state.endScrolling}
             onScroll={onScroll}>
-            {state.visibleViews[1]}
+            {visibleViews[1]}
             <div
               className={classNames(styles, 'spectrum-Table-bodyResizeIndicator')}
               style={{[direction === 'ltr' ? 'left' : 'right']: `${resizerPosition}px`, height: `${Math.max(state.virtualizer.contentSize.height, state.virtualizer.visibleRect.height)}px`, display: columnResizeState.resizingColumn ? 'block' : 'none'}} />
@@ -692,6 +691,17 @@ function TableVirtualizer<T>(props: TableVirtualizerProps<T>) {
   );
 }
 
+function renderChildren<T extends object>(parent: View | null, views: View[], renderWrapper: TableVirtualizerProps<T>['renderWrapper']) {
+  return views.map(view => {
+    return renderWrapper(
+      parent,
+      view,
+      view.children ? Array.from(view.children) : [],
+      childViews => renderChildren(view, childViews, renderWrapper)
+    );
+  });
+}
+
 function useStyle(layoutInfo: LayoutInfo, parent: LayoutInfo | null) {
   let {direction} = useLocale();
   let style = layoutInfoToStyle(layoutInfo, direction, parent);

package/src/TableViewLayout.ts

@@ -0,0 +1,87 @@
+/*
+ * Copyright 2024 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+import {DropTarget} from '@react-types/shared';
+import {GridNode} from '@react-types/grid';
+import {LayoutInfo, Rect} from '@react-stately/virtualizer';
+import {LayoutNode, TableLayout} from '@react-stately/layout';
+
+export class TableViewLayout<T> extends TableLayout<T> {
+  private isLoading: boolean = false;
+
+  protected buildCollection(): LayoutNode[] {
+    let loadingState = this.collection.body.props.loadingState;
+    this.isLoading = loadingState === 'loading' || loadingState === 'loadingMore';
+    return super.buildCollection();
+  }
+
+  protected buildColumn(node: GridNode<T>, x: number, y: number): LayoutNode {
+    let res = super.buildColumn(node, x, y);
+    res.layoutInfo.allowOverflow = true; // for resizer nubbin
+    return res;
+  }
+
+  protected buildBody(): LayoutNode {
+    let node = super.buildBody(0);
+    let {children, layoutInfo} = node;
+    let width = node.layoutInfo.rect.width;
+
+    if (this.isLoading) {
+      // Add some margin around the loader to ensure that scrollbars don't flicker in and out.
+      let rect = new Rect(40, 40, (width || this.virtualizer.visibleRect.width) - 80, children.length === 0 ? this.virtualizer.visibleRect.height - 80 : 60);
+      let loader = new LayoutInfo('loader', 'loader', rect);
+      loader.parentKey = layoutInfo.key;
+      loader.isSticky = children.length === 0;
+      let node = {
+        layoutInfo: loader,
+        validRect: loader.rect
+      };
+      children.push(node);
+      this.layoutNodes.set(loader.key, node);
+      layoutInfo.rect.height = loader.rect.maxY;
+      width = Math.max(width, rect.width);
+    } else if (children.length === 0) {
+      let rect = new Rect(40, 40, this.virtualizer.visibleRect.width - 80, this.virtualizer.visibleRect.height - 80);
+      let empty = new LayoutInfo('empty', 'empty', rect);
+      empty.parentKey = layoutInfo.key;
+      empty.isSticky = true;
+      let node = {
+        layoutInfo: empty,
+        validRect: empty.rect
+      };
+      children.push(node);
+      layoutInfo.rect.height = empty.rect.maxY;
+      width = Math.max(width, rect.width);
+    }
+
+    return node;
+  }
+
+  protected buildRow(node: GridNode<T>, x: number, y: number): LayoutNode {
+    let res = super.buildRow(node, x, y);
+    res.layoutInfo.rect.height += 1; // for bottom border
+    return res;
+  }
+
+  protected getEstimatedRowHeight(): number {
+    return super.getEstimatedRowHeight() + 1; // for bottom border
+  }
+
+  protected isStickyColumn(node: GridNode<T>) {
+    return node.props?.isDragButtonCell || node.props?.isSelectionCell;
+  }
+
+  getDropTargetFromPoint(x: number, y: number, isValidDropTarget: (target: DropTarget) => boolean): DropTarget {
+    // Offset for height of header row
+    y -= this.virtualizer.layout.getVisibleLayoutInfos(new Rect(x, y, 1, 1)).find(info => info.type === 'headerrow')?.rect.height;
+    return super.getDropTargetFromPoint(x, y, isValidDropTarget);
+  }
+}