neo.mjs 5.7.1 → 5.7.3

package/apps/ServiceWorker.mjs

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

package/examples/ServiceWorker.mjs

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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "neo.mjs",
-    "version": "5.7.1",
+    "version": "5.7.3",
     "description": "The webworkers driven UI framework",
     "type": "module",
     "repository": {

package/src/DefaultConfig.mjs

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

package/src/form/field/Number.mjs

@@ -32,6 +32,11 @@ class Number extends Text {
          * @member {String[]} baseCls=['neo-numberfield','neo-textfield']
          */
         baseCls: ['neo-numberfield', 'neo-textfield'],
+        /**
+         * Prevent users from typing specific characters.
+         * @member {String[]|null} disabledChars=['e','E']
+         */
+        disabledChars: ['e', 'E'],
         /**
          * data passes maxLength, minLength & valueLength properties
          * @member {Function} errorTextMaxValue=data=>`Max value violation: ${data.value} / ${data.maxValue}`
@@ -254,7 +259,7 @@ class Number extends Text {
             return false;
         }
 
-        if (value % me.stepSize !== 0) {
+        if ((value / me.stepSize) % 1 !== 0) {
             return false;
         }
 
@@ -275,13 +280,11 @@ class Number extends Text {
      * @protected
      */
     onFocusLeave(data) {
-        let me          = this,
-            stepSizePow = Math.pow(10, me.stepSizeDigits),
-            value       = me.value;
+        let me    = this,
+            value = me.value;
 
         if (value !== null) {
             value = me.stepSizeDigits > 0 ? parseFloat(value) : parseInt(value);
-            value = value - Math.round((value % me.stepSize) * stepSizePow) / stepSizePow;
             value = Math.max(me.minValue, value);
             value = Math.min(me.maxValue, value);
 
@@ -378,7 +381,6 @@ class Number extends Text {
             maxValue    = me.maxValue,
             minValue    = me.minValue,
             stepSize    = me.stepSize,
-            stepSizePow = Math.pow(10, me.stepSizeDigits),
             returnValue = super.validate(silent),
             errorParam  = {maxValue, minValue, stepSize, value};
 
@@ -389,7 +391,7 @@ class Number extends Text {
             } else if (Neo.isNumber(minValue) && isNumber && value < minValue) {
                 me._error = me.errorTextMinValue(errorParam);
                 returnValue = false;
-            } else if ((Math.round((value % me.stepSize) * stepSizePow) / stepSizePow) !== 0) {
+            } else if ((value / me.stepSize) % 1 !== 0) {
                 me._error = me.errorTextStepSize(errorParam);
                 returnValue = false;
             }

package/src/form/field/Text.mjs

@@ -69,6 +69,12 @@ class Text extends Base {
          * @member {Boolean} clearToOriginalValue_=false
          */
         clearToOriginalValue_: false,
+        /**
+         * Prevent users from typing specific characters.
+         * E.g. disabling +-e for NumberFields
+         * @member {String[]|null} disabledChars_=null
+         */
+        disabledChars_: null,
         /**
          * @member {String|null} error_=null
          */
@@ -299,6 +305,24 @@ class Text extends Base {
         })
     }
 
+    /**
+     * Triggered after the disabledChars config got changed
+     * @param {String[]|null} value
+     * @param {String[]|null} oldValue
+     * @protected
+     */
+    afterSetDisabledChars(value, oldValue) {
+        if (value) {
+            let me = this;
+
+            Neo.main.DomEvents.registerDisabledInputChars({
+                appName: me.appName,
+                chars  : value,
+                id     : me.getInputEl().id
+            })
+        }
+    }
+
     /**
      * Triggered after the error config got changed
      * @param {String|null} value
@@ -936,6 +960,23 @@ class Text extends Base {
         me.fire('clear')
     }
 
+    /**
+     *
+     * @param args
+     */
+    destroy(...args) {
+        let me = this;
+
+        if (me.disabledChars) {
+            Neo.main.DomEvents.unregisterDisabledInputChars({
+                appName: me.appName,
+                id     : me.getInputEl().id
+            })
+        }
+
+        super.destroy(...args);
+    }
+
     /**
      * Calls focus() on the inputEl node instead
      * @param {String} id=this.id

package/src/main/DomEvents.mjs

@@ -60,7 +60,8 @@ const lastWheelEvent = {
     target: null
 };
 
-const preventClickTargets       = [],
+const disabledInputKeys         = {},
+      preventClickTargets       = [],
       preventContextmenuTargets = [];
 
 /**
@@ -100,7 +101,9 @@ class DomEvents extends Base {
         remote: {
             app: [
                 'addDomListener',
-                'registerPreventDefaultTargets'
+                'registerDisabledInputChars',
+                'registerPreventDefaultTargets',
+                'unregisterDisabledInputChars'
             ]
         }
     }
@@ -507,11 +510,18 @@ class DomEvents extends Base {
      * @param {Object} event
      */
     onKeyDown(event) {
-        this.sendMessageToApp(this.getKeyboardEventData(event));
+        let target  = event.target,
+            isInput = target.nodeName === 'INPUT';
 
-        if (event.target.nodeName !== 'INPUT') { // see: https://github.com/neomjs/neo/issues/1729
-            if (['ArrowDown', 'ArrowLeft', 'ArrowRight', 'ArrowUp'].includes(event.key)) {
-                event.preventDefault();
+        if (isInput && disabledInputKeys[target.id]?.includes(event.key)) {
+            event.preventDefault();
+        } else {
+            this.sendMessageToApp(this.getKeyboardEventData(event));
+
+            if (!isInput) { // see: https://github.com/neomjs/neo/issues/1729
+                if (['ArrowDown', 'ArrowLeft', 'ArrowRight', 'ArrowUp'].includes(event.key)) {
+                    event.preventDefault();
+                }
             }
         }
     }
@@ -659,7 +669,16 @@ class DomEvents extends Base {
             value = true;
         }
 
-        return value;
+        return value
+    }
+
+    /**
+     * @param {Object} data
+     * @param {String[]} data.chars
+     * @param {String} data.id
+     */
+    registerDisabledInputChars(data) {
+        disabledInputKeys[data.id] = data.chars
     }
 
     /**
@@ -726,7 +745,15 @@ class DomEvents extends Base {
             }
         }
 
-        return false;
+        return false
+    }
+
+    /**
+     * @param {Object} data
+     * @param {String} data.id
+     */
+    unregisterDisabledInputChars(data) {
+        delete disabledInputKeys[data.id]
     }
 }