@lemonadejs/dropdown 3.1.1 → 3.1.3

package/dist/index.js

@@ -305,13 +305,14 @@ if (!Modal && typeof (require) === 'function') {
 
         const setCursor = function(index) {
             let item = self.rows[index];
+
             if (typeof(item) !== 'undefined') {
                 // Set cursor number
                 cursor = index;
                 // Set visual indication
                 item.cursor = true;
                 // Go to the item on the scroll in case the item is not on the viewport
-                if (! item.el || ! item.el.parentNode) {
+                if (! (item.el && item.el.parentNode)) {
                     // Goto method
                     self.goto(item);
                 }
@@ -373,6 +374,8 @@ if (!Modal && typeof (require) === 'function') {
         const updateLabel = function() {
             if (value && value.length) {
                 self.input.textContent = value.filter(v => v.selected).map(i => i.text).join('; ');
+            } else {
+                self.input.textContent = '';
             }
         }
 
@@ -392,15 +395,17 @@ if (!Modal && typeof (require) === 'function') {
             // Width && values
             value = [];
 
-            self.data.map(function(s) {
-                // Select values
-                if (newValue.indexOf(s.value) !== -1) {
-                    s.selected = true;
-                    value.push(s);
-                } else {
-                    s.selected = false;
-                }
-            });
+            if (Array.isArray(self.data)) {
+                self.data.map(function (s) {
+                    // Select values
+                    if (newValue.indexOf(s.value) !== -1) {
+                        s.selected = true;
+                        value.push(s);
+                    } else {
+                        s.selected = false;
+                    }
+                });
+            }
 
             // Update label
             updateLabel();
@@ -456,8 +461,6 @@ if (!Modal && typeof (require) === 'function') {
             let v = value[value.length-1];
             // Move to the correct position
             if (v) {
-                // Go to the last item in the array of values
-                self.goto(v);
                 // Mark the position of the cursor to the same element
                 setCursor(self.rows.indexOf(v));
             } else {
@@ -499,14 +502,10 @@ if (!Modal && typeof (require) === 'function') {
             }
         }
 
-        let timer = null;
-
         self.open = function () {
             if (self.modal && self.modal.closed) {
                 // Open the modal
                 self.modal.closed = false;
-                // Timer
-                timer = setTimeout(() => timer = null, 400);
             }
         }
 
@@ -518,10 +517,6 @@ if (!Modal && typeof (require) === 'function') {
         }
 
         self.toggle = function(e) {
-            if (timer) {
-                return;
-            }
-
             if (self.modal) {
                 if (self.modal.closed) {
                     self.open();
@@ -621,29 +616,35 @@ if (!Modal && typeof (require) === 'function') {
             })
             // Key events
             self.el.addEventListener('keydown', function(e) {
-                let prevent = false;
-                if (e.key === 'ArrowUp') {
-                    moveCursor(-1);
-                    prevent = true;
-                } else if (e.key === 'ArrowDown') {
-                    moveCursor(1);
-                    prevent = true;
-                } else if (e.key === 'Home') {
-                    moveCursor(-1, true);
-                } else if (e.key === 'End') {
-                    moveCursor(1, true);
-                } else if (e.key === 'Enter') {
-                    self.select(e, self.rows[cursor]);
-                    prevent = true;
-                } else {
-                    if (e.keyCode === 32 && ! self.autocomplete) {
+                if (! self.modal.closed) {
+                    let prevent = false;
+                    if (e.key === 'ArrowUp') {
+                        moveCursor(-1);
+                        prevent = true;
+                    } else if (e.key === 'ArrowDown') {
+                        moveCursor(1);
+                        prevent = true;
+                    } else if (e.key === 'Home') {
+                        moveCursor(-1, true);
+                    } else if (e.key === 'End') {
+                        moveCursor(1, true);
+                    } else if (e.key === 'Enter') {
                         self.select(e, self.rows[cursor]);
+                        prevent = true;
+                    } else {
+                        if (e.keyCode === 32 && !self.autocomplete) {
+                            self.select(e, self.rows[cursor]);
+                        }
                     }
-                }
 
-                if (prevent) {
-                    e.preventDefault();
-                    e.stopImmediatePropagation();
+                    if (prevent) {
+                        e.preventDefault();
+                        e.stopImmediatePropagation();
+                    }
+                } else {
+                    if (e.key === 'ArrowUp' || e.key === 'ArrowDown') {
+                        self.modal.closed = false;
+                    }
                 }
             });
 
@@ -721,7 +722,7 @@ if (!Modal && typeof (require) === 'function') {
 
         return `<div class="lm-dropdown" data-insert="{{self.insert}}" data-type="{{self.type}}" data-state="{{self.state}}" :value="self.value">
             <div class="lm-dropdown-header">
-                <div class="lm-dropdown-input" onpaste="self.onpaste" oninput="self.search" onfocus="self.open" onclick="self.click" placeholder="{{self.placeholder}}" :ref="self.input" tabindex="0"></div>
+                <div class="lm-dropdown-input" onpaste="self.onpaste" oninput="self.search" onfocus="self.open" onmousedown="self.click" placeholder="{{self.placeholder}}" :ref="self.input" tabindex="0"></div>
                 <div class="lm-dropdown-add" onmousedown="self.add"></div>
                 <button onclick="self.close" class="lm-dropdown-done">Done</button>
             </div>

package/package.json

@@ -19,5 +19,5 @@
     },
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
-    "version": "3.1.1"
+    "version": "3.1.3"
 }