@itwin/core-markup 5.0.0-dev.7 → 5.0.0-dev.72

package/lib/cjs/Undo.js

@@ -12,15 +12,19 @@ const core_bentley_1 = require("@itwin/core-bentley");
 const Markup_1 = require("./Markup");
 /* @internal */
 class UndoAction {
+    cmdName;
+    cmdId = 0;
     constructor(cmdName) {
         this.cmdName = cmdName;
-        this.cmdId = 0;
     }
 }
 /** created when a new element is added to the markup
  * @internal
  */
 class AddAction extends UndoAction {
+    _elem;
+    _parent;
+    _index;
     constructor(cmdName, _elem) {
         super(cmdName);
         this._elem = _elem;
@@ -38,6 +42,9 @@ class AddAction extends UndoAction {
  * @internal
  */
 class DeleteAction extends UndoAction {
+    _elem;
+    _parent;
+    _index;
     constructor(cmdName, _elem) {
         super(cmdName);
         this._elem = _elem;
@@ -55,6 +62,11 @@ class DeleteAction extends UndoAction {
  * @internal
  */
 class RepositionAction extends UndoAction {
+    _elem;
+    _oldIndex;
+    _oldParent;
+    _newParent;
+    _newIndex;
     constructor(cmdName, _elem, _oldIndex, _oldParent) {
         super(cmdName);
         this._elem = _elem;
@@ -77,6 +89,8 @@ class RepositionAction extends UndoAction {
  * @internal
  */
 class ModifyAction extends UndoAction {
+    _newElem;
+    _oldElement;
     constructor(cmdName, _newElem, _oldElement) {
         super(cmdName);
         this._newElem = _newElem;
@@ -97,13 +111,11 @@ class ModifyAction extends UndoAction {
  * @public
  */
 class UndoManager {
-    constructor() {
-        this._currentCmd = 0;
-        this._grouped = 0;
-        this._stack = [];
-        this._currentPos = 0;
-        this._cmdName = "";
-    }
+    _currentCmd = 0;
+    _grouped = 0;
+    _stack = [];
+    _currentPos = 0;
+    _cmdName = "";
     addAction(action) {
         this._stack.length = this._currentPos;
         action.cmdId = this._currentCmd;

package/lib/cjs/Undo.js.map

@@ -1 +1 @@
-{"version":3,"file":"Undo.js","sourceRoot":"","sources":["../../src/Undo.ts"],"names":[],"mappings":"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","sourcesContent":["/*---------------------------------------------------------------------------------------------\r\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\r\n* See LICENSE.md in the project root for license terms and full copyright notice.\r\n*--------------------------------------------------------------------------------------------*/\r\n/** @packageDocumentation\r\n * @module MarkupTools\r\n */\r\n\r\nimport { assert } from \"@itwin/core-bentley\";\r\nimport { Element as MarkupElement } from \"@svgdotjs/svg.js\";\r\nimport { MarkupApp } from \"./Markup\";\r\n\r\n/* @internal */\r\nabstract class UndoAction {\r\n  public cmdId: number = 0;\r\n  public abstract reverse(): void;\r\n  public abstract reinstate(): void;\r\n  constructor(public cmdName: string) { }\r\n}\r\n\r\n/** created when a new element is added to the markup\r\n * @internal\r\n */\r\nclass AddAction extends UndoAction {\r\n  private _parent: MarkupElement;\r\n  private _index: number;\r\n  constructor(cmdName: string, private _elem: MarkupElement) {\r\n    super(cmdName);\r\n    this._parent = _elem.parent() as MarkupElement;\r\n    assert(this._parent !== undefined);\r\n    this._index = _elem.position();\r\n  }\r\n  public reinstate() { this._parent.add(this._elem, this._index); }\r\n  public reverse() {\r\n    MarkupApp.markup!.selected.drop(this._elem);\r\n    this._elem.remove();\r\n  }\r\n}\r\n\r\n/** created when an existing element is deleted from the markup\r\n * @internal\r\n */\r\nclass DeleteAction extends UndoAction {\r\n  private _parent: MarkupElement;\r\n  private _index: number;\r\n  constructor(cmdName: string, private _elem: MarkupElement) {\r\n    super(cmdName);\r\n    this._parent = _elem.parent() as MarkupElement;\r\n    assert(this._parent !== undefined);\r\n    this._index = _elem.position();\r\n  }\r\n  public reverse() { this._parent.add(this._elem, this._index); }\r\n  public reinstate() {\r\n    MarkupApp.markup!.selected.drop(this._elem);\r\n    this._elem.remove();\r\n  }\r\n}\r\n\r\n/** created when an existing element's position is moved in the display order. This can also include re-parenting\r\n * @internal\r\n */\r\nclass RepositionAction extends UndoAction {\r\n  private _newParent: MarkupElement;\r\n  private _newIndex: number;\r\n\r\n  constructor(cmdName: string, private _elem: MarkupElement, private _oldIndex: number, private _oldParent: MarkupElement) {\r\n    super(cmdName);\r\n    this._newParent = _elem.parent() as MarkupElement;\r\n    assert(this._newParent !== undefined);\r\n    this._newIndex = _elem.position();\r\n  }\r\n  public reinstate() {\r\n    this._newParent.add(this._elem, this._newIndex);\r\n  }\r\n\r\n  public reverse() {\r\n    this._oldParent.add(this._elem, this._oldIndex);\r\n    if (this._elem.inSelection)\r\n      MarkupApp.markup!.selected.drop(this._elem);\r\n  }\r\n}\r\n\r\n/** created when an existing element's properties are modified.\r\n * @internal\r\n */\r\nclass ModifyAction extends UndoAction {\r\n  constructor(cmdName: string, private _newElem: MarkupElement, private _oldElement: MarkupElement) {\r\n    super(cmdName);\r\n    assert(_newElem !== undefined && _oldElement !== undefined);\r\n    MarkupApp.markup!.selected.replace(_oldElement, _newElem);\r\n  }\r\n  public reinstate() {\r\n    this._oldElement.replace(this._newElem);\r\n    MarkupApp.markup!.selected.replace(this._oldElement, this._newElem);\r\n  }\r\n\r\n  public reverse() {\r\n    this._newElem.replace(this._oldElement);\r\n    MarkupApp.markup!.selected.replace(this._newElem, this._oldElement);\r\n  }\r\n}\r\n\r\n/** Stores the sequence of operations performed on a Markup. Facilitates undo/redo of the operations.\r\n * @public\r\n */\r\nexport class UndoManager {\r\n  private _currentCmd = 0;\r\n  private _grouped = 0;\r\n  private _stack: UndoAction[] = [];\r\n  private _currentPos = 0;\r\n  private _cmdName = \"\";\r\n\r\n  private addAction(action: UndoAction) {\r\n    this._stack.length = this._currentPos;\r\n    action.cmdId = this._currentCmd;\r\n    this._stack.push(action);\r\n    this._currentPos = this.size;\r\n  }\r\n\r\n  /** @internal */\r\n  public get size() { return this._stack.length; }\r\n  private startCommand() {\r\n    if (0 === this._grouped)\r\n      ++this._currentCmd;\r\n  }\r\n\r\n  private startGroup() {\r\n    this.startCommand();\r\n    ++this._grouped;\r\n  }\r\n\r\n  private endGroup() { --this._grouped; }\r\n\r\n  /** Perform a series of changes to markup elements that should all be reversed as a single operation.\r\n   * @param fn the function that performs the changes to the elements. It must call the onXXX methods of this class to store\r\n   * the operations in the undo buffer.\r\n   * @note all of the onXXX methods of this class should *only* be called from within the callback function of this method.\r\n   */\r\n  public performOperation(cmdName: string, fn: VoidFunction) {\r\n    this._cmdName = cmdName;\r\n    this.startGroup();\r\n    fn();\r\n    this.endGroup();\r\n  }\r\n\r\n  /** call this from within a [[performOperation]] function *after* an element has been added to a markup */\r\n  public onAdded(elem: MarkupElement) { this.addAction(new AddAction(this._cmdName, elem)); }\r\n  /** call this from within a [[performOperation]] function *before* an element is about to be deleted from a markup */\r\n  public onDelete(elem: MarkupElement) { this.addAction(new DeleteAction(this._cmdName, elem)); }\r\n  /** call this from within a [[performOperation]] function *after* an element has been moved in display order in a markup */\r\n  public onRepositioned(elem: MarkupElement, oldIndex: number, oldParent: MarkupElement) { this.addAction(new RepositionAction(this._cmdName, elem, oldIndex, oldParent)); }\r\n  /** call this from within a [[performOperation]] function *after* an element has been modified in a markup */\r\n  public onModified(newElem: MarkupElement, oldElem: MarkupElement) { this.addAction(new ModifyAction(this._cmdName, newElem, oldElem)); }\r\n\r\n  /** determine whether there are any un-reversed operations */\r\n  public get undoPossible() { return this._currentPos > 0; }\r\n  /** determine whether there are any reversed operations */\r\n  public get redoPossible() { return this._currentPos < this.size; }\r\n  /** the name of the operation that can be undone (or undefined) */\r\n  public get undoString() { return this.undoPossible ? this._stack[this._currentPos - 1].cmdName : undefined; }\r\n  /** the name of the operation that can be redone (or undefined) */\r\n  public get redoString() { return this.redoPossible ? this._stack[this._currentPos].cmdName : undefined; }\r\n\r\n  /** reverse the most recent operation, if any */\r\n  public doUndo() {\r\n    if (this._currentPos === 0)\r\n      return; // no operations have been performed\r\n\r\n    const cmdId = this._stack[this._currentPos - 1].cmdId;\r\n    while (this._currentPos > 0 && cmdId === this._stack[this._currentPos - 1].cmdId)\r\n      this._stack[--this._currentPos].reverse();\r\n  }\r\n  /** reinstate the most recently reversed operation, if any */\r\n  public doRedo() {\r\n    if (this._currentPos === this.size)\r\n      return; // no operations have been reversed.\r\n\r\n    const cmdId = this._stack[this._currentPos].cmdId;\r\n    while (this._currentPos < this.size && cmdId === this._stack[this._currentPos].cmdId)\r\n      this._stack[this._currentPos++].reinstate();\r\n  }\r\n}\r\n"]}
+{"version":3,"file":"Undo.js","sourceRoot":"","sources":["../../src/Undo.ts"],"names":[],"mappings":"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","sourcesContent":["/*---------------------------------------------------------------------------------------------\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n* See LICENSE.md in the project root for license terms and full copyright notice.\n*--------------------------------------------------------------------------------------------*/\n/** @packageDocumentation\n * @module MarkupTools\n */\n\nimport { assert } from \"@itwin/core-bentley\";\nimport { Element as MarkupElement } from \"@svgdotjs/svg.js\";\nimport { MarkupApp } from \"./Markup\";\n\n/* @internal */\nabstract class UndoAction {\n  public cmdId: number = 0;\n  public abstract reverse(): void;\n  public abstract reinstate(): void;\n  constructor(public cmdName: string) { }\n}\n\n/** created when a new element is added to the markup\n * @internal\n */\nclass AddAction extends UndoAction {\n  private _parent: MarkupElement;\n  private _index: number;\n  constructor(cmdName: string, private _elem: MarkupElement) {\n    super(cmdName);\n    this._parent = _elem.parent() as MarkupElement;\n    assert(this._parent !== undefined);\n    this._index = _elem.position();\n  }\n  public reinstate() { this._parent.add(this._elem, this._index); }\n  public reverse() {\n    MarkupApp.markup!.selected.drop(this._elem);\n    this._elem.remove();\n  }\n}\n\n/** created when an existing element is deleted from the markup\n * @internal\n */\nclass DeleteAction extends UndoAction {\n  private _parent: MarkupElement;\n  private _index: number;\n  constructor(cmdName: string, private _elem: MarkupElement) {\n    super(cmdName);\n    this._parent = _elem.parent() as MarkupElement;\n    assert(this._parent !== undefined);\n    this._index = _elem.position();\n  }\n  public reverse() { this._parent.add(this._elem, this._index); }\n  public reinstate() {\n    MarkupApp.markup!.selected.drop(this._elem);\n    this._elem.remove();\n  }\n}\n\n/** created when an existing element's position is moved in the display order. This can also include re-parenting\n * @internal\n */\nclass RepositionAction extends UndoAction {\n  private _newParent: MarkupElement;\n  private _newIndex: number;\n\n  constructor(cmdName: string, private _elem: MarkupElement, private _oldIndex: number, private _oldParent: MarkupElement) {\n    super(cmdName);\n    this._newParent = _elem.parent() as MarkupElement;\n    assert(this._newParent !== undefined);\n    this._newIndex = _elem.position();\n  }\n  public reinstate() {\n    this._newParent.add(this._elem, this._newIndex);\n  }\n\n  public reverse() {\n    this._oldParent.add(this._elem, this._oldIndex);\n    if (this._elem.inSelection)\n      MarkupApp.markup!.selected.drop(this._elem);\n  }\n}\n\n/** created when an existing element's properties are modified.\n * @internal\n */\nclass ModifyAction extends UndoAction {\n  constructor(cmdName: string, private _newElem: MarkupElement, private _oldElement: MarkupElement) {\n    super(cmdName);\n    assert(_newElem !== undefined && _oldElement !== undefined);\n    MarkupApp.markup!.selected.replace(_oldElement, _newElem);\n  }\n  public reinstate() {\n    this._oldElement.replace(this._newElem);\n    MarkupApp.markup!.selected.replace(this._oldElement, this._newElem);\n  }\n\n  public reverse() {\n    this._newElem.replace(this._oldElement);\n    MarkupApp.markup!.selected.replace(this._newElem, this._oldElement);\n  }\n}\n\n/** Stores the sequence of operations performed on a Markup. Facilitates undo/redo of the operations.\n * @public\n */\nexport class UndoManager {\n  private _currentCmd = 0;\n  private _grouped = 0;\n  private _stack: UndoAction[] = [];\n  private _currentPos = 0;\n  private _cmdName = \"\";\n\n  private addAction(action: UndoAction) {\n    this._stack.length = this._currentPos;\n    action.cmdId = this._currentCmd;\n    this._stack.push(action);\n    this._currentPos = this.size;\n  }\n\n  /** @internal */\n  public get size() { return this._stack.length; }\n  private startCommand() {\n    if (0 === this._grouped)\n      ++this._currentCmd;\n  }\n\n  private startGroup() {\n    this.startCommand();\n    ++this._grouped;\n  }\n\n  private endGroup() { --this._grouped; }\n\n  /** Perform a series of changes to markup elements that should all be reversed as a single operation.\n   * @param fn the function that performs the changes to the elements. It must call the onXXX methods of this class to store\n   * the operations in the undo buffer.\n   * @note all of the onXXX methods of this class should *only* be called from within the callback function of this method.\n   */\n  public performOperation(cmdName: string, fn: VoidFunction) {\n    this._cmdName = cmdName;\n    this.startGroup();\n    fn();\n    this.endGroup();\n  }\n\n  /** call this from within a [[performOperation]] function *after* an element has been added to a markup */\n  public onAdded(elem: MarkupElement) { this.addAction(new AddAction(this._cmdName, elem)); }\n  /** call this from within a [[performOperation]] function *before* an element is about to be deleted from a markup */\n  public onDelete(elem: MarkupElement) { this.addAction(new DeleteAction(this._cmdName, elem)); }\n  /** call this from within a [[performOperation]] function *after* an element has been moved in display order in a markup */\n  public onRepositioned(elem: MarkupElement, oldIndex: number, oldParent: MarkupElement) { this.addAction(new RepositionAction(this._cmdName, elem, oldIndex, oldParent)); }\n  /** call this from within a [[performOperation]] function *after* an element has been modified in a markup */\n  public onModified(newElem: MarkupElement, oldElem: MarkupElement) { this.addAction(new ModifyAction(this._cmdName, newElem, oldElem)); }\n\n  /** determine whether there are any un-reversed operations */\n  public get undoPossible() { return this._currentPos > 0; }\n  /** determine whether there are any reversed operations */\n  public get redoPossible() { return this._currentPos < this.size; }\n  /** the name of the operation that can be undone (or undefined) */\n  public get undoString() { return this.undoPossible ? this._stack[this._currentPos - 1].cmdName : undefined; }\n  /** the name of the operation that can be redone (or undefined) */\n  public get redoString() { return this.redoPossible ? this._stack[this._currentPos].cmdName : undefined; }\n\n  /** reverse the most recent operation, if any */\n  public doUndo() {\n    if (this._currentPos === 0)\n      return; // no operations have been performed\n\n    const cmdId = this._stack[this._currentPos - 1].cmdId;\n    while (this._currentPos > 0 && cmdId === this._stack[this._currentPos - 1].cmdId)\n      this._stack[--this._currentPos].reverse();\n  }\n  /** reinstate the most recently reversed operation, if any */\n  public doRedo() {\n    if (this._currentPos === this.size)\n      return; // no operations have been reversed.\n\n    const cmdId = this._stack[this._currentPos].cmdId;\n    while (this._currentPos < this.size && cmdId === this._stack[this._currentPos].cmdId)\n      this._stack[this._currentPos++].reinstate();\n  }\n}\n"]}

package/lib/cjs/core-markup.js.map

@@ -1 +1 @@
-{"version":3,"file":"core-markup.js","sourceRoot":"","sources":["../../src/core-markup.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA;;;+FAG+F;AAC/F,2CAAyB;AACzB,+CAA6B;AAC7B,gDAA8B;AAC9B,+CAA6B;AAC7B,6CAA2B;AAC3B,yCAAuB;AACvB,6CAA2B;AAE3B;;GAEG;AACH;;;GAGG;AACH;;;GAGG","sourcesContent":["/*---------------------------------------------------------------------------------------------\r\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\r\n* See LICENSE.md in the project root for license terms and full copyright notice.\r\n*--------------------------------------------------------------------------------------------*/\r\nexport * from \"./Markup\";\r\nexport * from \"./MarkupTool\";\r\nexport * from \"./RedlineTool\";\r\nexport * from \"./SelectTool\";\r\nexport * from \"./TextEdit\";\r\nexport * from \"./Undo\";\r\nexport * from \"./SvgJsExt\";\r\n\r\n/** @docs-package-description\r\n * The core-markup package supplies tools for creating, editing, and saving SVG-based markups of Viewports.\r\n */\r\n/**\r\n * @docs-group-description MarkupApp\r\n * Classes for configuring and administering the markup system.\r\n */\r\n/**\r\n * @docs-group-description MarkupTools\r\n * Classes for supplying interactive tools for creating and editing markup elements.\r\n */\r\n"]}
+{"version":3,"file":"core-markup.js","sourceRoot":"","sources":["../../src/core-markup.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA;;;+FAG+F;AAC/F,2CAAyB;AACzB,+CAA6B;AAC7B,gDAA8B;AAC9B,+CAA6B;AAC7B,6CAA2B;AAC3B,yCAAuB;AACvB,6CAA2B;AAE3B;;GAEG;AACH;;;GAGG;AACH;;;GAGG","sourcesContent":["/*---------------------------------------------------------------------------------------------\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n* See LICENSE.md in the project root for license terms and full copyright notice.\n*--------------------------------------------------------------------------------------------*/\nexport * from \"./Markup\";\nexport * from \"./MarkupTool\";\nexport * from \"./RedlineTool\";\nexport * from \"./SelectTool\";\nexport * from \"./TextEdit\";\nexport * from \"./Undo\";\nexport * from \"./SvgJsExt\";\n\n/** @docs-package-description\n * The core-markup package supplies tools for creating, editing, and saving SVG-based markups of Viewports.\n */\n/**\n * @docs-group-description MarkupApp\n * Classes for configuring and administering the markup system.\n */\n/**\n * @docs-group-description MarkupTools\n * Classes for supplying interactive tools for creating and editing markup elements.\n */\n"]}

package/lib/esm/Markup.js

@@ -22,6 +22,117 @@ import { UndoManager } from "./Undo";
  * @public
  */
 export class MarkupApp {
+    /** the current Markup being created */
+    static markup;
+    /** The namespace for the Markup tools */
+    static namespace;
+    /** By setting members of this object, applications can control the appearance and behavior of various parts of MarkupApp. */
+    static props = {
+        /** the UI controls displayed on Elements by the Select Tool to allow users to modify them. */
+        handles: {
+            /** The diameter of the circles for the handles. */
+            size: 10,
+            /** The attributes of the stretch handles */
+            stretch: { "fill-opacity": .85, "stroke": "black", "fill": "white" },
+            /** The attributes of the line that connects the top-center stretch handle to the rotate handle. */
+            rotateLine: { "stroke": "grey", "fill-opacity": .85 },
+            /** The attributes of the rotate handle. */
+            rotate: { "cursor": `url(${IModelApp.publicPath}Markup/rotate.png) 12 12, auto`, "fill-opacity": .85, "stroke": "black", "fill": "lightBlue" },
+            /** The attributes of box around the element. */
+            moveOutline: { "cursor": "move", "stroke-dasharray": "6,6", "fill": "none", "stroke-opacity": .85, "stroke": "white" },
+            /** The attributes of box that provides the move cursor. */
+            move: { "cursor": "move", "opacity": 0, "stroke-width": 10, "stroke": "white" },
+            /** The attributes of handles on the vertices of lines. */
+            vertex: { "cursor": `url(${IModelApp.publicPath}cursors/crosshair.cur), crosshair`, "fill-opacity": .85, "stroke": "black", "fill": "white" },
+        },
+        /** properties for providing feedback about selected elements. */
+        hilite: {
+            /** the color of selected elements */
+            color: "magenta",
+            /** the color of an element as the cursor passes over it */
+            flash: "cyan",
+        },
+        /** optionally, show a drop-shadow behind all markup elements. */
+        dropShadow: {
+            /** if false, no drop shadow */
+            enable: true,
+            /** the attributes of the drop shadow. See https://developer.mozilla.org/en-US/docs/Web/SVG/Element/feDropShadow */
+            attr: {
+                "stdDeviation": 2,
+                "dx": 1.2,
+                "dy": 1.4,
+                "flood-color": "#1B3838",
+            },
+        },
+        /** The "active placement" parameters. New elements are created with these parameters, so UI controls should set them. */
+        active: {
+            /** the CSS style properties of new text elements. */
+            text: {
+                "font-family": "sans-serif",
+                "font-size": "30px",
+                "stroke": "none",
+                "fill": "red",
+            },
+            /** the CSS style properties of new elements. */
+            element: {
+                "stroke": "red",
+                "stroke-opacity": 0.8,
+                "stroke-width": 3,
+                "stroke-dasharray": 0,
+                "stroke-linecap": "round",
+                "stroke-linejoin": "round",
+                "fill": "blue",
+                "fill-opacity": 0.2,
+            },
+            arrow: {
+                length: 7,
+                width: 6,
+            },
+            cloud: {
+                path: "M3.0,2.5 C3.9,.78 5.6,-.4 8.1,1.0 C9.1,0 11.3,-.2 12.5,.5 C14.2,-.5 17,.16 17.9,2.5 C21,3 20.2,7.3 17.6,7.5 C16.5,9.2 14.4,9.8 12.7,8.9 C11.6,10 9.5,10.3 8.1,9.4 C5.7,10.8 3.3,9.4 2.6,7.5 C-.9,7.7 .6,1.7 3.0,2.5z",
+            },
+        },
+        /** Values for placing and editing Text. */
+        text: {
+            /** A default string for the Markup.Text.Place command. Applications can turn this off, or supply the user's initials, for example. */
+            startValue: "Note: ",
+            /** Parameters for the size and appearance of the text editor */
+            edit: {
+                background: "blanchedalmond",
+                /** Starting size, will be updated if user stretches the box */
+                size: { width: "25%", height: "4em" },
+                /** font size of the text editor */
+                fontSize: "14pt",
+                /** A background box drawn around text so user can tell what's being selected */
+                textBox: { "fill": "lightGrey", "fill-opacity": .1, "stroke-opacity": .85, "stroke": "lightBlue" },
+            },
+        },
+        /** Used to draw the border outline around the view while it is being marked up so the user can tell Markup is active */
+        borderOutline: {
+            "stroke": "gold",
+            "stroke-width": 6,
+            "stroke-opacity": 0.4,
+            "fill": "none",
+        },
+        /** Used to draw the border corner symbols for the view while it is being marked up so the user can tell Markup is active */
+        borderCorners: {
+            "stroke": "black",
+            "stroke-width": 2,
+            "stroke-opacity": 0.2,
+            "fill": "gold",
+            "fill-opacity": 0.2,
+        },
+        /** Determines what is returned by MarkupApp.stop */
+        result: {
+            /** The format for the image data. */
+            imageFormat: "image/png",
+            /** If true, the markup graphics will be imprinted in the returned image. */
+            imprintSvgOnImage: true,
+            /** the maximum width for the returned image. If the source view width is larger than this, it will be scaled down to this size. */
+            maxWidth: 2048,
+        },
+    };
+    static _saveDefaultToolId = "";
     /** @internal */
     static screenToVbMtx() {
         const matrix = this.markup?.svgMarkup?.screenCTM().inverse();
@@ -42,6 +153,7 @@ export class MarkupApp {
     }
     /** determine whether there's a markup session currently active */
     static get isActive() { return undefined !== this.markup; }
+    static markupSelectToolId = "Markup.Select";
     static createMarkup(view, markupData) { return new Markup(view, markupData); }
     static lockViewportSize(view, markupData) {
         const parentDiv = view.vpDiv;
@@ -149,7 +261,7 @@ export class MarkupApp {
     /** @internal */
     static async readMarkup() {
         const result = this.props.result;
-        let canvas = this.markup.vp.readImageToCanvas();
+        let canvas = this.markup.vp.readImageToCanvas({ omitCanvasDecorations: false });
         let svg, image;
         try {
             svg = this.readMarkupSvg(); // read the current svg data for the markup
@@ -176,6 +288,8 @@ export class MarkupApp {
         return { rect: { width: canvas.width, height: canvas.height }, svg, image };
     }
     /** @internal */
+    static markupPrefix = "markup-";
+    /** @internal */
     static get dropShadowId() { return `${this.markupPrefix}dropShadow`; } // this is referenced in the markup Svg to apply the drop-shadow filter to all markup elements.
     /** @internal */
     static get cornerId() { return `${this.markupPrefix}photoCorner`; }
@@ -206,116 +320,6 @@ export class MarkupApp {
     /** @internal */
     static get textEditorClass() { return `${this.markupPrefix}textEditor`; }
 }
-/** By setting members of this object, applications can control the appearance and behavior of various parts of MarkupApp. */
-MarkupApp.props = {
-    /** the UI controls displayed on Elements by the Select Tool to allow users to modify them. */
-    handles: {
-        /** The diameter of the circles for the handles. */
-        size: 10,
-        /** The attributes of the stretch handles */
-        stretch: { "fill-opacity": .85, "stroke": "black", "fill": "white" },
-        /** The attributes of the line that connects the top-center stretch handle to the rotate handle. */
-        rotateLine: { "stroke": "grey", "fill-opacity": .85 },
-        /** The attributes of the rotate handle. */
-        rotate: { "cursor": `url(${IModelApp.publicPath}Markup/rotate.png) 12 12, auto`, "fill-opacity": .85, "stroke": "black", "fill": "lightBlue" },
-        /** The attributes of box around the element. */
-        moveOutline: { "cursor": "move", "stroke-dasharray": "6,6", "fill": "none", "stroke-opacity": .85, "stroke": "white" },
-        /** The attributes of box that provides the move cursor. */
-        move: { "cursor": "move", "opacity": 0, "stroke-width": 10, "stroke": "white" },
-        /** The attributes of handles on the vertices of lines. */
-        vertex: { "cursor": `url(${IModelApp.publicPath}cursors/crosshair.cur), crosshair`, "fill-opacity": .85, "stroke": "black", "fill": "white" },
-    },
-    /** properties for providing feedback about selected elements. */
-    hilite: {
-        /** the color of selected elements */
-        color: "magenta",
-        /** the color of an element as the cursor passes over it */
-        flash: "cyan",
-    },
-    /** optionally, show a drop-shadow behind all markup elements. */
-    dropShadow: {
-        /** if false, no drop shadow */
-        enable: true,
-        /** the attributes of the drop shadow. See https://developer.mozilla.org/en-US/docs/Web/SVG/Element/feDropShadow */
-        attr: {
-            "stdDeviation": 2,
-            "dx": 1.2,
-            "dy": 1.4,
-            "flood-color": "#1B3838",
-        },
-    },
-    /** The "active placement" parameters. New elements are created with these parameters, so UI controls should set them. */
-    active: {
-        /** the CSS style properties of new text elements. */
-        text: {
-            "font-family": "sans-serif",
-            "font-size": "30px",
-            "stroke": "none",
-            "fill": "red",
-        },
-        /** the CSS style properties of new elements. */
-        element: {
-            "stroke": "red",
-            "stroke-opacity": 0.8,
-            "stroke-width": 3,
-            "stroke-dasharray": 0,
-            "stroke-linecap": "round",
-            "stroke-linejoin": "round",
-            "fill": "blue",
-            "fill-opacity": 0.2,
-        },
-        arrow: {
-            length: 7,
-            width: 6,
-        },
-        cloud: {
-            path: "M3.0,2.5 C3.9,.78 5.6,-.4 8.1,1.0 C9.1,0 11.3,-.2 12.5,.5 C14.2,-.5 17,.16 17.9,2.5 C21,3 20.2,7.3 17.6,7.5 C16.5,9.2 14.4,9.8 12.7,8.9 C11.6,10 9.5,10.3 8.1,9.4 C5.7,10.8 3.3,9.4 2.6,7.5 C-.9,7.7 .6,1.7 3.0,2.5z",
-        },
-    },
-    /** Values for placing and editing Text. */
-    text: {
-        /** A default string for the Markup.Text.Place command. Applications can turn this off, or supply the user's initials, for example. */
-        startValue: "Note: ",
-        /** Parameters for the size and appearance of the text editor */
-        edit: {
-            background: "blanchedalmond",
-            /** Starting size, will be updated if user stretches the box */
-            size: { width: "25%", height: "4em" },
-            /** font size of the text editor */
-            fontSize: "14pt",
-            /** A background box drawn around text so user can tell what's being selected */
-            textBox: { "fill": "lightGrey", "fill-opacity": .1, "stroke-opacity": .85, "stroke": "lightBlue" },
-        },
-    },
-    /** Used to draw the border outline around the view while it is being marked up so the user can tell Markup is active */
-    borderOutline: {
-        "stroke": "gold",
-        "stroke-width": 6,
-        "stroke-opacity": 0.4,
-        "fill": "none",
-    },
-    /** Used to draw the border corner symbols for the view while it is being marked up so the user can tell Markup is active */
-    borderCorners: {
-        "stroke": "black",
-        "stroke-width": 2,
-        "stroke-opacity": 0.2,
-        "fill": "gold",
-        "fill-opacity": 0.2,
-    },
-    /** Determines what is returned by MarkupApp.stop */
-    result: {
-        /** The format for the image data. */
-        imageFormat: "image/png",
-        /** If true, the markup graphics will be imprinted in the returned image. */
-        imprintSvgOnImage: true,
-        /** the maximum width for the returned image. If the source view width is larger than this, it will be scaled down to this size. */
-        maxWidth: 2048,
-    },
-};
-MarkupApp._saveDefaultToolId = "";
-MarkupApp.markupSelectToolId = "Markup.Select";
-/** @internal */
-MarkupApp.markupPrefix = "markup-";
 const removeSvgNamespace = (svg) => {
     svg.node.removeAttribute("xmlns:svgjs");
     return svg;
@@ -327,6 +331,21 @@ const newSvgElement = (name) => adopt(create(name));
  * @public
  */
 export class Markup {
+    vp;
+    /** @internal */
+    markupDiv;
+    /** Support undo/redo of markup operations */
+    undo = new UndoManager();
+    /** The set of currently selected markup elements */
+    selected;
+    /** @internal */
+    svgContainer;
+    /** @internal */
+    svgMarkup;
+    /** @internal */
+    svgDynamics;
+    /** @internal */
+    svgDecorations;
     /** create the drop-shadow filter in the Defs section of the supplied svg element */
     createDropShadow(svg) {
         const filter = SVG(`#${MarkupApp.dropShadowId}`); // see if we already have one?
@@ -358,8 +377,6 @@ export class Markup {
      */
     constructor(vp, markupData) {
         this.vp = vp;
-        /** Support undo/redo of markup operations */
-        this.undo = new UndoManager();
         this.markupDiv = vp.addNewDiv("overlay-markup", true, 20); // this div goes on top of the canvas, but behind UI layers
         const rect = this.markupDiv.getBoundingClientRect();
         // First, see if there is a markup passed in as an argument