@operato/board 1.1.37 → 1.1.39

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@operato/board",
-  "version": "1.1.37",
+  "version": "1.1.39",
   "description": "Webcomponent for board following open-wc recommendations",
   "author": "heartyoh",
   "main": "dist/src/index.js",
@@ -110,7 +110,7 @@
   "devDependencies": {
     "@custom-elements-manifest/analyzer": "^0.4.17",
     "@hatiolab/prettier-config": "^1.0.0",
-    "@hatiolab/things-scene": "^3.0.22",
+    "@hatiolab/things-scene": "^3.2.0",
     "@material/mwc-fab": "^0.27.0",
     "@material/mwc-icon": "^0.27.0",
     "@open-wc/eslint-config": "^4.3.0",
@@ -146,5 +146,5 @@
       "prettier --write"
     ]
   },
-  "gitHead": "6f015266daddd7faec2219a0b7fbbdc935899378"
+  "gitHead": "f482cfb98b0bb24ff637196cedc2a632ecffacb2"
 }

package/src/ox-board-viewer.ts

@@ -92,17 +92,20 @@ export class BoardViewer extends LitElement {
   @property({ type: Object }) board: any = {}
   @property({ type: Object }) provider: ReferenceProvider | null = null
   @property({ type: Object }) data: any
+  @property({ type: Object }) values: any
 
   @property({ type: Boolean, reflect: true, attribute: 'hide-fullscreen' }) hideFullscreen = false
   @property({ type: Boolean, reflect: true, attribute: 'hide-navigation' }) hideNavigation = false
 
   @state() _scene: any = null
-  @state() _forward: Array<any> = []
-  @state() _backward: Array<any> = []
+  @state() _forward: { id: string; scene: any }[] = []
+  @state() _backward: { id: string; scene: any }[] = []
 
   @state() _oldtarget?: HTMLElement
   @state() _fade_animations?: Array<Animation>
 
+  public currentBoardId?: string = this.board?.id
+
   @query('#target') _target!: HTMLElement
   @query('#prev') _prev!: HTMLElement
   @query('#next') _next!: HTMLElement
@@ -201,13 +204,17 @@ export class BoardViewer extends LitElement {
     if (changes.has('data') && this._scene && this.data) {
       this._scene.data = this.data
     }
+
+    if (changes.has('values') && this._scene && this.values) {
+      this._scene.values = this.values
+    }
   }
 
   async initSceneAsync() {
     if (!this.board || !this.board.id) return
 
     this._scene = await this.provider!.get(this.board.id, true)
-    this.setupScene(this._scene)
+    this.setupScene({ id: this.board.id, scene: this._scene })
   }
 
   initScene() {
@@ -229,7 +236,7 @@ export class BoardViewer extends LitElement {
 
     this.provider!.add(this.board.id, this._scene)
 
-    this.setupScene(this._scene)
+    this.setupScene({ id: this.board.id, scene: this._scene })
   }
 
   closeScene() {
@@ -243,10 +250,10 @@ export class BoardViewer extends LitElement {
     }
 
     // delete queued scenes
-    this._forward.forEach(scene => scene.release && scene.release())
+    this._forward.forEach(({ scene }) => scene.release && scene.release())
     this._forward = []
 
-    this._backward.forEach(scene => scene.release && scene.release())
+    this._backward.forEach(({ scene }) => scene.release && scene.release())
     this._backward = []
   }
 
@@ -255,7 +262,7 @@ export class BoardViewer extends LitElement {
     this.transientShowButtons()
   }
 
-  setupScene(scene: any) {
+  setupScene({ id, scene }: { id: string; scene: any }) {
     this._scene = scene
 
     const backgroundColor = this._scene?.root.state.fillStyle
@@ -274,6 +281,7 @@ export class BoardViewer extends LitElement {
     if (this.data) {
       this._scene.data = this.data
     }
+    this.currentBoardId = id
 
     this.bindSceneEvents()
 
@@ -296,17 +304,17 @@ export class BoardViewer extends LitElement {
         this.unbindSceneEvents(this._scene)
         /* 원래의 target에 되돌린다. */
         this._scene.target = this._oldtarget
-        this._backward.push(this._scene)
+        this._backward.push({ id: this.currentBoardId!, scene: this._scene })
       }
 
       this._scene = scene
 
-      this._forward.forEach(scene => scene.release && scene.release())
+      this._forward.forEach(({ scene }) => scene.release && scene.release())
 
       /* forward를 비운다. */
       this._forward = []
 
-      this.setupScene(scene)
+      this.setupScene({ id: boardId, scene })
 
       if (bindingData) {
         scene.data = bindingData
@@ -317,6 +325,7 @@ export class BoardViewer extends LitElement {
   }
 
   bindSceneEvents() {
+    this._scene.on('run', this.onRunBoard, this)
     this._scene.on('goto', this.onLinkGoto, this)
     this._scene.on('link-open', this.onLinkOpen, this)
     this._scene.on('link-move', this.onLinkMove, this)
@@ -326,6 +335,7 @@ export class BoardViewer extends LitElement {
   }
 
   unbindSceneEvents(scene: any) {
+    scene.off('run', this.onRunBoard, this)
     scene.off('goto', this.onLinkGoto, this)
     scene.off('link-open', this.onLinkOpen, this)
     scene.off('link-move', this.onLinkMove, this)
@@ -381,7 +391,7 @@ export class BoardViewer extends LitElement {
   /* event handlers */
 
   onTapNext() {
-    var scene = this._forward.pop()
+    var { id, scene } = this._forward.pop() || {}
     if (!scene) return
 
     if (this._scene) {
@@ -389,14 +399,14 @@ export class BoardViewer extends LitElement {
       /* 원래의 target에 되돌린다. */
       this._scene.target = this._oldtarget
       this.unbindSceneEvents(this._scene)
-      this._backward.push(this._scene)
+      this._backward.push({ id: id!, scene: this._scene })
     }
 
-    this.setupScene(scene)
+    this.setupScene({ id: id!, scene })
   }
 
   onTapPrev() {
-    var scene = this._backward.pop()
+    var { id, scene } = this._backward.pop() || {}
     if (!scene) return
 
     if (this._scene) {
@@ -404,10 +414,10 @@ export class BoardViewer extends LitElement {
       /* 원래의 target에 되돌린다. */
       this._scene.target = this._oldtarget
       this.unbindSceneEvents(this._scene)
-      this._forward.push(this._scene)
+      this._forward.push({ id: id!, scene: this._scene })
     }
 
-    this.setupScene(scene)
+    this.setupScene({ id: id!, scene })
   }
 
   onTapFullscreen() {
@@ -418,6 +428,10 @@ export class BoardViewer extends LitElement {
     )
   }
 
+  onRunBoard() {
+    this.dispatchEvent(new CustomEvent('run-board', { bubbles: true, composed: true, detail: this.board.id }))
+  }
+
   onLinkGoto(targetBoardId: string, options: any, fromComponent: any) {
     const { input, output } = options || { input: '(self)' }
     const data = input && fromComponent.root.findFirst(input, fromComponent)?.data
@@ -477,6 +491,10 @@ export class BoardViewer extends LitElement {
     return this._scene?.data
   }
 
+  getSceneValues() {
+    return this._scene?.values
+  }
+
   async getSceneImageData(base64 = false) {
     if (!this._scene) {
       return

package/src/selector/ox-board-selector.ts

@@ -194,7 +194,6 @@ export class BoardSelector extends InfiniteScrollable(localize(i18next)(LitEleme
     `
   }
 
-  //@ts-ignore
   get scrollTargetEl(): HTMLElement | null {
     return this.renderRoot.querySelector('#main') as HTMLElement
   }