beyond-rails 0.0.270 → 0.0.276

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c96df07fe7ae22477b03cdaa6dd2f966dd483d11eabacc634fd2044be11a534
-  data.tar.gz: ac13284fabfac310664793f94618c1d7c763137c23bb33c1ac4d8afe983e4d3e
+  metadata.gz: '0587787bc9b1b01ca9b6adfee2492dbd79f4a83b275df96ea58c90bde40e7d55'
+  data.tar.gz: 8ef857ab342e1d0935de5fef72c256ff684c57ecc53f3b26f219b8401b06972d
 SHA512:
-  metadata.gz: 130618e8992dd06fa092f3f2314e39ead96119a5912b9723ada96bd64482d65d50d0933f9d47f417f2e6a8dfc0da0481adceb5435b565e1d0b5f48ebb0b86735
-  data.tar.gz: 50067515dd03207b0323f6535d38d2d7a5e6d3ee2a16468382cd69482e9fb91013f7cfd62da5c739ece7938748e5b43a6946ece2e13758a646d55fab282d5aa3
+  metadata.gz: fa68191ab050166c130c418089b0127286b3998b61688ced221c0627ed055aa4a7f391273f74de49debeb13a3942ed209e47e5f17ad77e0bfa50e00d76a68a74
+  data.tar.gz: 07bbf67a42392542a4fb26532f4970ff47fce89b0c5c7458099fcc10fa6023bcc856064e9d21829ca246b64f1aa5f9d482bb045e21d6cd498fba8c195d41e44a

data/src/js/components/DateMenu.js

@@ -12,12 +12,13 @@ import {
   getDaysInMonth,
   getMonth,
   getYear,
-  throttle,
+  isFuture,
   range,
   set,
   startOfDay,
   startOfMonth,
   subMonths,
+  throttle,
   toPixel,
   format
 } from '../utils'
@@ -46,6 +47,7 @@ export default class DateMenu {
     this.endDate = endDate
     this.hoveredCellData = null
     this.options = options
+    this.noFuture = options.noFuture || false
     this.tz = options.tz || DEFAULT_TIMEZONE
     this.locale = options.locale || DEFAULT_LOCALE
     this.captionPattern = options.captionPattern || 'yyyy MMMM'
@@ -74,7 +76,7 @@ export default class DateMenu {
 
   getTableRows(date) {
 
-    const { startDate, endDate } = this
+    const { noFuture, startDate, endDate } = this
 
     const daysInMonth = getDaysInMonth(date)
     const firstDateOfMonth = startOfMonth(date)
@@ -118,6 +120,7 @@ export default class DateMenu {
         isStartDate: dateEq(initialStartDate, d),
         isEndDate: dateEq(initialEndDate, d),
         isSelected: (resCompareStart <= 0) && (resCompareEnd >= 0),
+        isDisabled: noFuture && isFuture(d),
         isToday: (today === formatDate(d)),
         day
       }
@@ -191,6 +194,9 @@ export default class DateMenu {
     if (row.type === CELL_TYPE_EMPTY) {
       return '<td></td>'
     }
+    if (row.isDisabled) {
+      return `<td class="cell js-disabled">${row.day}</td>`
+    }
     if (row.isStartDate || row.isEndDate) {
       return `<td class="cell selected-ex" data-date-table-cell>${row.day}</td>`
     }

data/src/js/components/Datepicker.js

@@ -63,7 +63,12 @@ export default class Datepicker {
     this.focused = true
     this.clearInputStatus()
     this.dateInput.setActive(true)
-    this.dateMenu.setDate({ date: this.menuDate })
+
+    this.dateMenu.setDate({
+      date: this.menuDate,
+      startDate: this.date
+    })
+
     this.dateMenu.show(this.dom)
     this.timeMenu && this.timeMenu.hide()
   }
@@ -88,7 +93,8 @@ export default class Datepicker {
       return
     }
 
-    const res = parse(value, dateInput.datePattern, date)
+    const res = parse(value, dateInput.datePattern, date || new Date())
+
     this.nextDate = null
     if (res.toString() === 'Invalid Date') {
       return dateInput.setDanger(true)
@@ -107,16 +113,17 @@ export default class Datepicker {
   handleDateInputBlur() {
     const { nextDate, date, dateInput } = this
 
-    if (date === null) {
+    if ((date === null) && (nextDate === null)) {
       dateInput.setDate(null)
       this.timeInput && this.timeInput.setDate(null)
       this._blurTimer = setTimeout(() => this.emitChange(), 50)
     }
     else if (nextDate) {
       this.date = nextDate
+      this.menuDate = nextDate
       dateInput.setDate(nextDate)
-      this.dateMenu.setDate({ startDate: nextDate })
       this.nextDate = null
+      this.emitChange()
     }
     else {
       dateInput.setDate(date)

data/src/js/components/PieChart.js

@@ -16,6 +16,7 @@ export default class PieChart {
     this.total = 0
 
     this.options = options
+    this.labelVisible = isDef(options.labelVisible) ? options.labelVisible : true
     this.height = options.height
     this.width = options.width
     this.padding = isDef(options.padding) ? options.padding : 30
@@ -236,8 +237,10 @@ export default class PieChart {
     this.total = data.reduce((t, row) => t + row.value, 0)
     this.data = this.setAngles(data)
     this.raf(() => {
-      const labels = this.data.map(row => row.label)
-      this.drawLabels(labels, this.styles)
+      if (this.labelVisible) {
+        const labels = this.data.map(row => row.label)
+        this.drawLabels(labels, this.styles)
+      }
       this.draw()
     })
   }

data/src/js/components/SearchDropdown.js

@@ -247,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 (node.dataset && ('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() {

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/_date-menu.scss

@@ -70,6 +70,10 @@
         border-style: solid;
         border-color: #e3e8ee;
       }
+      &.cell.js-disabled {
+        opacity: .4;
+        cursor: not-allowed;
+      }
       &.cell.today {
         background-color: #fffef4;
       }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beyond-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.270
+  version: 0.0.276
 platform: ruby
 authors:
 - kmsheng
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-14 00:00:00.000000000 Z
+date: 2021-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sassc
@@ -288,7 +288,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.0.9
 signing_key:
 specification_version: 4
 summary: beyond is a collection of frontend components which aims for admin website.