neo.mjs 5.0.3 → 5.1.1

package/src/component/wrapper/GoogleMaps.mjs

@@ -7,41 +7,6 @@ import Store           from '../../data/Store.mjs';
  * @extends Neo.component.Base
  */
 class GoogleMaps extends Base {
-    /**
-     * false hides the default fullscreen control
-     * @member {Boolean} fullscreenControl=true
-     */
-    fullscreenControl = true
-    /**
-     * @member {Object} markerStoreConfig=null
-     */
-    markerStoreConfig = null
-    /**
-     * Internal flag. Gets set to true once Neo.main.addon.GoogleMaps.create() is finished.
-     * @member {Boolean} mapCreated=false
-     */
-    mapCreated = false
-    /**
-     * Pass any options to the map instance which are not explicitly defined here
-     * @member {Object} mapOptions={}
-     */
-    mapOptions = {}
-    /**
-     * null => the maximum zoom from the current map type is used instead
-     * @member {Number|null} maxZoom=null
-     */
-    maxZoom = null
-    /**
-     null => the minimum zoom from the current map type is used instead
-     * @member {Number|null} minZoom=null
-     */
-    minZoom = null
-    /**
-     * false hides the default zoom control
-     * @member {Boolean} zoomControl=true
-     */
-    zoomControl = true
-
     static config = {
         /**
          * @member {String} className='Neo.component.wrapper.GoogleMaps'
@@ -86,6 +51,41 @@ class GoogleMaps extends Base {
         zoom_: 8
     }
 
+    /**
+     * false hides the default fullscreen control
+     * @member {Boolean} fullscreenControl=true
+     */
+    fullscreenControl = true
+    /**
+     * @member {Object} markerStoreConfig=null
+     */
+    markerStoreConfig = null
+    /**
+     * Internal flag. Gets set to true once Neo.main.addon.GoogleMaps.create() is finished.
+     * @member {Boolean} mapCreated=false
+     */
+    mapCreated = false
+    /**
+     * Pass any options to the map instance which are not explicitly defined here
+     * @member {Object} mapOptions={}
+     */
+    mapOptions = {}
+    /**
+     * null => the maximum zoom from the current map type is used instead
+     * @member {Number|null} maxZoom=null
+     */
+    maxZoom = null
+    /**
+     null => the minimum zoom from the current map type is used instead
+     * @member {Number|null} minZoom=null
+     */
+    minZoom = null
+    /**
+     * false hides the default zoom control
+     * @member {Boolean} zoomControl=true
+     */
+    zoomControl = true
+
     /**
      * @param {Object} config
      */

package/src/container/Base.mjs

@@ -215,6 +215,7 @@ class Base extends Component {
 
             case 'NeoInstance': {
                 item.set(config);
+                item.getController()?.parseConfig(item);
                 break;
             }
 

package/src/controller/Component.mjs

@@ -141,6 +141,7 @@ class Component extends Base {
         let me        = this,
             listeners = component.listeners,
             reference = component.reference,
+            validator = component.validator,
             eventHandler, handlerScope;
 
         if (listeners) {
@@ -174,6 +175,16 @@ class Component extends Base {
             });
         }
 
+        if (Neo.isString(validator)) {
+            handlerScope = me.getHandlerScope(validator);
+
+            if (!handlerScope) {
+                Logger.logError('Unknown validator for', component.id, component);
+            } else {
+                component.validator = handlerScope[validator].bind(handlerScope);
+            }
+        }
+
         if (reference) {
             me.references[reference] = component;
         }

package/src/core/Base.mjs

@@ -10,12 +10,24 @@ const configSymbol       = Symbol.for('configSymbol'),
  * @class Neo.core.Base
  */
 class Base {
+    /**
+     * Regex to grab the MethodName from an error
+     * which is a second generation function
+     * @type {*}
+     */
+    static methodNameRegex = /\n.*\n\s+at\s+.*\.(\w+)\s+.*/
     /**
      * True automatically applies the core.Observable mixin
      * @member {Boolean} observable=false
      * @static
      */
     static observable = false
+    /**
+     * Keep the overwritten methods
+     * @type {Object}
+     */
+    static overwrittenMethods = {}
+
     /**
      * Set this one to false in case you don't want to stick
      * to the "anti-pattern" to apply classes to the global Neo or App namespace
@@ -137,6 +149,33 @@ class Base {
         }
     }
 
+    /**
+     * Applying overwrites and adding overwrittenMethods to the class constructors
+     * @param {Object} cfg
+     * @protected
+     */
+    static applyOverwrites(cfg) {
+        let overwrites = Neo.ns(cfg.className, false, Neo.overwrites),
+            cls, item;
+
+        if (overwrites) {
+            // Apply all methods
+            for (item in overwrites) {
+                if (Neo.isFunction(overwrites[item])) {
+                    // Already existing ones
+                    cls = this.prototype;
+
+                    if (cls[item]) {
+                        // add to overwrittenMethods
+                        cls.constructor.overwrittenMethods[item] = cls[item];
+                    }
+                }
+            }
+            // Apply configs to prototype
+            overwrites && Object.assign(cfg, overwrites);
+        }
+    }
+
     /**
      * Convenience method for beforeSet functions which test if a given value is inside a static array
      * @param {String|Number} value
@@ -156,6 +195,33 @@ class Base {
         return value;
     }
 
+    /**
+     * From within an overwrite, a method can call a parent method, by using callOverwritten.
+     *
+     * @example
+     *    afterSetHeight(value, oldValue) {
+     *        // do the standard
+     *        this.callOverwritten(...arguments);
+     *        // do you own stuff
+     *    }
+     *
+     * We create an error to get the caller.name and then run that method on the constructor.
+     * This is based on the following error structure, e.g. afterSetHeight.
+     *
+     *     Error
+     *         at Base.callOverwritten (Base.mjs:176:21)
+     *         at Base.afterSetHeight (Overrides.mjs:19:26)
+     *
+     * @param args
+     */
+    callOverwritten(...args) {
+        let stack      = new Error().stack,
+            regex      = Base.methodNameRegex,
+            methodName = stack.match(regex)[1];
+
+        this.__proto__.constructor.overwrittenMethods[methodName].call(this, ...args);
+    }
+
     /**
      * Uses the IdGenerator to create an id if a static one is not explicitly set.
      * Registers the instance to manager.Instance if this one is already created,

package/src/core/Observable.mjs

@@ -148,8 +148,10 @@ class Observable extends Base {
         }
 
         while (proto?.constructor.isClass) {
+            ctor = proto.constructor;
+
             if (ctor.observable && !ctor.listeners) {
-                Object.assign(proto.constructor, {
+                Object.assign(ctor, {
                     addListener   : me.addListener,
                     fire          : me.fire,
                     listeners     : {},

package/src/data/connection/Fetch.mjs

@@ -5,11 +5,6 @@ import Base from '../../core/Base.mjs';
  * @extends Neo.core.Base
  */
 class Fetch extends Base {
-    /**
-     * @member {Object} defaultHeaders=null
-     */
-    defaultHeaders = null
-
     static config = {
         /**
          * @member {String} className='Neo.data.connection.Fetch'
@@ -18,6 +13,11 @@ class Fetch extends Base {
         className: 'Neo.data.connection.Fetch'
     }
 
+    /**
+     * @member {Object} defaultHeaders=null
+     */
+    defaultHeaders = null
+
     /**
      * @param {Object|String} url
      * @param {Object} config

package/src/data/connection/WebSocket.mjs

@@ -7,6 +7,31 @@ import Observable  from '../../core/Observable.mjs';
  * @extends Neo.core.Base
  */
 class Socket extends Base {
+    /**
+     * True automatically applies the core.Observable mixin
+     * @member {Boolean} observable=true
+     * @static
+     */
+    static observable = true
+
+    static config = {
+        /**
+         * @member {String} className='Neo.data.connection.WebSocket'
+         * @protected
+         */
+        className: 'Neo.data.connection.WebSocket',
+        /**
+         * @member {String} ntype='socket-connection'
+         * @protected
+         */
+        ntype: 'socket-connection',
+        /**
+         * @member {WebSocket|null} socket_=null
+         * @protected
+         */
+        socket_: null
+    }
+
     /**
      * @member {String|null} channel=null
      */
@@ -34,30 +59,6 @@ class Socket extends Base {
      * @member {String|null} serverAddress=null
      */
     serverAddress = null
-    /**
-     * True automatically applies the core.Observable mixin
-     * @member {Boolean} observable=true
-     * @static
-     */
-    static observable = true
-
-    static config = {
-        /**
-         * @member {String} className='Neo.data.connection.WebSocket'
-         * @protected
-         */
-        className: 'Neo.data.connection.WebSocket',
-        /**
-         * @member {String} ntype='socket-connection'
-         * @protected
-         */
-        ntype: 'socket-connection',
-        /**
-         * @member {WebSocket|null} socket_=null
-         * @protected
-         */
-        socket_: null
-    }
 
     /**
      * @param {Object} config

package/src/dialog/header/Toolbar.mjs

@@ -5,6 +5,18 @@ import Base from '../../toolbar/Base.mjs';
  * @extends Neo.toolbar.Base
  */
 class Toolbar extends Base {
+    static config = {
+        /**
+         * @member {String} className='Neo.dialog.header.Toolbar'
+         * @protected
+         */
+        className: 'Neo.dialog.header.Toolbar',
+        /**
+         * @member {String|null} title=null
+         */
+        title_: null
+    }
+
     /**
      * @member {Object} actionMap
      */
@@ -28,18 +40,6 @@ class Toolbar extends Base {
      */
     actions = ['maximize', 'close']
 
-    static config = {
-        /**
-         * @member {String} className='Neo.dialog.header.Toolbar'
-         * @protected
-         */
-        className: 'Neo.dialog.header.Toolbar',
-        /**
-         * @member {String|null} title=null
-         */
-        title_: null
-    }
-
     /**
      * Triggered after the title config got changed
      * @param {String} value

package/src/form/field/Search.mjs

@@ -29,7 +29,7 @@ class Search extends Text {
          * Value for the placeholderText_ textfield config
          * @member {String} placeholderText='Search'
          */
-        placeholderText: 'Search',
+        placeholderText: 'Search'
     }
 }
 

package/src/form/field/Select.mjs

@@ -10,16 +10,6 @@ import VDomUtil        from '../../util/VDom.mjs';
  * @extends Neo.form.field.Picker
  */
 class Select extends Picker {
-    /**
-     * @member {String} filterOperator='like'
-     */
-    filterOperator = 'like'
-    /**
-     * Set this config to false, in case typing into the input field should not filter list items
-     * @member {Boolean} useFilter=true
-     */
-    useFilter = true
-
     /**
      * Valid values for triggerAction
      * @member {String[]} triggerActions=['all','filtered']
@@ -116,6 +106,16 @@ class Select extends Picker {
         valueField: 'id'
     }
 
+    /**
+     * @member {String} filterOperator='like'
+     */
+    filterOperator = 'like'
+    /**
+     * Set this config to false, in case typing into the input field should not filter list items
+     * @member {Boolean} useFilter=true
+     */
+    useFilter = true
+
     /**
      * @param {Object} config
      */

package/src/form/field/Text.mjs

@@ -10,26 +10,6 @@ import VNodeUtil    from '../../util/VNode.mjs';
  * @extends Neo.form.field.Base
  */
 class Text extends Base {
-    /**
-     * data passes maxLength, minLength & valueLength properties
-     * @member {Function} errorTextMaxLength=data=>`Max length violation: ${valueLength} / ${maxLength}`
-     */
-    errorTextMaxLength = data => `Max length violation: ${data.valueLength} / ${data.maxLength}`
-    /**
-     * data passes maxLength, minLength & valueLength properties
-     * @member {Function} errorTextMinLength=data=>`Min length violation: ${data.valueLength} / ${data.minLength}`
-     */
-    errorTextMinLength = data => `Min length violation: ${data.valueLength} / ${data.minLength}`
-    /**
-     * @member {String} errorTextRequired='Required'
-     */
-    errorTextRequired = 'Required'
-    /**
-     * Set this value to false, in case a field should display errors up front
-     * @member {Boolean} validBeforeMount=true
-     */
-    validBeforeMount = true
-
     /**
      * Valid values for autoCapitalize
      * @member {String[]} autoCapitalizeValues=['characters','none','on','off','sentences','words']
@@ -178,6 +158,11 @@ class Text extends Base {
          * @member {Object|Object[]|null} triggers_=null
          */
         triggers_: null,
+        /**
+         * A string based value will get resolved into the closest controller which implements it
+         * @member {Function|String|null} validator=null
+         */
+        validator: null,
         /**
          * @member {Object} _vdom
          */
@@ -190,6 +175,26 @@ class Text extends Base {
         ]}
     }
 
+    /**
+     * data passes maxLength, minLength & valueLength properties
+     * @member {Function} errorTextMaxLength=data=>`Max length violation: ${valueLength} / ${maxLength}`
+     */
+    errorTextMaxLength = data => `Max length violation: ${data.valueLength} / ${data.maxLength}`
+    /**
+     * data passes maxLength, minLength & valueLength properties
+     * @member {Function} errorTextMinLength=data=>`Min length violation: ${data.valueLength} / ${data.minLength}`
+     */
+    errorTextMinLength = data => `Min length violation: ${data.valueLength} / ${data.minLength}`
+    /**
+     * @member {String} errorTextRequired='Required'
+     */
+    errorTextRequired = 'Required'
+    /**
+     * Set this value to false, in case a field should display errors up front
+     * @member {Boolean} validBeforeMount=true
+     */
+    validBeforeMount = true
+
     /**
      * @param {Object} config
      */
@@ -772,11 +777,12 @@ class Text extends Base {
      */
     beforeSetLabelText(value, oldValue) {
         let me                = this,
-            labelOptionalText = me.labelOptionalText;
+            labelOptionalText = me.labelOptionalText,
+            hasOptionalText   = value.endsWith(labelOptionalText);
 
-        if (me.showOptionalText && !me.required) {
-            return value + labelOptionalText;
-        } else if (value && value.endsWith(labelOptionalText)) {
+        if (me.showOptionalText && !me.required && !hasOptionalText) {
+            value += labelOptionalText;
+        } else if (value && hasOptionalText) {
             value = value.replace(labelOptionalText, '');
         }
 
@@ -1288,9 +1294,17 @@ class Text extends Base {
             value       = me.value,
             valueLength = value?.toString().length,
             isEmpty     = !value || valueLength < 1,
-            errorParam  = {maxLength, minLength, valueLength};
+            errorParam  = {maxLength, minLength, valueLength},
+            errorText;
+
+        if (Neo.isFunction(me.validator)) {
+            errorText = me.validator(me);
 
-        if (required && isEmpty) {
+            if (errorText !== true) {
+                me[errorField] = errorText;
+                returnValue = false;
+            }
+        } else if (required && isEmpty) {
             me[errorField] = me.errorTextRequired;
             returnValue = false;
         } else if (Neo.isNumber(maxLength) && valueLength > maxLength) {

package/src/form/field/trigger/Date.mjs

@@ -5,7 +5,7 @@ import Picker from './Picker.mjs';
  * @class Neo.form.field.trigger.Date
  * @extends Neo.form.field.trigger.Picker
  */
-class Date extends Picker {
+class DateTrigger extends Picker {
     static config = {
         /**
          * @member {String} className='Neo.form.field.trigger.Date'
@@ -24,6 +24,6 @@ class Date extends Picker {
     }
 }
 
-Neo.applyClassConfig(Date);
+Neo.applyClassConfig(DateTrigger);
 
-export default Date;
+export default DateTrigger;

package/src/form/field/trigger/Search.mjs

@@ -0,0 +1,28 @@
+import Picker from './Picker.mjs';
+
+/**
+ * @class Neo.form.field.trigger.Search
+ * @extends Neo.form.field.trigger.Picker
+ */
+class Search extends Picker {
+    static config = {
+        /**
+         * @member {String} className='Neo.form.field.trigger.Search'
+         * @protected
+         */
+        className: 'Neo.form.field.trigger.Search',
+        /**
+         * @member {String} ntype='trigger-search'
+         * @protected
+         */
+        ntype: 'trigger-search',
+        /**
+         * @member {String|null} iconCls='fas fa-magnifying-glass'
+         */
+        iconCls: 'fas fa-magnifying-glass'
+    }
+}
+
+Neo.applyClassConfig(Search);
+
+export default Search;

package/src/grid/Container.mjs

@@ -10,26 +10,6 @@ import * as header     from './header/_export.mjs';
  * @extends Neo.container.Base
  */
 class Container extends BaseContainer {
-    /**
-     * Configs for Neo.grid.header.Toolbar
-     * @member {Object|null} [headerToolbarConfig=null]
-     */
-    headerToolbarConfig = null
-    /**
-     * @member {String|null} headerToolbarId_=null
-     */
-    headerToolbarId = null
-    /**
-     * Configs for Neo.grid.View
-     * @member {Object|null} [viewConfig=null]
-     */
-    viewConfig = null
-    /**
-     * @member {String|null} viewId_=null
-     * @protected
-     */
-    viewId = null
-
     static config = {
         /**
          * @member {String} className='Neo.grid.Container'
@@ -75,6 +55,26 @@ class Container extends BaseContainer {
         ]}
     }
 
+    /**
+     * Configs for Neo.grid.header.Toolbar
+     * @member {Object|null} [headerToolbarConfig=null]
+     */
+    headerToolbarConfig = null
+    /**
+     * @member {String|null} headerToolbarId_=null
+     */
+    headerToolbarId = null
+    /**
+     * Configs for Neo.grid.View
+     * @member {Object|null} [viewConfig=null]
+     */
+    viewConfig = null
+    /**
+     * @member {String|null} viewId_=null
+     * @protected
+     */
+    viewId = null
+
     /**
      * @param {Object} config
      */

package/src/grid/header/Button.mjs

@@ -6,16 +6,6 @@ import NeoArray   from '../../util/Array.mjs';
  * @extends Neo.button.Base
  */
 class Button extends BaseButton {
-    /**
-     * Sort direction when clicking on an unsorted button
-     * @member {String} defaultSortDirection='ASC'
-     */
-    defaultSortDirection = 'ASC'
-    /**
-     * @member {String|null} field=null
-     */
-    field = null
-
     /**
      * Valid values for align
      * @member {String[]} alignValues: ['left', 'center', 'right']
@@ -60,6 +50,16 @@ class Button extends BaseButton {
         isSorted_: null
     }
 
+    /**
+     * Sort direction when clicking on an unsorted button
+     * @member {String} defaultSortDirection='ASC'
+     */
+    defaultSortDirection = 'ASC'
+    /**
+     * @member {String|null} field=null
+     */
+    field = null
+
     /**
      * @param {Object} config
      */

package/src/list/Color.mjs

@@ -5,13 +5,6 @@ import Base from './Base.mjs';
  * @extends Neo.list.Base
  */
 class Color extends Base {
-    /**
-     * form.field.Color needs to trigger a silent vdom update
-     * @member {Boolean} silentSelectUpdate=false
-     * @protected
-     */
-    silentSelectUpdate = false
-
     static config = {
         /**
          * @member {String} className='Neo.list.Color'
@@ -40,6 +33,13 @@ class Color extends Base {
         colorFormatter: (scope,data) => data[scope.colorField]
     }
 
+    /**
+     * form.field.Color needs to trigger a silent vdom update
+     * @member {Boolean} silentSelectUpdate=false
+     * @protected
+     */
+    silentSelectUpdate = false
+
     /**
      * Override this method for custom renderers
      * @param {Object} record

package/src/main/addon/CesiumJS.mjs

@@ -8,12 +8,6 @@ import DomAccess from '../DomAccess.mjs';
  * @singleton
  */
 class CesiumJS extends Base {
-    /**
-     * @member {Object} viewers={}
-     * @protected
-     */
-    viewers = {}
-
     static config = {
         /**
          * @member {String} className='Neo.main.addon.CesiumJS'
@@ -40,6 +34,12 @@ class CesiumJS extends Base {
         singleton: true
     }
 
+    /**
+     * @member {Object} viewers={}
+     * @protected
+     */
+    viewers = {}
+
     /**
      * @param {Object} config
      */