-
Notifications
You must be signed in to change notification settings - Fork 841
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[EuiDataGrid] Actually fix calls to tabbable instead of moving the issue to a different part of the code #5163
Merged
chandlerprall
merged 5 commits into
elastic:master
from
chandlerprall:bug/5162-maybe-dont-do-that-chandler
Sep 10, 2021
Merged
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
8740397
Don't process cells multiple times, and furthermore process cells not…
chandlerprall ebcfbd3
unit test
chandlerprall 4af1064
Moved and updated unit test for getParentCellContent
chandlerprall 5f2b70d
Refactor tests into better-explained cases
chandlerprall bb63d9a
changelog
chandlerprall File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains 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 |
---|---|---|
|
@@ -248,16 +248,16 @@ const IS_JEST_ENVIRONMENT = global.hasOwnProperty('_isJest'); | |
* and search its ancestors for a div[data-datagrid-cellcontent], if any, | ||
* which is a valid target for disabling tabbing within | ||
*/ | ||
function getParentCellContent(_element: Node | HTMLElement) { | ||
export function getParentCellContent(_element: Node | HTMLElement) { | ||
let element: HTMLElement | null = | ||
_element.nodeType === document.ELEMENT_NODE | ||
? (_element as HTMLElement) | ||
: _element.parentElement; | ||
|
||
while ( | ||
element && | ||
element.nodeName !== 'div' && | ||
element.hasAttribute('data-datagrid-cellcontent') | ||
element && // we haven't walked off the document yet | ||
element.nodeName !== 'div' && // looking for a div | ||
!element.hasAttribute('data-datagrid-cellcontent') // that has data-datagrid-cellcontent | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. this There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 🤦♀️ I feel super bad for not noticing this/digging into it a bit more deeply in the first PR. Apologies! |
||
) { | ||
element = element.parentElement; | ||
} | ||
|
@@ -592,10 +592,16 @@ export const EuiDataGridBody: FunctionComponent<EuiDataGridBodyProps> = ( | |
}, [unconstrainedHeight, wrapperDimensions, isFullScreen]); | ||
|
||
const preventTabbing = useCallback((records: MutationRecord[]) => { | ||
// multiple mutation records can implicate the same cell | ||
// so be sure to only check each cell once | ||
const processedCells = new Set(); | ||
|
||
for (let i = 0; i < records.length; i++) { | ||
const record = records[i]; | ||
// find the cell content owning this mutation | ||
const cell = getParentCellContent(record.target); | ||
if (processedCells.has(cell)) continue; | ||
processedCells.add(cell); | ||
|
||
if (cell) { | ||
// if we found it, disable tabbable elements | ||
|
This file contains 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
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.
export for testing