diff options
| author | bobzel <zzzman@gmail.com> | 2023-10-11 15:06:40 -0400 |
|---|---|---|
| committer | bobzel <zzzman@gmail.com> | 2023-10-11 15:06:40 -0400 |
| commit | 54e80f26df04f1a031d1d7e4b840fe9426d4d2cf (patch) | |
| tree | dd31defc3bb9ce34b1ae606bada49e1ad3f87932 | |
| parent | d929c0511cae863412a398f426d9e5b7ca64e6d9 (diff) | |
fixed panMode to not do marquee selection on nested but inactive collections.
| -rw-r--r-- | src/client/views/collections/collectionFreeForm/MarqueeView.tsx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/client/views/collections/collectionFreeForm/MarqueeView.tsx b/src/client/views/collections/collectionFreeForm/MarqueeView.tsx index a6a3280eb..5c053fefc 100644 --- a/src/client/views/collections/collectionFreeForm/MarqueeView.tsx +++ b/src/client/views/collections/collectionFreeForm/MarqueeView.tsx @@ -222,7 +222,7 @@ export class MarqueeView extends React.Component<SubCollectionViewProps & Marque if (!(e.nativeEvent as any).marqueeHit) { (e.nativeEvent as any).marqueeHit = true; // allow marquee if right click OR alt+left click OR in adding presentation slide & left key drag mode - if (e.button === 2 || (e.button === 0 && (e.altKey || Doc.UserDoc().freeformScrollMode === freeformScrollMode.Pan))) { + if (e.button === 2 || (e.button === 0 && (e.altKey || (this.props.isContentActive?.(true) && Doc.UserDoc().freeformScrollMode === freeformScrollMode.Pan)))) { // if (e.altKey || (MarqueeView.DragMarquee && this.props.active(true))) { this.setPreviewCursor(e.clientX, e.clientY, true, false, this.props.Document); // (!e.altKey) && e.stopPropagation(); // bcz: removed so that you can alt-click on button in a collection to switch link following behaviors. |