beyond-rails 0.0.264 → 0.0.269

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c50569e664c1fcbed09ffbded0db57abcf311f9a04254dbd772cefbaafe04c2e
-  data.tar.gz: e2dc759c9069a62eb43b65864469b865f6812c7447772fc91e20531058746c25
+  metadata.gz: 7d41b21a153a6a43a56575b0cde527fe030b9c31e2323729259bcfd8b869a049
+  data.tar.gz: 408fcaaf73bd21fa7dfb52b3faa42ff44c8fda0247e7cc6b8792f82003d53f7e
 SHA512:
-  metadata.gz: 0b84f7ff5b00eb96a30fd9baf13b91be6e22dd10e3f521d89b33ba6e2b2dd403dceec22db65cf730bf78800a8596b15fdf9f69a7e1f79606e02e3aa551156cb8
-  data.tar.gz: 9bc478bdf05fe67768bddea72550587d0b5964ef2b20078a0779bd57a7c3bf239ad807cd361bb5dc2c71ce6fa7b25f5ac1ea18af26fea211d74a742649512314
+  metadata.gz: 3dfe20d9ce4b0b86fe30da9c85f7edab753264fcfb386b16433370a44b7748c9d39f377421f83b07b03e395b085323174fc4929e60e24422cf708f43d5e0fba6
+  data.tar.gz: afead4a051571df239994f0f1680f7caea17f63d741b28bbd22aa29275a541527927112ed8bb02c986a81bc87c5ef3e6d81fbd4dbc3da3330f2f7f422678c0ce

data/src/js/components/Modal.js

@@ -59,6 +59,8 @@ 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)
     }
@@ -350,5 +399,9 @@ export default class SearchDropdown {
 
   destroy() {
     this.menu.remove()
+    this.menu = null
+    this.input = null
+    this.menuContent = null
+    this.loader = 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.264
+  version: 0.0.269
 platform: ruby
 authors:
 - kmsheng
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-04 00:00:00.000000000 Z
+date: 2020-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sassc