Update eslint deps #3615
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -296,6 +296,8 @@ function DataGrid<R, SR, K extends Key>( | |
| const [isDragging, setDragging] = useState(false); | ||
| const [draggedOverRowIdx, setOverRowIdx] = useState<number | undefined>(undefined); | ||
| const [scrollToPosition, setScrollToPosition] = useState<PartialPosition | null>(null); | ||
| const [shouldFocusCell, setShouldFocusCell] = useState(false); | ||
| const [previousRowIdx, setPreviousRowIdx] = useState(-1); | ||
|
|
||
| const getColumnWidth = useCallback( | ||
| (column: CalculatedColumn<R, SR>) => { | ||
|
|
@@ -338,15 +340,13 @@ function DataGrid<R, SR, K extends Key>( | |
| const [selectedPosition, setSelectedPosition] = useState( | ||
| (): SelectCellState | EditCellState<R> => ({ idx: -1, rowIdx: minRowIdx - 1, mode: 'SELECT' }) | ||
| ); | ||
| const [prevSelectedPosition, setPrevSelectedPosition] = useState(selectedPosition); | ||
|
|
||
| /** | ||
| * refs | ||
| */ | ||
| const latestDraggedOverRowIdx = useRef(draggedOverRowIdx); | ||
| const focusSinkRef = useRef<HTMLDivElement>(null); | ||
|
Comment on lines
-345
to
-349
Collaborator
Author
There was a problem hiding this comment. Removed a few refs |
||
|
|
||
| /** | ||
| * computed values | ||
|
|
@@ -458,31 +458,50 @@ function DataGrid<R, SR, K extends Key>( | |
| selectCell({ rowIdx: minRowIdx + rowIdx - 1, idx }); | ||
| }); | ||
|
|
||
| /** | ||
| * callbacks | ||
| */ | ||
| const setDraggedOverRowIdx = useCallback((rowIdx?: number) => { | ||
| setOverRowIdx(rowIdx); | ||
| latestDraggedOverRowIdx.current = rowIdx; | ||
| }, []); | ||
|
|
||
| const focusCellOrCellContent = useCallback(() => { | ||
| const cell = getCellToScroll(gridRef.current!); | ||
| if (cell === null) return; | ||
|
|
||
| scrollIntoView(cell); | ||
| // Focus cell content when available instead of the cell itself | ||
| const elementToFocus = cell.querySelector<Element & HTMLOrSVGElement>('[tabindex="0"]') ?? cell; | ||
| elementToFocus.focus({ preventScroll: true }); | ||
| }, [gridRef]); | ||
|
|
||
| /** | ||
| * effects | ||
| */ | ||
| useLayoutEffect(() => { | ||
| if ( | ||
| !selectedCellIsWithinSelectionBounds || | ||
| isSamePosition(selectedPosition, prevSelectedPosition) | ||
| ) { | ||
| setPrevSelectedPosition(selectedPosition); | ||
| return; | ||
| } | ||
|
|
||
| setPrevSelectedPosition(selectedPosition); | ||
|
|
||
| if (focusSinkRef.current !== null && selectedPosition.idx === -1) { | ||
| focusSinkRef.current.focus({ preventScroll: true }); | ||
| scrollIntoView(focusSinkRef.current); | ||
| } | ||
| }, [selectedCellIsWithinSelectionBounds, selectedPosition, prevSelectedPosition]); | ||
|
|
||
| useLayoutEffect(() => { | ||
| if (shouldFocusCell) { | ||
| setShouldFocusCell(false); | ||
| focusCellOrCellContent(); | ||
| } | ||
| }, [shouldFocusCell, focusCellOrCellContent]); | ||
|
|
||
| useImperativeHandle(ref, () => ({ | ||
| element: gridRef.current, | ||
|
|
@@ -499,14 +518,6 @@ function DataGrid<R, SR, K extends Key>( | |
| selectCell | ||
| })); | ||
|
|
||
| /** | ||
| * event handlers | ||
| */ | ||
|
|
@@ -536,9 +547,8 @@ function DataGrid<R, SR, K extends Key>( | |
| if (isRowSelectionDisabled?.(row) === true) return; | ||
| const newSelectedRows = new Set(selectedRows); | ||
| const rowKey = rowKeyGetter(row); | ||
| const rowIdx = rows.indexOf(row); | ||
| setPreviousRowIdx(rowIdx); | ||
|
|
||
| if (checked) { | ||
| newSelectedRows.add(rowKey); | ||
|
|
@@ -758,7 +768,7 @@ function DataGrid<R, SR, K extends Key>( | |
| // Avoid re-renders if the selected cell state is the same | ||
| scrollIntoView(getCellToScroll(gridRef.current!)); | ||
| } else { | ||
| setShouldFocusCell(true); | ||
| setSelectedPosition({ ...position, mode: 'SELECT' }); | ||
| } | ||
|
|
||
|
|
@@ -870,16 +880,6 @@ function DataGrid<R, SR, K extends Key>( | |
| return isDraggedOver ? selectedPosition.idx : undefined; | ||
| } | ||
|
|
||
| function renderDragHandle() { | ||
| if ( | ||
| onFill == null || | ||
|
|
@@ -925,7 +925,7 @@ function DataGrid<R, SR, K extends Key>( | |
| const colSpan = getColSpan(column, lastFrozenColumnIndex, { type: 'ROW', row }); | ||
|
|
||
| const closeEditor = (shouldFocusCell: boolean) => { | ||
| setShouldFocusCell(shouldFocusCell); | ||
| setSelectedPosition(({ idx, rowIdx }) => ({ idx, rowIdx, mode: 'SELECT' })); | ||
| }; | ||
|
|
||
|
|
@@ -1061,6 +1061,7 @@ function DataGrid<R, SR, K extends Key>( | |
| // Reset the positions if the current values are no longer valid. This can happen if a column or row is removed | ||
| if (selectedPosition.idx > maxColIdx || selectedPosition.rowIdx > maxRowIdx) { | ||
| setSelectedPosition({ idx: -1, rowIdx: minRowIdx - 1, mode: 'SELECT' }); | ||
| // eslint-disable-next-line react-compiler/react-compiler | ||
| setDraggedOverRowIdx(undefined); | ||
|
Collaborator
Author
There was a problem hiding this comment. Is this needed? We do set it to undefined after the drag operation
Collaborator
There was a problem hiding this comment. Is it possible that the rows update while we're dragging?
Collaborator
Author
There was a problem hiding this comment. Probably. I added it back for now. I will look into alternatives
Collaborator
There was a problem hiding this comment. Mmh, setting ref during render?
Collaborator
Author
There was a problem hiding this comment. Yeah, need a workaround. We need ref to access the latest value. I will investigate |
||
| } | ||
|
|
||
|
|
@@ -1182,6 +1183,7 @@ function DataGrid<R, SR, K extends Key>( | |
| ); | ||
| })} | ||
| <RowSelectionChangeProvider value={selectRowLatest}> | ||
| {/* eslint-disable-next-line react-compiler/react-compiler */} | ||
|
Collaborator
Author
There was a problem hiding this comment. Don't know which line it is complaining about
Collaborator
There was a problem hiding this comment. Probably the
Collaborator
Author
There was a problem hiding this comment. I tried removing it and it was still showing the same warning |
||
| {getViewportRows()} | ||
| </RowSelectionChangeProvider> | ||
| {bottomSummaryRows?.map((row, rowIdx) => { | ||
|
|
@@ -1245,7 +1247,7 @@ function DataGrid<R, SR, K extends Key>( | |
| <ScrollToCell | ||
| scrollToPosition={scrollToPosition} | ||
| setScrollToCellPosition={setScrollToPosition} | ||
| gridRef={gridRef} | ||
|
Collaborator
Author
There was a problem hiding this comment.
|
||
| /> | ||
| )} | ||
| </div> | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I removed the eslint-plugin. Not sure why is it failing
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks like the plugin needs to export
Plugin, manually tweaking the declaration files fixes it.Composite projects require declaration files to be emitted, and TS can't emit a declaration file without access to the
Plugintype from the@tanstack/eslint-plugin-router.Should open an issue.