@plait/core 0.0.17 → 0.0.21

package/fesm2020/plait-core.mjs

@@ -419,7 +419,7 @@ function createBoard(host, children, options) {
         },
         onChange: () => { },
         mousedown: (event) => { },
-        mouseup: (event) => { },
+        globalMouseup: (event) => { },
         mousemove: (event) => { },
         keydown: (event) => { },
         keyup: (event) => { },
@@ -432,7 +432,7 @@ function createBoard(host, children, options) {
 }
 
 function withBoard(board) {
-    const { onChange, mouseup } = board;
+    const { onChange } = board;
     board.onChange = () => {
         const onContextChange = BOARD_TO_ON_CHANGE.get(board);
         if (onContextChange) {
@@ -505,13 +505,10 @@ function isNoSelectionElement(e) {
 }
 
 function withSelection(board) {
-    const { mousedown, mousemove, mouseup } = board;
+    const { mousedown, mousemove, globalMouseup } = board;
     let start = null;
     let end = null;
     board.mousedown = (event) => {
-        if (!isNoSelectionElement(event) && board.cursor === BaseCursorStatus.select) {
-            start = toPoint(event.x, event.y, board.host);
-        }
         mousedown(event);
     };
     board.mousemove = (event) => {
@@ -524,9 +521,14 @@ function withSelection(board) {
         }
         mousemove(event);
     };
-    board.mouseup = (event) => {
+    board.globalMouseup = (event) => {
         if (isNoSelectionElement(event)) {
-            return mouseup(event);
+            return globalMouseup(event);
+        }
+        else {
+            if (!start && event.target instanceof Node && board.host.contains(event.target)) {
+                start = toPoint(event.x, event.y, board.host);
+            }
         }
         if (start) {
             Transforms.setSelection(board, { anchor: start, focus: start });
@@ -536,7 +538,7 @@ function withSelection(board) {
         }
         start = null;
         end = null;
-        mouseup(event);
+        globalMouseup(event);
     };
     return board;
 }
@@ -628,6 +630,9 @@ const PlaitOperation = {
  * Extendable Custom Types Interface
  */
 
+const SAVING = new WeakMap();
+const MERGING = new WeakMap();
+
 const IS_IOS = typeof navigator !== 'undefined' &&
     typeof window !== 'undefined' &&
     /iPad|iPhone|iPod/.test(navigator.userAgent) &&
@@ -788,7 +793,7 @@ function rotate(x1, y1, x2, y2, angle) {
  * Check whether to merge an operation into the previous operation.
  */
 const shouldMerge = (op, prev) => {
-    if (op.type === 'set_viewport') {
+    if (op.type === 'set_viewport' && op.type === prev?.type) {
         return true;
     }
     return false;
@@ -811,6 +816,40 @@ const shouldClear = (op) => {
     }
     return true;
 };
+const PlaitHistoryBoard = {
+    /**
+     * Get the saving flag's current value.
+     */
+    isSaving(board) {
+        return SAVING.get(board);
+    },
+    /**
+     * Get the merge flag's current value.
+     */
+    isMerging(board) {
+        return MERGING.get(board);
+    },
+    /**
+     * Apply a series of changes inside a synchronous `fn`, without merging any of
+     * the new operations into previous save point in the history.
+     */
+    withoutMerging(board, fn) {
+        const prev = PlaitHistoryBoard.isMerging(board);
+        MERGING.set(board, false);
+        fn();
+        MERGING.set(board, prev);
+    },
+    /**
+     * Apply a series of changes inside a synchronous `fn`, without saving any of
+     * their operations into the history.
+     */
+    withoutSaving(board, fn) {
+        const prev = PlaitHistoryBoard.isSaving(board);
+        SAVING.set(board, false);
+        fn();
+        SAVING.set(board, prev);
+    }
+};
 
 function withHistroy(board) {
     const { apply, keydown } = board;
@@ -855,7 +894,7 @@ function withHistroy(board) {
             save = shouldSave(op, lastOp);
         }
         if (save) {
-            if (merge == null) {
+            if (!merge) {
                 if (lastBatch == null) {
                     merge = false;
                 }
@@ -895,42 +934,6 @@ function withHistroy(board) {
     };
     return board;
 }
-const SAVING = new WeakMap();
-const MERGING = new WeakMap();
-const PlaitHistoryBoard = {
-    /**
-     * Get the saving flag's current value.
-     */
-    isSaving(board) {
-        return SAVING.get(board);
-    },
-    /**
-     * Get the merge flag's current value.
-     */
-    isMerging(board) {
-        return MERGING.get(board);
-    },
-    /**
-     * Apply a series of changes inside a synchronous `fn`, without merging any of
-     * the new operations into previous save point in the history.
-     */
-    withoutMerging(editor, fn) {
-        const prev = PlaitHistoryBoard.isMerging(editor);
-        MERGING.set(editor, false);
-        fn();
-        MERGING.set(editor, prev);
-    },
-    /**
-     * Apply a series of changes inside a synchronous `fn`, without saving any of
-     * their operations into the history.
-     */
-    withoutSaving(editor, fn) {
-        const prev = PlaitHistoryBoard.isSaving(editor);
-        SAVING.set(editor, false);
-        fn();
-        SAVING.set(editor, prev);
-    }
-};
 
 class PlaitElementComponent {
     constructor(renderer2, viewContainerRef) {
@@ -1071,7 +1074,7 @@ class PlaitBoardComponent {
         fromEvent(document, 'mouseup')
             .pipe(takeUntil(this.destroy$))
             .subscribe((event) => {
-            this.board.mouseup(event);
+            this.board.globalMouseup(event);
         });
         fromEvent(this.host, 'dblclick')
             .pipe(takeUntil(this.destroy$))
@@ -1235,5 +1238,5 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.11", ngImpo
  * Generated bundle index. Do not edit.
  */
 
-export { BOARD_TO_ON_CHANGE, BaseCursorStatus, FLUSHING, HOST_TO_ROUGH_SVG, IS_APPLE, IS_CHROME, IS_CHROME_LEGACY, IS_EDGE_LEGACY, IS_FIREFOX, IS_IOS, IS_SAFARI, IS_TEXT_EDITABLE, NS, Path, PlaitBoardComponent, PlaitElementComponent, PlaitModule, PlaitNode, PlaitOperation, Transforms, Viewport, createG, createSVG, createText, distanceBetweenPointAndSegment, getViewBox, hotkeys, idCreator, inverse, isNoSelectionElement, isNullOrUndefined, isSetViewportOperation, rotate, shouldClear, shouldMerge, shouldSave, toPoint, toRectangleClient, transformPoint, transformPoints };
+export { BOARD_TO_ON_CHANGE, BaseCursorStatus, FLUSHING, HOST_TO_ROUGH_SVG, IS_APPLE, IS_CHROME, IS_CHROME_LEGACY, IS_EDGE_LEGACY, IS_FIREFOX, IS_IOS, IS_SAFARI, IS_TEXT_EDITABLE, MERGING, NS, Path, PlaitBoardComponent, PlaitElementComponent, PlaitHistoryBoard, PlaitModule, PlaitNode, PlaitOperation, SAVING, Transforms, Viewport, createG, createSVG, createText, distanceBetweenPointAndSegment, getViewBox, hotkeys, idCreator, inverse, isNoSelectionElement, isNullOrUndefined, isSetViewportOperation, rotate, shouldClear, shouldMerge, shouldSave, toPoint, toRectangleClient, transformPoint, transformPoints };
 //# sourceMappingURL=plait-core.mjs.map