@operato/board 1.4.72 → 1.4.74

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@operato/board",
-  "version": "1.4.72",
+  "version": "1.4.74",
   "description": "Webcomponent for board following open-wc recommendations",
   "author": "heartyoh",
   "main": "dist/src/index.js",
@@ -148,5 +148,5 @@
       "prettier --write"
     ]
   },
-  "gitHead": "ee307b4f77ec06edeb64bba9bb31e5e7ef14f81b"
+  "gitHead": "efb08a7edf07c1a1a2a87135436168f1c9065cc0"
 }

package/src/modeller/edit-toolbar-style.ts

@@ -171,6 +171,10 @@ export const style = css`
     background-position-y: -1142px;
   }
 
+  #databind-copy {
+    background-position-y: -692px;
+  }
+
   #context-menu {
     background-position-y: -692px;
   }

package/src/modeller/edit-toolbar.ts

@@ -280,10 +280,10 @@ export class EditToolbar extends LitElement {
         if (ctrlKey && !shiftKey) this.onTapRedo()
         break
       case 'Digit1':
-        if (altKey) this.onStartStylePasteMode()
+        if (ctrlKey) this.onStartStylePasteMode()
         break
       case 'Digit2':
-        if (altKey) this.onStartDatabindPasteMode()
+        if (ctrlKey) this.onStartDatabindPasteMode()
         break
       case 'KeyC':
         if (ctrlKey && !shiftKey) this.onTapCopy()

package/src/modeller/scene-viewer/ox-scene-viewer.ts

@@ -234,12 +234,22 @@ export default class OxSceneViewer extends LitElement {
       this._setMode(after)
     }
 
-    if (after === 2) {
-      this.style.cursor = 'all-scroll'
-    } else if (after === 3) {
-      this.style.cursor = 'crosshair'
-    } else {
-      this.style.cursor = 'default'
+    switch (after) {
+      case 1:
+        this.style.cursor = 'default'
+        break
+      case 2:
+        this.style.cursor = 'all-scroll'
+        break
+      case 3:
+        this.style.cursor = 'crosshair'
+        break
+      case 4:
+        this.style.cursor = 'copy'
+        break
+      case 5:
+        this.style.cursor = 'context-menu'
+        break
     }
   }
 

package/src/ox-board-modeller.ts

@@ -299,6 +299,11 @@ export class BoardModeller extends ScopedElementsMixin(LitElement) {
   }
 
   disconnectedCallback(): void {
+    if (this.scene) {
+      this.scene.stopStylePasteMode()
+      this.scene.stopDatabindPasteMode()
+    }
+
     super.disconnectedCallback()
     this.unbindShortcutEvent()
   }
@@ -306,28 +311,9 @@ export class BoardModeller extends ScopedElementsMixin(LitElement) {
   updated(changes: PropertyValues<this>) {
     if (changes.has('scene')) {
       const old = changes.get('scene')
-
       if (old) {
-        old.off('stylepastestart')
-        old.off('stylepastestop')
-        old.off('databindpastestart')
-        old.off('databindpastestop')
-      }
-
-      const scene = this.scene
-      if (scene) {
-        this.scene?.on('stylepastestart', () => {
-          this.viewer.style.cursor = 'cell'
-        })
-        this.scene?.on('stylepastestop', () => {
-          this.viewer.style.cursor = 'default'
-        })
-        this.scene?.on('databindpastestart', () => {
-          this.viewer.style.cursor = 'context-menu'
-        })
-        this.scene?.on('databindpastestop', () => {
-          this.viewer.style.cursor = 'default'
-        })
+        old.stopStylePasteMode()
+        old.stopDatabindPasteMode()
       }
     }
   }