aboutsummaryrefslogtreecommitdiff
path: root/src/client/views/collections/CollectionView.tsx
diff options
context:
space:
mode:
authorNaafiyan Ahmed <naafiyan@gmail.com>2022-07-12 12:07:38 -0400
committerNaafiyan Ahmed <naafiyan@gmail.com>2022-07-12 12:07:38 -0400
commit31041d7a5b2c3699518ebb33ccab016af0acd579 (patch)
tree8d8651ef3bcf9e6fee0c55c598ec5c356dbcc05f /src/client/views/collections/CollectionView.tsx
parent39cf91aadee5f448e1a7a0a07da9e769d6e242fa (diff)
parent0906eab4135db844dc45a20d33f84e7439461c9b (diff)
merged master
Diffstat (limited to 'src/client/views/collections/CollectionView.tsx')
-rw-r--r--src/client/views/collections/CollectionView.tsx1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/client/views/collections/CollectionView.tsx b/src/client/views/collections/CollectionView.tsx
index b432104a1..2ae0c01ef 100644
--- a/src/client/views/collections/CollectionView.tsx
+++ b/src/client/views/collections/CollectionView.tsx
@@ -173,6 +173,7 @@ export class CollectionView extends ViewBoxAnnotatableComponent<ViewBoxAnnotatab
onContextMenu = (e: React.MouseEvent): void => {
const cm = ContextMenu.Instance;
+ if (e.nativeEvent.cancelBubble) return; // nested calls to React to render can cause the same event to trigger in the outer view even if the inner view has handled it. This avoid CollectionDockingView menu options from being added when the event has been handled by a sub-document.
if (cm && !e.isPropagationStopped() && this.rootDoc[Id] !== CurrentUserUtils.MainDocId) { // need to test this because GoldenLayout causes a parallel hierarchy in the React DOM for its children and the main document view7
this.setupViewTypes("UI Controls...", vtype => {
const newRendition = Doc.MakeAlias(this.rootDoc);