neo.mjs 8.6.0 → 8.6.2

package/apps/ServiceWorker.mjs

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

package/apps/portal/view/home/FooterContainer.mjs

@@ -107,7 +107,7 @@ class FooterContainer extends Container {
             }, {
                 module: Component,
                 cls   : ['neo-version'],
-                html  : 'v8.6.0'
+                html  : 'v8.6.2'
             }]
         }],
         /**

package/examples/ServiceWorker.mjs

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

package/package.json

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

package/src/DefaultConfig.mjs

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

package/src/form/field/ComboBox.mjs

@@ -395,9 +395,10 @@ class ComboBox extends Picker {
      * @param {String|null} value The value to filter the picker by
      */
     doFilter(value) {
-        let me                      = this,
-            {picker, record, store} = me,
-            filter                  = store.getFilter(me.displayField);
+        let me              = this,
+            {picker, store} = me,
+            record          = me.value,
+            filter          = store.getFilter(me.displayField);
 
         if (filter) {
             filter.value = value
@@ -408,8 +409,9 @@ class ComboBox extends Picker {
             me.showPicker();
 
             // List might not exist until the picker is created
-            let {list }          = me,
-                {selectionModel} = list;
+            let {list}           = me,
+                {selectionModel} = list,
+                index            = store.indexOf(record);
 
             // On show, set the active item to be the current selected record or the first
             if (record) {
@@ -419,11 +421,8 @@ class ComboBox extends Picker {
                 selectionModel.suspendEvents = false
             }
 
-            me.timeout(100).then(() => {
-                const index = store.indexOf(record);
-                list._focusIndex = -1; // silent update to ensure afterSetFocusIndex() always gets called
-                list.focusIndex  = index > -1 ? index : 0
-            })
+            list._focusIndex = -1; // silent update to ensure afterSetFocusIndex() always gets called
+            list.focusIndex  = index > -1 ? index : 0
         }
         // Filtered down to nothing - hide picker if it has been created.
         else {

package/src/list/Base.mjs

@@ -256,13 +256,7 @@ class List extends Component {
      * @protected
      */
     afterSetFocusIndex(value, oldValue) {
-        let me = this;
-
-        if (Neo.isNumber(value)) {
-            Neo.main.addon.Navigator.navigateTo([me.getHeaderlessIndex(value), me.navigator])
-        } else if (value) {
-            Neo.main.addon.Navigator.navigateTo([me.getItemId(value[me.getKeyProperty()]), me.navigator])
-        }
+        value !== null && this.updateItemFocus(value)
     }
 
     /**
@@ -846,6 +840,32 @@ class List extends Component {
             }
         }
     }
+
+    /**
+     *
+     * @param {Number|Object} value
+     * @returns {Promise<void>}
+     */
+    async updateItemFocus(value) {
+        let me           = this,
+            {navigateTo} = Neo.main.addon.Navigator;
+
+        if (me.mounted) {
+            if (Neo.isNumber(value)) {
+                navigateTo([me.getHeaderlessIndex(value), me.navigator])
+            } else if (value) {
+                navigateTo([me.getItemId(value[me.getKeyProperty()]), me.navigator])
+            }
+        } else {
+            me.on('mounted', () => {
+                // We could subscribe multiple times before getting mounted,
+                // so only trigger the callback for the last focusIndex
+                if (value === me.focusIndex) {
+                    me.updateItemFocus(me.focusIndex)
+                }
+            }, me, {once: true})
+        }
+    }
 }
 
 export default Neo.setupClass(List);

package/src/main/DomAccess.mjs

@@ -520,19 +520,28 @@ class DomAccess extends Base {
 
     /**
      * @param {String|HTMLElement} nodeId
-     * @returns {HTMLElement}
+     * @returns {HTMLElement|null}
      * @protected
      */
     getElement(nodeId) {
-        return nodeId.nodeType ? nodeId : Neo.config.useDomIds ?  document.getElementById(nodeId) : document.querySelector(`[data-neo-id='${nodeId}']`)
+        let node = nodeId?.nodeType ?
+            nodeId : Neo.config.useDomIds ?
+                document.getElementById(nodeId) :
+                document.querySelector(`[data-neo-id='${nodeId}']`);
+
+        return node || null
     }
 
     /**
-     * @param {String|HTMLElement} [nodeId='document.body']
-     * @returns {HTMLElement}
+     * @param {String|HTMLElement} nodeId='document.body'
+     * @returns {HTMLElement|null}
      * @protected
      */
     getElementOrBody(nodeId='document.body') {
+        if (!nodeId) {
+            return null
+        }
+
         return nodeId.nodeType ? nodeId : (nodeId === 'body' || nodeId === 'document.body') ? document.body : this.getElement(nodeId)
     }