6.04 核心上线 (#627)

Ricardo-Li · web-flow · commit 544a32bf2a38 · 2019-06-04T16:00:22.000+08:00
diff --git a/packages/mip/examples/mip2/mip-test-slot.html b/packages/mip/examples/mip2/mip-test-slot.html
@@ -0,0 +1,22 @@
+<!--htmlcs-disable-->
+<!DOCTYPE html>
+<html mip>
+<head>
+  <meta charset="utf-8">
+  <title>MIP tree demo</title>
+  <meta name="apple-touch-fullscreen" content="yes">
+  <meta name="apple-mobile-web-app-capable" content="yes">
+  <meta name="format-detection" content="telephone=no">
+  <meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
+  <link rel="stylesheet" href="../../dist/mip.css">
+  <style mip-custom>
+  </style>
+</head>
+
+<body>
+  <mip-test-slot><span>hello</span></mip-test-slot>
+  <script src="../../dist/mip.js"></script>
+  <script src="../../dist/mip-vue.js"></script>
+  <script src="./mip-test-slot.js"></script>
+</body>
+</html>
diff --git a/packages/mip/examples/mip2/mip-test-slot.js b/packages/mip/examples/mip2/mip-test-slot.js
@@ -0,0 +1,17 @@
+/**
+ * @file mip-tree
+ * @author sfe
+ */
+
+/* global MIP */
+
+MIP.registerVueCustomElement('mip-test-slot', {
+  template: `
+    <div>
+      <div v-for="i in [1, 2, 3, 4, 5, 6,7]" :key="i">
+        {{ i }}
+        <slot></slot>
+      </div>
+    </div>
+  `
+})
diff --git a/packages/mip/src/vue/core/instance/render-helpers/render-slot.js b/packages/mip/src/vue/core/instance/render-helpers/render-slot.js
@@ -19,6 +19,7 @@ export function renderSlot (
   bindObject
 ) {
   const scopedSlotFn = this.$scopedSlots[name]
+  let nodes
   if (scopedSlotFn) { // scoped slot
     props = props || {}
     if (bindObject) {
@@ -32,18 +33,15 @@ export function renderSlot (
       props = extend(extend({}, bindObject), props)
     }
 
-    return scopedSlotFn(props) || fallback
+    nodes = scopedSlotFn(props) || fallback
+  } else {
+    nodes = this.$slots[name] || fallback
   }
-  const slotNodes = this.$slots[name]
-  // warn duplicate slot usage
-  if (slotNodes && process.env.NODE_ENV !== 'production') {
-    slotNodes._rendered && warn(
-      `Duplicate presence of slot "${name}" found in the same render tree ` +
-      '- this will likely cause render errors.',
-      this
-    )
-    slotNodes._rendered = true
+
+  const target = props && props.slot
+  if (target) {
+    return this.$createElement('template', { slot: target }, nodes)
   }
 
-  return slotNodes || fallback
+  return nodes
 }
diff --git a/packages/mip/src/vue/core/instance/render.js b/packages/mip/src/vue/core/instance/render.js
@@ -65,21 +65,10 @@ export function renderMixin (Vue) {
     const vm = this
     const {render, _parentVnode} = vm.$options
 
-    if (vm._isMounted) {
-      // if the parent didn't update, the slot nodes will be the ones from
-      // last render. They need to be cloned to ensure "freshness" for this render.
-      for (const key in vm.$slots) {
-        const slot = vm.$slots[key]
-        if (slot._rendered) {
-          vm.$slots[key] = cloneVNodes(slot, true
-            // deep
-          )
-        }
-      }
+    if (_parentVnode) {
+      vm.$scopedSlots = _parentVnode.data.scopedSlots || emptyObject
     }
 
-    vm.$scopedSlots = (_parentVnode && _parentVnode.data.scopedSlots) || emptyObject
-
     // set parent vnode. this allows render functions to have access
     // to the data on the placeholder node.
     vm.$vnode = _parentVnode
diff --git a/packages/mip/src/vue/core/vdom/patch.js b/packages/mip/src/vue/core/vdom/patch.js
@@ -15,7 +15,7 @@
  * of making flow understand it is not worth it.
  */
 
-import VNode from './vnode'
+import VNode, {cloneVNode} from './vnode'
 import config from '../config'
 import {SSR_ATTR} from 'shared/constants'
 import {registerRef} from './modules/ref'
@@ -123,7 +123,7 @@ export function createPatchFunction (backend) {
   function createElm (vnode, insertedVnodeQueue, parentElm, refElm, nested) {
     // mip patch: 如果是渲染好的 Node 节点，直接插入
     if (vnode instanceof Node) {
-      nodeOps.insertBefore(parentElm, vnode, refElm)
+      nodeOps.insertBefore(parentElm, vnode.cloneNode(true), refElm)
       return
     }
 
@@ -438,20 +438,20 @@ export function createPatchFunction (backend) {
         newCh[newEndIdx--] = oldEndVnode
         oldEndVnode = oldCh[oldEndIdx--]
       } else if (sameVnode(oldStartVnode, newStartVnode)) {
-        patchVnode(oldStartVnode, newStartVnode, insertedVnodeQueue)
+        patchVnode(oldStartVnode, newStartVnode, insertedVnodeQueue, newCh, newStartIdx)
         oldStartVnode = oldCh[++oldStartIdx]
         newStartVnode = newCh[++newStartIdx]
       } else if (sameVnode(oldEndVnode, newEndVnode)) {
-        patchVnode(oldEndVnode, newEndVnode, insertedVnodeQueue)
+        patchVnode(oldEndVnode, newEndVnode, insertedVnodeQueue, newCh, newStartIdx)
         oldEndVnode = oldCh[--oldEndIdx]
         newEndVnode = newCh[--newEndIdx]
       } else if (sameVnode(oldStartVnode, newEndVnode)) { // Vnode moved right
-        patchVnode(oldStartVnode, newEndVnode, insertedVnodeQueue)
+        patchVnode(oldStartVnode, newEndVnode, insertedVnodeQueue, newCh, newStartIdx)
         canMove && nodeOps.insertBefore(parentElm, oldStartVnode.elm, nodeOps.nextSibling(oldEndVnode.elm))
         oldStartVnode = oldCh[++oldStartIdx]
         newEndVnode = newCh[--newEndIdx]
       } else if (sameVnode(oldEndVnode, newStartVnode)) { // Vnode moved left
-        patchVnode(oldEndVnode, newStartVnode, insertedVnodeQueue)
+        patchVnode(oldEndVnode, newStartVnode, insertedVnodeQueue, newCh, newStartIdx)
         canMove && nodeOps.insertBefore(parentElm, oldEndVnode.elm, oldStartVnode.elm)
         oldEndVnode = oldCh[--oldEndIdx]
         newStartVnode = newCh[++newStartIdx]
@@ -477,7 +477,7 @@ export function createPatchFunction (backend) {
           }
 
           if (sameVnode(vnodeToMove, newStartVnode)) {
-            patchVnode(vnodeToMove, newStartVnode, insertedVnodeQueue)
+            patchVnode(vnodeToMove, newStartVnode, insertedVnodeQueue, newCh, newStartIdx)
             oldCh[idxInOld] = undefined
             canMove && nodeOps.insertBefore(parentElm, vnodeToMove.elm, oldStartVnode.elm)
           } else {
@@ -505,11 +505,23 @@ export function createPatchFunction (backend) {
     }
   }
 
-  function patchVnode (oldVnode, vnode, insertedVnodeQueue, removeOnly) {
+  function patchVnode (
+    oldVnode,
+    vnode,
+    insertedVnodeQueue,
+    ownerArray,
+    index,
+    removeOnly
+  ) {
     if (oldVnode === vnode) {
       return
     }
 
+    if (isDef(vnode.elm) && isDef(ownerArray)) {
+      // clone reused vnode
+      vnode = ownerArray[index] = cloneVNode(vnode)
+    }
+
     const elm = vnode.elm = oldVnode.elm
 
     if (isTrue(oldVnode.isAsyncPlaceholder)) {
@@ -733,7 +745,7 @@ export function createPatchFunction (backend) {
       const isRealElement = isDef(oldVnode.nodeType)
       if (!isRealElement && sameVnode(oldVnode, vnode)) {
         // patch existing root node
-        patchVnode(oldVnode, vnode, insertedVnodeQueue, removeOnly)
+        patchVnode(oldVnode, vnode, insertedVnodeQueue, null, null, removeOnly)
       } else {
         if (isRealElement) {
           // mounting to a real element
