@react-spectrum/table 3.14.1 → 3.15.0

package/dist/TableViewBase.module.js

@@ -122,7 +122,7 @@ function $bd013581c0a4b065$export$3f8f74b6bfd2c5df() {
     return (0, $7lS7h$useContext)($bd013581c0a4b065$export$d288a7dd40372bc);
 }
 function $bd013581c0a4b065$var$TableViewBase(props, ref) {
-    var _dropState_target;
+    var _dropState_target, _dragAndDropHooks_isVirtualDragging, _dragAndDropHooks_isVirtualDragging1;
     props = (0, $7lS7h$useProviderProps)(props);
     let { isQuiet: isQuiet, onAction: onAction, onResizeStart: propsOnResizeStart, onResizeEnd: propsOnResizeEnd, dragAndDropHooks: dragAndDropHooks, state: state } = props;
     let isTableDraggable = !!(dragAndDropHooks === null || dragAndDropHooks === void 0 ? void 0 : dragAndDropHooks.useDraggableCollectionState);
@@ -148,25 +148,24 @@ function $bd013581c0a4b065$var$TableViewBase(props, ref) {
     // with table layout, so we need to track it here
     let [, setIsResizing] = (0, $7lS7h$useState)(false);
     let domRef = (0, $7lS7h$useDOMRef)(ref);
-    let headerRef = (0, $7lS7h$useRef)(undefined);
-    let bodyRef = (0, $7lS7h$useRef)(undefined);
+    let headerRef = (0, $7lS7h$useRef)(null);
+    let bodyRef = (0, $7lS7h$useRef)(null);
     let density = props.density || 'regular';
     let layout = (0, $7lS7h$useMemo)(()=>new (0, $5fb43af69b290859$export$725d101278f5a47b)({
             // If props.rowHeight is auto, then use estimated heights based on scale, otherwise use fixed heights.
-            rowHeight: props.overflowMode === 'wrap' ? null : $bd013581c0a4b065$var$ROW_HEIGHTS[density][scale],
-            estimatedRowHeight: props.overflowMode === 'wrap' ? $bd013581c0a4b065$var$ROW_HEIGHTS[density][scale] : null,
-            headingHeight: props.overflowMode === 'wrap' ? null : $bd013581c0a4b065$var$DEFAULT_HEADER_HEIGHT[scale],
-            estimatedHeadingHeight: props.overflowMode === 'wrap' ? $bd013581c0a4b065$var$DEFAULT_HEADER_HEIGHT[scale] : null
+            rowHeight: props.overflowMode === 'wrap' ? undefined : $bd013581c0a4b065$var$ROW_HEIGHTS[density][scale],
+            estimatedRowHeight: props.overflowMode === 'wrap' ? $bd013581c0a4b065$var$ROW_HEIGHTS[density][scale] : undefined,
+            headingHeight: props.overflowMode === 'wrap' ? undefined : $bd013581c0a4b065$var$DEFAULT_HEADER_HEIGHT[scale],
+            estimatedHeadingHeight: props.overflowMode === 'wrap' ? $bd013581c0a4b065$var$DEFAULT_HEADER_HEIGHT[scale] : undefined
         }), // don't recompute when state.collection changes, only used for initial value
-    // eslint-disable-next-line react-hooks/exhaustive-deps
     [
         props.overflowMode,
         scale,
         density
     ]);
-    let dragState;
+    let dragState = null;
     let preview = (0, $7lS7h$useRef)(null);
-    if (isTableDraggable) {
+    if (isTableDraggable && dragAndDropHooks) {
         dragState = dragAndDropHooks.useDraggableCollectionState({
             collection: state.collection,
             selectionManager: state.selectionManager,
@@ -175,10 +174,10 @@ function $bd013581c0a4b065$var$TableViewBase(props, ref) {
         dragAndDropHooks.useDraggableCollection({}, dragState, domRef);
     }
     let DragPreview = dragAndDropHooks === null || dragAndDropHooks === void 0 ? void 0 : dragAndDropHooks.DragPreview;
-    let dropState;
-    let droppableCollection;
-    let isRootDropTarget;
-    if (isTableDroppable) {
+    let dropState = null;
+    let droppableCollection = null;
+    let isRootDropTarget = false;
+    if (isTableDroppable && dragAndDropHooks) {
         dropState = dragAndDropHooks.useDroppableCollectionState({
             collection: state.collection,
             selectionManager: state.selectionManager
@@ -207,31 +206,35 @@ function $bd013581c0a4b065$var$TableViewBase(props, ref) {
     let [headerRowHovered, setHeaderRowHovered] = (0, $7lS7h$useState)(false);
     // This overrides collection view's renderWrapper to support DOM hierarchy.
     let renderWrapper = (0, $7lS7h$useCallback)((parent, reusableView, children, renderChildren)=>{
+        var _parent_layoutInfo;
         if (reusableView.viewType === 'rowgroup') return /*#__PURE__*/ (0, $7lS7h$react).createElement($bd013581c0a4b065$var$TableRowGroup, {
             key: reusableView.key,
             layoutInfo: reusableView.layoutInfo,
-            parent: parent === null || parent === void 0 ? void 0 : parent.layoutInfo,
+            parent: (_parent_layoutInfo = parent === null || parent === void 0 ? void 0 : parent.layoutInfo) !== null && _parent_layoutInfo !== void 0 ? _parent_layoutInfo : null,
             // Override the default role="rowgroup" with role="presentation",
             // in favor or adding role="rowgroup" to the ScrollView with
             // ref={bodyRef} in the TableVirtualizer below.
             role: "presentation"
         }, renderChildren(children));
+        var _parent_layoutInfo1;
         if (reusableView.viewType === 'header') return /*#__PURE__*/ (0, $7lS7h$react).createElement($bd013581c0a4b065$var$TableHeader, {
             key: reusableView.key,
             layoutInfo: reusableView.layoutInfo,
-            parent: parent === null || parent === void 0 ? void 0 : parent.layoutInfo
+            parent: (_parent_layoutInfo1 = parent === null || parent === void 0 ? void 0 : parent.layoutInfo) !== null && _parent_layoutInfo1 !== void 0 ? _parent_layoutInfo1 : null
         }, renderChildren(children));
+        var _parent_layoutInfo2;
         if (reusableView.viewType === 'row') return /*#__PURE__*/ (0, $7lS7h$react).createElement($bd013581c0a4b065$var$TableRow, {
             key: reusableView.key,
             item: reusableView.content,
             layoutInfo: reusableView.layoutInfo,
-            parent: parent === null || parent === void 0 ? void 0 : parent.layoutInfo
+            parent: (_parent_layoutInfo2 = parent === null || parent === void 0 ? void 0 : parent.layoutInfo) !== null && _parent_layoutInfo2 !== void 0 ? _parent_layoutInfo2 : null
         }, renderChildren(children));
+        var _parent_layoutInfo3;
         if (reusableView.viewType === 'headerrow') return /*#__PURE__*/ (0, $7lS7h$react).createElement($bd013581c0a4b065$var$TableHeaderRow, {
             onHoverChange: setHeaderRowHovered,
             key: reusableView.key,
             layoutInfo: reusableView.layoutInfo,
-            parent: parent === null || parent === void 0 ? void 0 : parent.layoutInfo,
+            parent: (_parent_layoutInfo3 = parent === null || parent === void 0 ? void 0 : parent.layoutInfo) !== null && _parent_layoutInfo3 !== void 0 ? _parent_layoutInfo3 : null,
             item: reusableView.content
         }, renderChildren(children));
         return /*#__PURE__*/ (0, $7lS7h$react).createElement($bd013581c0a4b065$var$TableCellWrapper, {
@@ -264,7 +267,7 @@ function $bd013581c0a4b065$var$TableViewBase(props, ref) {
                 return /*#__PURE__*/ (0, $7lS7h$react).createElement("div", {
                     role: "gridcell",
                     "aria-colindex": item.index + 1,
-                    "aria-colspan": item.colspan > 1 ? item.colspan : null
+                    "aria-colspan": item.colspan != null && item.colspan > 1 ? item.colspan : undefined
                 });
             case 'column':
                 if (item.props.isSelectionCell) return /*#__PURE__*/ (0, $7lS7h$react).createElement($bd013581c0a4b065$var$TableSelectAllCell, {
@@ -293,6 +296,7 @@ function $bd013581c0a4b065$var$TableViewBase(props, ref) {
             case 'empty':
                 return /*#__PURE__*/ (0, $7lS7h$react).createElement($bd013581c0a4b065$var$EmptyState, null);
         }
+        return null;
     }, []);
     let [isVerticalScrollbarVisible, setVerticalScollbarVisible] = (0, $7lS7h$useState)(false);
     let [isHorizontalScrollbarVisible, setHorizontalScollbarVisible] = (0, $7lS7h$useState)(false);
@@ -313,7 +317,7 @@ function $bd013581c0a4b065$var$TableViewBase(props, ref) {
     let { isFocusVisible: isFocusVisible, focusProps: focusProps } = (0, $7lS7h$useFocusRing)();
     let isEmpty = state.collection.size === 0;
     let onFocusedResizer = ()=>{
-        bodyRef.current.scrollLeft = headerRef.current.scrollLeft;
+        if (bodyRef.current && headerRef.current) bodyRef.current.scrollLeft = headerRef.current.scrollLeft;
     };
     let onResizeStart = (0, $7lS7h$useCallback)((widths)=>{
         setIsResizing(true);
@@ -348,9 +352,8 @@ function $bd013581c0a4b065$var$TableViewBase(props, ref) {
         focusedKey,
         dropTargetKey
     ]);
-    let mergedProps = (0, $7lS7h$mergeProps)(isTableDroppable && (droppableCollection === null || droppableCollection === void 0 ? void 0 : droppableCollection.collectionProps), gridProps, focusProps, (dragAndDropHooks === null || dragAndDropHooks === void 0 ? void 0 : dragAndDropHooks.isVirtualDragging()) && {
-        tabIndex: null
-    });
+    let mergedProps = (0, $7lS7h$mergeProps)(isTableDroppable ? droppableCollection === null || droppableCollection === void 0 ? void 0 : droppableCollection.collectionProps : null, gridProps, focusProps);
+    if (dragAndDropHooks === null || dragAndDropHooks === void 0 ? void 0 : (_dragAndDropHooks_isVirtualDragging = dragAndDropHooks.isVirtualDragging) === null || _dragAndDropHooks_isVirtualDragging === void 0 ? void 0 : _dragAndDropHooks_isVirtualDragging.call(dragAndDropHooks)) mergedProps.tabIndex = undefined;
     return /*#__PURE__*/ (0, $7lS7h$react).createElement($bd013581c0a4b065$export$93e4b0b2cc49b648.Provider, {
         value: {
             state: state,
@@ -393,11 +396,12 @@ function $bd013581c0a4b065$var$TableViewBase(props, ref) {
         headerRef: headerRef,
         bodyRef: bodyRef,
         isFocusVisible: isFocusVisible,
-        isVirtualDragging: dragAndDropHooks === null || dragAndDropHooks === void 0 ? void 0 : dragAndDropHooks.isVirtualDragging(),
+        isVirtualDragging: (dragAndDropHooks === null || dragAndDropHooks === void 0 ? void 0 : (_dragAndDropHooks_isVirtualDragging1 = dragAndDropHooks.isVirtualDragging) === null || _dragAndDropHooks_isVirtualDragging1 === void 0 ? void 0 : _dragAndDropHooks_isVirtualDragging1.call(dragAndDropHooks)) || false,
         isRootDropTarget: isRootDropTarget
-    }), DragPreview && isTableDraggable && /*#__PURE__*/ (0, $7lS7h$react).createElement(DragPreview, {
+    }), DragPreview && isTableDraggable && dragAndDropHooks && dragState && /*#__PURE__*/ (0, $7lS7h$react).createElement(DragPreview, {
         ref: preview
     }, ()=>{
+        if (dragState.draggedKey == null) return null;
         if (dragAndDropHooks.renderPreview) return dragAndDropHooks.renderPreview(dragState.draggingKeys, dragState.draggedKey);
         let itemCount = dragState.draggingKeys.size;
         let maxWidth = bodyRef.current.getBoundingClientRect().width;
@@ -450,8 +454,10 @@ function $bd013581c0a4b065$var$TableVirtualizer(props) {
         collection: collection,
         renderView: renderView,
         onVisibleRectChange (rect) {
-            bodyRef.current.scrollTop = rect.y;
-            (0, $7lS7h$setScrollLeft)(bodyRef.current, direction, rect.x);
+            if (bodyRef.current) {
+                bodyRef.current.scrollTop = rect.y;
+                (0, $7lS7h$setScrollLeft)(bodyRef.current, direction, rect.x);
+            }
         },
         persistedKeys: persistedKeys,
         layoutOptions: (0, $7lS7h$useMemo)(()=>({
@@ -482,7 +488,8 @@ function $bd013581c0a4b065$var$TableVirtualizer(props) {
     // only that it changes in a resize, and when that happens, we want to sync the body to the
     // header scroll position
     (0, $7lS7h$useEffect)(()=>{
-        if ((0, $7lS7h$getInteractionModality)() === 'keyboard' && headerRef.current.contains(document.activeElement)) {
+        var _headerRef_current;
+        if ((0, $7lS7h$getInteractionModality)() === 'keyboard' && ((_headerRef_current = headerRef.current) === null || _headerRef_current === void 0 ? void 0 : _headerRef_current.contains(document.activeElement)) && bodyRef.current) {
             (0, $7lS7h$scrollIntoView)(headerRef.current, document.activeElement);
             (0, $7lS7h$scrollIntoViewport)(document.activeElement, {
                 containingElement: domRef.current
@@ -498,7 +505,7 @@ function $bd013581c0a4b065$var$TableVirtualizer(props) {
     let headerHeight = ((_layout_getLayoutInfo = layout.getLayoutInfo('header')) === null || _layout_getLayoutInfo === void 0 ? void 0 : _layout_getLayoutInfo.rect.height) || 0;
     // Sync the scroll position from the table body to the header container.
     let onScroll = (0, $7lS7h$useCallback)(()=>{
-        headerRef.current.scrollLeft = bodyRef.current.scrollLeft;
+        if (headerRef.current && bodyRef.current) headerRef.current.scrollLeft = bodyRef.current.scrollLeft;
     }, [
         bodyRef,
         headerRef
@@ -518,9 +525,7 @@ function $bd013581c0a4b065$var$TableVirtualizer(props) {
         resizingColumnWidth,
         columnResizeState.resizingColumn
     ]);
-    let mergedProps = (0, $7lS7h$mergeProps)(otherProps, isVirtualDragging && {
-        tabIndex: null
-    });
+    if (isVirtualDragging) otherProps.tabIndex = undefined;
     let firstColumn = collection.columns[0];
     let scrollPadding = 0;
     if (firstColumn.props.isSelectionCell || firstColumn.props.isDragButtonCell) scrollPadding = columnResizeState.getColumnWidth(firstColumn.key);
@@ -528,7 +533,7 @@ function $bd013581c0a4b065$var$TableVirtualizer(props) {
     return /*#__PURE__*/ (0, $7lS7h$react).createElement($bd013581c0a4b065$export$d288a7dd40372bc.Provider, {
         value: resizingColumn
     }, /*#__PURE__*/ (0, $7lS7h$react).createElement((0, $7lS7h$FocusScope), null, /*#__PURE__*/ (0, $7lS7h$react).createElement("div", {
-        ...mergedProps,
+        ...otherProps,
         ref: domRef
     }, /*#__PURE__*/ (0, $7lS7h$react).createElement("div", {
         role: "presentation",
@@ -555,7 +560,7 @@ function $bd013581c0a4b065$var$TableVirtualizer(props) {
         //  Using tabIndex={-1} prevents the ScrollView from being tabbable, and using role="rowgroup"
         //  here and role="presentation" on the table body content fixes the table structure.
         role: "rowgroup",
-        tabIndex: isVirtualDragging ? null : -1,
+        tabIndex: isVirtualDragging ? undefined : -1,
         style: {
             flex: 1,
             scrollPaddingInlineStart: scrollPadding
@@ -650,7 +655,7 @@ function $bd013581c0a4b065$var$TableColumnHeader(props) {
         className: (0, $7lS7h$classNames)((0, ($parcel$interopDefault($7lS7h$table_vars_cssmodulejs))), 'spectrum-Table-headCellContents')
     }, column.rendered)));
 }
-let $bd013581c0a4b065$var$_TableColumnHeaderButton = (props, ref)=>{
+let $bd013581c0a4b065$var$ForwardTableColumnHeaderButton = (props, ref)=>{
     let { focusProps: focusProps, alignment: alignment, ...otherProps } = props;
     let { isEmpty: isEmpty } = $bd013581c0a4b065$export$3cb274deb6c2d854();
     let domRef = (0, $7lS7h$useFocusableRef)(ref);
@@ -678,7 +683,7 @@ let $bd013581c0a4b065$var$_TableColumnHeaderButton = (props, ref)=>{
         ref: domRef
     }, props.children));
 };
-let $bd013581c0a4b065$var$TableColumnHeaderButton = /*#__PURE__*/ (0, $7lS7h$react).forwardRef($bd013581c0a4b065$var$_TableColumnHeaderButton);
+let $bd013581c0a4b065$var$TableColumnHeaderButton = /*#__PURE__*/ (0, $7lS7h$react).forwardRef($bd013581c0a4b065$var$ForwardTableColumnHeaderButton);
 function $bd013581c0a4b065$var$ResizableTableColumnHeader(props) {
     var _column_props, _state_sortDescriptor, _state_sortDescriptor1, _state_sortDescriptor2, _state_sortDescriptor3;
     let { column: column } = props;
@@ -723,20 +728,21 @@ function $bd013581c0a4b065$var$ResizableTableColumnHeader(props) {
     };
     let allowsSorting = (_column_props = column.props) === null || _column_props === void 0 ? void 0 : _column_props.allowsSorting;
     let items = (0, $7lS7h$useMemo)(()=>{
-        let options = [
-            allowsSorting ? {
+        let options = [];
+        if (allowsSorting) {
+            options.push({
                 label: stringFormatter.format('sortAscending'),
                 id: 'sort-asc'
-            } : undefined,
-            allowsSorting ? {
+            });
+            options.push({
                 label: stringFormatter.format('sortDescending'),
                 id: 'sort-desc'
-            } : undefined,
-            {
-                label: stringFormatter.format('resizeColumn'),
-                id: 'resize'
-            }
-        ];
+            });
+        }
+        options.push({
+            label: stringFormatter.format('resizeColumn'),
+            id: 'resize'
+        });
         return options;
     // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [
@@ -807,7 +813,7 @@ function $bd013581c0a4b065$var$ResizableTableColumnHeader(props) {
     }, /*#__PURE__*/ (0, $7lS7h$react).createElement((0, $cb7d341e8868d81d$export$d9658cdf8c86807), null)))));
 }
 function $bd013581c0a4b065$var$TableSelectAllCell({ column: column }) {
-    let ref = (0, $7lS7h$useRef)(undefined);
+    let ref = (0, $7lS7h$useRef)(null);
     let { state: state } = $bd013581c0a4b065$export$3cb274deb6c2d854();
     let isSingleSelectionMode = state.selectionManager.selectionMode === 'single';
     let { columnHeaderProps: columnHeaderProps } = (0, $7lS7h$useTableColumnHeader)({
@@ -839,7 +845,7 @@ function $bd013581c0a4b065$var$TableSelectAllCell({ column: column }) {
     })));
 }
 function $bd013581c0a4b065$var$TableDragHeaderCell({ column: column }) {
-    let ref = (0, $7lS7h$useRef)(undefined);
+    let ref = (0, $7lS7h$useRef)(null);
     let { state: state } = $bd013581c0a4b065$export$3cb274deb6c2d854();
     let { columnHeaderProps: columnHeaderProps } = (0, $7lS7h$useTableColumnHeader)({
         node: column,
@@ -888,8 +894,10 @@ function $bd013581c0a4b065$export$cd7c5802f9e21187() {
     return (0, $7lS7h$useContext)($bd013581c0a4b065$var$TableRowContext);
 }
 function $bd013581c0a4b065$var$TableRow({ item: item, children: children, layoutInfo: layoutInfo, parent: parent, ...otherProps }) {
-    var _state_collection_rows_find, _layout_getContentSize, _layout_virtualizer;
-    let ref = (0, $7lS7h$useRef)(undefined);
+    var _state_collection_rows_find, _layout_getContentSize, _layout_virtualizer, // Remove tab index from list row if performing a screenreader drag. This prevents TalkBack from focusing the row,
+    // allowing for single swipe navigation between row drop indicator
+    _dragAndDropHooks_isVirtualDragging;
+    let ref = (0, $7lS7h$useRef)(null);
     let { state: state, layout: layout, dragAndDropHooks: dragAndDropHooks, isTableDraggable: isTableDraggable, isTableDroppable: isTableDroppable, dragState: dragState, dropState: dropState } = $bd013581c0a4b065$export$3cb274deb6c2d854();
     let isSelected = state.selectionManager.isSelected(item.key);
     let { rowProps: rowProps, hasAction: hasAction, allowsSelection: allowsSelection } = (0, $7lS7h$useTableRow)({
@@ -899,7 +907,6 @@ function $bd013581c0a4b065$var$TableRow({ item: item, children: children, layout
     }, state, ref);
     let isDisabled = state.selectionManager.isDisabled(item.key);
     let isInteractive = !isDisabled && (hasAction || allowsSelection || isTableDraggable);
-    let isDroppable = isTableDroppable && !isDisabled;
     let { pressProps: pressProps, isPressed: isPressed } = (0, $7lS7h$usePress)({
         isDisabled: !isInteractive
     });
@@ -917,35 +924,33 @@ function $bd013581c0a4b065$var$TableRow({ item: item, children: children, layout
     // Figure out if the TableView content is equal or greater in height to the container. If so, we'll need to round the bottom
     // border corners of the last row when selected.
     let isFlushWithContainerBottom = false;
+    var _layout_virtualizer_visibleRect_height;
     if (isLastRow) {
-        if (((_layout_getContentSize = layout.getContentSize()) === null || _layout_getContentSize === void 0 ? void 0 : _layout_getContentSize.height) >= ((_layout_virtualizer = layout.virtualizer) === null || _layout_virtualizer === void 0 ? void 0 : _layout_virtualizer.visibleRect.height)) isFlushWithContainerBottom = true;
+        if (((_layout_getContentSize = layout.getContentSize()) === null || _layout_getContentSize === void 0 ? void 0 : _layout_getContentSize.height) >= ((_layout_virtualizer_visibleRect_height = (_layout_virtualizer = layout.virtualizer) === null || _layout_virtualizer === void 0 ? void 0 : _layout_virtualizer.visibleRect.height) !== null && _layout_virtualizer_visibleRect_height !== void 0 ? _layout_virtualizer_visibleRect_height : 0)) isFlushWithContainerBottom = true;
     }
-    let draggableItem;
-    if (isTableDraggable) {
-        // eslint-disable-next-line react-hooks/rules-of-hooks
+    let draggableItem = null;
+    if (isTableDraggable && dragAndDropHooks && dragState) {
         draggableItem = dragAndDropHooks.useDraggableItem({
             key: item.key,
             hasDragButton: true
         }, dragState);
         if (isDisabled) draggableItem = null;
     }
-    let droppableItem;
-    let isDropTarget;
-    let dropIndicator;
-    let dropIndicatorRef = (0, $7lS7h$useRef)(undefined);
-    if (isTableDroppable) {
+    let isDropTarget = false;
+    let dropIndicator = null;
+    let dropIndicatorRef = (0, $7lS7h$useRef)(null);
+    if (isTableDroppable && dragAndDropHooks && dropState) {
         let target = {
             type: 'item',
             key: item.key,
             dropPosition: 'on'
         };
         isDropTarget = dropState.isDropTarget(target);
-        // eslint-disable-next-line react-hooks/rules-of-hooks
         dropIndicator = dragAndDropHooks.useDropIndicator({
             target: target
         }, dropState, dropIndicatorRef);
     }
-    let dragButtonRef = (0, $7lS7h$react).useRef(undefined);
+    let dragButtonRef = (0, $7lS7h$react).useRef(null);
     let { buttonProps: dragButtonProps } = (0, $7lS7h$useButton)({
         ...draggableItem === null || draggableItem === void 0 ? void 0 : draggableItem.dragButtonProps,
         elementType: 'div'
@@ -953,14 +958,9 @@ function $bd013581c0a4b065$var$TableRow({ item: item, children: children, layout
     let style = $bd013581c0a4b065$var$useStyle(layoutInfo, parent);
     let props = (0, $7lS7h$mergeProps)(rowProps, otherProps, {
         style: style
-    }, focusWithinProps, focusProps, hoverProps, pressProps, draggableItem === null || draggableItem === void 0 ? void 0 : draggableItem.dragProps, // Remove tab index from list row if performing a screenreader drag. This prevents TalkBack from focusing the row,
-    // allowing for single swipe navigation between row drop indicator
-    (dragAndDropHooks === null || dragAndDropHooks === void 0 ? void 0 : dragAndDropHooks.isVirtualDragging()) && {
+    }, focusWithinProps, focusProps, hoverProps, pressProps, draggableItem === null || draggableItem === void 0 ? void 0 : draggableItem.dragProps, (dragAndDropHooks === null || dragAndDropHooks === void 0 ? void 0 : (_dragAndDropHooks_isVirtualDragging = dragAndDropHooks.isVirtualDragging) === null || _dragAndDropHooks_isVirtualDragging === void 0 ? void 0 : _dragAndDropHooks_isVirtualDragging.call(dragAndDropHooks)) ? {
         tabIndex: null
-    });
-    let dropProps = isDroppable ? droppableItem === null || droppableItem === void 0 ? void 0 : droppableItem.dropProps : {
-        'aria-hidden': droppableItem === null || droppableItem === void 0 ? void 0 : droppableItem.dropProps['aria-hidden']
-    };
+    } : null);
     let { visuallyHiddenProps: visuallyHiddenProps } = (0, $7lS7h$useVisuallyHidden)();
     return /*#__PURE__*/ (0, $7lS7h$react).createElement($bd013581c0a4b065$var$TableRowContext.Provider, {
         value: {
@@ -986,13 +986,13 @@ function $bd013581c0a4b065$var$TableRow({ item: item, children: children, layout
         ...dropIndicator === null || dropIndicator === void 0 ? void 0 : dropIndicator.dropIndicatorProps,
         ref: dropIndicatorRef
     }))), /*#__PURE__*/ (0, $7lS7h$react).createElement("div", {
-        ...(0, $7lS7h$mergeProps)(props, dropProps),
+        ...props,
         ref: ref,
         className: (0, $7lS7h$classNames)((0, ($parcel$interopDefault($7lS7h$table_vars_cssmodulejs))), 'spectrum-Table-row', {
             'is-active': isPressed,
             'is-selected': isSelected,
             'spectrum-Table-row--highlightSelection': state.selectionManager.selectionBehavior === 'replace',
-            'is-next-selected': state.selectionManager.isSelected(item.nextKey),
+            'is-next-selected': item.nextKey != null && state.selectionManager.isSelected(item.nextKey),
             'is-focused': isFocusVisibleWithin,
             'focus-ring': isFocusVisible,
             'is-hovered': isHovered,
@@ -1015,7 +1015,7 @@ function $bd013581c0a4b065$var$TableRow({ item: item, children: children, layout
 }
 function $bd013581c0a4b065$var$TableHeaderRow({ item: item, children: children, layoutInfo: layoutInfo, parent: parent, ...props }) {
     let { state: state, headerMenuOpen: headerMenuOpen } = $bd013581c0a4b065$export$3cb274deb6c2d854();
-    let ref = (0, $7lS7h$useRef)(undefined);
+    let ref = (0, $7lS7h$useRef)(null);
     let { rowProps: rowProps } = (0, $7lS7h$useTableHeaderRow)({
         node: item,
         isVirtualized: true
@@ -1032,7 +1032,7 @@ function $bd013581c0a4b065$var$TableHeaderRow({ item: item, children: children,
     }, children);
 }
 function $bd013581c0a4b065$var$TableDragCell({ cell: cell }) {
-    let ref = (0, $7lS7h$useRef)(undefined);
+    let ref = (0, $7lS7h$useRef)(null);
     let { state: state, isTableDraggable: isTableDraggable } = $bd013581c0a4b065$export$3cb274deb6c2d854();
     let isDisabled = state.selectionManager.isDisabled(cell.parentKey);
     let { gridCellProps: gridCellProps } = (0, $7lS7h$useTableCell)({
@@ -1050,7 +1050,7 @@ function $bd013581c0a4b065$var$TableDragCell({ cell: cell }) {
     }, isTableDraggable && !isDisabled && /*#__PURE__*/ (0, $7lS7h$react).createElement($bd013581c0a4b065$var$DragButton, null)));
 }
 function $bd013581c0a4b065$var$TableCheckboxCell({ cell: cell }) {
-    let ref = (0, $7lS7h$useRef)(undefined);
+    let ref = (0, $7lS7h$useRef)(null);
     let { state: state } = $bd013581c0a4b065$export$3cb274deb6c2d854();
     // The TableCheckbox should always render its disabled status if the row is disabled, regardless of disabledBehavior,
     // but the cell itself should not render its disabled styles if disabledBehavior="selection" because the row might have actions on it.
@@ -1082,7 +1082,7 @@ function $bd013581c0a4b065$var$TableCell({ cell: cell }) {
     let { scale: scale } = (0, $7lS7h$useProvider)();
     let { state: state } = $bd013581c0a4b065$export$3cb274deb6c2d854();
     let isExpandableTable = 'expandedKeys' in state;
-    let ref = (0, $7lS7h$useRef)(undefined);
+    let ref = (0, $7lS7h$useRef)(null);
     let columnProps = cell.column.props;
     let isDisabled = state.selectionManager.isDisabled(cell.parentKey);
     let { gridCellProps: gridCellProps } = (0, $7lS7h$useTableCell)({
@@ -1129,9 +1129,9 @@ function $bd013581c0a4b065$var$TableCell({ cell: cell }) {
 }
 function $bd013581c0a4b065$var$TableCellWrapper({ layoutInfo: layoutInfo, virtualizer: virtualizer, parent: parent, children: children }) {
     let { isTableDroppable: isTableDroppable, dropState: dropState } = (0, $7lS7h$useContext)($bd013581c0a4b065$export$93e4b0b2cc49b648);
-    let isDropTarget;
-    let isRootDroptarget;
-    if (isTableDroppable) {
+    let isDropTarget = false;
+    let isRootDroptarget = false;
+    if (isTableDroppable && dropState) {
         if (parent.content) isDropTarget = dropState.isDropTarget({
             type: 'item',
             dropPosition: 'on',
@@ -1159,7 +1159,7 @@ function $bd013581c0a4b065$var$ExpandableRowChevron({ cell: cell }) {
     // TODO: move some/all of the chevron button setup into a separate hook?
     let { direction: direction } = (0, $7lS7h$useLocale)();
     let { state: state } = $bd013581c0a4b065$export$3cb274deb6c2d854();
-    let expandButtonRef = (0, $7lS7h$useRef)(undefined);
+    let expandButtonRef = (0, $7lS7h$useRef)(null);
     let stringFormatter = (0, $7lS7h$useLocalizedStringFormatter)((0, ($parcel$interopDefault($7lS7h$intlStringsmodulejs))), '@react-spectrum/table');
     let isExpanded;
     if ('expandedKeys' in state) isExpanded = state.expandedKeys === 'all' || state.expandedKeys.has(cell.parentKey);
@@ -1205,7 +1205,7 @@ function $bd013581c0a4b065$var$CenteredWrapper({ children: children }) {
     let rowProps;
     if ('expandedKeys' in state) {
         let topLevelRowCount = [
-            ...state.keyMap.get(state.collection.body.key).childNodes
+            ...state.collection.body.childNodes
         ].length;
         rowProps = {
             'aria-level': 1,