sunrize 1.9.1 → 1.10.2

package/src/Editors/ScriptEditor.js

@@ -1,22 +1,22 @@
 "use strict";
 
 const
-   $           = require ("jquery"),
-   electron    = require ("electron"),
-   path        = require ("path"),
-   url         = require ("url"),
-   fs          = require ("fs"),
-   X3D         = require ("../X3D"),
-   Interface   = require ("../Application/Interface"),
-   Splitter    = require ("../Controls/Splitter"),
-   NodeList    = require ("./NodeList"),
-   Console     = require ("./Console"),
-   Editor      = require ("../Undo/Editor"),
-   UndoManager = require ("../Undo/UndoManager"),
-   monaco      = require ("monaco-editor/min/vs/loader.js"),
-   _           = require ("../Application/GetText");
-
-monaco .require .config ({
+   $            = require ("jquery"),
+   electron     = require ("electron"),
+   path         = require ("path"),
+   url          = require ("url"),
+   fs           = require ("fs"),
+   X3D          = require ("../X3D"),
+   Interface    = require ("../Application/Interface"),
+   Splitter     = require ("../Controls/Splitter"),
+   NodeList     = require ("./NodeList"),
+   Console      = require ("./Console"),
+   Editor       = require ("../Undo/Editor"),
+   UndoManager  = require ("../Undo/UndoManager"),
+   monacoLoader = require ("monaco-editor/min/vs/loader.js"),
+   _            = require ("../Application/GetText");
+
+monacoLoader .require .config ({
    baseUrl: url .pathToFileURL (path .resolve (path .dirname (require .resolve ("monaco-editor/package.json")), "min")) + "/",
 });
 
@@ -137,14 +137,21 @@ module .exports = class ScriptEditor extends Interface
       this .setup ();
    }
 
-   colorScheme (shouldUseDarkColors)
+   getMonaco ()
    {
-      monaco .require (["vs/editor/editor.main"], monaco =>
+      return new Promise (resolve =>
       {
-         monaco .editor .setTheme (shouldUseDarkColors ? "vs-dark" : "vs-light");
+         monacoLoader .require (["vs/editor/editor.main"], ({ m: monaco }) => resolve (monaco));
       });
    }
 
+   async colorScheme (shouldUseDarkColors)
+   {
+      const monaco = await this .getMonaco ();
+
+      monaco .editor .setTheme (shouldUseDarkColors ? "vs-dark" : "vs-light");
+   }
+
    async setNode (node)
    {
       this .directOutputButton .hide ();
@@ -368,74 +375,92 @@ module .exports = class ScriptEditor extends Interface
       "ShaderPart": "c",
    };
 
-   getEditor (node)
+   async getEditor (node)
+   {
+      if (!this .editors .has (node))
+         this .editors .set (node, await this .createEditor (node));
+
+      return this .editors .get (node);
+   }
+
+   async createEditor (node)
+   {
+      const
+         monaco  = await this .getMonaco (),
+         element = $("<div></div>") .addClass ("script-editor-monaco");
+
+      const editor = monaco .editor .create (element .get (0),
+      {
+         language: this .languages [node .getTypeName ()],
+         contextmenu: false,
+         automaticLayout: true,
+         wordWrap: "on",
+         wrappingIndent: "indent",
+         minimap: { enabled: false },
+         bracketPairColorization: { enabled: true },
+      });
+
+      editor .viewState = editor .saveViewState ();
+
+      editor .onDidFocusEditorWidget (() => this .setDeclarations (monaco));
+      editor .onDidBlurEditorWidget (() => this .apply ());
+      editor .onKeyDown (event => this .onKeyDown (event));
+
+      element .on ("mouseenter", () => this .setDeclarations (monaco));
+      element .on ("contextmenu", () => this .showContextMenu ());
+
+      // this .debugFindActions (editor)
+      return { element, editor, monaco };
+   }
+
+   onKeyDown (event)
    {
-      return new Promise ((resolve, reject) =>
+      const { keyCode, ctrlKey, metaKey } = event;
+
+      switch (keyCode)
       {
-         if (this .editors .has (node))
+         case 33: // c
          {
-            resolve (this .editors .get (node));
+            if (!(metaKey || ctrlKey))
+               break;
+
+            event .preventDefault ();
+            event .stopPropagation ();
+            this .cutOrCopy ("copy");
+            break;
          }
-         else
+         case 52: // v
          {
-            monaco .require (["vs/editor/editor.main"], monaco =>
-            {
-               const element = $("<div></div>")
-                  .addClass ("script-editor-monaco")
-                  .appendTo (this .verticalSplitterRight);
-
-               self .MonacoEnvironment =
-               {
-                  getWorkerUrl (moduleId, label)
-                  {
-                     return url .pathToFileURL (require .resolve ("monaco-editor/min/vs/base/worker/workerMain.js"));
-                  },
-               };
-
-               const editor = monaco .editor .create (element .get (0),
-               {
-                  language: this .languages [node .getTypeName ()],
-                  contextmenu: false,
-                  automaticLayout: true,
-                  wordWrap: "on",
-                  wrappingIndent: "indent",
-                  minimap: { enabled: false },
-                  bracketPairColorization: { enabled: true },
-               });
-
-               editor .onDidFocusEditorWidget (() => this .setDeclarations (monaco));
-               editor .onDidBlurEditorWidget (() => this .apply ());
-
-               editor .onKeyDown ((event) =>
-               {
-                  const { keyCode, ctrlKey, metaKey } = event;
-
-                  if (keyCode === 52 && (metaKey || ctrlKey))
-                  {
-                     event .preventDefault ();
-                     this .paste ();
-                  }
-               });
-
-               editor .viewState = editor .saveViewState ();
-
-               element .on ("mouseenter", () => this .setDeclarations (monaco))
-               element .on ("contextmenu", () => this .showContextMenu ());
-               element .detach ();
-
-               // this .debugFindActions (editor)
-               this .editors .set (node, { element, editor, monaco });
-
-               // Return editor.
-
-               resolve (this .editors .get (node));
-            });
+            if (!(metaKey || ctrlKey))
+               break;
+
+            event .preventDefault ();
+            event .stopPropagation ();
+            this .paste ();
+            break;
          }
-      });
+         case 54: // x
+         {
+            if (!(metaKey || ctrlKey))
+               break;
+
+            event .preventDefault ();
+            event .stopPropagation ();
+            this .cutOrCopy ("cut");
+            break;
+         }
+      }
    }
 
-   showContextMenu ()
+   async showContextMenu ()
    {
+      await $.sleep ();
+
+      const app = require ("../Application/Window");
+
+      if (!app .activeElementIsMonacoEditor ())
+         return;
+
       const menu = [
          // {
          //    label: _("Go to Definition"),
@@ -478,14 +503,17 @@ module .exports = class ScriptEditor extends Interface
          { type: "separator" },
          {
             label: _("Cut"),
-            args: ["cutOrCopy", true],
+            accelerator: "CmdOrCtrl+X",
+            args: ["cutOrCopy", "cut"],
          },
          {
             label: _("Copy"),
-            args: ["cutOrCopy", false],
+            accelerator: "CmdOrCtrl+C",
+            args: ["cutOrCopy", "copy"],
          },
          {
             label: _("Paste"),
+            accelerator: "CmdOrCtrl+V",
             args: ["paste"],
          },
          { type: "separator" },
@@ -503,6 +531,16 @@ module .exports = class ScriptEditor extends Interface
       this .editor .getAction (id) .run ();
    }
 
+   triggerEvent (... args)
+   {
+      this .editor .trigger (... args);
+   }
+
+   // execCommand (command)
+   // {
+   //    document .execCommand (command);
+   // }
+
    debugFindActions (editor = this .editor)
    {
       for (const action of editor .getSupportedActions ())
@@ -552,12 +590,7 @@ module .exports = class ScriptEditor extends Interface
       }
    }
 
-   // execCommand (command)
-   // {
-   //    document .execCommand (command);
-   // }
-
-   cutOrCopy (cut)
+   cutOrCopy (type)
    {
       this .editor .focus ();
 
@@ -576,7 +609,7 @@ module .exports = class ScriptEditor extends Interface
       // Set the clipboard contents.
       navigator .clipboard .writeText (data || "");
 
-      if (!cut)
+      if (type === "copy")
          return;
 
       // This is a cut operation, so replace the selection with an empty string.

package/src/Undo/Editor.js

@@ -476,8 +476,8 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
 </html>`
    }
 
-   static absoluteURL = new RegExp ("^(?:[a-z]+:|//)", "i")
-   static fontFamilies = new Set (["SERIF", "SANS", "TYPEWRITER"])
+   static absoluteURL = new RegExp ("^(?:[a-z]+:|//)", "i");
+   static fontFamilies = new Set (["SERIF", "SANS", "TYPEWRITER"]);
 
    /**
     *
@@ -3448,7 +3448,7 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
 
       const nodesToRemove = this .#nodesToRemove .get (executionContext);
 
-      for (const node of nodes)
+      for (const node of nodes .filter (node => node))
          nodesToRemove .push (node .valueOf ());
 
       if (undoManager .defer ("removeNodesFromExecutionContextIfNecessary"))

package/src/assets/X3D.reg

@@ -0,0 +1,81 @@
+Windows Registry Editor Version 5.00
+
+[HKEY_CURRENT_USER\Software\Classes\.x3d\OpenWithProgids]
+"Sunrize.x3d"=""
+
+[HKEY_CURRENT_USER\Software\Classes\.x3dz\OpenWithProgids]
+"Sunrize.x3dz"=""
+
+[HKEY_CURRENT_USER\Software\Classes\.x3dv\OpenWithProgids]
+"Sunrize.x3dv"=""
+
+[HKEY_CURRENT_USER\Software\Classes\.x3dvz\OpenWithProgids]
+"Sunrize.x3dvz"=""
+
+[HKEY_CURRENT_USER\Software\Classes\.x3dj\OpenWithProgids]
+"Sunrize.x3dj"=""
+
+[HKEY_CURRENT_USER\Software\Classes\.x3djz\OpenWithProgids]
+"Sunrize.x3djz"=""
+
+[HKEY_CURRENT_USER\Software\Classes\.wrl\OpenWithProgids]
+"Sunrize.wrl"=""
+
+[HKEY_CURRENT_USER\Software\Classes\.wrz\OpenWithProgids]
+"Sunrize.wrz"=""
+
+[HKEY_CURRENT_USER\Software\Classes\Sunrize.x3d]
+@="Sunrize X3D XML File"
+[HKEY_CURRENT_USER\Software\Classes\Sunrize.x3d\DefaultIcon]
+@="\"SUNRIZE_EXE\",0"
+[HKEY_CURRENT_USER\Software\Classes\Sunrize.x3d\shell\open\command]
+@="\"SUNRIZE_EXE\" \"%1\""
+
+[HKEY_CURRENT_USER\Software\Classes\Sunrize.x3dz]
+@="Sunrize X3D XML File"
+[HKEY_CURRENT_USER\Software\Classes\Sunrize.x3dz\DefaultIcon]
+@="\"SUNRIZE_EXE\",0"
+[HKEY_CURRENT_USER\Software\Classes\Sunrize.x3dz\shell\open\command]
+@="\"SUNRIZE_EXE\" \"%1\""
+
+[HKEY_CURRENT_USER\Software\Classes\Sunrize.x3dv]
+@="Sunrize X3D Classic VRML File"
+[HKEY_CURRENT_USER\Software\Classes\Sunrize.x3dv\DefaultIcon]
+@="\"SUNRIZE_EXE\",0"
+[HKEY_CURRENT_USER\Software\Classes\Sunrize.x3dv\shell\open\command]
+@="\"SUNRIZE_EXE\" \"%1\""
+
+[HKEY_CURRENT_USER\Software\Classes\Sunrize.x3dvz]
+@="Sunrize X3D Classic VRML File"
+[HKEY_CURRENT_USER\Software\Classes\Sunrize.x3dvz\DefaultIcon]
+@="\"SUNRIZE_EXE\",0"
+[HKEY_CURRENT_USER\Software\Classes\Sunrize.x3dvz\shell\open\command]
+@="\"SUNRIZE_EXE\" \"%1\""
+
+[HKEY_CURRENT_USER\Software\Classes\Sunrize.x3dj]
+@="Sunrize X3D JSON File"
+[HKEY_CURRENT_USER\Software\Classes\Sunrize.x3dj\DefaultIcon]
+@="\"SUNRIZE_EXE\",0"
+[HKEY_CURRENT_USER\Software\Classes\Sunrize.x3dj\shell\open\command]
+@="\"SUNRIZE_EXE\" \"%1\""
+
+[HKEY_CURRENT_USER\Software\Classes\Sunrize.x3djz]
+@="Sunrize X3D JSON File"
+[HKEY_CURRENT_USER\Software\Classes\Sunrize.x3djz\DefaultIcon]
+@="\"SUNRIZE_EXE\",0"
+[HKEY_CURRENT_USER\Software\Classes\Sunrize.x3djz\shell\open\command]
+@="\"SUNRIZE_EXE\" \"%1\""
+
+[HKEY_CURRENT_USER\Software\Classes\Sunrize.wrl]
+@="Sunrize VRML File"
+[HKEY_CURRENT_USER\Software\Classes\Sunrize.wrl\DefaultIcon]
+@="\"SUNRIZE_EXE\",0"
+[HKEY_CURRENT_USER\Software\Classes\Sunrize.wrl\shell\open\command]
+@="\"SUNRIZE_EXE\" \"%1\""
+
+[HKEY_CURRENT_USER\Software\Classes\Sunrize.wrz]
+@="Sunrize VRML File"
+[HKEY_CURRENT_USER\Software\Classes\Sunrize.wrz\DefaultIcon]
+@="\"SUNRIZE_EXE\",0"
+[HKEY_CURRENT_USER\Software\Classes\Sunrize.wrz\shell\open\command]
+@="\"SUNRIZE_EXE\" \"%1\""

package/src/assets/html/application-template.html

@@ -7,12 +7,29 @@
   <body>
     <tab-group sortable="true">
       <style>
+::-webkit-scrollbar {
+  width: 8px;
+  height: 8px;
+}
+
+::-webkit-scrollbar-track, /* Track */
+::-webkit-scrollbar-thumb:window-inactive, /* Handle */
+::-webkit-scrollbar-corner { /* Corner */
+  background-color: transparent;
+}
+
+/* Handle */
+::-webkit-scrollbar-thumb {
+  background-color: var(--scrollbar-thumb-color);
+}
+
 .etabs .nav {
   height: var(--window-tabs-height);
   background: var(--background-color);
   box-shadow: none;
   border: none;
-  overflow: auto;
+  overflow-x: auto;
+  overflow-y: hidden;
   white-space: nowrap;
 }
 

package/src/assets/html/window-template.html

@@ -4,7 +4,6 @@
     <link rel="stylesheet" type="text/css" href="../node_modules/jquery-ui-dist/jquery-ui.min.css"/>
     <link rel="stylesheet" type="text/css" href="../node_modules/qtip2/dist/jquery.qtip.min.css"/>
     <link rel="stylesheet" type="text/css" href="../themes/default.css"/>
-    <link rel="stylesheet" data-name="vs/editor/editor.main" href="../node_modules/monaco-editor/min/vs/editor/editor.main.css">
   </head>
   <body>
     <div id="vertical-splitter" class="vertical-splitter">