-
Notifications
You must be signed in to change notification settings - Fork 238
fix(context-menu): position anchor and prevent escaping container COMPASS-9673 #7192
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
Merged
Merged
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
50a8aed
Use position: fixed; to escape containers
kraenhansen 78f5c2d
Offset app inside sandbox
kraenhansen 839bb93
Wrap menu providers children in a container
kraenhansen d12dd74
Don't prevent default if no menu items exists
kraenhansen 2be737a
Return early when holding shift
kraenhansen 39b8565
Adjust test to account for the container
kraenhansen 69d7f55
Unwrap the `ContextMenuProvider`'s container
kraenhansen 67e7a57
Skip failing test for now - tracked by COMPASS-9730
kraenhansen 6f82bf1
chore(web): revert changes to sandbox index.html
gribnoysup 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 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
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 |
|---|---|---|
|
|
@@ -38,6 +38,7 @@ export function ContextMenuProvider({ | |
| }) { | ||
| // Check if there's already a parent context menu provider | ||
| const parentContext = useContext(ContextMenuContext); | ||
| const containerRef = useRef<HTMLDivElement | null>(null); | ||
|
|
||
| const [menu, setMenu] = useState<ContextMenuState>({ | ||
| isOpen: false, | ||
|
|
@@ -62,18 +63,17 @@ export function ContextMenuProvider({ | |
| ); | ||
|
|
||
| useEffect(() => { | ||
| // Don't set up event listeners if we have a parent context | ||
| if (parentContext || disabled) return; | ||
| // We skip registering listeners when parentContext is known to avoid registering multiple (nested) listeners | ||
|
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. Drive-by to have the comment say something about, why we're actually doing this. |
||
| const { current: container } = containerRef; | ||
| if (parentContext || disabled || !container) return; | ||
|
|
||
| function handleContextMenu(event: MouseEvent) { | ||
| event.preventDefault(); | ||
|
|
||
| const itemGroups = getContextMenuContent(event as EnhancedMouseEvent); | ||
|
|
||
| if (itemGroups.length === 0) { | ||
| if (itemGroups.length === 0 || event.shiftKey) { | ||
| return; | ||
| } | ||
|
|
||
| event.preventDefault(); | ||
| onContextMenuOpenRef.current?.(itemGroups); | ||
|
|
||
| setMenu({ | ||
|
|
@@ -86,7 +86,7 @@ export function ContextMenuProvider({ | |
| }); | ||
| } | ||
|
|
||
| document.addEventListener('contextmenu', handleContextMenu); | ||
| container.addEventListener('contextmenu', handleContextMenu); | ||
| window.addEventListener('resize', handleClosingEvent); | ||
| window.addEventListener( | ||
| 'scroll', | ||
|
|
@@ -100,13 +100,19 @@ export function ContextMenuProvider({ | |
| ); | ||
|
|
||
| return () => { | ||
| document.removeEventListener('contextmenu', handleContextMenu); | ||
| container.removeEventListener('contextmenu', handleContextMenu); | ||
| window.removeEventListener('resize', handleClosingEvent); | ||
| window.removeEventListener('scroll', handleClosingEvent, { | ||
| capture: true, | ||
| }); | ||
| }; | ||
| }, [disabled, handleClosingEvent, onContextMenuOpenRef, parentContext]); | ||
| }, [ | ||
| disabled, | ||
| containerRef, | ||
| handleClosingEvent, | ||
| onContextMenuOpenRef, | ||
| parentContext, | ||
| ]); | ||
|
|
||
| const value = useMemo( | ||
| () => ({ | ||
|
|
@@ -122,7 +128,13 @@ export function ContextMenuProvider({ | |
|
|
||
| return ( | ||
| <ContextMenuContext.Provider value={value}> | ||
| {children} | ||
| <div | ||
| ref={containerRef} | ||
| data-testid="context-menu-children-container" | ||
| style={{ display: 'contents' }} | ||
| > | ||
| {children} | ||
| </div> | ||
| <Wrapper menu={{ ...menu, close }} /> | ||
| </ContextMenuContext.Provider> | ||
| ); | ||
|
|
||
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.
The actual fix for the original bug.