Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 3 additions & 23 deletions packages/@adobe/react-spectrum/src/table/Resizer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import intlMessages from '../../intl/table/*.json';
import {isWebKit} from 'react-aria/private/utils/platform';
import {Key, RefObject} from '@react-types/shared';
import {mergeProps} from 'react-aria/mergeProps';
import React, {createContext, ForwardedRef, useContext, useEffect, useState} from 'react';
import React, {createContext, ForwardedRef, useContext} from 'react';
import ReactDOM from 'react-dom';
import styles from '@adobe/spectrum-css-temp/components/table/vars.css';
import {useLocale} from 'react-aria/I18nProvider';
Expand Down Expand Up @@ -63,27 +63,7 @@ export const Resizer = React.forwardRef(function Resizer<T>(
let stringFormatter = useLocalizedStringFormatter(intlMessages, '@react-spectrum/table');
let {direction} = useLocale();

let [isPointerDown, setIsPointerDown] = useState(false);
useEffect(() => {
let setDown = e => {
if (e.pointerType === 'mouse') {
setIsPointerDown(true);
}
};
let setUp = e => {
if (e.pointerType === 'mouse') {
setIsPointerDown(false);
}
};
document.addEventListener('pointerdown', setDown, {capture: true});
document.addEventListener('pointerup', setUp, {capture: true});
return () => {
document.removeEventListener('pointerdown', setDown, {capture: true});
document.removeEventListener('pointerup', setUp, {capture: true});
};
}, []);

let {inputProps, resizerProps} = useTableColumnResize<unknown>(
let {inputProps, resizerProps, isMouseResizing} = useTableColumnResize<unknown>(
mergeProps(props, {
'aria-label': stringFormatter.format('columnResizer'),
isDisabled: isEmpty
Expand Down Expand Up @@ -128,7 +108,7 @@ export const Resizer = React.forwardRef(function Resizer<T>(
role="presentation"
className={classNames(styles, 'spectrum-Table-columnResizerPlaceholder')}
/>
<CursorOverlay show={isResizing && isPointerDown}>
<CursorOverlay show={isResizing && isMouseResizing}>
<div style={{position: 'fixed', top: 0, left: 0, bottom: 0, right: 0, cursor}} />
</CursorOverlay>
</>
Expand Down
24 changes: 9 additions & 15 deletions packages/react-aria-components/src/Table.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -1374,7 +1374,7 @@ export const ColumnResizer = forwardRef(function ColumnResizer(
let {onResizeStart, onResize, onResizeEnd} = useContext(ResizableTableContainerContext)!;
let {column, triggerRef} = useContext(ColumnResizerContext)!;
let inputRef = useRef<HTMLInputElement>(null);
let {resizerProps, inputProps, isResizing} = useTableColumnResize(
let {resizerProps, inputProps, isResizing, isMouseResizing} = useTableColumnResize(
{
column,
'aria-label': props['aria-label'] || stringFormatter.format('tableResizer'),
Expand Down Expand Up @@ -1425,24 +1425,15 @@ export const ColumnResizer = forwardRef(function ColumnResizer(
}
});

let [isMouseDown, setMouseDown] = useState(false);
let onPointerDown = (e: PointerEvent) => {
if (e.pointerType === 'mouse') {
setMouseDown(true);
}
};

if (!isResizing && isMouseDown) {
setMouseDown(false);
}

let DOMProps = filterDOMProps(props, {global: true});

// Cursor overlay is used to style the cursor against the entire screen.
// Do not turn off pointer events or the cursor will no longer be styled.
return (
<dom.div
ref={objectRef}
role="presentation"
{...mergeProps(DOMProps, renderProps, resizerProps, {onPointerDown}, hoverProps)}
{...mergeProps(DOMProps, renderProps, resizerProps, hoverProps)}
data-hovered={isHovered || undefined}
data-focused={isFocused || undefined}
data-focus-visible={isFocusVisible || undefined}
Expand All @@ -1451,9 +1442,12 @@ export const ColumnResizer = forwardRef(function ColumnResizer(
{renderProps.children}
<input ref={inputRef} {...mergeProps(inputProps, focusProps)} />
{isResizing &&
isMouseDown &&
isMouseResizing &&
ReactDOM.createPortal(
<div style={{position: 'fixed', top: 0, left: 0, bottom: 0, right: 0, cursor}} />,
<div
style={{position: 'fixed', top: 0, left: 0, bottom: 0, right: 0, cursor}}
data-testid="cursor-overlay"
/>,
document.body
)}
</dom.div>
Expand Down
19 changes: 16 additions & 3 deletions packages/react-aria/src/table/useTableColumnResize.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* governing permissions and limitations under the License.
*/

import {ChangeEvent, useCallback, useEffect, useRef} from 'react';
import {ChangeEvent, useCallback, useEffect, useRef, useState} from 'react';
import {ColumnSize} from 'react-stately/useTableState';
import {DOMAttributes, FocusableElement, Key, RefObject} from '@react-types/shared';
import {focusSafely} from '../interactions/focusSafely';
Expand Down Expand Up @@ -38,6 +38,11 @@ export interface TableColumnResizeAria {
resizerProps: DOMAttributes;
/** Whether this column is currently being resized. */
isResizing: boolean;
/**
* Whether this column is currently being resized via a mouse drag (e.g. to render a cursor
* overlay).
*/
isMouseResizing: boolean;
}

export interface AriaTableColumnResizeProps<T> {
Expand Down Expand Up @@ -94,6 +99,9 @@ export function useTableColumnResize<T>(
let lastSize = useRef<Map<Key, ColumnSize> | null>(null);
let wasFocusedOnResizeStart = useRef(false);
let editModeEnabled = state.tableState.isKeyboardNavigationDisabled;
// Whether a mouse drag-resize is active. Set on the first move (not on press) so a cursor
// overlay only mounts during an actual drag.
let [isMouseResizing, setMouseResizing] = useState(false);

let {direction} = useLocale();

Expand Down Expand Up @@ -172,8 +180,11 @@ export function useTableColumnResize<T>(

const columnResizeWidthRef = useRef<number>(0);
const {moveProps} = useMove({
onMoveStart() {
onMoveStart(e) {
columnResizeWidthRef.current = state.getColumnWidth(item.key);
if (e.pointerType === 'mouse') {
setMouseResizing(true);
}
startResize(item);
},
onMove(e) {
Expand All @@ -196,6 +207,7 @@ export function useTableColumnResize<T>(
onMoveEnd(e) {
let {pointerType} = e;
columnResizeWidthRef.current = 0;
setMouseResizing(false);
if (pointerType === 'mouse' || (pointerType === 'touch' && wasFocusedOnResizeStart.current)) {
endResize(item);
}
Expand Down Expand Up @@ -332,6 +344,7 @@ export function useTableColumnResize<T>(
},
ariaProps
),
isResizing
isResizing,
isMouseResizing
};
}