beyond-rails 0.0.217 → 0.0.222

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc8e595696f351d27825c440fc48825dc0360b4a0aeeb23d8ff88f51d70e7794
-  data.tar.gz: f65dc6990f6962438dc867f2eb6f29f50658f8ac474b52cb13765621ffbf358a
+  metadata.gz: 9092f0bac590910c0f6c461a47857ad83cb7efacb67586997817cae359792141
+  data.tar.gz: 0ad899417aab8fc983e7757fbb10d92a0716b73b71336dd676a113409c88adb8
 SHA512:
-  metadata.gz: d5b3863f1fd9a07e8ccc2c086c5ca2292e9c40a2e40fbd860935dbff10378f3421d7294be5557c894affae7a5f665a63b1bf4a11de0dfc5549174b9947a58a08
-  data.tar.gz: f5319191d5a32812c4a18ecd28e1bce0d56fa1f16c69f72c7db633d805d1a61edc6fad8b589658f61e8bd604882704ec1e6d589e6ea9faf11ceadf0469f11ddc
+  metadata.gz: 52d4d14acf31d6bd983bb790129edfb3be544f2d65614ec9c0939ec3935f74e132422529a9a6e4e1cc3da8075b76089c96168782c8a0feb005d8e35118aa4385
+  data.tar.gz: 0f1a43fb0eec229837bd6626baac37af0a6b6ccd9a5857475d9198610006df39782856c2cdfde45af9781a6fcbdc32cf935ab22ed105b2f07cc782d5b3d53e18

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/js/index.js

@@ -27,6 +27,16 @@ import Tooltip from './components/Tooltip'
 import bind from './utils/bind'
 import docReady from './utils/docReady'
 import unbindAll from './utils/unbindAll'
+import {
+  $,
+  $$,
+  allOff,
+  load,
+  on,
+  onload,
+  onunload,
+  unload
+} from './utils/dom'
 
 export {
   Alert,
@@ -49,7 +59,15 @@ export {
   Timepicker,
   Toast,
   Tooltip,
+  $,
+  $$,
   bind,
+  allOff,
   docReady,
-  unbindAll
+  load,
+  on,
+  onload,
+  onunload,
+  unbindAll,
+  unload
 }

data/src/js/utils/dom.js

@@ -0,0 +1,56 @@
+const offFns = []
+const loadRows = []
+const unloadRows = []
+
+const onPage = row => {
+  const { controller, action } = row
+  const { dataset } = document.body
+  return (dataset.controller === controller) && (dataset.action === action)
+}
+
+export const $ = (selector, dom = document) => dom.querySelector(selector)
+
+export const $$ = (selector, dom = document) => Array.from(dom.querySelectorAll(selector))
+
+export const on = (dom, event, cb, useCapture = false) => {
+  dom.addEventListener(event, cb, useCapture)
+  const off = () => dom.removeEventListener(event, cb, useCapture)
+  offFns.push(off)
+
+  return () => {
+    const index = offFns.findIndex(fn => fn === off)
+    if (index !== -1) {
+      offFns.splice(index, 1)
+    }
+    off()
+  }
+}
+
+export const allOff = () => {
+  offFns.forEach(fn => fn())
+  offFns.length = 0
+}
+
+export const onload = (controller, action, fn) => {
+  loadRows.push({ controller, action, fn })
+}
+
+export const load = () => {
+  loadRows.forEach(row => {
+    if (onPage(row)) {
+      row.fn()
+    }
+  })
+}
+
+export const onunload = (controller, action, fn) => {
+  unloadRows.push({ controller, action, fn })
+}
+
+export const unload = () => {
+  unloadRows.forEach(row => {
+    if (onPage(row)) {
+      row.fn()
+    }
+  })
+}

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.217
+  version: 0.0.222
 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-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sassc
@@ -173,6 +173,7 @@ files:
 - src/js/utils/dateGt.js
 - src/js/utils/dateLt.js
 - src/js/utils/docReady.js
+- src/js/utils/dom.js
 - src/js/utils/domEval.js
 - src/js/utils/getFloatedTargetPos.js
 - src/js/utils/getKey.js