beyond-rails 0.0.214 → 0.0.215

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64b522414fe0b7fa86cb3df83c81bba74875f7c52b5ee3706b37bd573926bc13
-  data.tar.gz: 305bd9944bccb2a77e40c75042576d12b366d827366b2deee387d6f24b26cdaf
+  metadata.gz: 2f68ab9a79de99e40d9e8460452b9cf7fdaa43ff92b2a553f5c1715f0f99fd6d
+  data.tar.gz: 2ba5dd5bb3e6ffa51fdb779d32c08e25a03a442cefa7e5803c3a1a66dd8f7f9d
 SHA512:
-  metadata.gz: 81acdccfca585e4e420833a6a859ff319e367fe72d4d20a908fc3c755d0e59832ff4ee87094aa69a83b12c266381862e103fa5a778de0dc3b884478fb9b21787
-  data.tar.gz: ded05312ca85dd45d648c215d6f9c725349a4e062ed3d76635b42f0e1af903e1beae70c59b7e7c53f873a32d719d6c75983c99a8e107746a91444ebac76ecf67
+  metadata.gz: 83b82acf5fb118c6e6c26177cb0886bb90772f556b0da4ae371a18e77f3541f2427358eedfef4af09bd09bd03fa01fad89c117bd34cbce3b4893898aac5e1f17
+  data.tar.gz: 205e57cafe9e23882c7cf5614142d573cc5685550d718ba02b2fae32fa917111642ff75dbc2025f2b50664abfa84a74aa189657717b5580985b4c4c91754f880

data/src/js/decorators/supportDom.js

@@ -1,19 +1,20 @@
 import { isFunction } from '../utils'
-import isUndef from '../utils/isUndef'
 import createdComponents from '../consts/createdComponents'
 
 const domMap = new Map()
 
 export default function supportDom(target) {
 
+  const targetName = target.name
+
   return class extends target {
 
     init() {
-      if (domMap.has(this.dom) && isUndef(this._skipDomChecking)) {
-        console.warn('This dom has already been initialized.', this.dom)
+      if (this.classNameUsed) {
+        console.warn(`This dom has already been initialized by ${targetName}`, this.dom)
         return
       }
-      this.setDomToMap()
+      this.setClassNameByDom(target)
 
       this._listeners = []
       this._externalListeners = []
@@ -23,18 +24,38 @@ export default function supportDom(target) {
       createdComponents.push(this)
     }
 
-    setDomToMap() {
+    get classNameUsed() {
+      if (this._skipDomChecking) {
+        return false
+      }
+      const classnames = domMap.get(this.dom) || []
+      return classnames.includes(targetName)
+    }
+
+    setClassNameByDom(target) {
       const { dom } = this
       if (dom) {
-        domMap.set(dom, true)
+        const classes = domMap.get(dom) || []
+        classes.push(targetName)
+        domMap.set(dom, classes)
       }
     }
 
-    deleteDomFromMap() {
+    deleteClassNameByDom(target) {
       const { dom } = this
-      if (dom) {
+      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) {
@@ -59,7 +80,7 @@ export default function supportDom(target) {
     }
 
     destroy() {
-      this.deleteDomFromMap()
+      this.deleteClassNameByDom(target)
       this._externalListeners.length = 0
       this.removeEvents()
       if (isFunction(super.destroy)) {

metadata

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