j-component 1.4.8 → 1.4.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "j-component",
-  "version": "1.4.8",
+  "version": "1.4.10",
   "description": "miniprogram custom component framework",
   "main": "index.js",
   "types": "index.d.ts",

package/src/componentmanager.js

@@ -128,6 +128,15 @@ class ComponentManager {
           const exparserNodes = this.shadowRoot.querySelectorAll(selector)
           return exparserNodes.map(item => getSelectComponentResult(item))
         }
+        caller.selectOwnerComponent = () => {
+          const ownerShadowRoot = this.ownerShadowRoot
+          if (!(ownerShadowRoot instanceof exparser.ShadowRoot)) return null
+
+          const exparserNode = ownerShadowRoot.getHostNode()
+          if (!exparserNode) return null
+
+          return getSelectComponentResult(exparserNode)
+        }
         caller.createSelectorQuery = () => new SelectorQuery(caller)
         caller.createIntersectionObserver = options => new IntersectionObserver(caller, options)
         caller.setData = (data, callback) => {

package/src/render/component.js

@@ -60,10 +60,10 @@ function exparserTreeToJSON(node) {
     let children = array
     const vt = node._vt
 
-    if (vt) {
-      if (vt.type === CONSTANT.TYPE_TEXT) {
-        array.push(vt.content)
-      } else if (vt.type === CONSTANT.TYPE_NATIVE || vt.type === CONSTANT.TYPE_COMPONENT) {
+    if (node instanceof exparser.TextNode) {
+      array.push(node.textContent)
+    } else if (node instanceof exparser.Element) {
+      if (!node.__virtual) {
         children = []
         const child = {
           tagName: _.getTagName(vt.componentId || vt.tagName) || vt.tagName,
@@ -78,10 +78,9 @@ function exparserTreeToJSON(node) {
         })
         array.push(child)
       }
+      (node.__wxSlotChildren || []).forEach(child => _inner(child, children))
     }
 
-    (node.__wxSlotChildren || []).forEach(child => _inner(child, children))
-
     return array
   }
 

package/src/render/diff.js

@@ -43,12 +43,16 @@ function diffVt(oldVt, newVt) {
       }
 
       // 检查事件
-      Object.keys(oldVt.event).forEach(key => {
-        const {name, isCapture, id} = oldVt.event[key]
+      if (isSameEvent(oldVt.event, newVt.event)) {
+        newVt.event = oldVt.event
+      } else {
+        Object.keys(oldVt.event).forEach(key => {
+          const {name, isCapture, id} = oldVt.event[key]
 
-        exparser.removeListenerFromElement(node, name, id, {capture: isCapture})
-      })
-      render.updateEvent(node, newVt.event)
+          exparser.removeListenerFromElement(node, name, id, {capture: isCapture})
+        })
+        render.updateEvent(node, newVt.event)
+      }
 
       // 检查子节点
       const oldChildren = oldVt.children
@@ -122,6 +126,28 @@ function diffAttrs(oldAttrs, newAttrs) {
   return isChange ? retAttrs : false
 }
 
+/**
+ * diff 事件绑定
+ */
+function isSameEvent(oldEvent, newEvent) {
+  const oldKeys = Object.keys(oldEvent)
+  const newKeys = Object.keys(newEvent)
+
+  if (oldKeys.length !== newKeys.length) return false
+
+  return oldKeys.every(key => {
+    const oldItem = oldEvent[key]
+    const newItem = newEvent[key]
+
+    return newItem &&
+      oldItem.name === newItem.name &&
+      oldItem.isCapture === newItem.isCapture &&
+      oldItem.isMutated === newItem.isMutated &&
+      oldItem.isCatch === newItem.isCatch &&
+      oldItem.handler === newItem.handler
+  })
+}
+
 /**
  * diff 列表
  */