@tarojs/plugin-platform-harmony-ets 4.0.0-alpha.22 → 4.0.0-alpha.24

package/dist/runtime-framework/react/app.ts

@@ -23,7 +23,7 @@ export const ReactMeta: IReactMeta = {
   PageContext: EMPTY_OBJ
 }
 
-const pageKeyId = incrementId()
+const pageKeyId = incrementId(1)
 
 export function connectReactPage (
   R: typeof React,
@@ -72,7 +72,7 @@ export function connectReactPage (
           }))
 
         return h(
-          'view',
+          'taro-page',
           { id, className: 'taro_page' },
           children
         )
@@ -85,7 +85,7 @@ export function createReactApp (
   App,
   react,
   dom,
-  _config?: any
+  config?: any
 ) {
   ReactMeta.R = react
   h = react.createElement
@@ -107,10 +107,10 @@ export function createReactApp (
   }
 
   function renderReactRoot () {
-    const appId = 'app'
+    const appId = config?.appId || 'app'
 
     if (ReactMeta.Container === EMPTY_OBJ) {
-      const Container = document.createElement('view')
+      const Container = document.getElementById(appId)
 
       Container.id = appId
       ReactMeta.Container = Container
@@ -132,7 +132,7 @@ export function createReactApp (
 
     public mount (pageComponent: any, id: string, getCtx: () => any, cb: () => void) {
       const pageWrapper = connectReactPage(react, id, getCtx)(pageComponent)
-      const key = id + pageKeyId()
+      const key = `${id}_${pageKeyId()}`
       const page = () => h(pageWrapper, { key, tid: id })
       this.pages.push(page)
       this.forceUpdate(cb)

package/dist/runtime-framework/react/native-page.ts

@@ -19,7 +19,7 @@ import { EMPTY_OBJ, incrementId, isClassComponent } from './utils'
 import type { AppInstance } from '@tarojs/taro'
 import type * as React from 'react'
 
-const getNativeCompId = incrementId()
+const getNativeCompId = incrementId(1)
 let h: typeof React.createElement
 let ReactDOM
 let nativeComponentApp: AppInstance

package/dist/runtime-framework/react/page.ts

@@ -8,7 +8,7 @@ import { incrementId } from './utils'
 import type { PageConfig } from '@tarojs/taro'
 
 const instances = new Map<string, any>()
-const pageId = incrementId()
+const pageId = incrementId(1)
 
 export function injectPageInstance (inst: any, id: string) {
   hooks.call('mergePageInstance', instances.get(id), inst)

package/dist/runtime-framework/react/utils/index.ts

@@ -7,9 +7,9 @@ export function capitalize (s: string) {
   return s.charAt(0).toUpperCase() + s.slice(1)
 }
 
-export const incrementId = () => {
-  let n = 0
-  return () => (n++).toString()
+export const incrementId = (init = 0) => {
+  let n = init
+  return () => n++
 }
 
 export function ensureIsArray<T> (item: T | T[]): T[] {

package/dist/runtime-framework/solid/app.ts

@@ -31,10 +31,10 @@ export function createSolidApp(App: SolidComponent, config: AppConfig) {
   }
 
   function renderReactRoot() {
-    const appId = 'app'
+    const appId = config?.appId || 'app'
 
     if (ReactMeta.Container === EMPTY_OBJ) {
-      const Container = document.createElement('view')
+      const Container = document.getElementById(appId)
 
       Container.id = appId
       ReactMeta.Container = Container
@@ -68,7 +68,11 @@ export function createSolidApp(App: SolidComponent, config: AppConfig) {
               },
             })
 
-          return h('root', { id }, children)
+          return h(
+            'taro-page',
+            { id, className: 'taro_page' },
+            children
+          )
         },
       }),
     })

package/dist/runtime-framework/solid/page.ts

@@ -8,7 +8,7 @@ import { incrementId } from './utils'
 import type { PageConfig } from '@tarojs/taro'
 
 const instances = new Map<string, any>()
-const pageId = incrementId()
+const pageId = incrementId(1)
 
 export function injectPageInstance (inst: any, id: string) {
   hooks.call('mergePageInstance', instances.get(id), inst)

package/dist/runtime-framework/solid/utils/index.ts

@@ -9,9 +9,9 @@ export function capitalize (s: string) {
   return s.charAt(0).toUpperCase() + s.slice(1)
 }
 
-export const incrementId = () => {
-  let n = 0
-  return () => (n++).toString()
+export const incrementId = (init = 0) => {
+  let n = init
+  return () => n++
 }
 
 export const EMPTY_OBJ: any = {}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/plugin-platform-harmony-ets",
-  "version": "4.0.0-alpha.22",
+  "version": "4.0.0-alpha.24",
   "description": "OpenHarmony & 鸿蒙系统插件",
   "author": "O2Team",
   "homepage": "https://gitee.com/openharmony-sig/taro",
@@ -27,13 +27,13 @@
     "webpack-sources": "^3.2.3",
     "@babel/preset-react": "^7.24.1",
     "webpack": "5.91.0",
-    "@tarojs/components": "4.0.0-alpha.22",
-    "@tarojs/helper": "4.0.0-alpha.22",
-    "@tarojs/runner-utils": "4.0.0-alpha.22",
-    "@tarojs/runtime": "4.0.0-alpha.22",
-    "@tarojs/service": "4.0.0-alpha.22",
-    "@tarojs/taro": "4.0.0-alpha.22",
-    "@tarojs/shared": "4.0.0-alpha.22"
+    "@tarojs/components": "4.0.0-alpha.24",
+    "@tarojs/runner-utils": "4.0.0-alpha.24",
+    "@tarojs/helper": "4.0.0-alpha.24",
+    "@tarojs/runtime": "4.0.0-alpha.24",
+    "@tarojs/service": "4.0.0-alpha.24",
+    "@tarojs/shared": "4.0.0-alpha.24",
+    "@tarojs/taro": "4.0.0-alpha.24"
   },
   "devDependencies": {
     "fast-glob": "^3.3.1",
@@ -42,7 +42,7 @@
     "rollup-plugin-ts": "^3.0.2",
     "solid-js": "^1.8.16",
     "tslib": "^2.4.0",
-    "rollup-plugin-copy": "4.0.0-alpha.22"
+    "rollup-plugin-copy": "4.0.0-alpha.24"
   },
   "scripts": {
     "prod": "pnpm run build",