neo.mjs 6.17.2 → 6.18.1

package/src/calendar/view/week/plugin/DragDrop.mjs

@@ -16,11 +16,20 @@ class DragDrop extends Base {
          * @protected
          */
         className: 'Neo.calendar.view.week.plugin.DragDrop',
+        /**
+         * @member {String} ntype='plugin-calendar-week-dragdrop'
+         * @protected
+         */
+        ntype: 'plugin-calendar-week-dragdrop',
         /**
          * @member {Boolean} isDragging=false
          * @protected
          */
-        isDragging: false
+        isDragging: false,
+        /**
+         * @member {String} resizablePluginType='plugin-calendar-week-dragdrop'
+         */
+        resizablePluginType: 'calendar-week-eventresizable'
     }
 
     /**
@@ -31,10 +40,9 @@ class DragDrop extends Base {
 
         let me         = this,
             columnOpts = {scope: me, delegate: '.neo-c-w-column'},
-            eventOpts  = {scope: me, delegate: '.neo-event'},
-            owner      = me.owner;
+            eventOpts  = {scope: me, delegate: '.neo-event'};
 
-        owner.addDomListeners([
+        me.owner.addDomListeners([
             {'drag:end'  : me.onColumnDragEnd,   ...columnOpts},
             {'drag:end'  : me.onEventDragEnd,    ...eventOpts},
             {'drag:move' : me.onColumnDragMove,  ...columnOpts},
@@ -66,10 +74,9 @@ class DragDrop extends Base {
      * @returns {Neo.calendar.view.week.EventDragZone}
      */
     getEventDragZone(opts) {
-        let me            = this,
-            owner         = me.owner,
-            eventDragZone = owner.eventDragZone,
-            timeAxis      = owner.timeAxis,
+        let me                        = this,
+            {appName, owner}          = me,
+            {eventDragZone, timeAxis} = owner,
 
             config = {
                 axisEndTime                     : timeAxis.getTime(owner.endTime),
@@ -83,7 +90,7 @@ class DragDrop extends Base {
         if (!eventDragZone) {
             owner.eventDragZone = eventDragZone = Neo.create({
                 module           : EventDragZone,
-                appName          : me.appName,
+                appName,
                 owner,
                 scrollContainerId: owner.getScrollContainer().id,
                 ...config,
@@ -94,12 +101,12 @@ class DragDrop extends Base {
                         willChange: 'height'
                     }
                 }
-            });
+            })
         } else {
-            eventDragZone.set(config);
+            eventDragZone.set(config)
         }
 
-        return eventDragZone;
+        return eventDragZone
     }
 
     /**
@@ -107,11 +114,11 @@ class DragDrop extends Base {
      * @returns {Boolean}
      */
     isActiveCalendar() {
-        let owner         = this.owner,
-            calendarStore = owner.calendarStore,
-            calendarId    = owner.data.activeCalendarId || calendarStore.getAt(0)[calendarStore.keyProperty];
+        let {owner}         = this,
+            {calendarStore} = owner,
+            calendarId      = owner.data.activeCalendarId || calendarStore.getAt(0)[calendarStore.keyProperty];
 
-        return calendarStore.get(calendarId).active;
+        return calendarStore.get(calendarId).active
     }
 
     /**
@@ -119,7 +126,7 @@ class DragDrop extends Base {
      * @returns {Boolean}
      */
     isTopLevelColumn(path) {
-        return path[0].cls.includes('neo-c-w-column');
+        return path[0].cls.includes('neo-c-w-column')
     }
 
     /**
@@ -127,16 +134,16 @@ class DragDrop extends Base {
      * @returns {Boolean}
      */
     isTopLevelEvent(eventData) {
-        return eventData.path[0].cls.includes('neo-event');
+        return eventData.path[0].cls.includes('neo-event')
     }
 
     /**
      * @param {Object} data
      */
     onColumnDragEnd(data) {
-        let me     = this,
-            owner  = me.owner,
-            record = me[newRecordSymbol];
+        let me      = this,
+            {owner} = me,
+            record  = me[newRecordSymbol];
 
         if (record && me.isTopLevelColumn(data.path)) {
             me.isDragging = false;
@@ -148,8 +155,8 @@ class DragDrop extends Base {
                 style: {opacity: 1}
             }).then(() => {
                 owner.eventDragZone.dragEnd();
-                owner.getPlugin({flag:'resizable'}).onDragEnd(data);
-            });
+                owner.getPlugin(me.resizablePluginType).onDragEnd(data)
+            })
         }
     }
 
@@ -160,7 +167,7 @@ class DragDrop extends Base {
         let me = this;
 
         if (me.isActiveCalendar() && me.isTopLevelColumn(data.path)) {
-            me.owner.eventDragZone?.dragMove(data);
+            me.owner.eventDragZone?.dragMove(data)
         }
     }
 
@@ -171,9 +178,9 @@ class DragDrop extends Base {
         let me = this;
 
         if (me.isActiveCalendar() && me.isTopLevelColumn(data.targetPath)) {
-            let owner           = me.owner,
+            let {owner}         = me,
                 axisStartTime   = owner.timeAxis.getTime(owner.startTime),
-                calendarStore   = owner.calendarStore,
+                {calendarStore} = owner,
                 columnRect      = data.path[0].rect,
                 intervalSize    = 15,
                 intervals       = (owner.timeAxis.getTime(owner.endTime) - axisStartTime) * 60 / intervalSize,
@@ -217,16 +224,16 @@ class DragDrop extends Base {
                     proxyParentId                   : data.path[0].id
                 });
 
-                owner.getPlugin({flag:'resizable'}).onDragStart(data);
+                owner.getPlugin(me.resizablePluginType).onDragStart(data);
                 eventDragZone.dragStart(data);
 
                 setTimeout(() => {
                     me.isDragging && Neo.applyDeltas(me.appName, {
                         id   : eventId,
                         style: {opacity: 0}
-                    });
-                }, 50);
-            }, 50);
+                    })
+                }, 50)
+            }, 50)
         }
     }
 
@@ -234,20 +241,21 @@ class DragDrop extends Base {
      * @param {Object} data
      */
     onEventDragEnd(data) {
-        let me    = this,
-            owner = me.owner;
+        let me              = this,
+            {owner}         = me,
+            {eventDragZone} = owner;
 
         if (owner.enableDrag) {
-            owner.eventDragZone.dragEnd();
+            eventDragZone.dragEnd();
 
             if (!me.isTopLevelEvent(data)) {
                 data = me.adjustResizeEvent(data);
-                owner.getPlugin({flag:'resizable'}).onDragEnd(data);
+                owner.getPlugin(me.resizablePluginType).onDragEnd(data)
             } else {
-                owner.eventDragZone.removeBodyCursorCls();
+                eventDragZone.removeBodyCursorCls()
             }
 
-            me.isDragging = false;
+            me.isDragging = false
         }
     }
 
@@ -255,15 +263,15 @@ class DragDrop extends Base {
      * @param {Object} data
      */
     onEventDragMove(data) {
-        let me    = this,
-            owner = me.owner;
+        let me      = this,
+            {owner} = me;
 
         if (owner.enableDrag) {
             if (!me.isTopLevelEvent(data)) {
-                data = me.adjustResizeEvent(data);
+                data = me.adjustResizeEvent(data)
             }
 
-            owner.eventDragZone.dragMove(data);
+            owner.eventDragZone.dragMove(data)
         }
     }
 
@@ -272,7 +280,7 @@ class DragDrop extends Base {
      */
     onEventDragStart(data) {
         let me        = this,
-            owner     = me.owner,
+            {owner}   = me,
             modelData = owner.data;
 
         if (owner.enableDrag) {
@@ -280,7 +288,7 @@ class DragDrop extends Base {
                 dragElement, eventDragZone;
 
             if (!isTopLevelEvent) {
-                data = me.adjustResizeEvent(data);
+                data = me.adjustResizeEvent(data)
             }
 
             me.isDragging = true;
@@ -295,12 +303,12 @@ class DragDrop extends Base {
             });
 
             if (isTopLevelEvent) {
-                eventDragZone.addBodyCursorCls();
+                eventDragZone.addBodyCursorCls()
             } else {
-                owner.getPlugin({flag:'resizable'}).onDragStart(data);
+                owner.getPlugin(me.resizablePluginType).onDragStart(data)
             }
 
-            eventDragZone.dragStart(data);
+            eventDragZone.dragStart(data)
         }
     }
 }

package/src/calendar/view/week/plugin/EventResizable.mjs

@@ -10,7 +10,12 @@ class EventResizable extends Resizable {
          * @member {String} className='Neo.calendar.view.week.plugin.EventResizable'
          * @protected
          */
-        className: 'Neo.calendar.view.week.plugin.EventResizable'
+        className: 'Neo.calendar.view.week.plugin.EventResizable',
+        /**
+         * @member {String} ntype='plugin-calendar-week-eventresizable'
+         * @protected
+         */
+        ntype: 'plugin-calendar-week-eventresizable'
     }
 
     /**
@@ -39,7 +44,7 @@ class EventResizable extends Resizable {
 
         me.isDragging = true;
         me.addBodyCursorCls();
-        me.owner.eventDragZone[me.currentNodeName === 'top' ? 'keepEndDate' : 'keepStartDate'] = true;
+        me.owner.eventDragZone[me.currentNodeName === 'top' ? 'keepEndDate' : 'keepStartDate'] = true
     }
 
     /**
@@ -48,7 +53,7 @@ class EventResizable extends Resizable {
      */
     onMouseMove(data) {
         if (this.owner.data.events.enableDrag) {
-            super.onMouseMove(data);
+            super.onMouseMove(data)
         }
     }
 }

package/src/collection/Base.mjs

@@ -162,10 +162,10 @@ class Base extends CoreBase {
      */
     afterSetItems(value, oldValue) {
         if (value) {
-            let me          = this,
-                keyProperty = me.keyProperty,
-                i           = 0,
-                len         = value.length,
+            let me            = this,
+                {keyProperty} = me,
+                i             = 0,
+                len           = value.length,
                 item;
 
             for (; i < len; i++) {
@@ -322,16 +322,15 @@ class Base extends CoreBase {
                 hasMatch = false;
                 i        = 0;
 
+                let {direction, property} = key;
+
                 for (; i < len; i++) {
                     if (oldValue[i] === key) {
-                        oldValue[i].set({
-                            direction: key.direction,
-                            property : key.property
-                        });
+                        oldValue[i].set({direction, property});
 
                         hasMatch = true;
                         break
-                    } else if (oldValue[i].property === key.property && oldValue[i].direction === key.direction) {
+                    } else if (oldValue[i].property === property && oldValue[i].direction === direction) {
                         hasMatch = true;
                         break
                     }
@@ -362,8 +361,8 @@ class Base extends CoreBase {
         console.log('cacheUpdate', opts, this[toAddArray]);
         return;
 
-        let me          = this,
-            keyProperty = me.keyProperty,
+        let me            = this,
+            {keyProperty} = me,
             index, toAddMap, toRemoveMap;
 
         if (!me[silentUpdateMode]) {
@@ -477,9 +476,7 @@ class Base extends CoreBase {
     doSort(items=this._items, silent=false) {
         let me                = this,
             previousItems     = [...items],
-            sorters           = me.sorters,
-            sortDirections    = me.sortDirections,
-            sortProperties    = me.sortProperties,
+            {sorters, sortDirections, sortProperties} = me,
             countSorters      = sortProperties.length || 0,
             hasSortByMethod   = false,
             hasTransformValue = false,
@@ -510,7 +507,7 @@ class Base extends CoreBase {
                     }
 
                     return 0
-                });
+                })
             } else {
                 if (hasTransformValue) {
                     // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#Sorting_with_map
@@ -1126,11 +1123,10 @@ class Base extends CoreBase {
      */
     splice(index, removeCountOrToRemoveArray, toAddArray) {
         let me                 = this,
+            {keyProperty, map} = me,
             source             = me.getSource(),
             addedItems         = [],
             items              = me._items,
-            keyProperty        = me.keyProperty,
-            map                = me.map,
             removedItems       = [],
             removeCountAtIndex = Neo.isNumber(removeCountOrToRemoveArray) ? removeCountOrToRemoveArray : null,
             toRemoveArray      = Array.isArray(removeCountOrToRemoveArray) ? removeCountOrToRemoveArray : null,
@@ -1192,7 +1188,7 @@ class Base extends CoreBase {
 
         if (source) {
             if (!source.getSource()) {
-                source.preventBubbleUp = true;
+                source.preventBubbleUp = true
             }
 
             if (!me.preventBubbleUp) {
@@ -1226,10 +1222,7 @@ class Base extends CoreBase {
             delete me.preventBubbleUp
         }
 
-        return {
-            addedItems,
-            removedItems
-        }
+        return {addedItems, removedItems}
     }
 
     /**

package/src/collection/Filter.mjs

@@ -146,10 +146,8 @@ class Filter extends Base {
      * @returns {Object|null}
      */
     export() {
-        let me       = this,
-            operator = me.operator,
-            property = me.property,
-            value    = me.value;
+        let me                          = this,
+            {operator, property, value} = me;
 
         if (!me.filterBy) {
             return {operator, property, value}
@@ -166,11 +164,8 @@ class Filter extends Base {
         let me = this;
 
         if (oldValue !== undefined && me.isUpdating !== true) {
-            me.fire('change', {
-                operator: me.operator,
-                property: me.property,
-                value   : me.value
-            })
+            let {operator, property, value} = me;
+            me.fire('change', {operator, property, value})
         }
     }
 

package/src/collection/Sorter.mjs

@@ -124,15 +124,14 @@ class Sorter extends Base {
      * @returns {Object|null}
      */
     export() {
-        let me        = this,
-            direction = me.direction,
-            property  = me.property;
+        let me                    = this,
+            {direction, property} = me;
 
         if (!me.sortBy && direction && property) {
-            return {direction, property};
+            return {direction, property}
         }
 
-        return null;
+        return null
     }
 
     /**
@@ -141,10 +140,10 @@ class Sorter extends Base {
      */
     transformValue(value) {
         if (typeof value === 'string') {
-            value = value.toLowerCase();
+            value = value.toLowerCase()
         }
 
-        return value;
+        return value
     }
 }
 

package/src/component/Base.mjs

@@ -13,8 +13,10 @@ import VDomUtil         from '../util/VDom.mjs';
 import VNodeUtil        from '../util/VNode.mjs';
 
 const
-    lengthRE = /^\d+\w+$/,
-    addUnits = value => value == null ? value : isNaN(value) ? value : `${value}px`;
+    addUnits          = value => value == null ? value : isNaN(value) ? value : `${value}px`,
+    closestController = Symbol.for('closestController'),
+    closestModel      = Symbol.for('closestModel'),
+    lengthRE          = /^\d+\w+$/;
 
 /**
  * @class Neo.component.Base
@@ -422,7 +424,7 @@ class Base extends CoreBase {
     get parent() {
         let me = this;
 
-        return me.parentComponent || me.parentId !== 'document.body' ? Neo.getComponent(me.parentId) : null
+        return me.parentComponent || me.parentId === 'document.body' ? null : Neo.getComponent(me.parentId)
     }
 
     /**
@@ -577,9 +579,11 @@ class Base extends CoreBase {
     afterSetDomListeners(value, oldValue) {
         let me = this;
 
-        me.getController()?.parseDomListeners(me);
+        if (value?.[0] || oldValue?.[0]) {
+            me.getController()?.parseDomListeners(me);
 
-        DomEventManager.updateDomListeners(me, value, oldValue)
+            DomEventManager.updateDomListeners(me, value, oldValue)
+        }
     }
 
     /**
@@ -840,22 +844,19 @@ class Base extends CoreBase {
      * @protected
      */
     async afterSetResponsive(value, oldValue) {
-        if (!value) {
-            return
-        }
-
-        let me      = this,
-            module  = await import(`../../src/plugin/Responsive.mjs`),
-            plugins = me.plugins || [];
-
-        plugins.push({
-            module : module.default,
-            appName: me.appName,
-            id     : 'responsive',
-            value
-        });
+        if (value && !this.getPlugin('responsive')) {
+            let me      = this,
+                module  = await import(`../../src/plugin/Responsive.mjs`),
+                plugins = me.plugins || [];
+
+            plugins.push({
+                module : module.default,
+                appName: me.appName,
+                value
+            });
 
-        me.plugins = plugins
+            me.plugins = plugins
+        }
     }
 
     /**
@@ -1132,15 +1133,6 @@ class Base extends CoreBase {
         return this.getModel().getHierarchyData()
     }
 
-    /**
-     * Triggered when accessing the parentComponent config
-     * @param {Object} value
-     * @protected
-     */
-    beforeParentComponent(value) {
-        return value || this.parent
-    }
-
     /**
      * Triggered when accessing the style config
      * @param {Object} value
@@ -1252,7 +1244,7 @@ class Base extends CoreBase {
      * Creates a KeyNavigation instance if needed.
      * @param {Object} value
      * @param {Object} oldValue
-     * @returns {Neo.util.KeyNavigation}
+     * @returns {Neo.util.KeyNavigation|null}
      * @protected
      */
     beforeSetKeys(value, oldValue) {
@@ -1515,14 +1507,14 @@ class Base extends CoreBase {
         const result = [];
 
         if (this.floating) {
-            result.push('neo-floating');
+            result.push('neo-floating')
         }
 
-        return result;
+        return result
     }
 
     /**
-     * Find an instance stored inside a config via optionally passing an ntype.
+     * Find an instance stored inside a config via optionally passing a ntype.
      * Returns this[configName] or the closest parent component with a match.
      * Used by getController() & getModel()
      * @param {String} configName
@@ -1530,9 +1522,9 @@ class Base extends CoreBase {
      * @returns {Neo.core.Base|null}
      */
     getConfigInstanceByNtype(configName, ntype) {
-        let me              = this,
-            config          = me[configName],
-            parentComponent = me.parentComponent;
+        let me                = this,
+            config            = me[configName],
+            {parentComponent} = me;
 
         if (config && (!ntype || ntype === config.ntype)) {
             return config
@@ -1555,7 +1547,24 @@ class Base extends CoreBase {
      * @returns {Neo.controller.Component|null}
      */
     getController(ntype) {
-        return this.getConfigInstanceByNtype('controller', ntype)
+        let me = this,
+            controller;
+
+        if (!ntype) {
+            controller = me[closestController];
+
+            if (controller) {
+                return controller
+            }
+        }
+
+        controller = me.getConfigInstanceByNtype('controller', ntype);
+
+        if (!ntype) {
+            me[closestController] = controller;
+        }
+
+        return controller
     }
 
     /**
@@ -1565,7 +1574,7 @@ class Base extends CoreBase {
      * @returns {Promise<Neo.util.Rectangle>}
      */
     async getDomRect(id=this.id, appName=this.appName) {
-        const result = await Neo.main.DomAccess.getBoundingClientRect({appName, id, windowId: this.windowId});
+        let result = await Neo.main.DomAccess.getBoundingClientRect({appName, id, windowId: this.windowId});
 
         if (Array.isArray(result)) {
             return result.map(rect => Rectangle.clone(rect))
@@ -1584,7 +1593,24 @@ class Base extends CoreBase {
             return null
         }
 
-        return this.getConfigInstanceByNtype('model', ntype)
+        let me = this,
+            model;
+
+        if (!ntype) {
+            model = me[closestModel];
+
+            if (model) {
+                return model
+            }
+        }
+
+        model = me.getConfigInstanceByNtype('model', ntype);
+
+        if (!ntype) {
+            me[closestModel] = model
+        }
+
+        return model
     }
 
     /**
@@ -1637,7 +1663,13 @@ class Base extends CoreBase {
      * @returns {Neo.plugin.Base|null}
      */
     getPlugin(opts) {
-        opts = typeof opts !== 'string' ? opts : {id: opts};
+        if (Neo.isString(opts)) {
+            if (!opts.startsWith('plugin-')) {
+                opts = 'plugin-' + opts
+            }
+
+            opts = {ntype: opts}
+        }
 
         let me = this,
             hasMatch;
@@ -1810,7 +1842,7 @@ class Base extends CoreBase {
                     resolve && me.resolveUpdateCache.push(resolve)
                     return true
                 } else {
-                    return me.isParentVdomUpdating(parent.parentId)
+                    return me.isParentVdomUpdating(parent.parentId, resolve)
                 }
             }
         }

package/src/component/Canvas.mjs

@@ -42,10 +42,10 @@ class Canvas extends Component {
     afterSetMounted(value, oldValue) {
         super.afterSetMounted(value, oldValue);
 
-        let me        = this,
-            id        = me.getCanvasId(),
-            offscreen = me.offscreen,
-            worker    = Neo.currentWorker;
+        let me          = this,
+            id          = me.getCanvasId(),
+            {offscreen} = me,
+            worker      = Neo.currentWorker;
 
         if (value && offscreen) {
             worker.promiseMessage('main', {
@@ -58,11 +58,11 @@ class Canvas extends Component {
                     node  : data.offscreen,
                     nodeId: id
                 }, [data.offscreen]).then(() => {
-                    me.offscreenRegistered = true;
-                });
-            });
+                    me.offscreenRegistered = true
+                })
+            })
         } else if (offscreen) {
-            me.offscreenRegistered = false;
+            me.offscreenRegistered = false
         }
     }
 
@@ -71,7 +71,7 @@ class Canvas extends Component {
      * @returns {String}
      */
     getCanvasId() {
-        return this.id;
+        return this.id
     }
 }