feat: condense user selection into pane.

2022-11-22 10:55:06 +00:00
parent 707ee19875
commit da08e69e78
2 changed files with 24 additions and 15 deletions
@@ -102,23 +102,24 @@ const FlowRenderer = ({
      noWheelClassName={noWheelClassName}
      noPanClassName={noPanClassName}
    >
-      {children}
-      <UserSelection selectionKeyPressed={selectionKeyPressed || (selectBoxOnDrag && !panOnDrag)} />
-      {nodesSelectionActive && (
-        <NodesSelection
-          onSelectionContextMenu={onSelectionContextMenu}
-          noPanClassName={noPanClassName}
-          disableKeyboardA11y={disableKeyboardA11y}
-        />
-      )}
-      <Pane
+      <UserSelection
        onClick={onClick}
        onMouseEnter={onPaneMouseEnter}
        onMouseMove={onPaneMouseMove}
        onMouseLeave={onPaneMouseLeave}
        onContextMenu={onContextMenu}
        onWheel={onWheel}
-      />
+        selectionKeyPressed={selectionKeyPressed || (selectBoxOnDrag && !panOnDrag)}
+      >
+        {children}
+        {nodesSelectionActive && (
+          <NodesSelection
+            onSelectionContextMenu={onSelectionContextMenu}
+            noPanClassName={noPanClassName}
+            disableKeyboardA11y={disableKeyboardA11y}
+          />
+        )}
+      </UserSelection>
    </ZoomPane>
  );
 };