neo.mjs 6.17.1 → 6.18.0

package/src/main/draggable/sensor/Mouse.mjs

@@ -47,21 +47,21 @@ class Mouse extends Base {
      */
     construct(config) {
         super.construct(config);
-        Neo.bindMethods(this, ['onDistanceChange', 'onMouseDown', 'onMouseMove', 'onMouseUp']);
+        Neo.bindMethods(this, ['onDistanceChange', 'onMouseDown', 'onMouseMove', 'onMouseUp'])
     }
 
     /**
      * Attaches sensors event listeners to the DOM
      */
     attach() {
-        document.addEventListener('mousedown', this.onMouseDown, true);
+        document.addEventListener('mousedown', this.onMouseDown, true)
     }
 
     /**
      * Detaches sensors event listeners from the DOM
      */
     detach() {
-        document.removeEventListener('mousedown', this.onMouseDown, true);
+        document.removeEventListener('mousedown', this.onMouseDown, true)
     }
 
     /**
@@ -81,7 +81,7 @@ class Mouse extends Base {
             if (timeElapsed >= me.delay && distanceTravelled >= me.minDistance) {
                 clearTimeout(me.mouseDownTimeout);
                 document.removeEventListener('mousemove', me.onDistanceChange);
-                me.startDrag();
+                me.startDrag()
             }
         }
     }
@@ -96,7 +96,7 @@ class Mouse extends Base {
 
             // see: https://github.com/neomjs/neo/issues/2669
             if (!event.path) {
-                event.path = event.composedPath();
+                event.path = event.composedPath()
             }
 
             if (target) {
@@ -113,8 +113,8 @@ class Mouse extends Base {
                 document.addEventListener('mouseup',   me.onMouseUp);
 
                 me.mouseDownTimeout = setTimeout(() => {
-                    me.onDistanceChange({pageX: me.pageX, pageY: me.pageY});
-                }, me.delay);
+                    me.onDistanceChange({pageX: me.pageX, pageY: me.pageY})
+                }, me.delay)
             }
         }
     }
@@ -137,7 +137,7 @@ class Mouse extends Base {
                 path         : me.startEvent.path || me.startEvent.composedPath(),
                 target,
                 type         : 'drag:move'
-            });
+            })
         }
     }
 
@@ -175,10 +175,10 @@ class Mouse extends Base {
                     currentElement: null,
                     dragging      : false,
                     startEvent    : null
-                });
+                })
             }
 
-            me.dragging = false;
+            me.dragging = false
         }
     }
 
@@ -186,9 +186,9 @@ class Mouse extends Base {
      *
      */
     startDrag() {
-        let me         = this,
-            element    = me.currentElement,
-            startEvent = me.startEvent;
+        let me           = this,
+            element      = me.currentElement,
+            {startEvent} = me;
 
         me.trigger(element, {
             clientX      : startEvent.clientX,
@@ -204,13 +204,13 @@ class Mouse extends Base {
 
         if (me.dragging) {
             document.addEventListener('contextmenu', preventDefault, true);
-            document.addEventListener('mousemove',   me.onMouseMove);
+            document.addEventListener('mousemove',   me.onMouseMove)
         }
     }
 }
 
 function preventDefault(event) {
-    event.preventDefault();
+    event.preventDefault()
 }
 
 Neo.setupClass(Mouse);

package/src/main/draggable/sensor/Touch.mjs

@@ -6,12 +6,12 @@ let preventScrolling = false;
 // WebKit requires cancelable touchmove events to be added as early as possible
 window.addEventListener('touchmove', event => {
     if (!preventScrolling) {
-        return;
+        return
     }
 
     // Prevent scrolling
     if (event.cancelable) {
-        event.preventDefault();
+        event.preventDefault()
     }
 }, {cancelable: true, passive: false});
 
@@ -59,21 +59,21 @@ class Touch extends Base {
      */
     construct(config) {
         super.construct(config);
-        Neo.bindMethods(this, ['onDistanceChange', 'onTouchEnd', 'onTouchMove', 'onTouchStart', 'startDrag']);
+        Neo.bindMethods(this, ['onDistanceChange', 'onTouchEnd', 'onTouchMove', 'onTouchStart', 'startDrag'])
     }
 
     /**
      * Attaches sensors event listeners to the DOM
      */
     attach() {
-        document.addEventListener('touchstart', this.onTouchStart);
+        document.addEventListener('touchstart', this.onTouchStart)
     }
 
     /**
      * Detaches sensors event listeners from the DOM
      */
     detach() {
-        document.removeEventListener('touchstart', this.onTouchStart);
+        document.removeEventListener('touchstart', this.onTouchStart)
     }
 
     /**
@@ -84,17 +84,18 @@ class Touch extends Base {
         let me = this;
 
         if (me.currentElement) {
-            const {pageX, pageY}    = DomEvents.getTouchCoords(event),
-                  start             = DomEvents.getTouchCoords(me.startEvent),
-                  timeElapsed       = Date.now() - me.touchStartTime,
-                  distanceTravelled = DomEvents.getDistance(start.pageX, start.pageY, pageX, pageY) || 0;
+            const
+                {pageX, pageY}    = DomEvents.getTouchCoords(event),
+                start             = DomEvents.getTouchCoords(me.startEvent),
+                timeElapsed       = Date.now() - me.touchStartTime,
+                distanceTravelled = DomEvents.getDistance(start.pageX, start.pageY, pageX, pageY) || 0;
 
             Object.assign(me, {pageX, pageY});
 
             if (timeElapsed >= me.delay && distanceTravelled >= me.minDistance) {
                 clearTimeout(me.tapTimeout);
                 document.removeEventListener('touchmove', me.onDistanceChange);
-                me.startDrag();
+                me.startDrag()
             }
         }
     }
@@ -140,10 +141,10 @@ class Touch extends Base {
                 currentElement: null,
                 dragging      : false,
                 startEvent    : null
-            });
+            })
         }
 
-        me.dragging = false;
+        me.dragging = false
     }
 
     /**
@@ -167,7 +168,7 @@ class Touch extends Base {
                 path         : me.startEvent.path || me.startEvent.composedPath(),
                 target,
                 type         : 'drag:move'
-            });
+            })
         }
     }
 
@@ -183,7 +184,7 @@ class Touch extends Base {
 
             // see: https://github.com/neomjs/neo/issues/2669
             if (!event.path) {
-                event.path = event.composedPath();
+                event.path = event.composedPath()
             }
 
             Object.assign(me, {
@@ -200,8 +201,8 @@ class Touch extends Base {
             document.addEventListener('touchmove',   me.onDistanceChange, {cancelable: true});
 
             me.tapTimeout = setTimeout(() => {
-                me.onDistanceChange({touches: [{pageX: me.pageX, pageY: me.pageY}]});
-            }, me.delay);
+                me.onDistanceChange({touches: [{pageX: me.pageX, pageY: me.pageY}]})
+            }, me.delay)
         }
     }
 
@@ -209,10 +210,10 @@ class Touch extends Base {
      *
      */
     startDrag() {
-        let me         = this,
-            element    = me.currentElement,
-            startEvent = me.startEvent,
-            touch      = DomEvents.getTouchCoords(me.startEvent);
+        let me           = this,
+            element      = me.currentElement,
+            {startEvent} = me,
+            touch        = DomEvents.getTouchCoords(me.startEvent);
 
         me.trigger(element, {
             clientX      : touch.pageX,
@@ -228,16 +229,16 @@ class Touch extends Base {
 
         if (me.dragging) {
             document.addEventListener('contextmenu', preventDefault, true);
-            document.addEventListener('touchmove',   me.onTouchMove);
+            document.addEventListener('touchmove',   me.onTouchMove)
         }
 
-        preventScrolling = me.dragging;
+        preventScrolling = me.dragging
     }
 }
 
 function preventDefault(event) {
     event.preventDefault();
-    event.stopPropagation();
+    event.stopPropagation()
 }
 
 Neo.setupClass(Touch);

package/src/main/mixin/DeltaUpdates.mjs

@@ -20,10 +20,10 @@ class DeltaUpdates extends Base {
      * @param {String} nodeName
      */
     du_changeNodeName(node, nodeName) {
-        let attributes = node.attributes,
-            clone      = document.createElement(nodeName),
-            i          = 0,
-            len        = attributes.length,
+        let {attributes} = node,
+            clone        = document.createElement(nodeName),
+            i            = 0,
+            len          = attributes.length,
             attribute;
 
         for (; i < len; i++) {
@@ -59,7 +59,7 @@ class DeltaUpdates extends Base {
      * @param {String} delta.parentId
      */
     du_insertNode(delta) {
-        let index         = delta.index,
+        let {index}       = delta,
             parentNode    = this.getElementOrBody(delta.parentId),
             countChildren = parentNode?.childNodes.length,
             i             = 0,
@@ -67,9 +67,7 @@ class DeltaUpdates extends Base {
             hasComments   = false,
             node;
 
-        if (!parentNode) {
-            // console.log('parentNode not found', delta.parentId);
-        } else {
+        if (parentNode) {
             // console.log('insertNode', index, countChildren, delta.parentId);
 
             if (countChildren <= 20 && parentNode.nodeName !== 'TBODY') {
@@ -118,7 +116,7 @@ class DeltaUpdates extends Base {
      * @param {String} delta.parentId
      */
     du_moveNode(delta) {
-        let index      = delta.index,
+        let {index}    = delta,
             node       = this.getElement(delta.id),
             parentNode = this.getElement(delta.parentId);
 
@@ -291,9 +289,9 @@ class DeltaUpdates extends Base {
      * @param {String} [data.origin='app']
      */
     update(data) {
-        let me     = this,
-            deltas = data.deltas,
-            i      = 0,
+        let me       = this,
+            {deltas} = data,
+            i        = 0,
             len, map;
 
         deltas = Array.isArray(deltas) ? deltas : [deltas];

package/src/main/mixin/TouchDomEvents.mjs

@@ -19,42 +19,42 @@ class TouchDomEvents extends Base {
      * @param {Object} event
      */
     onTouchCancel(event) {
-        this.sendMessageToApp(this.getEventData(event));
+        this.sendMessageToApp(this.getEventData(event))
     }
 
     /**
      * @param {Object} event
      */
     onTouchEnd(event) {
-        this.sendMessageToApp(this.getEventData(event));
+        this.sendMessageToApp(this.getEventData(event))
     }
 
     /**
      * @param {Object} event
      */
     onTouchEnter(event) {
-        this.sendMessageToApp(this.getEventData(event));
+        this.sendMessageToApp(this.getEventData(event))
     }
 
     /**
      * @param {Object} event
      */
     onTouchLeave(event) {
-        this.sendMessageToApp(this.getEventData(event));
+        this.sendMessageToApp(this.getEventData(event))
     }
 
     /**
      * @param {Object} event
      */
     onTouchMove(event) {
-        this.sendMessageToApp(this.getEventData(event));
+        this.sendMessageToApp(this.getEventData(event))
     }
 
     /**
      * @param {Object} event
      */
     onTouchStart(event) {
-        this.sendMessageToApp(this.getEventData(event));
+        this.sendMessageToApp(this.getEventData(event))
     }
 }
 

package/src/manager/Base.mjs

@@ -19,7 +19,7 @@ class Base extends CollectionBase{
      * @returns {Object}
      */
     getById(id) {
-        return id && this.get(id) || null;
+        return id && this.get(id) || null
     }
 
     /**
@@ -29,9 +29,9 @@ class Base extends CollectionBase{
         let me = this;
 
         if (me.get(item.id)) {
-            Neo.logError('Trying to create an item with an already existing id', item, me.get(item.id));
+            Neo.logError('Trying to create an item with an already existing id', item, me.get(item.id))
         } else {
-            me.push(item);
+            me.push(item)
         }
     }
 
@@ -40,7 +40,7 @@ class Base extends CollectionBase{
      * @param {Object|String} item
      */
     unregister(item) {
-        this.remove(item);
+        this.remove(item)
     }
 }
 

package/src/manager/Component.mjs

@@ -29,7 +29,7 @@ class Component extends Base {
         let me = this;
 
         Neo.first        = me.getFirst.bind(me); // alias
-        Neo.getComponent = me.getById.bind(me);  // alias
+        Neo.getComponent = me.getById.bind(me)   // alias
     }
 
     /**
@@ -56,9 +56,9 @@ class Component extends Base {
         if (Neo.isString(config)) {
             config = {
                 ntype: config
-            };
+            }
         } else if (!config) {
-            config = {};
+            config = {}
         }
 
         configArray  = Object.entries(config);
@@ -68,16 +68,16 @@ class Component extends Base {
             if ((component[key] === value)
                 || (key === 'ntype' && me.hasPrototypePropertyValue(component, key, value)))
             {
-                matchArray.push(true);
+                matchArray.push(true)
             }
         });
 
         if (matchArray.length === configLength) {
             if (returnFirstMatch) {
-                return component;
+                return component
             }
 
-            returnArray.push(component);
+            returnArray.push(component)
         }
 
         childItems = me.find({parentId: component.id});
@@ -88,14 +88,14 @@ class Component extends Base {
 
             if (returnFirstMatch) {
                 if (returnValue !== null) {
-                    return returnValue;
+                    return returnValue
                 }
             } else if (returnValue.length > 0) {
-                returnArray.push(...returnValue);
+                returnArray.push(...returnValue)
             }
         }
 
-        return returnFirstMatch ? null: returnArray;
+        return returnFirstMatch ? null: returnArray
     }
 
     /**
@@ -112,11 +112,11 @@ class Component extends Base {
             id = path[i];
 
             if (id && me.has(id)) {
-                return id;
+                return id
             }
         }
 
-        return null;
+        return null
     }
 
     /**
@@ -135,10 +135,10 @@ class Component extends Base {
 
             childComponents = me.getChildComponents(item);
 
-            childComponents && components.push(...childComponents);
+            childComponents && components.push(...childComponents)
         });
 
-        return components;
+        return components
     }
 
     /**
@@ -149,7 +149,7 @@ class Component extends Base {
      * @returns {Array} childIds
      */
     getChildIds(vnode, childIds) {
-        return VNodeUtil.getChildIds(vnode, childIds);
+        return VNodeUtil.getChildIds(vnode, childIds)
     }
 
     /**
@@ -166,11 +166,11 @@ class Component extends Base {
             childComponent = this.get(node);
 
             if (childComponent) {
-                childComponents.push(childComponent);
+                childComponents.push(childComponent)
             }
         });
 
-        return childComponents;
+        return childComponents
     }
 
     /**
@@ -227,18 +227,18 @@ class Component extends Base {
                         const pairs = pairsMatch[1].split(',');
                         pairs.forEach((pair) => {
                             const [key, value] = pair.split('=');
-                            obj[key] = value.replace(/"/g, '');
+                            obj[key] = value.replace(/"/g, '')
                         });
                     }
                 }
                 objects.push(obj);
 
-                regex.lastIndex++;
+                regex.lastIndex++
             }
         } else if (Neo.isObject(componentDescription)){
-            objects.push(componentDescription);
+            objects.push(componentDescription)
         } else if (Neo.isArray(componentDescription)) {
-            objects = componentDescription;
+            objects = componentDescription
         }
 
         /* find the correct child using down() */
@@ -247,10 +247,11 @@ class Component extends Base {
                 let child = acc.down(key, returnFirstMatch);
 
                 if (!!child) {
-                    return child;
+                    return child
                 }
             }
-            return null;
+
+            return null
         }, root);
 
         return result
@@ -268,11 +269,11 @@ class Component extends Base {
             component = this.getById(component.parentId);
 
             if (component) {
-                parentIds.push(component.id);
+                parentIds.push(component.id)
             }
         }
 
-        return parentIds;
+        return parentIds
     }
 
     /**
@@ -287,11 +288,11 @@ class Component extends Base {
 
         for (; i < len; i++) {
             if (me.has(path[i])) {
-                componentPath.push(path[i]);
+                componentPath.push(path[i])
             }
         }
 
-        return componentPath;
+        return componentPath
     }
 
     /**
@@ -301,7 +302,7 @@ class Component extends Base {
      */
     getParents(component) {
         if (Neo.isString(component)) {
-            component = this.getById(component);
+            component = this.getById(component)
         }
 
         let parents = [];
@@ -310,11 +311,11 @@ class Component extends Base {
             component = this.getById(component.parentId);
 
             if (component) {
-                parents.push(component);
+                parents.push(component)
             }
         }
 
-        return parents;
+        return parents
     }
 
     /**
@@ -328,12 +329,13 @@ class Component extends Base {
     hasPrototypePropertyValue(component, property, value) {
         while (component !== null) {
             if (component.hasOwnProperty(property) && component[property] === value) {
-                return true;
+                return true
             }
-            component = component.__proto__;
+
+            component = component.__proto__
         }
 
-        return false;
+        return false
     }
 
     /**
@@ -353,9 +355,9 @@ class Component extends Base {
         if (Neo.isString(config)) {
             config = {
                 ntype: config
-            };
+            }
         } else if (!config) {
-            config = {};
+            config = {}
         }
 
         configArray  = Object.entries(config);
@@ -365,28 +367,26 @@ class Component extends Base {
             component = this.getById(component.parentId);
 
             if (!component) {
-                return returnFirstMatch ? null : returnArray;
+                return returnFirstMatch ? null : returnArray
             }
 
             matchArray = [];
 
             configArray.forEach(([key, value]) => {
                 if (component[key] === value) {
-                    matchArray.push(true);
+                    matchArray.push(true)
                 }
             });
 
             if (matchArray.length === configLength) {
                 if (returnFirstMatch) {
-                    return component;
+                    return component
                 }
 
-                returnArray.push(component);
+                returnArray.push(component)
             }
         }
     }
 }
 
-let instance = Neo.setupClass(Component);
-
-export default instance;
+export default Neo.setupClass(Component);