@operato/board 1.4.41 → 1.4.42

package/package.json

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

package/src/modeller/property-sidebar/inspector/inspector.ts

@@ -2,7 +2,9 @@ import '@operato/input/ox-input-search.js'
 
 import { css, html, LitElement, PropertyValues, TemplateResult } from 'lit'
 import { property, state } from 'lit/decorators.js'
-import Sortable from 'sortablejs'
+
+// TODO test Sortable
+// import Sortable from 'sortablejs'
 import { i18next } from '@operato/i18n'
 
 import { Component, Container, Scene } from '@hatiolab/things-scene'
@@ -122,6 +124,7 @@ export class SceneInspector extends LitElement {
 
   private _extendedMap: any
   private show: boolean = false
+  private count: number = -1
 
   disconnectScene(scene?: Scene) {
     if (scene) {
@@ -140,11 +143,13 @@ export class SceneInspector extends LitElement {
   }
 
   render() {
+    this.count = 0
+
     return html`
       <ox-input-search
         .placeholder=${i18next.t('text.search with type, id or tag')}
         autofocus
-        @change=${(e: Event) => (this.searchText = (e.target as HTMLInputElement).value)}
+        @change=${(e: Event) => (this.searchText = ((e.target as HTMLInputElement).value || '').toLowerCase())}
       ></ox-input-search>
 
       <div result>${!this.scene ? html`` : this.renderComponent(this.scene.root, 0)}</div>
@@ -191,35 +196,38 @@ export class SceneInspector extends LitElement {
       }
     }
 
-    this.updateComplete.then(() => {
-      this.renderRoot.querySelectorAll('[sortable]').forEach(sortable => {
-        new Sortable(sortable as HTMLElement, this.sortableConfig)
-      })
-    })
+    // TODO test Sortable
+    // this.updateComplete.then(() => {
+    //   this.renderRoot.querySelectorAll('[sortable]').forEach(sortable => {
+    //     new Sortable(sortable as HTMLElement, this.sortableConfig)
+    //   })
+    // })
   }
 
-  sortableConfig: Sortable.Options = {
-    group: 'inspector',
-    animation: 150,
-    draggable: '.component',
-    swapThreshold: 1,
-    onSort: this.onSort.bind(this)
-  }
+  // TODO test Sortable
+  // sortableConfig: Sortable.Options = {
+  //   group: 'inspector',
+  //   animation: 150,
+  //   draggable: '.component',
+  //   swapThreshold: 1,
+  //   onSort: this.onSort.bind(this)
+  // }
 
-  onSort(e: Sortable.SortableEvent) {
-    if (!this.scene) return
+  // TODO test Sortable
+  // onSort(e: Sortable.SortableEvent) {
+  //   if (!this.scene) return
 
-    var component = (e.item as HTMLElement & { component: Component }).component
-    var to_container = (e.to as HTMLElement & { component: Component }).component as Container
-    var to_index = e.newIndex! - 1
+  //   var component = (e.item as HTMLElement & { component: Component }).component
+  //   var to_container = (e.to as HTMLElement & { component: Component }).component as Container
+  //   var to_index = e.newIndex! - 1
 
-    this.scene.move(component, to_container, to_index)
+  //   this.scene.move(component, to_container, to_index)
 
-    this.show = false
-    this.updateComplete.then(() => {
-      this.show = true
-    })
-  }
+  //   this.show = false
+  //   this.updateComplete.then(() => {
+  //     this.show = true
+  //   })
+  // }
 
   _onclick(e: MouseEvent) {
     e.stopPropagation()
@@ -326,14 +334,24 @@ export class SceneInspector extends LitElement {
     this.requestUpdate()
   }
 
-  shouldBeShown(component: Component): boolean {
+  shouldBeShown(component: Component, counting: boolean = false): boolean {
     const { type, name, id, tag } = component.state
+    const found =
+      !this.searchText || `${type} ${name || ''} ${id || ''} ${tag || ''}`.toLowerCase().search(this.searchText) > -1
+
+    if (counting && found) {
+      this.count++
+    }
+
+    if (counting) {
+      console.log(found)
+    }
+
+    const foundChildren = ((component as Container).components || []).filter((child: Component) =>
+      this.shouldBeShown(child, counting)
+    ).length
 
-    return !!(
-      !this.searchText ||
-      `${type} ${name || ''} ${id || ''} ${tag || ''}`.search(this.searchText) > -1 ||
-      ((component as Container).components || []).find((child: Component) => this.shouldBeShown(child))
-    )
+    return !!(found || foundChildren > 0)
   }
 
   renderComponent(component: Component, depth: number): TemplateResult {
@@ -341,7 +359,7 @@ export class SceneInspector extends LitElement {
       return html``
     }
 
-    if (!this.shouldBeShown(component)) {
+    if (!this.shouldBeShown(component, depth == 0)) {
       return html``
     }
 
@@ -368,9 +386,8 @@ export class SceneInspector extends LitElement {
 
           <span class=${this.getNodeHandleClass(component)}> </span>
 
-          <span class="type">${depth == 0 ? 'ROOT' : type}</span> ${name
-            ? html` <span class="name">${name}</span> `
-            : html``}
+          <span class="type">${depth == 0 ? html`ROOT(count: ${this.count})` : type}</span>
+          ${name ? html` <span class="name">${name}</span> ` : html``}
         </span>
 
         ${extended.map(child => this.renderComponent(child, depth + 1))}