sunrize 1.11.1 → 1.11.3

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "sunrize",
   "productName": "Sunrize X3D Editor",
-  "version": "1.11.1",
+  "version": "1.11.3",
   "description": "A Multi-Platform X3D Editor",
   "main": "src/main.js",
   "bin": {
@@ -78,19 +78,20 @@
     "url": "https://patreon.com/X_ITE"
   },
   "devDependencies": {
-    "@electron-forge/cli": "^7.9.0",
-    "@electron-forge/maker-deb": "^7.9.0",
-    "@electron-forge/maker-dmg": "^7.9.0",
-    "@electron-forge/maker-rpm": "^7.9.0",
-    "@electron-forge/maker-squirrel": "^7.9.0",
-    "@electron-forge/maker-zip": "^7.9.0",
-    "@electron-forge/publisher-github": "^7.9.0",
+    "@electron-forge/cli": "^7.10.2",
+    "@electron-forge/maker-deb": "^7.10.2",
+    "@electron-forge/maker-dmg": "^7.10.2",
+    "@electron-forge/maker-rpm": "^7.10.2",
+    "@electron-forge/maker-squirrel": "^7.10.2",
+    "@electron-forge/maker-zip": "^7.10.2",
+    "@electron-forge/publisher-github": "^7.10.2",
     "shell-tools": "^1.1.9"
   },
   "dependencies": {
+    "@vscode/codicons": "^0.0.41",
     "capitalize": "^2.0.4",
     "console": "^0.7.2",
-    "electron": "^38.2.1",
+    "electron": "^38.4.0",
     "electron-prompt": "^1.7.0",
     "electron-squirrel-startup": "^1.0.1",
     "electron-tabs": "^1.0.4",
@@ -99,17 +100,17 @@
     "jquery-ui-dist": "^1.13.3",
     "jstree": "^3.3.17",
     "material-icons": "^1.13.14",
-    "material-symbols": "^0.36.2",
+    "material-symbols": "^0.38.0",
     "md5": "^2.3.0",
     "mime-types": "^3.0.1",
-    "monaco-editor": "^0.53.0",
+    "monaco-editor": "^0.54.0",
     "node-localstorage": "^3.0.5",
     "qtip2": "^3.0.3",
     "spectrum-colorpicker2": "^2.0.10",
     "string-similarity": "^4.0.4",
     "tweakpane": "^3.1.10",
     "update-electron-app": "^3.1.1",
-    "x_ite": "^12.1.1",
-    "x3d-traverse": "^1.0.13"
+    "x_ite": "^12.1.3",
+    "x3d-traverse": "^1.0.22"
   }
 }

package/src/Application/Dashboard.js

@@ -180,10 +180,19 @@ module .exports = class Dashboard extends Interface
       for (const node of nodes)
          outlineEditor .expandTo (node, { expandObject: true, expandAll: true });
 
-      const elements = nodes .map (node => outlineEditor .sceneGraph .find (`.node[node-id=${node .getId ()}]`));
+      const elements = nodes .map (node => outlineEditor .sceneGraph
+         .find (`:is(.node, .imported-node.proxy)[node-id="${node .getId ()}"]`));
 
-      for (const [i, element] of elements .entries ())
-         outlineEditor .selectNodeElement (element, { add: i > 0 });
+      outlineEditor .deselectAll ({ target: false });
+
+      for (const element of elements)
+      {
+         if (element .is (".node"))
+            outlineEditor .selectNodeElement (element, { add: true });
+
+         else if (element .is (".imported-node.proxy"))
+            outlineEditor .selectPrimaryElement (element, { add: true });
+      }
 
       // Scroll element into view.
       // Hide scrollbars during scroll to prevent overlay issue.

package/src/Application/Document.js

@@ -185,6 +185,10 @@ module .exports = class Document extends Interface
 
       // Restore
 
+      const pkg = require ("../../package.json");
+
+      console .info (`Welcome to ${pkg .productName} v${pkg .version}.`);
+
       await this .restoreFile ();
 
       if (!this .isInitialScene)
@@ -320,8 +324,8 @@ module .exports = class Document extends Interface
 
       const activeElement = this .activeElement;
 
-      if (activeElement .is ("input"))
-         return activeElement .attr ("type") === undefined || activeElement .attr ("type") === "text";
+      if (activeElement .is ("input:not([type]), input[type=text]"))
+         return true;
 
       if (activeElement .is ("textarea"))
          return true;
@@ -452,7 +456,7 @@ Viewpoint {
          pkg       = require ("../../package.json"),
          generator = scene .getMetaData ("generator") ?.filter (value => !value .startsWith (pkg .productName)) ?? [ ];
 
-      generator .push (`${pkg .productName} V${pkg .version}, ${pkg .homepage}`);
+      generator .unshift (`${pkg .productName} V${pkg .version}, ${pkg .homepage}`);
 
       if (!scene .getMetaData ("creator") ?.some (value => value .includes (this .fullname)))
          scene .addMetaData ("creator", this .fullname);
@@ -631,7 +635,7 @@ Viewpoint {
       if (this .activeElementIsMonacoEditor ())
          return;
 
-      this .sidebar .outlineEditor .copyNodes (true);
+      this .sidebar .outlineEditor .copyNodes ();
       return false;
    }
 

package/src/Application/Hierarchy.js

@@ -36,8 +36,8 @@ module .exports = new class Hierarchy extends Interface
    }
 
    #targetTypes = new Set ([
-      X3D .X3DConstants .X3DShapeNode,
       X3D .X3DConstants .Inline,
+      X3D .X3DConstants .X3DShapeNode,
    ]);
 
    target (node)
@@ -70,10 +70,17 @@ module .exports = new class Hierarchy extends Interface
 
             const node = object .getValue () .valueOf ();
 
-            if (!node .getType () .some (type => this .#targetTypes .has (type)))
+            if (!node .getType () .some (type => this .#targetTypes .has (type)) &&
+                !(node instanceof X3D .X3DImportedNodeProxy))
+            {
                continue;
+            }
+
+            const target = node .getType () .includes (X3D .X3DConstants .X3DShapeNode)
+               ? node .getGeometry () ?.valueOf () ?? node
+               : node;
 
-            targets .push (node .getGeometry ?.() ?.valueOf () ?? node);
+            targets .push (target);
          }
 
          for (const hierarchy of this .#find (targets))

package/src/Controls/Dialog.js

@@ -47,9 +47,12 @@ module .exports = class Dialog extends Interface
    {
       // Set default config values.
 
+      defaults .minSize ??= defaults .size;
+
       this .config .file .setDefaultValues (Object .assign ({
          position: undefined,
          size: [400, 250],
+         minSize: [400, 250],
       },
       defaults));
    }
@@ -58,8 +61,8 @@ module .exports = class Dialog extends Interface
    {
       this .element .dialog ({
          position: { ... this .config .file .position, of: $("body") },
-         minWidth: this .config .file .getDefaultValue ("size") [0],
-         minHeight: this .config .file .getDefaultValue ("size") [1],
+         minWidth: this .config .file .minSize [0],
+         minHeight: this .config .file .minSize [1],
          width: this .config .file .size [0],
          height: this .config .file .size [1],
       })

package/src/Editors/Console.js

@@ -5,6 +5,7 @@ const
    $         = require ("jquery"),
    electron  = require ("electron"),
    Interface = require ("../Application/Interface"),
+   util      = require ("util"),
    _         = require ("../Application/GetText");
 
 module .exports = class Console extends Interface
@@ -31,34 +32,103 @@ module .exports = class Console extends Interface
       this .history            = [ ];
       this .addMessageCallback = this .addMessage .bind (this);
 
-      this .console   = element;
-      this .left      = $("<div></div>") .addClass ("console-left") .appendTo (this .console);
-      this .toolbar   = $("<div></div>") .addClass (["toolbar", "vertical-toolbar", "console-toolbar"]) .appendTo (this .console);
-      this .output    = $("<div></div>") .addClass (["console-output", "output"]) .attr ("tabindex", 0) .appendTo (this .left);
-      this .input     = $("<div></div>") .addClass ("console-input") .appendTo (this .left);
+      this .console = element;
+      this .left    = $("<div></div>") .addClass ("console-left") .appendTo (this .console);
+      this .toolbar = $("<div></div>") .addClass (["toolbar", "vertical-toolbar", "console-toolbar"]) .appendTo (this .console);
+
+      this .output = $("<div></div>")
+         .addClass (["console-output", "output"])
+         .attr ("tabindex", 0)
+         .on ("keydown", event => this .outputKey (event))
+         .appendTo (this .left);
+
+      this .input = $("<div></div>")
+         .addClass ("console-input")
+         .appendTo (this .left);
+
+      // Search Widget
+
+      this .search = $("<div></div>")
+         .addClass ("console-search")
+         .appendTo (this .left)
+         .hide ();
+
+      this .search .resizable({
+         handles: "w",
+         minWidth: 285,
+         resize: () => this .config .file .searchWidth = this .search .width (),
+      });
+
+      this .searchInputElements = $("<div></div>")
+         .addClass ("console-search-input-elements")
+         .appendTo (this .search);
+
+      this .searchInput = $("<input></input>")
+         .attr ("type", "text")
+         .attr ("placeholder", _("Find"))
+         .addClass ("console-search-input")
+         .on ("input", () => this .searchString ())
+         .on ("keydown", event => this .searchKey (event))
+         .appendTo (this .searchInputElements);
+
+      this .searchCaseSensitiveButton = $("<div></div>")
+         .addClass (["codicon", "codicon-case-sensitive", "console-search-case-sensitive"])
+         .on ("click", () => this .searchCaseSensitive (!this .config .file .searchCaseSensitive))
+         .appendTo (this .searchInputElements);
+
+      this .searchStatus = $("<div></div>")
+         .addClass ("console-search-status")
+         .text ("No results")
+         .appendTo (this .search);
+
+      this .searchPreviousButton = $("<div></div>")
+         .addClass (["search-previous", "codicon", "codicon-arrow-up", "disabled"])
+         .attr ("tabindex", 0)
+         .on ("click", () => this .searchPrevious ())
+         .appendTo (this .search);
+
+      this .searchNextButton = $("<div></div>")
+         .addClass (["search-next", "codicon", "codicon-arrow-down", "disabled"])
+         .attr ("tabindex", 0)
+         .on ("click", () => this .searchNext ())
+         .appendTo (this .search);
+
+      // Toolbar
+
+      this .searchButton = $("<span></span>")
+         .addClass ("material-icons")
+         .css ("transform", "scale(1.2)")
+         .attr ("title", _("Show search widget."))
+         .text ("search")
+         .on ("click", () => this .toggleSearch (!this .config .file .search))
+         .appendTo (this .toolbar);
+
+      $("<span></span>") .addClass ("separator") .appendTo (this .toolbar);
 
       this .suspendButton = $("<span></span>")
          .addClass ("material-icons")
          .attr ("title", _("Suspend console output."))
-         .text ("cancel")
-         .appendTo (this .toolbar)
-         .on ("click", () => this .setSuspendConsole (!this .suspendConsole));
+         .text ("pause_circle")
+         .on ("click", () => this .setSuspendConsole (!this .suspendConsole))
+         .appendTo (this .toolbar);
 
       this .clearButton = $("<span></span>")
          .addClass ("material-icons")
          .attr ("title", _("Clear console."))
          .text ("delete_forever")
-         .appendTo (this .toolbar)
-         .on ("click", () => this .clearConsole ());
+         .on ("click", () => this .clearConsole ())
+         .appendTo (this .toolbar);
 
       $("<span></span>") .addClass ("separator") .appendTo (this .toolbar);
 
+      // Input
+
       this .textarea = $("<textarea></textarea>")
          .attr ("placeholder", _("Evaluate X3D Script code here, e.g. type `Browser.name`."))
          .attr ("tabindex", 0)
-         .appendTo (this .input)
          .on ("keydown", event => this .onkeydown (event))
-         .on ("keyup", event => this .onkeyup (event));
+         .on ("keyup", event => this .onkeyup (event))
+         .appendTo (this .input);
 
       if (this .console .attr ("id") !== "console")
       {
@@ -75,10 +145,21 @@ module .exports = class Console extends Interface
    {
       super .configure ();
 
-      this .config .file .setDefaultValues ({ history: [ ] });
+      this .config .file .setDefaultValues ({
+         history: [ ],
+         search: false,
+         searchWidth: 285,
+         searchCaseSensitive: false,
+      });
 
       this .history      = this .config .file .history .slice (-this .HISTORY_MAX);
       this .historyIndex = this .history .length;
+
+      this .output .scrollTop (this .output .prop ("scrollHeight"));
+
+      this .search .width (this .config .file .searchWidth);
+      this .toggleSearch (this .config .file .search);
+      this .searchCaseSensitive ();
    }
 
    async set_browser_initialized ()
@@ -98,6 +179,8 @@ module .exports = class Console extends Interface
    excludes = [
       "The vm module of Node.js is unsupported",
       "Uncaught TypeError: Cannot read properties of null (reading 'removeChild')",
+      "aria-hidden",
+      "<line>",
       // "Invalid asm.js: Invalid member of stdlib",
    ];
 
@@ -108,8 +191,14 @@ module .exports = class Console extends Interface
 
       const
          classes = [this .logLevels [level] ?? "log", this .logClasses [level]],
-         title   = sourceId ? `${sourceId}:${line}`: "",
-         text    = $("<p></p>") .addClass (classes) .attr ("title", title) .text (message);
+         title   = sourceId ? `${sourceId}:${line}`: "";
+
+      const text = $(message .split ("\n")
+         .map (line => $("<p></p>")
+            .addClass (classes)
+            .attr ("title", title)
+            .text (line)
+            .get (0)));
 
       if (this .messageTime && performance .now () - this .messageTime > 1000)
          this .output .append ($("<p></p>") .addClass ("splitter"));
@@ -132,6 +221,8 @@ module .exports = class Console extends Interface
 
       this .output .append (text);
       this .output .scrollTop (this .output .prop ("scrollHeight"));
+
+      this .findElements (text, this .currentElement, false);
    }
 
    setSuspendConsole (value)
@@ -158,6 +249,7 @@ module .exports = class Console extends Interface
 
       this .output .empty ();
       this .addMessage (null, "info", __filename, 0, `Console cleared at ${new Date () .toLocaleTimeString ()}.`);
+      this .searchString ();
    }
 
    onkeydown (event)
@@ -244,13 +336,156 @@ module .exports = class Console extends Interface
 
       try
       {
-         console .debug (String (this .scriptNode .evaluate (text)));
+         console .debug (this .scriptNode .evaluate (text));
       }
       catch (error)
       {
-         console .error (`${error .name}: ${error .message}`);
+         console .error (error);
       }
 
       this .textarea .val ("");
    }
+
+   toggleSearch (visible)
+   {
+      this .config .file .search = visible;
+
+      if (visible)
+      {
+         this .searchButton .addClass ("active");
+         this .search .show ();
+         this .searchInput .trigger ("focus");
+
+         this .searchString ();
+      }
+      else
+      {
+         this .searchButton .removeClass ("active");
+         this .search .hide ();
+         this .output .find (".selected") .removeClass ("selected");
+      }
+   }
+
+   searchString ()
+   {
+      this .foundElements = [ ];
+
+      this .findElements (this .output .children (), 0, true);
+   }
+
+   findElements (elements, currentElement, scroll)
+   {
+      if (this .search .is (":hidden"))
+         return;
+
+      const
+         toString = this .searchCaseSensitiveButton .hasClass ("active") ? "toString" : "toLowerCase",
+         string   = this .searchInput .val () [toString] ();
+
+      if (!string)
+         return;
+
+      this .foundElements = this .foundElements .concat (Array .from (elements, element => $(element))
+         .filter (element => element .text () [toString] () .includes (string)));
+
+      this .updateCurrentElement (currentElement, scroll);
+   }
+
+   searchKey (event)
+   {
+      switch (event .key)
+      {
+         case "Enter":
+         {
+            if (!this .foundElements .length)
+               break;
+
+            if (event .shiftKey)
+               this .searchPrevious ();
+            else
+               this .searchNext ();
+
+            break;
+         }
+      }
+   }
+
+   searchCaseSensitive (value = this .config .file .searchCaseSensitive)
+   {
+      this .config .file .searchCaseSensitive = value;
+
+      if (this .config .file .searchCaseSensitive)
+         this .searchCaseSensitiveButton .addClass ("active");
+      else
+         this .searchCaseSensitiveButton .removeClass ("active");
+
+      this .searchInput .trigger ("focus");
+
+      this .searchString ();
+   }
+
+   searchPrevious ()
+   {
+      this .updateCurrentElement (this .currentElement - 1);
+   }
+
+   searchNext ()
+   {
+      this .updateCurrentElement (this .currentElement + 1);
+   }
+
+   updateCurrentElement (value, scroll = true)
+   {
+      if (value < 0)
+         value = this .foundElements .length - 1;
+
+      if (value >= this .foundElements .length)
+         value = 0;
+
+      this .currentElement = value;
+
+      this .output .find (".selected") .removeClass ("selected");
+
+      if (this .foundElements .length)
+      {
+         const element = this .foundElements [this .currentElement];
+
+         element .addClass ("selected");
+
+         if (scroll)
+         {
+            element .get (0) .scrollIntoView ({ block: "center", inline: "start", behavior: "smooth" });
+            $(window) .scrollTop (0);
+         }
+
+         this .searchStatus .text (util .format (_("%d of %d"), this .currentElement + 1, this .foundElements .length));
+         this .searchPreviousButton .removeClass ("disabled");
+         this .searchNextButton     .removeClass ("disabled");
+      }
+      else
+      {
+         this .searchStatus .text (`No results`);
+         this .searchPreviousButton .addClass ("disabled");
+         this .searchNextButton     .addClass ("disabled");
+      }
+   }
+
+   outputKey (event)
+   {
+      switch (event .key)
+      {
+         case "f":
+         {
+            if (event .ctrlKey || event .metaKey)
+            {
+               this .searchInput .val (window .getSelection () .toString ());
+               this .searchInput .trigger ("select");
+
+               this .toggleSearch (true);
+            }
+
+            break;
+         }
+      }
+   }
 };

package/src/Editors/Library.js

@@ -27,7 +27,7 @@ module .exports = new class Library extends Dialog
 
    configure ()
    {
-      super .configure ({ size: [600, 400] });
+      super .configure ({ size: [600, 400], minSize: [400, 300] });
 
       // Set default config values.
 

package/src/Editors/MaterialsLibrary.js

@@ -26,7 +26,7 @@ module .exports = class Materials extends LibraryPane
 
       this .#list = $("<ul></ul>")
          .appendTo (this .output)
-         .addClass ("library-list");
+         .addClass (["library-list", "materials"]);
 
       const
          canvas  = $("<x3d-canvas preserveDrawingBuffer='true' xrSessionMode='NONE'></x3d-canvas>"),
@@ -51,9 +51,11 @@ module .exports = class Materials extends LibraryPane
 
             nodes .push ($("<li></li>")
                .addClass (["node", "icon"])
-               .text (`${group .getNodeName ()} ${c + 1}`)
                .attr ("group", g)
                .attr ("child", c)
+               .append ($("<span></span>")
+                  .addClass ("text")
+                  .text (`${group .getNodeName ()} ${c + 1}`))
                .appendTo (this .#list)
                .on ("dblclick", () => this .importX3D (material .getNodeName (), material .toXMLString ())));
          }
@@ -65,7 +67,7 @@ module .exports = class Materials extends LibraryPane
          .css ({ "position": "absolute", "visibility": "hidden" })
          .prependTo ($("body"));
 
-      await browser .resize (25, 25);
+      await browser .resize (256, 256);
       await browser .replaceWorld (scene);
 
       for (const element of Array .from (this .output .find (".node"), e => $(e)))