neo.mjs 6.17.2 → 6.18.1

package/src/component/wrapper/MapboxGL.mjs

@@ -84,7 +84,7 @@ class MapboxGL extends Component {
      * @protected
      */
     afterSetCenter(value, oldValue) {
-        this.centerMap(value);
+        this.centerMap(value)
     }
 
     /**
@@ -94,14 +94,16 @@ class MapboxGL extends Component {
      * @protected
      */
     afterSetChartData(value, oldValue) {
-        let me = this;
+        let me = this,
+            {appName, dataSourceId, id, windowId} = me;
 
         value && Neo.main.addon.MapboxGL.updateData({
-            appName     : me.appName,
-            data        : value,
-            dataSourceId: me.dataSourceId,
-            id          : me.id
-        });
+            appName,
+            data: value,
+            dataSourceId,
+            id,
+            windowId
+        })
     }
 
     /**
@@ -111,11 +113,15 @@ class MapboxGL extends Component {
      * @protected
      */
     afterSetLayers(value, oldValue) {
+        let me = this,
+            {appName, id, windowId} = me;
+
         value && Neo.main.addon.MapboxGL.addLayers({
-            appName: this.appName,
-            id     : this.id,
-            layers : value
-        });
+            appName,
+            id,
+            layers: value,
+            windowId
+        })
     }
 
     /**
@@ -125,14 +131,16 @@ class MapboxGL extends Component {
      * @protected
      */
     afterSetMapboxStyle(value, oldValue) {
-        let me = this;
+        let me = this,
+            {accessToken, appName, id, windowId} = me;
 
         me.mounted && Neo.main.addon.MapboxGL.setStyle({
-            accessToken: me.accessToken,
-            appName    : me.appName,
-            id         : me.id,
-            style      : value
-        });
+            accessToken,
+            appName,
+            id,
+            style: value,
+            windowId
+        })
     }
 
     /**
@@ -142,13 +150,11 @@ class MapboxGL extends Component {
      * @protected
      */
     afterSetMounted(value, oldValue) {
-        let me = this;
+        let me = this,
+            {appName, id, layers, sources, windowId} = me;
 
         if (value === false && oldValue !== undefined) {
-            Neo.main.addon.MapboxGL.destroy({
-                appName: me.appName,
-                id     : me.id
-            });
+            Neo.main.addon.MapboxGL.destroy({appName, id, windowId})
         }
 
         super.afterSetMounted(value, oldValue);
@@ -156,27 +162,28 @@ class MapboxGL extends Component {
         if (value) {
             const opts = {
                 accessToken: me.accessToken,
-                appName    : me.appName,
+                appName,
                 center     : me.center,
-                id         : me.id,
+                id,
                 mapboxStyle: me.mapboxStyle,
-                zoom       : me.zoom
+                zoom       : me.zoom,
+                windowId
             };
 
             if (me.chartData) {
                 opts.data         = me.chartData;
-                opts.dataSourceId = me.dataSourceId;
+                opts.dataSourceId = me.dataSourceId
             }
 
-            if (me.layers) {
-                opts.layers = me.layers;
+            if (layers) {
+                opts.layers = layers
             }
 
-            if (me.sources) {
-                opts.sources = me.sources;
+            if (sources) {
+                opts.sources = sources
             }
 
-            Neo.main.addon.MapboxGL.create(opts).then(me.onMapMounted);
+            Neo.main.addon.MapboxGL.create(opts).then(me.onMapMounted)
         }
     }
 
@@ -187,11 +194,16 @@ class MapboxGL extends Component {
      * @protected
      */
     afterSetSources(value, oldValue) {
-        value && Neo.main.addon.MapboxGL.addSources({
-            appName: this.appName,
-            id     : this.id,
-            sources: value
-        });
+        if (value) {
+            let {appName, id, windowId} = this;
+
+            Neo.main.addon.MapboxGL.addSources({
+                appName,
+                id,
+                sources: value,
+                windowId
+            })
+        }
     }
 
     /**
@@ -201,23 +213,29 @@ class MapboxGL extends Component {
      * @protected
      */
     afterSetZoom(value, oldValue) {
-        let me = this;
-
-        me.mounted && Neo.main.addon.MapboxGL.zoom({
-            appName: me.appName,
-            id     : me.id,
-            zoom   : value
-        });
+        if (this.mounted) {
+            let {appName, id, windowId} = this;
+
+            Neo.main.addon.MapboxGL.zoom({
+                appName,
+                id,
+                zoom: value,
+                windowId
+            })
+        }
     }
 
     /**
      *
      */
     autoResize() {
+        let {appName, id, windowId} = this;
+
         Neo.main.addon.MapboxGL.autoResize({
-            appName: this.appName,
-            id     : this.id
-        });
+            appName,
+            id,
+            windowId
+        })
     }
 
     /**
@@ -229,10 +247,10 @@ class MapboxGL extends Component {
     beforeSetCenter(value, oldValue) {
         if (value && value.long) {
             value.lng = value.long;
-            delete value.long;
+            delete value.long
         }
 
-        return value;
+        return value
     }
 
     /**
@@ -243,10 +261,10 @@ class MapboxGL extends Component {
      */
     beforeSetChartData(value, oldValue) {
         if (value && this.convertDataToGeoJson) {
-            value = this.convertToGeoJson(value);
+            value = this.convertToGeoJson(value)
         }
 
-        return value;
+        return value
     }
 
     /**
@@ -258,13 +276,16 @@ class MapboxGL extends Component {
      * @protected
      */
     centerMap(value, animate=false) {
+        let {appName, id, windowId} = this;
+
         Neo.main.addon.MapboxGL.center({
             animate,
-            appName: this.appName,
-            id     : this.id,
-            lat    : value.lat,
-            lng    : value.lng
-        });
+            appName,
+            id,
+            lat: value.lat,
+            lng: value.lng,
+            windowId
+        })
     }
 
     /**
@@ -298,7 +319,7 @@ class MapboxGL extends Component {
             })
         });
 
-        return geoJson;
+        return geoJson
     }
 
     /**
@@ -313,21 +334,21 @@ class MapboxGL extends Component {
 
         me._center = {lat: value.lat, lng: value.lng}; // silent update
 
-        me.centerMap(value, true);
+        me.centerMap(value, true)
     }
 
     /**
      *
      */
     getVdomRoot() {
-        return this.vdom.cn[0].cn[0];
+        return this.vdom.cn[0].cn[0]
     }
 
     /**
      *
      */
     getVnodeRoot() {
-        return this.vnode.childNodes[0].childNodes[0];
+        return this.vnode.childNodes[0].childNodes[0]
     }
 
     /**
@@ -345,13 +366,17 @@ class MapboxGL extends Component {
      * @param {Array} data.value
      */
     setFilter(data) {
+        let {appName, id, windowId}   = this,
+            {layerId, options, value} = data;
+
         Neo.main.addon.MapboxGL.setFilter({
-            appName: this.appName,
-            id     : this.id,
-            layerId: data.layerId,
-            options: data.options,
-            value  : data.value
-        });
+            appName,
+            id,
+            layerId,
+            options,
+            value,
+            windowId
+        })
     }
 
     /**
@@ -363,14 +388,18 @@ class MapboxGL extends Component {
      * @param {String} data.value
      */
     setLayoutProperty(data) {
+        let {appName, id, windowId}        = this,
+            {key, layerId, options, value} = data;
+
         Neo.main.addon.MapboxGL.setLayoutProperty({
-            appName: this.appName,
-            id     : this.id,
-            key    : data.key,
-            layerId: data.layerId,
-            options: data.options,
-            value  : data.value
-        });
+            appName,
+            id,
+            key,
+            layerId,
+            options,
+            value,
+            windowId
+        })
     }
 
     /**
@@ -382,14 +411,18 @@ class MapboxGL extends Component {
      * @param {String} data.value
      */
     setPaintProperty(data) {
+        let {appName, id, windowId}        = this,
+            {key, layerId, options, value} = data;
+
         Neo.main.addon.MapboxGL.setPaintProperty({
-            appName: this.appName,
-            id     : this.id,
-            key    : data.key,
-            layerId: data.layerId,
-            options: data.options,
-            value  : data.value
-        });
+            appName,
+            id,
+            key,
+            layerId,
+            options,
+            value,
+            windowId
+        })
     }
 }
 

package/src/container/Accordion.mjs

@@ -58,20 +58,20 @@ class Accordion extends Panel {
      * @param {Number[]} oldValue
      */
     afterSetInitialOpen(value, oldValue) {
-        const me            = this,
-              items         = me.items,
-              expandedItems = me.expandedItems;
+        let me                     = this,
+            {expandedItems, items} = me,
+            id, item;
 
         value.forEach((itemNo) => {
-            const id   = Neo.getId(me.itemDefaults.ntype),
-                  item = items[itemNo];
+            id   = Neo.getId(me.itemDefaults.ntype),
+            item = items[itemNo];
 
             item.expanded = true;
-            item.id = id;
-            NeoArray.add(expandedItems, id);
+            item.id       = id;
+            NeoArray.add(expandedItems, id)
         });
 
-        me.expandedItems = expandedItems;
+        me.expandedItems = expandedItems
     }
 
     /**
@@ -80,8 +80,8 @@ class Accordion extends Panel {
      * @param {String|null} oldValue
      */
     afterSetTitle(value, oldValue) {
-        const me      = this,
-              titleEl = me.down({flag: 'titleEl'});
+        let me      = this,
+            titleEl = me.down({flag: 'titleEl'});
 
         if (value && !titleEl) {
             me.headers = [{
@@ -89,7 +89,7 @@ class Accordion extends Panel {
                 cls    : ['neo-accordion-title'],
                 dock   : 'top',
                 text   : value
-            }];
+            }]
         }
     }
 
@@ -102,26 +102,24 @@ class Accordion extends Panel {
      * @protected
      */
     childExpandChange(data) {
-        const me               = this,
-              maxExpandedItems = me.maxExpandedItems,
-              expandedItems    = me.expandedItems,
-              curNoOpenItems   = expandedItems.length,
-              target           = data.target,
-              targetId         = target.id,
-              expanded         = data.expanded;
+        let me                                = this,
+            {expandedItems, maxExpandedItems} = me,
+            {expanded, target}                = data,
+            curNoOpenItems                    = expandedItems.length,
+            targetId                          = target.id;
 
         if (expanded
             && maxExpandedItems !== 0
             && curNoOpenItems === maxExpandedItems
         ) {
             Neo.get(expandedItems[0]).expanded = false;
-            NeoArray.remove(expandedItems, expandedItems[0]);
+            NeoArray.remove(expandedItems, expandedItems[0])
         }
 
         target.expanded = expanded;
         NeoArray.toggle(expandedItems, targetId);
 
-        me.expandedItems = expandedItems;
+        me.expandedItems = expandedItems
     }
 }
 

package/src/container/AccordionItem.mjs

@@ -55,9 +55,8 @@ class AccordionContainer extends Base {
     createItems() {
         let me       = this,
             arrowCls = me.arrowCls || 'fa-caret-down',
-            iconCls  = me.iconCls || ['no-icon'],
-            items    = me.items,
-            title    = me.title,
+            iconCls  = me.iconCls  || ['no-icon'],
+            {items, title} = me,
             header, content;
 
         if (!Neo.isArray(iconCls)) {
@@ -108,9 +107,9 @@ class AccordionContainer extends Base {
      * @param {Boolean} isExpanded
      */
     afterSetExpanded(isExpanded) {
-        let me  = this,
-            cls = me.cls,
-            fn  = isExpanded ? 'add' : 'remove';
+        let me    = this,
+            {cls} = me,
+            fn    = isExpanded ? 'add' : 'remove';
 
         NeoArray[fn](cls, 'neo-expanded');
         me.cls = cls;
@@ -118,7 +117,7 @@ class AccordionContainer extends Base {
         // Ensure scrollbars are not flipping in and out
         me.timeout(450).then(() => {
             NeoArray[fn](cls, 'neo-scrollable');
-            me.cls = cls;
+            me.cls = cls
         })
     }
 
@@ -141,7 +140,7 @@ class AccordionContainer extends Base {
 
             NeoArray.remove(cls, oldValue);
             NeoArray.add(cls, newValue);
-            iconEl.cls = cls;
+            iconEl.cls = cls
         }
     }
 
@@ -154,7 +153,9 @@ class AccordionContainer extends Base {
     afterSetTitle(newValue) {
         let titleEl = this.down({flag: 'titleEl'});
 
-        if (titleEl) titleEl.html = newValue;
+        if (titleEl) {
+            titleEl.html = newValue
+        }
     }
 
     /**
@@ -170,9 +171,9 @@ class AccordionContainer extends Base {
             parent.childExpandChange({
                 expanded: !currentState,
                 target  : me
-            });
+            })
         } else {
-            me.expanded = !currentState;
+            me.expanded = !currentState
         }
     }
 }

package/src/container/Base.mjs

@@ -199,9 +199,9 @@ class Base extends Component {
      */
     afterSetRendering(value, oldValue) {
         if (oldValue !== undefined) {
-            let items = this.items,
-                i     = 0,
-                len   = items.length;
+            let {items} = this,
+                i       = 0,
+                len     = items.length;
 
             for (; i < len; i++) {
                 if (!items[i].vdom.removeDom) {
@@ -218,6 +218,8 @@ class Base extends Component {
      * @protected
      */
     afterSetWindowId(value, oldValue) {
+        super.afterSetWindowId(value, oldValue);
+
         let me = this;
 
         value && me.items?.forEach(item => {
@@ -240,12 +242,11 @@ class Base extends Component {
      */
      beforeSetItems(value, oldValue) {
         if (Neo.typeOf(value) === 'Object') {
-            const result = [];
-
-            let hasWeight;
+            let result = [],
+                hasWeight, item;
 
             for (const ref in value) {
-                const item = value[ref]
+                item = value[ref]
 
                 item.reference = ref;
                 result.push(item);
@@ -255,10 +256,11 @@ class Base extends Component {
             if (hasWeight) {
                 result.sort(byWeight);
             }
-            value = result;
+
+            value = result
         }
 
-        return value;
+        return value
     }
 
     /**
@@ -299,7 +301,7 @@ class Base extends Component {
                     module: item,
                     ...config
                 });
-                break;
+                break
             }
 
             case 'NeoInstance': {
@@ -309,7 +311,7 @@ class Base extends Component {
                 // based listeners which still need to get resolved.
                 item.getController()?.parseConfig(item);
                 item.getModel()     ?.parseConfig(item);
-                break;
+                break
             }
 
             case 'Object': {
@@ -345,7 +347,7 @@ class Base extends Component {
                     item.vdom = Object.assign(item.vdom || {}, {removeDom: true})
                 }
 
-                break;
+                break
             }
 
             case 'String': {
@@ -355,7 +357,7 @@ class Base extends Component {
                     ...config
                 });
 
-                break;
+                break
             }
         }
 
@@ -369,7 +371,7 @@ class Base extends Component {
         let me        = this,
             items     = me._items,
             itemsRoot = me.getVdomItemsRoot(),
-            layout    = me.layout;
+            {layout}  = me;
 
         itemsRoot.cn = [];
 
@@ -434,8 +436,7 @@ class Base extends Component {
     getItem(reference, items=this.items) {
         let i   = 0,
             len = items.length,
-            item,
-            childItem;
+            childItem, item;
 
         for (; i < len; i++) {
             item = items[i];
@@ -492,8 +493,8 @@ class Base extends Component {
      * @returns {Neo.component.Base|Neo.component.Base[]}
      */
     insert(index, item, silent=false) {
-        let me    = this,
-            items = me.items,
+        let me      = this,
+            {items} = me,
             i, len, returnArray;
 
         if (Array.isArray(item)) {
@@ -506,7 +507,7 @@ class Base extends Component {
                 returnArray.unshift(me.insert(index, item[len - 1 - i], true))
             }
 
-            item = returnArray;
+            item = returnArray
         } else {
             item = me.createItem(item, index);
 
@@ -660,9 +661,8 @@ class Base extends Component {
      * @returns {Neo.component.Base|null}
      */
     removeAt(index, destroyItem=true, silent=false) {
-        let me    = this,
-            items = me.items,
-            vdom  = me.vdom,
+        let me      = this,
+            {items} = me,
             item;
 
         if (index >= items.length) {
@@ -674,12 +674,13 @@ class Base extends Component {
 
             me.getVdomItemsRoot().cn.splice(index, 1);
 
-            me[silent || destroyItem ? '_vdom' : 'vdom'] = vdom;
+            !silent && me.update();
 
             if (destroyItem) {
                 item.destroy(true, silent);
                 return null
             } else {
+                me.layout?.removeChildAttributes(item);
                 item.mounted = false;
                 return item
             }