beyond-rails 0.0.267 → 0.0.272

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec9a44772db8cea73d2dbcee1266bcc9fe2225d8a05b7bbf3af6bb8c06a61fec
-  data.tar.gz: c077e2218952530a31f70945f4edbdb0f5fd99ca6e5200bc4ce2b45d8378e625
+  metadata.gz: 90e90e6f38c45540cbedb5ccc0341459c5a9a210d27c472aa97b340a4b2d9814
+  data.tar.gz: 34f2a1783e2c88888e782bdb42517d0a53b2dd6505a69542519aac2689e20d2c
 SHA512:
-  metadata.gz: 0ae6f42201d3d06c5a21e6b2822409771202780cbe69109696af7051c3562ad7d1feb63080e9fc9d6547abac740aebb615095cbe2cf7f4044e60c2364b0f6277
-  data.tar.gz: 382dea3264cfb9965d3c733d7bc3a1eaa8493ed0d43c79c40817142ffbddbb7ff412df449da9375d5a22cf6606c3a9b34ae1f064ea94c8458c9fe805b9a8ceaa
+  metadata.gz: 355b5f4412816e6219309c12a2b9a779920bb9e1dda4a1c65827efddad7a51dcc20cac7fafea460fe48f7550a28b44741f7f13112d9f6d265718d1587980bd38
+  data.tar.gz: da9e828f1ecc04b2398ff6418da097a88895454f5cc24d0e9c935cacfcc5cc0da10d4b0417e1f232e61e5765cd5c627cc31404719ba995ade2d430d5a8ce7716

data/src/js/components/Modal.js

@@ -59,6 +59,7 @@ export default class Modal {
 
     if (this.isVisible && html) {
       this.replace(html)
+      this.modal.classList.add('js-active')
       this.modal.style.display = 'block'
       return this.triggerShowEventIfNeeded()
     }

data/src/js/components/SearchDropdown.js

@@ -25,12 +25,15 @@ export default class SearchDropdown {
     this.offset = options.offset || 14
     this.offsetTop = options.offsetTop || 0
     this.offsetLeft = options.offsetLeft || 0
+    this.noDataMsg = options.noDataMsg || '沒有資料'
     this.isMenuVisible = false
     this.lastKeyword = null
     this.selectedIndex = 0
     this.items = []
     this.compositionStarted = false
     this.compositionJustEnded = false
+    this.noDataMsgVisible = false
+    this.loading = true
     this.init()
   }
 
@@ -77,6 +80,19 @@ export default class SearchDropdown {
 
     inputWrap.appendChild(input)
 
+    const loader = document.createElement('div')
+    loader.className = 'search-dropdown-loader'
+
+    loader.innerHTML = `
+      <div class="fb-loader">
+        <div></div>
+        <div></div>
+        <div></div>
+      </div>
+    `
+
+    inputWrap.appendChild(loader)
+
     if (this.options.placeholder) {
       input.setAttribute('placeholder', this.options.placeholder)
     }
@@ -88,6 +104,20 @@ export default class SearchDropdown {
     this.menu = menu
     this.input = input
     this.menuContent = menuContent
+    this.loader = loader
+  }
+
+  setLoading(loading) {
+    this.loading = loading
+
+    if (loading) {
+      this.input.classList.add('loading')
+      this.loader.style.display = 'block'
+    }
+    else {
+      this.input.classList.remove('loading')
+      this.loader.style.display = 'none'
+    }
   }
 
   setMenuContentActive(active) {
@@ -150,15 +180,23 @@ export default class SearchDropdown {
   }
 
   renderMenu() {
-    const { menuContent, items } = this
-    menuContent.innerHTML = items.map((item, i) => {
-      return this.options.renderItem(item, i, (this.selectedIndex === i))
+    const { menuContent, items, selectedIndex } = this
+    const { renderItem } = this.options
+
+    const menuItems = items.map((item, i) => {
+      return renderItem(item, i, (selectedIndex === i))
     })
-      .join('')
+
+    if (this.noDataMsgVisible) {
+      menuItems.unshift(`<div class="search-dropdown-menu-item">${this.noDataMsg}</div>`)
+    }
+
+    menuContent.innerHTML = menuItems.join('')
+
     this.setMenuContentActive(items.length > 0)
 
     const menuItemEls = this.getMenuItemEls()
-    const selectedEl = menuItemEls[this.selectedIndex]
+    const selectedEl = menuItemEls[selectedIndex]
     if (selectedEl) {
       const scrollTop = menuContent.scrollTop
       const contentTop = menuContent.offsetTop
@@ -168,10 +206,10 @@ export default class SearchDropdown {
       const elBottom = elTop + elHeight
 
       if (elTop < contentTop) {
-        this.menuContent.scrollTop -= elHeight
+        menuContent.scrollTop -= elHeight
       }
       else if (elBottom > contentBottom) {
-        this.menuContent.scrollTop += elHeight
+        menuContent.scrollTop += elHeight
       }
     }
   }
@@ -187,8 +225,19 @@ export default class SearchDropdown {
     }
     this.resetSelectedIndex()
     this.lastKeyword = keyword
+    this.noDataMsgVisible = false
+    this.setItems([])
+
+    this.setLoading(true)
+
     const items = await this.options.getData(keyword)
 
+    this.setLoading(false)
+
+    if (items.length === 0) {
+      this.noDataMsgVisible = true
+    }
+
     if (this.lastKeyword === this.input.value) {
       this.setItems(items)
     }
@@ -198,17 +247,10 @@ export default class SearchDropdown {
     return Array.from(this.menuContent.querySelectorAll('[data-item]'))
   }
 
-  findClickedItem(target, parent) {
-    const rows = this.getMenuItemEls()
-    let node = target
-    while (node.parentNode !== parent) {
-      if ('item' in node.dataset) {
-        const index = rows.findIndex(row => row === node)
-        return this.items[index]
-      }
-      node = node.parentNode
-    }
-    return null
+  findClickedItem(target) {
+    const index = this.getMenuItemEls()
+      .findIndex(item => (target === item) || (item.contains(target)))
+    return this.items[index]
   }
 
   isInputFocused() {
@@ -350,5 +392,9 @@ export default class SearchDropdown {
 
   destroy() {
     this.menu.remove()
+    this.menu = null
+    this.input = null
+    this.menuContent = null
+    this.loader = null
   }
 }

data/src/js/components/TagInput.js

@@ -170,6 +170,11 @@ export default class TagInput {
     const { input, suggestInput } = this
     const inputValue = suggestInput.value || input.value
     const res = await this.validate(inputValue)
+    if (res.clear) {
+      input.value = ''
+      suggestInput.value = ''
+      return
+    }
     if (! res.isTag) {
       return this.shake()
     }
@@ -243,7 +248,7 @@ export default class TagInput {
 
   destroy() {
     this.tags.forEach(tag => tag.remove())
-    this.inputDiv.remove()
+    this.inputDiv && this.inputDiv.remove()
     this.canvas = null
     this.input = null
     this.suggestInput = null

data/src/sass/components/_search-dropdown.scss

@@ -2,10 +2,24 @@
   width: 420px;
   padding: 0;
   .search-dropdown-input-wrap {
+    position: relative;
     padding: 14px;
   }
   .search-dropdown-input.input {
     width: 100%;
+    &.loading {
+      padding-right: 40px;
+    }
+  }
+  .search-dropdown-loader {
+    display: none;
+    position: absolute;
+    right: 20px;
+    top: 0;
+    bottom: 0;
+    margin-top: auto;
+    margin-bottom: auto;
+    height: 32px;
   }
   .search-dropdown-menu.active {
     border-top: 1px solid rgba(60, 66, 87, .16);

data/src/sass/components/_spinner.scss

@@ -6,6 +6,16 @@
     transform: rotate(360deg);
   }
 }
+@keyframes fb-loader {
+  0% {
+    top: 6px;
+    height: 25px;
+  }
+  50%, 100% {
+    top: 10px;
+    height: 12px;
+  }
+}
 
 .loader {
   margin: 50px auto;
@@ -77,3 +87,30 @@
 .ring-loader div:nth-child(3) {
   animation-delay: -0.15s;
 }
+
+.fb-loader {
+  display: inline-block;
+  position: relative;
+  @include size(32px);
+}
+
+.fb-loader div {
+  display: inline-block;
+  position: absolute;
+  left: 0;
+  width: 4px;
+  background: $bg-primary-ex;
+  animation: fb-loader 1.2s cubic-bezier(0, 0.5, 0.5, 1) infinite;
+}
+.fb-loader div:nth-child(1) {
+  left: 6px;
+  animation-delay: -0.24s;
+}
+.fb-loader div:nth-child(2) {
+  left: 14px;
+  animation-delay: -0.12s;
+}
+.fb-loader div:nth-child(3) {
+  left: 22px;
+  animation-delay: 0;
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beyond-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.267
+  version: 0.0.272
 platform: ruby
 authors:
 - kmsheng
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-07 00:00:00.000000000 Z
+date: 2020-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sassc