neo.mjs 5.6.10 → 5.6.12

package/apps/ServiceWorker.mjs

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

package/apps/form/neo-config.json

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

package/apps/form/view/pages/Page11.mjs

@@ -1,5 +1,5 @@
+import CountryField      from '../../../../src/form/field/Country.mjs';
 import FormPageContainer from '../FormPageContainer.mjs';
-import SelectField       from '../../../../src/form/field/Select.mjs';
 import ZipCodeField      from '../../../../src/form/field/ZipCode.mjs';
 
 /**
@@ -13,36 +13,75 @@ class Page11 extends FormPageContainer {
          * @protected
          */
         className: 'Form.view.pages.Page11',
+        /**
+         * @member {Object} itemDefaults
+         */
+        itemDefaults: {
+            itemDefaults: {
+                flex : 1,
+                style: {maxWidth: '300px'}
+            }
+        },
         /**
          * @member {Object[]} items
          */
         items: [{
-            module        : SelectField,
-            editable      : false,
-            forceSelection: true,
-            labelText     : 'Country',
-            name          : 'page11.countryfield',
-            reference     : 'country',
-            value         : 'DE',
+            ntype : 'container',
+            layout: {ntype: 'hbox'},
 
-            store: {
-                data: [
-                    {id: 'DE',     name: 'Germany'},
-                    {id: 'Others', name: 'Others'}
-                ]
-            }
-        }, {
-            module      : ZipCodeField,
-            countryField: 'country',
-            labelText   : 'Munich',
-            name        : 'page11.field1',
-            required    : true,
-            value       : '80796'
+            items : [{
+                module        : CountryField,
+                editable      : false,
+                forceSelection: true,
+                labelText     : 'Country',
+                name          : 'page11.countryfield1',
+                reference     : 'country1',
+                value         : 'DE',
+
+                store: {
+                    data: [
+                        {id: 'DE',     name: 'Germany'},
+                        {id: 'Others', name: 'Others'}
+                    ]
+                }
+            }, {
+                module      : ZipCodeField,
+                countryField: 'country1',
+                labelText   : 'Munich',
+                name        : 'page11.zipcodefield1',
+                required    : true,
+                style       : {marginLeft: '10px', maxWidth: '300px'},
+                value       : '80796'
+            }]
         }, {
-            module      : ZipCodeField,
-            countryField: 'country',
-            labelText   : 'Page 11 Field 2',
-            name        : 'page11.field2'
+            ntype : 'container',
+            layout: {ntype: 'hbox', align: 'stretch'},
+
+            items: [{
+                module   : ZipCodeField,
+                labelText: 'Munich',
+                name     : 'page11.zipcodefield2',
+                reference: 'zipcodefield2',
+                required : true,
+                value    : '80796'
+            }, {
+                module        : CountryField,
+                editable      : false,
+                forceSelection: true,
+                labelText     : 'Country',
+                name          : 'page11.countryfield2',
+                reference     : 'country2',
+                style         : {marginLeft: '10px', maxWidth: '300px'},
+                value         : 'DE',
+                zipCodeField  : 'zipcodefield2',
+
+                store: {
+                    data: [
+                        {id: 'DE',     name: 'Germany'},
+                        {id: 'Others', name: 'Others'}
+                    ]
+                }
+            }]
         }]
     }
 }

package/examples/ServiceWorker.mjs

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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "neo.mjs",
-    "version": "5.6.10",
+    "version": "5.6.12",
     "description": "The webworkers driven UI framework",
     "type": "module",
     "repository": {
@@ -57,7 +57,7 @@
         "neo-jsdoc-x": "^1.0.5",
         "postcss": "^8.4.23",
         "sass": "^1.62.1",
-        "webpack": "^5.82.0",
+        "webpack": "^5.82.1",
         "webpack-cli": "^5.1.1",
         "webpack-dev-server": "4.15.0",
         "webpack-hook-plugin": "^1.0.7",

package/src/DefaultConfig.mjs

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

package/src/form/field/Country.mjs

@@ -0,0 +1,58 @@
+import Select from '../../form/field/Select.mjs';
+
+/**
+ * @class Neo.form.field.Country
+ * @extends Neo.form.field.Select
+ */
+class Country extends Select {
+    static config = {
+        /**
+         * @member {String} className='Neo.form.field.Country'
+         * @protected
+         */
+        className: 'Neo.form.field.Country',
+        /**
+         * @member {String} ntype='countryfield'
+         * @protected
+         */
+        ntype: 'countryfield',
+        /**
+         * You can either pass a field instance or a field reference
+         * @member {Neo.form.field.Base|String|null} zipCodeField_=null
+         */
+        zipCodeField_: null
+    }
+
+    /**
+     * Triggered after the zipCodeField config got changed
+     * @param {Neo.form.field.Base|null} value
+     * @param {Neo.form.field.Base|null} oldValue
+     * @protected
+     */
+    afterSetZipCodeField(value, oldValue) {
+        if (value && value instanceof Neo.form.field.Base) {
+            value.countryField = this
+        }
+    }
+
+    /**
+     * Triggered before the zipCodeField config gets changed
+     * @param {Neo.form.field.Base|String|null} value
+     * @param {Neo.form.field.Base|String|null} oldValue
+     * @returns {Neo.form.field.Base|null}
+     * @protected
+     */
+    beforeSetZipCodeField(value, oldValue) {
+        let me = this;
+
+        if (Neo.isString(value)) {
+            return me.up().getReference(value)
+        }
+
+        return value;
+    }
+}
+
+Neo.applyClassConfig(Country);
+
+export default Country;

package/src/form/field/Picker.mjs

@@ -270,9 +270,16 @@ class Picker extends Text {
         // avoid breaking selection model cls updates
         await Neo.timeout(30);
 
-        me.pickerIsMounted && picker.unmount();
+        if (me.pickerIsMounted) {
+            picker.unmount();
+
+            me.pickerIsMounted = false;
 
-        me.pickerIsMounted = false;
+            Neo.main.addon.ScrollSync.unregister({
+                sourceId: me.id,
+                targetId: picker.id
+            })
+        }
     }
 
     /**
@@ -372,6 +379,11 @@ class Picker extends Text {
             });
 
             picker.render(true);
+
+            Neo.main.addon.ScrollSync.register({
+                sourceId: me.id,
+                targetId: picker.id
+            })
         }
     }
 

package/src/form/field/Select.mjs

@@ -637,7 +637,7 @@ class Select extends Picker {
                 cls: ['neo-input-field-wrapper'],
                 cn : [{
                     tag         : 'input',
-                    autocomplete: 'off',
+                    autocomplete: 'no',
                     autocorrect : 'off',
                     cls         : ['neo-textfield-input', 'neo-typeahead-input'],
                     id          : me.getInputHintId(),

package/src/form/field/Text.mjs

@@ -258,12 +258,13 @@ class Text extends Base {
 
     /**
      * Triggered after the autoComplete config got changed
+     * Chrome ignores a value of "off", so we stick to a different value instead
      * @param {Boolean} value
      * @param {Boolean} oldValue
      * @protected
      */
     afterSetAutoComplete(value, oldValue) {
-        this.changeInputElKey('autocomplete', value ? null : 'off');
+        this.changeInputElKey('autocomplete', value ? null : 'no');
     }
 
     /**

package/src/form/field/ZipCode.mjs

@@ -93,24 +93,10 @@ class ZipCode extends Text {
      * @protected
      */
     beforeSetCountryField(value, oldValue) {
-        let me = this,
-            field;
+        let me = this;
 
         if (Neo.isString(value)) {
-            field = me.up().getReference(value);
-
-            /*
-             * The related field could be at a higher index inside the items array
-             * => Not being constructed when this logic triggers.
-             * In this case we want to frequently check again until the field is found.
-             */
-            if (!field) {
-                setTimeout(() => {
-                    me.countryField = value;
-                }, 20)
-            }
-
-            return field
+            return me.up().getReference(value)
         }
 
         return value;

package/src/main/addon/DragDrop.mjs

@@ -310,10 +310,13 @@ class DragDrop extends Base {
         }
 
         if (!me.dragProxyElement || me.alwaysFireDragMove) {
+            const originalEvent = event.detail.originalEvent;
             DomEvents.sendMessageToApp({
                 ...me.getEventData(event),
                 offsetX: me.offsetX,
                 offsetY: me.offsetY,
+                screenX: originalEvent.screenX,
+                screenY: originalEvent.screenY,
                 type   : 'drag:move'
             });
         }

package/src/main/addon/GoogleMaps.mjs

@@ -167,8 +167,6 @@ class GoogleMaps extends Base {
         let key = Neo.config.googleMapsApiKey,
             url = ' https://maps.googleapis.com/maps/api/js';
 
-        window.foo = Neo.emptyFn;
-
         DomAccess.loadScript(`${url}?key=${key}&v=weekly&callback=Neo.emptyFn`).then(() => {
             console.log('GoogleMaps API loaded');
         })

package/src/main/addon/ScrollSync.mjs

@@ -30,13 +30,55 @@ class ScrollSync extends Base {
         singleton: true
     }
 
+    /**
+     * @member {Object} items=[]
+     * @protected
+     */
+    items = []
+
     /**
      * @param {Object} data
      * @param {String} data.sourceId
      * @param {String} data.targetId
      */
     register(data) {
-        console.log('register', data)
+        let me       = this,
+            items    = me.items,
+            sourceId = data.sourceId,
+            targetId = data.targetId;
+
+        // ensure that there are no duplicate entries
+        me.removeItem(sourceId, targetId);
+
+        items.push({
+            source: {id: sourceId},
+            target: {id: targetId}
+        })
+
+        console.log('register', data, items)
+    }
+
+    /**
+     * @param {String} sourceId
+     * @param {String} targetId
+     * @returns {Boolean}
+     */
+    removeItem(sourceId, targetId) {
+        let items = this.items,
+            i     = 0,
+            len   = items.length,
+            item;
+
+        for (; i < len; i++) {
+            item = items[i];
+
+            if (item.source.id === sourceId && item.target.id === targetId) {
+                items.splice(i, 1);
+                return true
+            }
+        }
+
+        return false
     }
 
     /**
@@ -45,7 +87,7 @@ class ScrollSync extends Base {
      * @param {String} data.targetId
      */
     unregister(data) {
-        console.log('unregister', data)
+        this.removeItem(data.sourceId, data.targetId)
     }
 }