wunderbaum 0.0.1 → 0.0.4

package/src/wb_ext_filter.ts

@@ -9,7 +9,6 @@ import {
   escapeHtml,
   escapeRegex,
   extend,
-  extractHtmlText,
   onEvent,
 } from "./util";
 import { NodeFilterCallback, NodeStatusType } from "./common";
@@ -79,7 +78,7 @@ export class FilterExtension extends WunderbaumExtension {
       count = 0,
       tree = this.tree,
       treeOpts = tree.options,
-      escapeTitles = treeOpts.escapeTitles,
+      // escapeTitles = treeOpts.escapeTitles,
       prevAutoCollapse = treeOpts.autoCollapse,
       opts = extend({}, treeOpts.filter, _opts),
       hideMode = opts.mode === "hide",
@@ -118,35 +117,36 @@ export class FilterExtension extends WunderbaumExtension {
         if (!node.title) {
           return false;
         }
-        let text = escapeTitles ? node.title : extractHtmlText(node.title);
+        // let text = escapeTitles ? node.title : extractHtmlText(node.title);
+        let text = node.title;
         // `.match` instead of `.test` to get the capture groups
         let res = text.match(re);
 
         if (res && opts.highlight) {
-          if (escapeTitles) {
-            if (opts.fuzzy) {
-              temp = _markFuzzyMatchedChars(text, res, escapeTitles);
-            } else {
-              // #740: we must not apply the marks to escaped entity names, e.g. `"`
-              // Use some exotic characters to mark matches:
-              temp = text.replace(reHighlight, function (s) {
-                return START_MARKER + s + END_MARKER;
-              });
-            }
-            // now we can escape the title...
-            node.titleWithHighlight = escapeHtml(temp)
-              // ... and finally insert the desired `<mark>` tags
-              .replace(RE_START_MARKER, "<mark>")
-              .replace(RE_END_MARTKER, "</mark>");
+          // if (escapeTitles) {
+          if (opts.fuzzy) {
+            temp = _markFuzzyMatchedChars(text, res, true);
           } else {
-            if (opts.fuzzy) {
-              node.titleWithHighlight = _markFuzzyMatchedChars(text, res);
-            } else {
-              node.titleWithHighlight = text.replace(reHighlight, function (s) {
-                return "<mark>" + s + "</mark>";
-              });
-            }
+            // #740: we must not apply the marks to escaped entity names, e.g. `&quot;`
+            // Use some exotic characters to mark matches:
+            temp = text.replace(reHighlight, function (s) {
+              return START_MARKER + s + END_MARKER;
+            });
           }
+          // now we can escape the title...
+          node.titleWithHighlight = escapeHtml(temp)
+            // ... and finally insert the desired `<mark>` tags
+            .replace(RE_START_MARKER, "<mark>")
+            .replace(RE_END_MARTKER, "</mark>");
+          // } else {
+          //   if (opts.fuzzy) {
+          //     node.titleWithHighlight = _markFuzzyMatchedChars(text, res);
+          //   } else {
+          //     node.titleWithHighlight = text.replace(reHighlight, function (s) {
+          //       return "<mark>" + s + "</mark>";
+          //     });
+          //   }
+          // }
           // node.debug("filter", escapeTitles, text, node.titleWithHighlight);
         }
         return !!res;
@@ -266,9 +266,9 @@ export class FilterExtension extends WunderbaumExtension {
    * [ext-filter] Reset the filter.
    */
   clearFilter() {
-    let tree = this.tree,
-      // statusNode = tree.root.findDirectChild(KEY_NODATA),
-      escapeTitles = tree.options.escapeTitles;
+    let tree = this.tree;
+    // statusNode = tree.root.findDirectChild(KEY_NODATA),
+    // escapeTitles = tree.options.escapeTitles;
     // enhanceTitle = tree.options.enhanceTitle,
     tree.enableUpdate(false);
 
@@ -284,11 +284,11 @@ export class FilterExtension extends WunderbaumExtension {
       if (node.match && node._rowElem) {
         // #491, #601
         let titleElem = node._rowElem.querySelector("span.wb-title")!;
-        if (escapeTitles) {
-          titleElem.textContent = node.title;
-        } else {
-          titleElem.innerHTML = node.title;
-        }
+        // if (escapeTitles) {
+        titleElem.textContent = node.title;
+        // } else {
+        //   titleElem.innerHTML = node.title;
+        // }
         node._callEvent("enhanceTitle", { titleElem: titleElem });
       }
       delete node.match;
@@ -330,7 +330,7 @@ export class FilterExtension extends WunderbaumExtension {
 function _markFuzzyMatchedChars(
   text: string,
   matches: RegExpMatchArray,
-  escapeTitles = false
+  escapeTitles = true
 ) {
   let matchingIndices = [];
   // get the indices of matched characters (Iterate through `RegExpMatchArray`)
@@ -350,7 +350,7 @@ function _markFuzzyMatchedChars(
   // Map each `text` char to its position and store in `textPoses`.
   let textPoses = text.split("");
   if (escapeTitles) {
-    // If escaping the title, then wrap the matchng char within exotic chars
+    // If escaping the title, then wrap the matching char within exotic chars
     matchingIndices.forEach(function (v) {
       textPoses[v] = START_MARKER + textPoses[v] + END_MARKER;
     });

package/src/wb_ext_grid.ts

@@ -0,0 +1,45 @@
+/*!
+ * Wunderbaum - ext-grid
+ * Copyright (c) 2021-2022, Martin Wendt. Released under the MIT license.
+ * @VERSION, @DATE (https://github.com/mar10/wunderbaum)
+ */
+import { Wunderbaum } from "./wunderbaum";
+import { WunderbaumExtension } from "./wb_extension_base";
+import { DragCallbackArgType, DragObserver } from "./drag_observer";
+
+export class GridExtension extends WunderbaumExtension {
+  protected observer: DragObserver;
+
+  constructor(tree: Wunderbaum) {
+    super(tree, "grid", {
+      // throttle: 200,
+    });
+
+    this.observer = new DragObserver({
+      root: window.document,
+      selector: "span.wb-col-resizer",
+      thresh: 4,
+      // throttle: 400,
+      dragstart: (e) => {
+        return this.tree.element.contains(e.dragElem);
+      },
+      drag: (e) => {
+        // TODO: throttle
+        return this.handleDrag(e);
+      },
+      dragstop: (e) => {
+        return this.handleDrag(e);
+      },
+    });
+  }
+
+  init() {
+    super.init();
+  }
+
+  protected handleDrag(e: DragCallbackArgType): void {
+    const info = Wunderbaum.getEventInfo(e.event);
+    // this.tree.options.
+    this.tree.log(`${e.type}(${e.dx})`, e, info);
+  }
+}

package/src/wb_ext_keynav.ts

@@ -94,7 +94,7 @@ export class KeynavExtension extends WunderbaumExtension {
           if (!node.expanded && (node.children || node.lazy)) {
             eventName = "Add"; // expand
           } else if (navModeOption === NavigationModeOption.startRow) {
-            tree.setCellMode(NavigationMode.cellNav);
+            tree.setNavigationMode(NavigationMode.cellNav);
             return;
           }
           break;
@@ -133,6 +133,8 @@ export class KeynavExtension extends WunderbaumExtension {
         case "Home":
         case "Control+End":
         case "Control+Home":
+        case "Meta+ArrowDown":
+        case "Meta+ArrowUp":
         case "PageDown":
         case "PageUp":
           node.navigate(eventName, { activate: activate, event: event });
@@ -164,10 +166,10 @@ export class KeynavExtension extends WunderbaumExtension {
           break;
         case "Escape":
           if (tree.navMode === NavigationMode.cellEdit) {
-            tree.setCellMode(NavigationMode.cellNav);
+            tree.setNavigationMode(NavigationMode.cellNav);
             handled = true;
           } else if (tree.navMode === NavigationMode.cellNav) {
-            tree.setCellMode(NavigationMode.row);
+            tree.setNavigationMode(NavigationMode.row);
             handled = true;
           }
           break;
@@ -176,7 +178,7 @@ export class KeynavExtension extends WunderbaumExtension {
             tree.setColumn(tree.activeColIdx - 1);
             handled = true;
           } else if (navModeOption !== NavigationModeOption.cell) {
-            tree.setCellMode(NavigationMode.row);
+            tree.setNavigationMode(NavigationMode.row);
             handled = true;
           }
           break;
@@ -193,6 +195,8 @@ export class KeynavExtension extends WunderbaumExtension {
         case "Home":
         case "Control+End":
         case "Control+Home":
+        case "Meta+ArrowDown":
+        case "Meta+ArrowUp":
         case "PageDown":
         case "PageUp":
           node.navigate(eventName, { activate: activate, event: event });

package/src/wb_extension_base.ts

@@ -38,14 +38,14 @@ export abstract class WunderbaumExtension {
     this.tree.element.classList.add("wb-ext-" + this.id);
   }
 
-  // protected callEvent(name: string, extra?: any): any {
-  //   let func = this.extensionOpts[name];
+  // protected callEvent(type: string, extra?: any): any {
+  //   let func = this.extensionOpts[type];
   //   if (func) {
   //     return func.call(
   //       this.tree,
   //       util.extend(
   //         {
-  //           event: this.id + "." + name,
+  //           event: this.id + "." + type,
   //         },
   //         extra
   //       )