beyond-rails 0.0.219 → 0.0.224

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 996c7b9357d48ee7468378eaf34235b25f2546cb00f28323456638c6d104b038
-  data.tar.gz: '06392f4a4d63a8f5b643709395ae63b4d4ade3a5ff98e644f5859fdd254d0819'
+  metadata.gz: e55ddcbe0f96833cc9e26265b631aceee22acdfc4939e0f6b60e1b4c46498886
+  data.tar.gz: cf17d9695a7e2132a571b8caec00640c3082d951bc01893bb5df7948cc359a38
 SHA512:
-  metadata.gz: 2e9420822a0c1b1ed7f91505b4b3d14ef63e2330add3114141d34d29ee8592a79e2b2f7225c75e08815169af8c0c918e10488b64ef0b68efc6fbcb2b11b5cd40
-  data.tar.gz: 1217b6cecb86c65a34b520619f5be9098a4221074d6d367fb4174453518dd8d52e7f5bafa22177da9151e5957a94dcd27a55bee877285c9606fbd26410d6e7e2
+  metadata.gz: 2a1b89d81dc3785d4f1cd9c9d2612a8ab144684c1b4904e802394a50be0b5edec0f4087d9998cb466143433a481fb8703a70bfd330f88763e900acc351b0ee9c
+  data.tar.gz: 37ccae788cc332c9a25d7dd92f2e6a4ec6dc44ee37d49b160b38abea4a0b10ff3d9bfc2bcb08673fbb0ae60d43560ce45771227e20599a579012c8a239dc5977

data/src/js/components/LineChart.js

@@ -130,6 +130,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 +149,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 +208,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 +288,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 +313,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)
     })
   }
@@ -505,10 +529,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.219
+  version: 0.0.224
 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