ULMS-2986 Fixed stamp duplication

foxford · Jun 10, 2024 · 08e1fea · 08e1fea
1 parent 124d2a2
commit 08e1fea
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 12 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/drawing/package.json b/packages/drawing/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ulms/ui-drawing",
-  "version": "3.5.1",
+  "version": "3.5.2",
   "license": "MIT",
   "main": "index.js",
   "module": "es/index.js",

diff --git a/packages/drawing/src/cursor-provider.js b/packages/drawing/src/cursor-provider.js
@@ -14,19 +14,20 @@ class CCursorProvider {
 
   setCursor(cursorObject, adjustPoint = '-0.5 -0.5') {
     this._clearCursor()
+
     if (cursorObject) {
       cursorObject.clone((object) => {
         this.__cursor = object || null
+
         if (this.__cursor) {
           this.__adjustPoint = adjustPoint
 
           makeNotInteractive(this.__cursor)
+
           this.__cursor.set('_draft', true)
           this.__cursor.set('opacity', 0.5)
         }
       })
-    } else {
-      this.__cursor = null
     }
   }
 
@@ -64,7 +65,7 @@ class CCursorProvider {
   }
 
   show() {
-    if (this.__canvas && this.__cursor) {
+    if (this.__canvas && this.__cursor && this.__cursorOnBoard) {
       this.__canvas.add(this.__cursor)
     }
   }

diff --git a/packages/drawing/src/tools/stamp.js b/packages/drawing/src/tools/stamp.js
@@ -37,6 +37,11 @@ export class StampTool extends PositionableObject {
     this.#image = null
 
     this.#publicStorage = publicStorageProvider
+
+    this._cursorString = `url("${this.#publicStorage.getUrl(
+      this.#publicStorage.types.STAMP,
+      cursorName,
+    )}") 5 19, crosshair`
   }
 
   configure(props) {
@@ -57,13 +62,6 @@ export class StampTool extends PositionableObject {
     this._canvas.setCursor(this._cursorString)
   }
 
-  get _cursorString() {
-    return `url("${this.#publicStorage.getUrl(
-      this.#publicStorage.types.STAMP,
-      cursorName,
-    )}") 5 19, crosshair`
-  }
-
   _onLoad = (image) => {
     if (image) {
       CursorProvider.setCursor(image, '-1 0')