beyond-rails 0.0.216 → 0.0.221

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9fe01a2e2f9bee54d4f3f5e44b26bca8b223666c0749383fcde789ffae9fca6c
-  data.tar.gz: 56434ea193d4294f2c74d70ab41acfc85fa531b53ec8888d862d3729861a56de
+  metadata.gz: fcaf483b7501fa330c379d3c95aa48b0b03a919779f826d3de924419712ef5a7
+  data.tar.gz: 7261373eabc32b8320c6dfb103191af62f58c184591c2be03640ea7d92578d82
 SHA512:
-  metadata.gz: d64f68417f19ff8e8640a052d917df93eb49dd05b87c6c727ea0ed42056ad45d34258ba2396f3aa7da5a5ea4c03879a4448f934fdf83fe24e885484495351dcf
-  data.tar.gz: 9226d6dadae03caf44bf49f13b0c3545ac3ecab2af677704c4be0a5d2bf18a847d65e77db81bbe51ab03d3ac6ed327f4ef790694c0418e58396053b6f7483463
+  metadata.gz: 386edb5bdf6ccf290a4d471004fd457c61d5ec63b67d0ef0c032e513b9a9b3d0dbff099e4ddca788940bd4e4f14fcca894410a0e1169279edf168a45f55a6f67
+  data.tar.gz: b09ce56ee589e899f5fe66294fc09fe385e6b4ecc2e5ecebecec786e91b729a43957e59628c1a9a45e0cc0189993ed2f0a51731fd466d3357d9039edb13ee56a

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/decorators/supportDom.js

@@ -1,21 +1,11 @@
 import { isFunction } from '../utils'
 import createdComponents from '../consts/createdComponents'
 
-const domMap = new Map()
-
 export default function supportDom(target) {
 
-  const targetName = target.name
-
   return class extends target {
 
     init() {
-      if (this.classNameUsed) {
-        console.warn(`This dom has already been initialized by ${targetName}`, this.dom)
-        return
-      }
-      this.setClassNameByDom(target)
-
       this._listeners = []
       this._externalListeners = []
       if (isFunction(super.init)) {
@@ -24,40 +14,6 @@ export default function supportDom(target) {
       createdComponents.push(this)
     }
 
-    get classNameUsed() {
-      if (this._skipDomChecking) {
-        return false
-      }
-      const classnames = domMap.get(this.dom) || []
-      return classnames.includes(targetName)
-    }
-
-    setClassNameByDom(target) {
-      const { dom } = this
-      if (dom) {
-        const classes = domMap.get(dom) || []
-        classes.push(targetName)
-        domMap.set(dom, classes)
-      }
-    }
-
-    deleteClassNameByDom(target) {
-      const { dom } = this
-      if (! dom) {
-        return
-      }
-      const { name } = target
-      const classnames = (domMap.get(dom) || [])
-        .filter(classname => classname !== name)
-
-      if (classnames.length === 0) {
-        domMap.delete(dom)
-      }
-      else {
-        domMap.set(dom, classnames)
-      }
-    }
-
     on(name, func) {
       this._externalListeners.push({ name, func })
     }
@@ -80,7 +36,6 @@ export default function supportDom(target) {
     }
 
     destroy() {
-      this.deleteClassNameByDom(target)
       this._externalListeners.length = 0
       this.removeEvents()
       if (isFunction(super.destroy)) {

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()
+    }
+  })
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beyond-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.216
+  version: 0.0.221
 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-05 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