neo.mjs 6.15.0 → 6.15.1

package/apps/ServiceWorker.mjs

@@ -20,9 +20,9 @@ class ServiceWorker extends ServiceBase {
          */
         singleton: true,
         /**
-         * @member {String} version='6.15.0'
+         * @member {String} version='6.15.1'
          */
-        version: '6.15.0'
+        version: '6.15.1'
     }
 
     /**

package/apps/portal/view/learn/MainContainerController.mjs

@@ -67,12 +67,13 @@ class MainContainerController extends Controller {
     /**
      * @param {Object} data
      * @param {String} data.appName
+     * @param {Number} data.windowId
      */
-    async onAppConnect(data) {
+    async onAppConnect(data) {console.log(data);
         let me              = this,
             app             = Neo.apps[data.appName],
             mainView        = app.mainView,
-            windowId        = mainView.windowId,
+            {windowId}      = data,
             searchString    = await Neo.Main.getByPath({path: 'location.search', windowId}),
             livePreviewId   = me.decodeUri(searchString.substring(1)).id,
             livePreview     = Neo.getComponent(livePreviewId),
@@ -91,32 +92,38 @@ class MainContainerController extends Controller {
     /**
      * @param {Object} data
      * @param {String} data.appName
+     * @param {Number} data.windowId
      */
     async onAppDisconnect(data) {
-        let me              = this,
-            app             = Neo.apps[data.appName],
-            mainView        = app.mainView,
-            windowId        = mainView.windowId,
-            searchString    = await Neo.Main.getByPath({path: 'location.search', windowId}),
-            livePreviewId   = me.decodeUri(searchString.substring(1)).id,
-            livePreview     = Neo.getComponent(livePreviewId),
-            sourceContainer = livePreview.getReference('preview'),
-            tabContainer    = livePreview.tabContainer,
-            sourceView      = mainView.removeAt(0, false);
-
-        console.log(data, me.connectedApps);
-
-        livePreview.previewContainer = null;
-        sourceContainer.add(sourceView);
-
-        tabContainer.activeIndex = 1; // switch to the source view
-
-        livePreview.getReference('popout-window-button').disabled = false;
-        tabContainer.getTabAtIndex(1).disabled = false;
-
-        /*Neo.Main.windowClose({
-            names: me.connectedApps
-        })*/
+        let me                  = this,
+            {appName, windowId} = data,
+            app                 = Neo.apps[appName],
+            mainView            = app.mainView;
+
+        // Closing a code preview window needs to drop the preview back into the related main app
+        if (appName !== 'Portal') {
+            let searchString    = await Neo.Main.getByPath({path: 'location.search', windowId}),
+                livePreviewId   = me.decodeUri(searchString.substring(1)).id,
+                livePreview     = Neo.getComponent(livePreviewId),
+                sourceContainer = livePreview.getReference('preview'),
+                tabContainer    = livePreview.tabContainer,
+                sourceView      = mainView.removeAt(0, false);
+
+            livePreview.previewContainer = null;
+            sourceContainer.add(sourceView);
+
+            tabContainer.activeIndex = 1; // switch to the source view
+
+            livePreview.getReference('popout-window-button').disabled = false;
+            tabContainer.getTabAtIndex(1).disabled = false
+        }
+        // Close popup windows when closing or reloading the main window
+        else {
+            Neo.Main.windowClose({
+                names: me.connectedApps,
+                windowId
+            })
+        }
     }
 
     /**

package/apps/website/neo-config.json

@@ -3,5 +3,5 @@
     "basePath"        : "../../",
     "environment"     : "development",
     "mainPath"        : "./Main.mjs",
-    "mainThreadAddons": ["DragDrop", "Stylesheet"]
+    "mainThreadAddons": ["DragDrop", "Navigator", "Stylesheet"]
 }

package/docs/app/view/classdetails/MembersList.mjs

@@ -306,6 +306,7 @@ class MembersList extends Base {
                 item.examples.forEach(example => {
                     itemConfig.cn.push({
                         tag: 'pre',
+                        cls: ['hljs'],
                         cn : [{
                             tag : 'code',
                             html: example

package/docs/app/view/classdetails/SourceViewComponent.mjs

@@ -47,7 +47,7 @@ class SourceViewComponent extends Component {
          */
         _vdom:
         {cn: [
-            {tag: 'pre', cn: [
+            {tag: 'pre', cls: ['hljs'], cn: [
                 {tag: 'code', class: 'language-javascript'}
             ]}
         ]}

package/docs/resources/highlightjs-custom-dark-theme.css

@@ -17,7 +17,7 @@ code,
     display   : block;
     font-size : 12px;
     overflow-x: auto;
-    padding   : 0.5em;
+    padding   : 0;
 }
 
 .hljs,
@@ -117,4 +117,4 @@ code,
 
 .neo-highlighted-line {
     background-color: #3c3f41 !important;
-}
+}

package/docs/resources/highlightjs-custom-github-theme.css

@@ -14,7 +14,7 @@ pre.hljs {
     display   : block;
     font-size : 12px;
     overflow-x: auto;
-    padding   : 0.5em;
+    padding   : 0;
 }
 
 .hljs-comment,
@@ -133,4 +133,4 @@ pre.hljs {
 
 .neo-highlighted-line {
     background-color: #cee8fc !important;
-}
+}

package/examples/ServiceWorker.mjs

@@ -20,9 +20,9 @@ class ServiceWorker extends ServiceBase {
          */
         singleton: true,
         /**
-         * @member {String} version='6.15.0'
+         * @member {String} version='6.15.1'
          */
-        version: '6.15.0'
+        version: '6.15.1'
     }
 
     /**

package/package.json

@@ -1,7 +1,7 @@
 
 {
     "name": "neo.mjs",
-    "version": "6.15.0",
+    "version": "6.15.1",
     "description": "The webworkers driven UI framework",
     "type": "module",
     "repository": {

package/resources/scss/theme-neo-light/Global.scss

@@ -56,22 +56,3 @@ mark {
     color           : black;
     padding         : 0.1em 0.2em;
 }
-
-
-
-.neo-splitter {
-    opacity: 1;
-    margin: 8px 2px;
-    border-radius: 100px;
-    border: unset !important;
-
-    &:hover, &:active {
-        background-color: #5595F5 !important;
-    }
-}
-
-.neo-dragproxy {
-    &.neo-splitter {
-        background-color: #5595F5 !important;
-    }
-}

package/resources/scss/theme-neo-light/component/Splitter.scss

@@ -1,5 +1,22 @@
 :root .neo-theme-neo-light { // .neo-splitter
     --splitter-background-color: #f2f2f2;
     --splitter-border          : 1px solid #ddd;
-    --splitter-hover-color     : #5d83a7
+    --splitter-hover-color     : #5d83a7;
+
+    .neo-splitter {
+        opacity: 1;
+        margin: 8px 2px;
+        border-radius: 100px;
+        border: unset !important;
+
+        &:hover, &:active {
+            background-color: #5595F5 !important;
+        }
+    }
+
+    .neo-dragproxy {
+        &.neo-splitter {
+            background-color: #5595F5 !important;
+        }
+    }
 }

package/src/DefaultConfig.mjs

@@ -260,12 +260,12 @@ const DefaultConfig = {
     useVdomWorker: true,
     /**
      * buildScripts/injectPackageVersion.mjs will update this value
-     * @default '6.15.0'
+     * @default '6.15.1'
      * @memberOf! module:Neo
      * @name config.version
      * @type String
      */
-    version: '6.15.0'
+    version: '6.15.1'
 };
 
 Object.assign(DefaultConfig, {

package/src/main/DomEvents.mjs

@@ -412,7 +412,7 @@ class DomEvents extends Base {
         let manager = Neo.worker.Manager;
 
         manager.appNames.forEach(appName => {
-            manager.broadcast({action: 'disconnect', appName})
+            manager.broadcast({action: 'disconnect', appName, windowId: manager.windowId})
         })
     }
 

package/src/worker/Base.mjs

@@ -109,11 +109,12 @@ class Base extends CoreBase {
      * Only relevant for SharedWorkers
      * @param {Object} data
      */
-    onConnect(data) {
+    async onConnect(data) {
         // short delay to ensure app VCs are in place
-        setTimeout(() => {
-            this.fire('connect', {appName: data.appName})
-        }, 10)
+        await this.timeout(10);
+
+        let {appName, windowId} = data;
+        this.fire('connect', {appName, windowId})
     }
 
     /**
@@ -162,7 +163,8 @@ class Base extends CoreBase {
      * @param {Object} data
      */
     onDisconnect(data) {
-        this.fire('disconnect', {appName: data.appName})
+        let {appName, windowId} = data;
+        this.fire('disconnect', {appName, windowId})
     }
 
     /**
@@ -212,7 +214,7 @@ class Base extends CoreBase {
         for (port of me.ports) {
             if (!port.appName) {
                 port.appName = appName;
-                me.onConnect({appName});
+                me.onConnect({appName, windowId: port.windowId});
                 break
             }
         }