Skip to content

Revert "Keytips: Align keytipData with visible instance for dupes" #28977

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.

Sign up for GitHub

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

Merged
khmakoto merged 2 commits into from
Aug 24, 2023
Merged

Revert "Keytips: Align keytipData with visible instance for dupes" #28977

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7b78fc9
Revert "Keytips: Align keytipData with visible instance for dupes (#2…
makopch-ms Aug 24, 2023
218b153
change files
makopch-ms Aug 24, 2023
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
9 changes: 0 additions & 9 deletions packages/react/src/components/KeytipLayer/KeytipLayer.base.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import {
Async,
initializeComponentRef,
KeyCodes,
isElementVisibleAndNotHidden,
} from '../../Utilities';
import { KeytipManager } from '../../utilities/keytips/KeytipManager';
import { KeytipTree } from './KeytipTree';
Expand Down Expand Up @@ -376,15 +375,7 @@ export class KeytipLayerBase extends React.Component<IKeytipLayerProps, IKeytipL
// Account for overflow set sequences when checking for duplicates
keytipId = sequencesToID(mergeOverflows(keytip.keySequences, keytip.overflowSetSequence));
}
const targetSelector = ktpTargetFromSequences(keytip.keySequences);
const matchingElements = document.querySelectorAll(targetSelector);
seenIds[keytipId] = seenIds[keytipId] ? seenIds[keytipId] + 1 : 1;

// If there are multiple elements for the keytip sequence, return true if the element instance
// that corresponds to the keytip instance is visible
if (matchingElements.length > 1 && seenIds[keytipId] <= matchingElements.length) {
return keytip.visible && isElementVisibleAndNotHidden(matchingElements[seenIds[keytipId] - 1] as HTMLElement);
}
return keytip.visible && seenIds[keytipId] === 1;
});
}
Expand Down