@react-spectrum/table 3.12.11-nightly.4704 → 3.12.11-nightly.4718

package/dist/zh-TW.module.js.map

@@ -1 +1 @@
-{"mappings":";AAAA,4BAAiB;IAAG,YAAY,CAAC,gBAAE,CAAC;IAClC,iBAAiB,CAAC,gDAAM,CAAC;IACzB,QAAQ,CAAC,gBAAE,CAAC;IACZ,UAAU,CAAC,gBAAE,CAAC;IACd,WAAW,CAAC,gCAAI,CAAC;IACjB,eAAe,CAAC,wDAAO,CAAC;IACxB,gBAAgB,CAAC,wCAAK,CAAC;IACvB,iBAAiB,CAAC,gCAAI,CAAC;IACvB,kBAAkB,CAAC,gCAAI,CAAC;AAC1B","sources":["packages/@react-spectrum/table/intl/zh-TW.json"],"sourcesContent":["{\n  \"collapse\": \"收合\",\n  \"columnResizer\": \"欄大小調整器\",\n  \"drag\": \"拖曳\",\n  \"expand\": \"展開\",\n  \"loading\": \"正在載入\",\n  \"loadingMore\": \"正在載入更多…\",\n  \"resizeColumn\": \"調整欄大小\",\n  \"sortAscending\": \"升序排序\",\n  \"sortDescending\": \"降序排序\"\n}\n"],"names":[],"version":3,"file":"zh-TW.module.js.map"}
+{"mappings":";AAAA,4BAAiB;IAAG,YAAY,CAAC,gBAAE,CAAC;IAClC,iBAAiB,CAAC,gDAAM,CAAC;IACzB,QAAQ,CAAC,gBAAE,CAAC;IACZ,UAAU,CAAC,gBAAE,CAAC;IACd,WAAW,CAAC,gCAAI,CAAC;IACjB,eAAe,CAAC,wDAAO,CAAC;IACxB,gBAAgB,CAAC,wCAAK,CAAC;IACvB,iBAAiB,CAAC,gCAAI,CAAC;IACvB,kBAAkB,CAAC,gCAAI,CAAC;AAC1B","sources":["packages/@react-spectrum/table/intl/zh-TW.json"],"sourcesContent":["{\n  \"collapse\": \"收合\",\n  \"columnResizer\": \"欄大小調整器\",\n  \"drag\": \"拖曳\",\n  \"expand\": \"展開\",\n  \"loading\": \"載入中…\",\n  \"loadingMore\": \"正在載入更多…\",\n  \"resizeColumn\": \"調整欄大小\",\n  \"sortAscending\": \"升序排序\",\n  \"sortDescending\": \"降序排序\"\n}\n"],"names":[],"version":3,"file":"zh-TW.module.js.map"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-spectrum/table",
-  "version": "3.12.11-nightly.4704+546ffa41f",
+  "version": "3.12.11-nightly.4718+4b27a0c02",
   "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.2992+546ffa41f",
-    "@react-aria/focus": "3.0.0-nightly.2992+546ffa41f",
-    "@react-aria/i18n": "3.0.0-nightly.2992+546ffa41f",
-    "@react-aria/interactions": "3.0.0-nightly.2992+546ffa41f",
-    "@react-aria/overlays": "3.0.0-nightly.2992+546ffa41f",
-    "@react-aria/selection": "3.0.0-nightly.2992+546ffa41f",
-    "@react-aria/table": "3.14.2-nightly.4704+546ffa41f",
-    "@react-aria/utils": "3.0.0-nightly.2992+546ffa41f",
-    "@react-aria/virtualizer": "3.10.2-nightly.4704+546ffa41f",
-    "@react-aria/visually-hidden": "3.0.0-nightly.2992+546ffa41f",
-    "@react-spectrum/checkbox": "3.0.0-nightly.2992+546ffa41f",
-    "@react-spectrum/dnd": "3.3.11-nightly.4704+546ffa41f",
-    "@react-spectrum/layout": "3.6.6-nightly.4704+546ffa41f",
-    "@react-spectrum/menu": "3.19.2-nightly.4704+546ffa41f",
-    "@react-spectrum/progress": "3.0.0-nightly.2992+546ffa41f",
-    "@react-spectrum/tooltip": "3.0.0-nightly.2992+546ffa41f",
-    "@react-spectrum/utils": "3.0.0-nightly.2992+546ffa41f",
-    "@react-stately/flags": "3.0.4-nightly.4704+546ffa41f",
-    "@react-stately/layout": "3.13.10-nightly.4704+546ffa41f",
-    "@react-stately/table": "3.11.9-nightly.4704+546ffa41f",
-    "@react-stately/virtualizer": "3.7.2-nightly.4704+546ffa41f",
-    "@react-types/grid": "3.2.7-nightly.4704+546ffa41f",
-    "@react-types/shared": "3.0.0-nightly.2992+546ffa41f",
-    "@react-types/table": "3.9.6-nightly.4704+546ffa41f",
-    "@spectrum-icons/ui": "3.0.0-nightly.2992+546ffa41f",
+    "@react-aria/button": "3.0.0-nightly.3006+4b27a0c02",
+    "@react-aria/focus": "3.0.0-nightly.3006+4b27a0c02",
+    "@react-aria/i18n": "3.0.0-nightly.3006+4b27a0c02",
+    "@react-aria/interactions": "3.0.0-nightly.3006+4b27a0c02",
+    "@react-aria/overlays": "3.0.0-nightly.3006+4b27a0c02",
+    "@react-aria/selection": "3.0.0-nightly.3006+4b27a0c02",
+    "@react-aria/table": "3.14.2-nightly.4718+4b27a0c02",
+    "@react-aria/utils": "3.0.0-nightly.3006+4b27a0c02",
+    "@react-aria/virtualizer": "3.10.2-nightly.4718+4b27a0c02",
+    "@react-aria/visually-hidden": "3.0.0-nightly.3006+4b27a0c02",
+    "@react-spectrum/checkbox": "3.0.0-nightly.3006+4b27a0c02",
+    "@react-spectrum/dnd": "3.3.11-nightly.4718+4b27a0c02",
+    "@react-spectrum/layout": "3.6.6-nightly.4718+4b27a0c02",
+    "@react-spectrum/menu": "3.19.2-nightly.4718+4b27a0c02",
+    "@react-spectrum/progress": "3.0.0-nightly.3006+4b27a0c02",
+    "@react-spectrum/tooltip": "3.0.0-nightly.3006+4b27a0c02",
+    "@react-spectrum/utils": "3.0.0-nightly.3006+4b27a0c02",
+    "@react-stately/flags": "3.0.4-nightly.4718+4b27a0c02",
+    "@react-stately/layout": "3.13.10-nightly.4718+4b27a0c02",
+    "@react-stately/table": "3.11.9-nightly.4718+4b27a0c02",
+    "@react-stately/virtualizer": "3.7.2-nightly.4718+4b27a0c02",
+    "@react-types/grid": "3.2.7-nightly.4718+4b27a0c02",
+    "@react-types/shared": "3.0.0-nightly.3006+4b27a0c02",
+    "@react-types/table": "3.9.6-nightly.4718+4b27a0c02",
+    "@spectrum-icons/ui": "3.0.0-nightly.3006+4b27a0c02",
     "@swc/helpers": "^0.5.0"
   },
   "devDependencies": {
-    "@adobe/spectrum-css-temp": "3.0.0-nightly.2992+546ffa41f",
-    "@react-aria/dnd": "3.6.2-nightly.4704+546ffa41f",
-    "@react-stately/dnd": "3.3.2-nightly.4704+546ffa41f"
+    "@adobe/spectrum-css-temp": "3.0.0-nightly.3006+4b27a0c02",
+    "@react-aria/dnd": "3.6.2-nightly.4718+4b27a0c02",
+    "@react-stately/dnd": "3.3.2-nightly.4718+4b27a0c02"
   },
   "peerDependencies": {
     "@react-spectrum/provider": "^3.0.0",
@@ -76,5 +76,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "546ffa41f7d1d3a566950a14d8f46cf726891220"
+  "gitHead": "4b27a0c027f4fbab9ed1070c748966c902b13429"
 }

package/src/TableViewBase.tsx

@@ -33,10 +33,10 @@ import {GridNode} from '@react-types/grid';
 import {InsertionIndicator} from './InsertionIndicator';
 // @ts-ignore
 import intlMessages from '../intl/*.json';
-import {isAndroid, mergeProps, scrollIntoView, scrollIntoViewport} from '@react-aria/utils';
+import {isAndroid, mergeProps, scrollIntoView, scrollIntoViewport, useLoadMore} from '@react-aria/utils';
 import {Item, Menu, MenuTrigger} from '@react-spectrum/menu';
 import {LayoutInfo, Rect, ReusableView, useVirtualizerState} from '@react-stately/virtualizer';
-import {layoutInfoToStyle, ScrollView, setScrollLeft, useVirtualizer, VirtualizerItem} from '@react-aria/virtualizer';
+import {layoutInfoToStyle, ScrollView, setScrollLeft, VirtualizerItem} from '@react-aria/virtualizer';
 import ListGripper from '@spectrum-icons/ui/ListGripper';
 import {ListKeyboardDelegate} from '@react-aria/selection';
 import {Nubbin} from './Nubbin';
@@ -574,14 +574,11 @@ function TableVirtualizer<T>(props: TableVirtualizerProps<T>) {
     }), [columnResizeState.columnWidths])
   });
 
-  let memoedVirtualizerProps = useMemo(() => ({
-    tabIndex: otherProps.tabIndex,
-    persistedKeys,
-    isLoading,
-    onLoadMore
-  }), [otherProps.tabIndex, persistedKeys, isLoading, onLoadMore]);
+  useLoadMore({isLoading, onLoadMore, scrollOffset: 1}, bodyRef);
+  let onVisibleRectChange = useCallback((rect: Rect) => {
+    state.setVisibleRect(rect);
+  }, [state]);
 
-  let {virtualizerProps, scrollViewProps: {onVisibleRectChange}} = useVirtualizer(memoedVirtualizerProps, state, domRef);
   let onVisibleRectChangeMemo = useCallback(rect => {
     setTableWidth(rect.width);
     onVisibleRectChange(rect);
@@ -622,7 +619,6 @@ function TableVirtualizer<T>(props: TableVirtualizerProps<T>) {
   }), [resizingColumnWidth, columnResizeState.resizingColumn]);
   let mergedProps = mergeProps(
     otherProps,
-    virtualizerProps,
     isVirtualDragging && {tabIndex: null}
   );
 

package/src/TableViewLayout.ts

@@ -36,7 +36,7 @@ export class TableViewLayout<T> extends TableLayout<T> {
 
     if (this.isLoading) {
       // Add some margin around the loader to ensure that scrollbars don't flicker in and out.
-      let rect = new Rect(40, Math.max(layoutInfo.rect.maxY, 40), (width || this.virtualizer.visibleRect.width) - 80, children.length === 0 ? this.virtualizer.visibleRect.height - 80 : 60);
+      let rect = new Rect(40, children.length === 0 ? 40 : layoutInfo.rect.maxY, (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;
@@ -71,6 +71,14 @@ export class TableViewLayout<T> extends TableLayout<T> {
     return res;
   }
 
+  protected buildCell(node: GridNode<T>, x: number, y: number): LayoutNode {
+    let res = super.buildCell(node, x, y);
+    if (node.column?.props.hideHeader) {
+      res.layoutInfo.allowOverflow = true;
+    }
+    return res;
+  }
+
   protected getEstimatedRowHeight(): number {
     return super.getEstimatedRowHeight() + 1; // for bottom border
   }