Build with items filtering

Author: linev

build/jsroot.js

@@ -79824,9 +79824,14 @@ class JSRootMenu {
      * @param {string} [kind] - use 'text' (default), 'number', 'float' or 'int'
      * @protected */
    async input(title, value, kind, min, max) {
+      let onchange = null;
+      if (isFunc(kind)) {
+         onchange = kind;
+         kind = '';
+      }
       if (!kind)
          kind = 'text';
-      const inp_type = (kind === 'int') ? 'number' : 'text';
+      const inp_type = (kind === 'int') ? 'number' : 'text', value0 = value;
       let ranges = '';
       if ((value === undefined) || (value === null))
          value = '';
@@ -79839,24 +79844,33 @@ class JSRootMenu {
 
       const main_content =
          '<form><fieldset style="padding:0; border:0">' +
-            `<input type="${inp_type}" value="${value}" ${ranges} style="width:98%;display:block" class="jsroot_dlginp"/>` +
-         '</fieldset></form>';
+         `<input type="${inp_type}" value="${value}" ${ranges} style="width:98%;display:block" class="jsroot_dlginp"/>` +
+         '</fieldset></form>', oninit = !onchange ? null : elem => {
+            const inp = elem.querySelector('.jsroot_dlginp');
+            if (inp)
+               inp.oninput = () => onchange(inp.value);
+         };
 
       return new Promise(resolveFunc => {
-         this.runModal(title, main_content, { btns: true, height: 150, width: 400 }).then(element => {
-            if (!element)
+         this.runModal(title, main_content, { btns: true, height: 150, width: 400, oninit }).then(element => {
+            if (!element) {
+               if (onchange)
+                  onchange(value0);
                return;
-            let val = element.querySelector('.jsroot_dlginp').value;
+            }
+            let val = element.querySelector('.jsroot_dlginp').value, isok = true;
             if (kind === 'float') {
                val = Number.parseFloat(val);
-               if (Number.isFinite(val))
-                  resolveFunc(val);
+               isok = Number.isFinite(val);
             } else if (kind === 'int') {
                val = parseInt(val);
-               if (Number.isInteger(val))
-                  resolveFunc(val);
-            } else
+               isok = Number.isInteger(val);
+            }
+            if (isok) {
+               if (onchange)
+                  onchange(val);
                resolveFunc(val);
+            }
          });
       });
    }
@@ -80393,6 +80407,8 @@ class StandaloneMenu extends JSRootMenu {
          f = modal.element.select('.jsroot_dialog_footer').select('button');
       if (!f.empty())
          f.node().focus();
+      if (isFunc(args.oninit))
+         args.oninit(modal.element.node());
       return modal;
    }
 
@@ -164688,6 +164704,8 @@ class HierarchyPainter extends BasePainter {
    #one_by_one;  // process drop items one by one
    #topname; // top item name
    #cached_draw_object; // cached object for first draw
+   #draw_func; // alternative draw function
+   #redraw_func; // alternative redraw function
 
    /** @summary Create painter
      * @param {string} name - symbolic name
@@ -164718,6 +164736,23 @@ class HierarchyPainter extends BasePainter {
       this.textcolor = settings.DarkMode ? '#eee' : '#111';
    }
 
+   /** @summary Set alternative draw/redraw functions
+    * @desc If only only draw function specified - it also will be used for re-drawing
+    * @protected */
+   setDrawFunc(_draw, _redraw) {
+      if (isFunc(_draw)) {
+         this.#draw_func = _draw;
+         this.#redraw_func = isFunc(_redraw) ? _redraw : _draw;
+      }
+   }
+
+   /** @summary Invoke configured draw or redraw function
+    * @protected */
+   async callDrawFunc(dom, obj, opt, doredraw) {
+      const func = doredraw ? (this.#redraw_func || redraw) : (this.#draw_func || draw);
+      return func(dom, obj, opt);
+   }
+
    /** @summary Cleanup hierarchy painter
      * @desc clear drawing and browser */
    cleanup() {
@@ -165281,6 +165316,9 @@ class HierarchyPainter extends BasePainter {
       if (!element_title)
          element_title = element_name;
 
+      if (hitem._filter)
+         element_name += ' *';
+
       d3a.attr('title', element_title)
          .text(element_name + ('_value' in hitem ? ':' : ''))
          .style('background', hitem._background ? hitem._background : null);
@@ -165300,6 +165338,8 @@ class HierarchyPainter extends BasePainter {
          for (let i = 0; i < hitem._childs.length; ++i) {
             const chld = hitem._childs[i];
             chld._parent = hitem;
+            if (hitem._filter && chld._name && chld._name.indexOf(hitem._filter) < 0)
+               continue;
             if (!this.addItemHtml(chld, d3chlds, i))
                break; // if too many items, skip rest
          }
@@ -165963,6 +166003,15 @@ class HierarchyPainter extends BasePainter {
                if (hitem._childs === undefined)
                   menu.add('Expand', () => this.expandItem(itemname), 'Expand content of object');
                else {
+                  if (sett.handle?.pm && hitem._childs.length) {
+                     menu.add('Filter...', () => menu.input('Enter items to select', hitem._filter, f => {
+                        const changed = hitem._filter !== f;
+                        hitem._filter = f;
+                        if (changed)
+                           this.updateTreeNode(hitem);
+                     }), 'Filter out items based on input pattern');
+                  }
+
                   menu.add('Unexpand', () => {
                      hitem._more = true;
                      delete hitem._childs;
@@ -166140,10 +166189,8 @@ class HierarchyPainter extends BasePainter {
             if (use_dflt_opt && !drawopt && handle?.dflt && (handle.dflt !== kExpand))
                drawopt = handle.dflt;
 
-            if (dom) {
-               const func = updating ? redraw : draw;
-               return func(dom, obj, drawopt).then(p => complete(p)).catch(err => complete(null, err));
-            }
+            if (dom)
+               return this.callDrawFunc(dom, obj, drawopt, updating).then(p => complete(p)).catch(err => complete(null, err));
 
             let did_activate = false;
             const arr = [];
@@ -166187,9 +166234,9 @@ class HierarchyPainter extends BasePainter {
             cleanup(frame);
             mdi.activateFrame(frame);
 
-            return draw(frame, obj, drawopt)
-                         .then(p => complete(p))
-                         .catch(err => complete(null, err));
+            return this.callDrawFunc(frame, obj, drawopt)
+                       .then(p => complete(p))
+                       .catch(err => complete(null, err));
          });
       });
    }
@@ -166295,7 +166342,7 @@ class HierarchyPainter extends BasePainter {
          if (isFunc(dom?.addPadButtons))
             dom.addPadButtons();
 
-         return draw(dom, res.obj, opt).then(p => drop_complete(p, mp === p));
+         return this.callDrawFunc(dom, res.obj, opt).then(p => drop_complete(p, mp === p));
       });
    }
 
@@ -167462,7 +167509,7 @@ class HierarchyPainter extends BasePainter {
       }
 
       // check that we can found frame where drawing should be done
-      if (!document.getElementById(this.disp_frameid))
+      if (!this.disp_frameid || !document.getElementById(this.disp_frameid))
          return null;
 
       if (isBatchMode())

changes.md

@@ -5,6 +5,7 @@
 1. Resort order of ranges in http request, fixing several long-standing problems #374
 1. Implement for `TPie` 3d, text, title drawing including interactivity
 1. Implement `TCanvas` support in `build3d` function #373
+1. Implements `TTree` branches filtering via context menu #364
 1. Remove support for deprectaed `TH1K` class
 1. Fix - paint frame border mode/size from TCanvas