aboutsummaryrefslogtreecommitdiff
path: root/src/client/views/collections/CollectionMenu.tsx
diff options
context:
space:
mode:
authorbobzel <zzzman@gmail.com>2021-02-03 12:08:27 -0500
committerbobzel <zzzman@gmail.com>2021-02-03 12:08:27 -0500
commita774d7f55755703faa316401dd8724dd82a9ee98 (patch)
treeebc06f52e0ca8387923a2368fd7593a0ae7ad37c /src/client/views/collections/CollectionMenu.tsx
parentdf23545cff9c612a91272c16fa819f8b53c310d0 (diff)
added linkRelationship to linkEditor. fixed warnings.
Diffstat (limited to 'src/client/views/collections/CollectionMenu.tsx')
-rw-r--r--src/client/views/collections/CollectionMenu.tsx11
1 files changed, 9 insertions, 2 deletions
diff --git a/src/client/views/collections/CollectionMenu.tsx b/src/client/views/collections/CollectionMenu.tsx
index 4e2d81e61..7ba857449 100644
--- a/src/client/views/collections/CollectionMenu.tsx
+++ b/src/client/views/collections/CollectionMenu.tsx
@@ -25,7 +25,7 @@ import { undoBatch } from "../../util/UndoManager";
import { AntimodeMenu, AntimodeMenuProps } from "../AntimodeMenu";
import { EditableView } from "../EditableView";
import { GestureOverlay } from "../GestureOverlay";
-import { ActiveFillColor, ActiveInkColor, SetActiveArrowEnd, SetActiveArrowStart, SetActiveBezierApprox, SetActiveFillColor, SetActiveInkColor, SetActiveInkWidth } from "../InkingStroke";
+import { ActiveFillColor, ActiveInkColor, SetActiveArrowEnd, SetActiveArrowStart, SetActiveBezierApprox, SetActiveFillColor, SetActiveInkColor, SetActiveInkWidth, ActiveArrowStart, ActiveArrowEnd } from "../InkingStroke";
import { CollectionFreeFormDocumentView } from "../nodes/CollectionFreeFormDocumentView";
import { DocumentView } from "../nodes/DocumentView";
import { RichTextMenu } from "../nodes/formattedText/RichTextMenu";
@@ -591,12 +591,19 @@ export class CollectionFreeFormViewChrome extends React.Component<CollectionMenu
private _faName = ["pen-fancy", "minus", "long-arrow-alt-right", "arrows-alt-h", "square", "circle"];
@observable _selectedPrimitive = this._shapePrims.length;
@observable _keepPrimitiveMode = false; // for whether primitive selection enters a one-shot or persistent mode
-
@observable _colorBtn = false;
@observable _widthBtn = false;
@observable _fillBtn = false;
@action clearKeepPrimitiveMode() { this._selectedPrimitive = this._shapePrims.length; }
+ @action primCreated() {
+ if (!this._keepPrimitiveMode) { //get out of ink mode after each stroke=
+ Doc.SetSelectedTool(InkTool.None);
+ this._selectedPrimitive = this._shapePrims.length;
+ SetActiveArrowStart("none");
+ SetActiveArrowEnd("none");
+ }
+ }
@action
changeColor = (color: string, type: string) => {