neo.mjs 6.7.3 → 6.7.5

package/apps/ServiceWorker.mjs

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

package/examples/ServiceWorker.mjs

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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "neo.mjs",
-    "version": "6.7.3",
+    "version": "6.7.5",
     "description": "The webworkers driven UI framework",
     "type": "module",
     "repository": {
@@ -56,7 +56,7 @@
         "inquirer": "^9.2.11",
         "neo-jsdoc": "1.0.1",
         "neo-jsdoc-x": "1.0.5",
-        "postcss": "^8.4.30",
+        "postcss": "^8.4.31",
         "sass": "^1.68.0",
         "showdown": "^2.1.0",
         "webpack": "^5.88.2",

package/resources/scss/src/tab/header/Toolbar.scss

@@ -1,6 +1,6 @@
 .neo-tab-header-toolbar {
     background-color: transparent;
-    height          : var(--tab-button-height-pressed);
+    flex            : 0 0 auto;
     padding         : 0;
 
     &.neo-dock-bottom {

package/src/DefaultConfig.mjs

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

package/src/Neo.mjs

@@ -371,17 +371,13 @@ Neo = globalThis.Neo = Object.assign({
      * @returns {Object} target
      */
     merge(target, source) {
-        if (Neo.typeOf(target) === 'Object') {
-            for (let key in source) {
-                if (Neo.typeOf(source[key]) === 'Object') {
-                    if (!target[key]) {
-                        target[key] = source[key];
-                    } else {
-                        Neo.merge(target[key], source[key]);
-                    }
-                } else {
-                    target[key] = source[key];
-                }
+        for (const key in source) {
+            const value = source[key];
+
+            if (Neo.typeOf(value) === 'Object') {
+                target[key] = Neo.merge(target[key], value);
+            } else {
+                target[key] = value;
             }
         }
 

package/src/calendar/view/MainContainer.mjs

@@ -445,6 +445,7 @@ class MainContainer extends Container {
             height   : me.sideBarWidth,
             listeners: {change: me.onDateSelectorChange, scope: me},
             parentId : me.id, // we need the parentId to access the model inside the ctor
+            value    : null,
 
             bind: {
                 locale              : data => data.locale,

package/src/component/Base.mjs

@@ -48,9 +48,10 @@ class Base extends CoreBase {
         ntype: 'component',
         /**
          * The default alignment specification to position this Component relative to some other
-         * Component, or Element or Rectangle.
+         * Component, or Element or Rectangle. Only applies in case floating = true.
+         * @member {Object|String} align_={edgeAlign:'t-b',constrainTo:'document.body'}
          */
-        align_ : {
+        align_: {
             edgeAlign   : 't-b',
             constrainTo : 'document.body'
         },
@@ -970,26 +971,30 @@ class Base extends CoreBase {
     }
 
     /**
-     * @param {Object|String} align
+     * Triggered before the align config gets changed.
+     * @param {Object|String} value
+     * @param {Object} oldValue
      * @returns {Object}
+     * @protected
      */
-    beforeSetAlign(align) {
+    beforeSetAlign(value, oldValue) {
         let me = this;
 
         // Just a simple 't-b'
-        if (typeof align === 'string') {
-            align = {
-                edgeAlign: align
-            };
+        if (typeof value === 'string') {
+            value = {
+                edgeAlign: value
+            }
         }
         // merge the incoming alignment specification into the configured default
-        return me.merge(me.merge({}, me.constructor.config.align), align);
+        return Neo.merge(Neo.merge({}, me.constructor.config.align), value)
     }
 
     /**
      * Triggered before the cls config gets changed.
      * @param {String[]} value
      * @param {String[]} oldValue
+     * @returns {String[]}
      * @protected
      */
     beforeSetCls(value, oldValue) {
@@ -1018,8 +1023,9 @@ class Base extends CoreBase {
 
     /**
      * Triggered before the domListeners config gets changed.
-     * @param {Object} value
-     * @param {Object} oldValue
+     * @param {Object|Object[]} value
+     * @param {Object[]} oldValue
+     * @returns {Object[]}
      * @protected
      */
     beforeSetDomListeners(value, oldValue) {
@@ -1034,6 +1040,7 @@ class Base extends CoreBase {
      * Triggered before the hideMode config gets changed
      * @param {String} value
      * @param {String} oldValue
+     * @returns {String}
      * @protected
      */
      beforeSetHideMode(value, oldValue) {
@@ -1045,6 +1052,7 @@ class Base extends CoreBase {
      * Creates a KeyNavigation instance if needed.
      * @param {Object} value
      * @param {Object} oldValue
+     * @returns {Neo.util.KeyNavigation}
      * @protected
      */
     beforeSetKeys(value, oldValue) {
@@ -1088,6 +1096,7 @@ class Base extends CoreBase {
      * Triggered before the plugins config gets changed.
      * @param {Object[]} value
      * @param {Object[]} oldValue
+     * @returns {Neo.plugin.Base[]}
      * @protected
      */
     beforeSetPlugins(value, oldValue) {
@@ -1129,7 +1138,7 @@ class Base extends CoreBase {
 
         if (typeof value === 'object') {
             // merge the incoming style specification into the configured default
-            value = me.merge(me.merge({}, me.constructor.config.style), value)
+            value = Neo.merge(Neo.merge({}, me.constructor.config.style), value)
         }
 
         return value
@@ -2006,7 +2015,7 @@ class Base extends CoreBase {
      * hideMode: 'removeDom'  uses vdom removeDom.
      * hideMode: 'visibility' uses css visibility.
      */
-    show(align) {
+    show() {
         const me = this;
 
         if (me.hideMode !== 'visibility') {

package/src/component/DateSelector.mjs

@@ -346,16 +346,18 @@ class DateSelector extends Component {
     afterSetValue(value, oldValue) {
         let me = this;
 
-        if (!me.isUpdating) {
-            me.currentDate = new Date(`${value}T00:00:00.000Z`);
+        if (value) {
+            if (!me.isUpdating) {
+                me.currentDate = new Date(`${value}T00:00:00.000Z`);
 
-            me.fire('change', {
-                component: me,
-                oldValue,
-                value
-            })
-        } else {
-            me.cacheUpdate()
+                me.fire('change', {
+                    component: me,
+                    oldValue,
+                    value
+                })
+            } else {
+                me.cacheUpdate()
+            }
         }
     }
 

package/src/core/Base.mjs

@@ -364,26 +364,6 @@ class Base {
         }
     }
 
-    /**
-     * Merges nested objects
-     * @param {Object} dest={}
-     * @param {Object} src
-     * @returns {Object}
-     */
-    merge(dest={}, src) {
-        for (const key in src) {
-            const value = src[key];
-
-            if (typeof value === 'object') {
-                dest[key] = this.merge(dest[key], value);
-            }
-            else {
-                dest[key] = value;
-            }
-        }
-        return dest;
-    }
-
     /**
      * Override this method to change the order configs are applied to this instance.
      * @param {Object} config

package/src/form/field/FileUpload.mjs

@@ -535,9 +535,9 @@ class FileUpload extends Base {
         }
         // Failed network request
         else {
+            me.error    = xhr.response ? JSON.parse(xhr.response).message : `HTTP status : ${xhr.statusText}`;
             me.progress = NaN;
-            me.error = `HTTP status : ${xhr.statusText}`;
-            me.state = 'upload-failed';
+            me.state    = 'upload-failed';
         }
     }