Browse Source

delete rountangles also on middle click

Jakob Pietron 2 years ago
parent
commit
51a4a216dd

+ 4 - 0
src/frontend/rountangleEditor/RountangleComponent.tsx

@@ -94,6 +94,10 @@ export class RountangleComponent extends React.Component<RountangleProps, Rounta
                 this.props.dispatch({tag: 'deleteRountangle', id: this.props.id});
             }
         }
+        // delete on middle click
+        else if (event.button === 1) {
+            this.props.dispatch({tag: 'deleteRountangle', id: this.props.id});
+        }
     }
 
     // onDoubleClick = (event: React.MouseEvent) => {

+ 1 - 1
src/frontend/rountangleEditor/RountangleEditor.tsx

@@ -5,7 +5,7 @@ import {GraphType} from "../editable_graph";
 import {RountangleAction} from "./RountangleActions";
 import {INodeState, IValueState, GraphState} from "../../onion/graph_state";
 import {PrimitiveDelta, PrimitiveRegistry} from "../../onion/primitive_delta";
-import {assert, assertNever} from "../../util/assert";
+import {assertNever} from "../../util/assert";
 import {d3Types} from "../graph";
 
 export interface Rountangle {

+ 13 - 18
src/frontend/versioned_model.tsx

@@ -3,33 +3,28 @@ import * as Mantine from "@mantine/core";
 import * as Icons from "@tabler/icons";
 
 import {D3GraphStateUpdater} from "./d3_state";
-import {EditableGraph, UserEditCallback, SetNodePositionCallback, GraphType, NodeType, LinkType} from "./editable_graph";
+import {EditableGraph, GraphType, UserEditCallback} from "./editable_graph";
 import {
-  HistoryGraphType,
-  DependencyGraphType,
-  versionToNode,
-  setCurrentVersion,
+  addDeltaAndActivate,
   appendToHistoryGraph,
+  DependencyGraphType,
   fullDeltaId,
-  setDeltaActive,
-  setDeltaInactive,
-  deltaToDepGraphNode,
-  dependencyToDepGraphLink,
-  conflictToDepGraphLink,
   fullVersionId,
-  addDeltaAndActivate,
+  HistoryGraphType,
   initialHistoryGraph,
+  setCurrentVersion,
+  setDeltaActive,
+  setDeltaInactive,
 } from "./app_state";
-import {d3Types, Graph} from "./graph"
+import {Graph} from "./graph"
 import {emptyGraph, graphForces} from "./constants";
 import {RountangleEditor} from "./rountangleEditor/RountangleEditor";
 import {makeOverlayHelpIcon} from "./help_icons";
 
-import {embed, Version, VersionRegistry} from "../onion/version";
-import {PrimitiveDelta, PrimitiveRegistry} from "../onion/primitive_delta";
-import {PrimitiveValue, UUID} from "../onion/types";
-import {CompositeDelta, CompositeLevel} from "../onion/composite_delta";
-import {GraphState} from "../onion/graph_state"; 
+import {Version, VersionRegistry} from "../onion/version";
+import {PrimitiveDelta} from "../onion/primitive_delta";
+import {CompositeLevel} from "../onion/composite_delta";
+import {GraphState} from "../onion/graph_state";
 import {Delta} from "../onion/delta";
 
 const graphEditorLegend = <>
@@ -74,7 +69,7 @@ const helpText = {
     <Mantine.Divider label="Controls" labelPosition="center"/>
     <Mantine.Text>
       <b>Right-Click</b>: Create Rountangle<br/>
-      <b>Alt + Left-Click</b>: Delete Rountangle<br/>
+      <b>Alt + Left-Click or Middle-Click</b>: Delete Rountangle<br/>
       <b>Left-Drag</b>: Move/Resize Rountangle / Pan Canvas<br/>
       <b>Wheel</b>: Zoom<br/>
     </Mantine.Text>