diff --git a/change/@fluentui-contrib-react-keytips-a4582e5f-6bff-4c22-9227-f3ec97e68845.json b/change/@fluentui-contrib-react-keytips-a4582e5f-6bff-4c22-9227-f3ec97e68845.json new file mode 100644 index 00000000..e0f3d5b8 --- /dev/null +++ b/change/@fluentui-contrib-react-keytips-a4582e5f-6bff-4c22-9227-f3ec97e68845.json @@ -0,0 +1,7 @@ +{ + "type": "patch", + "comment": "fix: reported issues after bug bash", + "packageName": "@fluentui-contrib/react-keytips", + "email": "vgenaev@gmail.com", + "dependentChangeType": "patch" +} diff --git a/packages/react-keytips/src/components/Keytips/renderKeytips.tsx b/packages/react-keytips/src/components/Keytips/renderKeytips.tsx index f118eef2..e858093e 100644 --- a/packages/react-keytips/src/components/Keytips/renderKeytips.tsx +++ b/packages/react-keytips/src/components/Keytips/renderKeytips.tsx @@ -21,20 +21,22 @@ export const renderKeytips_unstable = (state: KeytipsState) => { const classes = useStyles(); return ( - - - {state.keytips.length > 0 && {state.keytips}} - + + {state.content} + + {state.keytips.length > 0 && {state.keytips}} + + ); }; diff --git a/packages/react-keytips/src/hooks/useHotkeys/useHotkeys.ts b/packages/react-keytips/src/hooks/useHotkeys/useHotkeys.ts index 282bd735..c22aadfa 100644 --- a/packages/react-keytips/src/hooks/useHotkeys/useHotkeys.ts +++ b/packages/react-keytips/src/hooks/useHotkeys/useHotkeys.ts @@ -62,10 +62,10 @@ export const useHotkeys = ( } }; - doc?.addEventListener(invokeEvent, handleInvokeEvent); + doc?.addEventListener(invokeEvent, handleInvokeEvent, true); doc?.addEventListener('keyup', handleKeyUp); return () => { - doc?.removeEventListener(invokeEvent, handleInvokeEvent); + doc?.removeEventListener(invokeEvent, handleInvokeEvent, true); doc?.removeEventListener('keyup', handleKeyUp); clearDelayTimeout(); }; diff --git a/packages/react-keytips/stories/Overflow/OverflowMenu.tsx b/packages/react-keytips/stories/Overflow/OverflowMenu.tsx index da33dc3e..255cff10 100644 --- a/packages/react-keytips/stories/Overflow/OverflowMenu.tsx +++ b/packages/react-keytips/stories/Overflow/OverflowMenu.tsx @@ -72,7 +72,6 @@ export const OverflowMenu = ({ ref={mergedRefs} icon={} aria-label={`${overflowCount} more tabs`} - role="tab" />