beyond-rails 0.0.220 → 0.0.225

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1ef85aad3c8a5799f0ea97067be6810e25005157c81e1c152e3c8d16dde6943
-  data.tar.gz: 1be3c704a9aae2e12ae193012a3d0886b42bd82e0320c82a7320ebd3596d269f
+  metadata.gz: 5e4265a216a874f0d0601c2ffb2166a1fd7faa9cb5453aa9e23ca0f09a3a4f7f
+  data.tar.gz: 8cc3c1212f19a02734fca2dc4b542d67dab8514483952a0ea2725d124c8d5e3d
 SHA512:
-  metadata.gz: 8b32274411e7ee48785ad15059861a46f8239730c343081c1441c34fa977d67acb376806e40df050fdef87d92ad6ef1125a73b6f72a3d62eb4155f558a1c3625
-  data.tar.gz: 6f1ad38f4abaf2adaf7fe8930766b81602f0cbfd158d33504fba1f263d26d0222a23b785c8a2796437e0e16ee471007374f7786da9d89f16062c1923e71714ec
+  metadata.gz: dc7afcff18a3f923bb9eb0a30bf48df340add79ed3ac4a20d312061286fb6ba716cdc0a7e813c86143c1c7d0e00780a0589aafad58e6c8861c3f60f61cf77633
+  data.tar.gz: 84f4d67e13db8aa0e05662e4d70728126aac064be37f78536b21621de25a1625552942fc1b6ef4695dfc8b40b7b48c5d9ff6dbe0d9455879f05f8aca5d0dc735

data/src/js/components/LineChart.js

@@ -83,6 +83,10 @@ export default class LineChart {
     this.bindPointMouseOver()
   }
 
+  get noData() {
+    return (this.xLabelRows.length === 0) && (this.yLabelRows.length === 0)
+  }
+
   get contentWidth() {
     return this.width - (this.xPadding * 2) - this.yLabelMargin -
       this.yLabelWidth - (this.xLabelWidth / 2)
@@ -130,6 +134,10 @@ export default class LineChart {
     return this.xAxisStart + this.contentWidth
   }
 
+  get xAxisMiddle() {
+    return (this.xAxisEnd - this.xAxisStart) / 2
+  }
+
   get xRatio() {
     const lineWidth = this.xAxisEnd - this.xAxisStart
     const xDelta = this.lastX - this.firstX
@@ -145,6 +153,10 @@ export default class LineChart {
     return this.yAxisStart - this.contentHeight
   }
 
+  get yAxisMiddle() {
+    return (this.yAxisStart - this.yAxisEnd) / 2
+  }
+
   get yRatio() {
     const lineHeight = this.yAxisStart - this.yAxisEnd
     const yDelta = Math.abs(this.lastY - this.firstY)
@@ -200,8 +212,17 @@ export default class LineChart {
     ctx.lineWidth = 2
 
     this.pointsArr.forEach((points, i) => {
+      const style = lineStyles[i] ? lineStyles[i] : '#000'
+
+      // only one point in a line
+      if (points.length === 1) {
+        const pos = pointPosMap.get(points[0])
+        this.fillCircle(ctx, pos.x, pos.y, 2, style)
+        return
+      }
+
       ctx.beginPath()
-      ctx.strokeStyle = lineStyles[i] ? lineStyles[i] : '#000'
+      ctx.strokeStyle = style
       points.forEach(p => {
         const pos = pointPosMap.get(p)
         ctx.lineTo(pos.x, pos.y)
@@ -271,10 +292,13 @@ export default class LineChart {
 
     ctx.strokeStyle = '#3c4257'
 
-    xLabelRows.forEach((row, i) => {
+    let x = this.xAxisMiddle
 
-      const x = xAxisStart + ((row.value - firstX) / xRatio)
+    xLabelRows.forEach((row, i) => {
 
+      if (xRatio !== 0) {
+        x = xAxisStart + ((row.value - firstX) / xRatio)
+      }
       ctx.beginPath()
       ctx.moveTo(x, scaleStart)
       ctx.lineTo(x, scaleEnd)
@@ -293,8 +317,12 @@ export default class LineChart {
     ctx.fillStyle = '#3c4257'
     ctx.textAlign = 'right'
 
+    let y = this.yAxisMiddle
+
     yLabelRows.forEach(row => {
-      const y = yAxisStart - ((row.value - firstY) / yRatio)
+      if (yRatio !== 0) {
+        y = yAxisStart - ((row.value - firstY) / yRatio)
+      }
       ctx.fillText(row.label, x, y - halfYLabelHeight)
     })
   }
@@ -445,8 +473,13 @@ export default class LineChart {
       this.setLabelHeights()
       this.setAxisData()
       this.updateLabelSizeForAutoStep()
+
+      if (this.noData) {
+        return this.raf(() => this.clear())
+      }
+
       this.setPointPos()
-      this.draw()
+      this.raf(() => this.draw())
     })
   }
 
@@ -498,6 +531,10 @@ export default class LineChart {
     this.setLabelHeights()
     this.setAxisData()
     this.updateLabelSizeForAutoStep()
+
+    if (this.noData) {
+      return this.raf(() => this.clear())
+    }
     this.setPointPos()
     this.raf(() => this.draw())
   }
@@ -505,10 +542,20 @@ export default class LineChart {
   setPointPos() {
     const { firstX, firstY, pointPosMap, xAxisStart, xRatio, yAxisStart, yRatio } = this
 
+    // edge case: only one point
+    let x = this.xAxisMiddle
+    let y = this.yAxisMiddle
+
     this.pointsArr.forEach((points, i) => {
       points.forEach(point => {
-        const x = xAxisStart + ((point.x - firstX) / xRatio)
-        const y = yAxisStart - ((point.y - firstY) / yRatio)
+
+        if (xRatio !== 0) {
+          x = xAxisStart + ((point.x - firstX) / xRatio)
+        }
+        if (yRatio !== 0) {
+          y = yAxisStart - ((point.y - firstY) / yRatio)
+        }
+
         const pos = { x, y }
         pointPosMap.set(point, pos)
       })

data/src/js/components/Modal.js

@@ -49,7 +49,19 @@ export default class Modal {
     this.modal = this.dom
   }
 
+  triggerShowEventIfNeeded() {
+    if (typeof $ === 'function') {
+      $(this.dom).trigger('beyond.modal.show')
+    }
+  }
+
   show(html) {
+
+    if (this.isVisible && html) {
+      this.replace(html)
+      return this.triggerShowEventIfNeeded()
+    }
+
     if (html) {
       this.replace(html)
     }
@@ -57,9 +69,7 @@ export default class Modal {
     this.modal.style.display = 'block'
     setTimeout(() => {
       this.modal.classList.add('js-active')
-      if (typeof $ === 'function') {
-        $(this.dom).trigger('beyond.modal.show')
-      }
+      this.triggerShowEventIfNeeded()
     }, 50)
   }
 

data/src/sass/_main.scss

@@ -131,6 +131,16 @@ $color-active: #5469d4;
   text-align: center !important;
 }
 
+.float-left {
+  float: left !important;
+}
+.float-right {
+  float: right !important;
+}
+.float-none {
+  float: none !important;
+}
+
 .sr-only {
   position: absolute;
   width: 1px;

data/src/sass/abstracts/_mixins.scss

@@ -90,27 +90,27 @@
 
   .#{$classname} {
     @if $side == '' {
-      #{$prop}: $space;
+      #{$prop}: $space !important;
     }
     @else if $side == 't' {
-      #{$prop}-top: $space;
+      #{$prop}-top: $space !important;
     }
     @else if $side == 'b' {
-      #{$prop}-bottom: $space;
+      #{$prop}-bottom: $space !important;
     }
     @else if $side == 'l' {
-      #{$prop}-left: $space;
+      #{$prop}-left: $space !important;
     }
     @else if $side == 'r' {
-      #{$prop}-right: $space;
+      #{$prop}-right: $space !important;
     }
     @else if $side == 'x' {
-      #{$prop}-left: $space;
-      #{$prop}-right: $space;
+      #{$prop}-left: $space !important;
+      #{$prop}-right: $space !important;
     }
     @else if $side == 'y' {
-      #{$prop}-top: $space;
-      #{$prop}-bottom: $space;
+      #{$prop}-top: $space !important;
+      #{$prop}-bottom: $space !important;
     }
     @else {
       @error "Unknown side #{$side}.";

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beyond-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.220
+  version: 0.0.225
 platform: ruby
 authors:
 - kmsheng
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-30 00:00:00.000000000 Z
+date: 2020-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sassc