beyond-rails 0.0.221 → 0.0.226

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fcaf483b7501fa330c379d3c95aa48b0b03a919779f826d3de924419712ef5a7
-  data.tar.gz: 7261373eabc32b8320c6dfb103191af62f58c184591c2be03640ea7d92578d82
+  metadata.gz: 6fe2004947bfbece8fa387026c40c31985d67b4de2fc8898dceb8d3691c7fbf9
+  data.tar.gz: '0182a586b22fd35847e4339c944dea67ee0a2f9057f4cc7e6384034d1c65cd44'
 SHA512:
-  metadata.gz: 386edb5bdf6ccf290a4d471004fd457c61d5ec63b67d0ef0c032e513b9a9b3d0dbff099e4ddca788940bd4e4f14fcca894410a0e1169279edf168a45f55a6f67
-  data.tar.gz: b09ce56ee589e899f5fe66294fc09fe385e6b4ecc2e5ecebecec786e91b729a43957e59628c1a9a45e0cc0189993ed2f0a51731fd466d3357d9039edb13ee56a
+  metadata.gz: 4800cdd8e025687e8d85c9a0445ef1fbd2e494bd99163defdbada82c6ec9b55822bea288fb15056250e5cb384a0254c1ff0ceb047b535ba3084d2700c8914987
+  data.tar.gz: f7ae8ead35cbcd39956223080bd08892d757ccb95f8f904dedcc523d60d53ca537b0be857e7e9dabe97be4ba2a90cc21a01f021a1aadf76e9e2f45eeee16750d

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/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;
@@ -143,6 +153,15 @@ $color-active: #5469d4;
   border: 0;
 }
 
+hr {
+  margin-top: 20px;
+  margin-bottom: 20px;
+  border-top: 1px solid #e3e8ee;
+  border-left: 0;
+  border-right: 0;
+  border-bottom: 0;
+}
+
 input[type=file], /* FF, IE7+, chrome (except button) */
 input[type=file]::-webkit-file-upload-button { /* chromes and blink button */
   cursor: pointer;

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}.";

data/src/sass/components/_btn.scss

@@ -186,3 +186,18 @@ button.close {
     color: #fff;
   }
 }
+
+.btn-file {
+  position: relative;
+  input[type="file"] {
+    position: absolute;
+    top: 0;
+    right: 0;
+    left: 0;
+    bottom: 0;
+    width: 100%;
+    padding: 0;
+    margin: 0;
+    opacity: 0;
+  }
+}

data/src/sass/components/_table.scss

@@ -4,6 +4,14 @@
   overflow-x: auto;
   -webkit-overflow-scrolling: touch;
 }
+
+%disabled-td {
+  cursor: not-allowed;
+  background-color: #ddd;
+  color: #333;
+  box-shadow: inset 0 -1px #c7c7c7;
+}
+
 .table {
   width: 100%;
   margin-bottom: 1rem;
@@ -51,6 +59,11 @@
     padding: 7px;
     box-shadow: inset 0 -1px #e3e8ee;
   }
+  tr.disabled {
+    > td {
+      @extend %disabled-td;
+    }
+  }
   tr {
     transition: .3s all;
   }
@@ -61,5 +74,8 @@
     tr:nth-child(even) td {
       background-color: #f7fafc;
     }
+    tr.disabled:nth-child(even) td {
+      @extend %disabled-td;
+    }
   }
 }

data/src/sass/layout/_col.scss

@@ -49,13 +49,12 @@
 }
 
 @for $i from 1 through length($breakpoints) {
-  $breakpoint: nth($breakpoints, $i);
   $size: nth($screen-sizes, $i);
   .col-#{$size} {
     @extend %col-basic;
   }
   @for $j from 1 through $col-total {
-    .col-#{$i},
+    .col-#{$j},
     .col-#{$size}-#{$j} {
       @extend %col-basic;
     }

metadata

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