Merge remote-tracking branch 'origin/feat/harmony' into feat/harmony-…

…style
NervJS · Jun 24, 2024 · f43d441 · f43d441
2 parents 42256c6 + 1de88e5
commit f43d441
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 6 deletions.
diff --git a/packages/taro-framework-react/src/vite.harmony.ts b/packages/taro-framework-react/src/vite.harmony.ts
@@ -35,6 +35,7 @@ function aliasPlugin (ctx: IPluginContext, framework: Frameworks): PluginOption
       config (config) {
         const alias: ({ find: string | RegExp, replacement: string })[] = [
           { find: /react-dom$/, replacement: '@tarojs/react' },
+          { find: /react-dom\/client$/, replacement: '@tarojs/react' },
         ]
 
         const mainFields = ['unpkg', ...defaultMainFields]

diff --git a/packages/taro-framework-react/src/vite.mini.ts b/packages/taro-framework-react/src/vite.mini.ts
@@ -34,7 +34,8 @@ function aliasPlugin (ctx: IPluginContext, framework: Frameworks): PluginOption
       name: 'taro-react:alias',
       config (config) {
         const alias: ({ find: string | RegExp, replacement: string })[] = [
-          { find: /react-dom$/, replacement: '@tarojs/react' }
+          { find: /react-dom$/, replacement: '@tarojs/react' },
+          { find: /react-dom\/client$/, replacement: '@tarojs/react' },
         ]
 
         const mainFields = ['unpkg', ...defaultMainFields]

diff --git a/packages/taro-platform-harmony/src/runtime-framework/react/native-page.ts b/packages/taro-platform-harmony/src/runtime-framework/react/native-page.ts
@@ -173,10 +173,9 @@ function initNativeComponentEntry (params: InitNativeComponentEntryParams) {
     app?.appendChild(nativeApp)
     app = nativeApp
   }
-  // eslint-disable-next-line react/no-deprecated
-  ReactDOM.render(h(Entry, {}), app)
-  // const root = ReactDOM.createRoot(app)
-  // root.render?.(h(Entry))
+
+  const root = ReactDOM.createRoot(app)
+  root.render?.(h(Entry))
 }
 
 

diff --git a/packages/taro-react/src/props.ts b/packages/taro-react/src/props.ts
@@ -53,12 +53,18 @@ export function updateProps (dom: TaroElement, oldProps: Props, newProps: Props)
 
 export function updatePropsByPayload (dom: TaroElement, oldProps: Props, updatePayload: any[]) {
   const handlers: (() => void)[] = []
+  let fixedHandler: (() => void) | null = null
   for (let i = 0; i < updatePayload.length; i += 2) {
     // key, value 成对出现
     const key = updatePayload[i]
     const newProp = updatePayload[i + 1]
     const oldProp = oldProps[key]
     if (isHarmony) {
+      if (key === '__fixed') {
+        // hack: __fixed最先识别
+        fixedHandler = () => setProperty(dom, key, newProp, oldProp)
+        continue
+      }
       // 鸿蒙样式前置插入，防止覆盖style
       if (key === '__hmStyle') {
         handlers.splice(0, 0, () => setHarmonyStyle(dom, newProp, oldProp))
@@ -70,6 +76,7 @@ export function updatePropsByPayload (dom: TaroElement, oldProps: Props, updateP
     }
   }
   if (isHarmony) {
+    fixedHandler && fixedHandler()
     for (let i = 0; i < handlers.length; i++) {
       handlers[i]()
     }

diff --git a/packages/taro-vite-runner/src/harmony/template/page.ts b/packages/taro-vite-runner/src/harmony/template/page.ts
@@ -756,7 +756,7 @@ callFn(this.page?.onReady, this, params)`
     const isCustomNavigationBar = this.appConfig.window?.navigationStyle === 'custom'
     let pageStr = ''
     if (this.buildConfig.isBuildNativeComp) {
-      return `if (true) {
+      return `if (this.node) {
   TaroView({ node: this.node as TaroViewElement, createLazyChildren: createLazyChildren })
   if (${isTabPage ? 'this.layerNode[index]' : 'this.layerNode'}) {
     Stack() {