Merge branch 'refs/heads/master' into fix-drn

.eslintrc.js

@@ -31,7 +31,8 @@ module.exports = {
   rules: {
     'no-cond-assign': 0,
     camelcase: 0,
-    indent: 0
+    indent: 0,
+    'symbol-description': 0
   },
   env: {
     'jest/globals': true,

packages/core/src/core/proxy.js

@@ -138,8 +138,8 @@ export default class MpxProxy {
       if (isReact) {
         // react专用，正确触发updated钩子
         this.pendingUpdatedFlag = false
-        // react专用，用于提供render渲染函数中访问props数据同时不追踪props数据的顶层响应性
-        this.propsWithoutReactive = {}
+        this.memoVersion = Symbol()
+        this.finalMemoVersion = Symbol()
       }
     }
     this.initApi()
@@ -290,7 +290,6 @@ export default class MpxProxy {
     if (isReact) {
       // react模式下props内部对象透传无需深clone，依赖对象深层的数据响应触发子组件更新
       this.props = this.target.__getProps()
-      this.propsWithoutReactive = Object.assign({}, this.props)
       shallowReactive(this.processIgnoreReactive(this.props))
     } else {
       this.props = diffAndCloneA(this.target.__getProps(this.options)).clone

packages/core/src/observer/scheduler.js

@@ -83,6 +83,10 @@ export function queueJob (job) {
   }
 }
 
+export function hasPendingJob (job) {
+  return queue.length && queue.includes(job, isFlushing && job.allowRecurse ? flushIndex + 1 : flushIndex)
+}
+
 function queueFlush () {
   if (!isFlushing && !isFlushPending) {
     isFlushPending = true

packages/core/src/platform/patch/react/getDefaultOptions.ios.js

@@ -7,7 +7,7 @@ import { hasOwn, isFunction, noop, isObject, isArray, getByPath, collectDataset,
 import MpxProxy from '../../../core/proxy'
 import { BEFOREUPDATE, ONLOAD, UPDATED, ONSHOW, ONHIDE, ONRESIZE, REACTHOOKSEXEC } from '../../../core/innerLifecycle'
 import mergeOptions from '../../../core/mergeOptions'
-import { queueJob } from '../../../observer/scheduler'
+import { queueJob, hasPendingJob } from '../../../observer/scheduler'
 import { createSelectorQuery, createIntersectionObserver } from '@mpxjs/api-proxy'
 import { IntersectionObserverContext, RouteContext, KeyboardAvoidContext } from '@mpxjs/webpack-plugin/lib/runtime/components/react/dist/context'
 
@@ -35,7 +35,6 @@ function createEffect (proxy, components) {
       proxy.callHook(BEFOREUPDATE)
       proxy.pendingUpdatedFlag = true
     }
-    // eslint-disable-next-line symbol-description
     proxy.stateVersion = Symbol()
     proxy.onStoreChange && proxy.onStoreChange()
   }
@@ -49,18 +48,14 @@ function createEffect (proxy, components) {
     if (!type) return null
     return createElement(type, ...rest)
   }
-  const getValue = (name) => {
-    if (hasOwn(proxy.propsWithoutReactive, name)) {
-      return proxy.propsWithoutReactive[name]
-    } else {
-      return proxy.target[name]
-    }
-  }
+
   proxy.effect = new ReactiveEffect(() => {
     // reset instance
     proxy.target.__resetInstance()
-    return proxy.target.__injectedRender(innerCreateElement, getComponent, getValue)
+    return proxy.target.__injectedRender(innerCreateElement, getComponent)
   }, () => queueJob(update), proxy.scope)
+  // render effect允许自触发
+  proxy.toggleRecurse(true)
 }
 
 function getRootProps (props) {
@@ -272,12 +267,10 @@ function createInstance ({ propsRef, type, rawOptions, currentInject, validProps
 
   Object.assign(proxy, {
     onStoreChange: null,
-    // eslint-disable-next-line symbol-description
     stateVersion: Symbol(),
     subscribe: (onStoreChange) => {
       if (!proxy.effect) {
         createEffect(proxy, components)
-        // eslint-disable-next-line symbol-description
         proxy.stateVersion = Symbol()
       }
       proxy.onStoreChange = onStoreChange
@@ -434,12 +427,10 @@ export function getDefaultOptions ({ type, rawOptions = {}, currentInject }) {
       Object.keys(validProps).forEach((key) => {
         if (hasOwn(props, key)) {
           instance[key] = props[key]
-          proxy.propsWithoutReactive[key] = props[key]
         } else {
           const altKey = hump2dash(key)
           if (hasOwn(props, altKey)) {
             instance[key] = props[altKey]
-            proxy.propsWithoutReactive[key] = props[altKey]
           }
         }
       })
@@ -473,7 +464,18 @@ export function getDefaultOptions ({ type, rawOptions = {}, currentInject }) {
 
     useSyncExternalStore(proxy.subscribe, proxy.getSnapshot)
 
-    const root = rawOptions.options?.disableMemo ? proxy.effect.run() : useMemo(() => proxy.effect.run(), [proxy.stateVersion])
+    if ((rawOptions.options?.disableMemo)) {
+      proxy.memoVersion = Symbol()
+    }
+
+    const finalMemoVersion = useMemo(() => {
+      if (!hasPendingJob(proxy.update)) {
+        proxy.finalMemoVersion = Symbol()
+      }
+      return proxy.finalMemoVersion
+    }, [proxy.stateVersion, proxy.memoVersion])
+
+    const root = useMemo(() => proxy.effect.run(), [finalMemoVersion])
     if (root && root.props.ishost) {
       const rootProps = getRootProps(props)
       rootProps.style = Object.assign({}, root.props.style, rootProps.style)

packages/webpack-plugin/lib/react/processTemplate.js

@@ -115,16 +115,15 @@ module.exports = function (template, {
         try {
           const ignoreMap = Object.assign({
             createElement: true,
-            getComponent: true,
-            getValue: true
+            getComponent: true
           }, meta.wxsModuleMap)
           const bindResult = bindThis.transform(rawCode, {
             ignoreMap
             // customBindThis (path, t) {
             //   path.replaceWith(t.callExpression(t.identifier('getValue'), [t.stringLiteral(path.node.name)]))
             // }
           })
-          output += `global.currentInject.render = function (createElement, getComponent, getValue) {
+          output += `global.currentInject.render = function (createElement, getComponent) {
   return ${bindResult.code}
 };\n`
         } catch (e) {