loading spinner should show when preload=focus. fixes #185

orchidjs · Aug 24, 2021 · 7f90d22 · 7f90d22
1 parent 0d54a75
commit 7f90d22
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/src/tom-select.ts b/src/tom-select.ts
@@ -1432,14 +1432,15 @@ export default class TomSelect extends MicroPlugin(MicroEvent){
 			}
 			return content;
 		};
-
-		// invalid query
-		if( !self.settings.shouldLoad.call(self,query) ){
-			add_template('not_loading');
+
 
 		// add loading message
-		}else if( self.loading ){
+		if( self.loading ){
 			add_template('loading');
+
+		// invalid query
+		}else if( !self.settings.shouldLoad.call(self,query) ){
+			add_template('not_loading');
 
 		// add no_results message
 		}else if( results.items.length === 0 ){

diff --git a/test/tests/config-load.js b/test/tests/config-load.js
@@ -12,7 +12,7 @@ describe('load', function() {
 				assert.equal(query, '');
 				setTimeout(function() {
 					load_cb([{value: 'c', text: 'C'}]);
-				});
+				},100);
 			}
 		});
 
@@ -21,6 +21,8 @@ describe('load', function() {
 		});
 
 		await asyncClick(test.instance.control);
+		assert.isOk(test.instance.dropdown.querySelector('.spinner'));
+
 		await waitFor(300);
 		assert.equal(calls_focus, 1);
 		assert.equal(calls_load, 1);