@tarojs/plugin-platform-harmony-ets 4.0.0-beta.2 → 4.0.0-beta.21

package/dist/runtime-ets/dom/stylesheet/util.ts

@@ -1,5 +1,5 @@
 // @ts-nocheck
-import matrix4 from '@ohos.matrix4'
+// import matrix4 from '@ohos.matrix4'
 import { isNumber } from '@tarojs/shared'
 
 import { convertNumber2VP } from '../../'
@@ -163,7 +163,6 @@ export class FlexManager {
   }
 }
 
-
 export class BORDER_STYLE_MAP {
   static solid = BorderStyle.Solid
   static dotted = BorderStyle.Dotted
@@ -188,11 +187,10 @@ export class BORDER_STYLE_MAP {
   }
 }
 
-
 export function getNodeMarginOrPaddingData (dataValue: string) {
   let res: any = {}
   if (dataValue) {
-    const values = dataValue.trim().split(new RegExp('\\s+'))
+    const values = dataValue.toString().trim().split(new RegExp('\\s+'))
     switch (values.length) {
       case 1:
         res = { top: values[0], right: values[0], bottom: values[0], left: values[0] }
@@ -216,7 +214,6 @@ export function getNodeMarginOrPaddingData (dataValue: string) {
   return res
 }
 
-
 export function getUnit (val) {
   // 空的字符串代表 Reconciler remove 了这个 prop，不进行后面的逻辑了
   if (val === '') return val
@@ -238,19 +235,26 @@ export function getUnit (val) {
 }
 
 export function getTransform(transform) {
+  // if (transform) {
+  //   return transform.reduce((res, item) => {
+  //     switch (item.type) {
+  //       case 'Translate': return res.translate(item.value)
+  //       case 'Scale': return res.scale(item.value)
+  //       case 'Rotate': return res.rotate(item.value)
+  //       case 'Matrix': return res.combine(matrix4.init(item.value))
+  //     }
+  //     return res
+  //   }, matrix4.identity())
+  // }
+  const result = {}
   if (transform) {
-    return transform.reduce((res, item) => {
-      switch (item.type) {
-        case 'Translate': return res.translate(item.value)
-        case 'Scale': return res.scale(item.value)
-        case 'Rotate': return res.rotate(item.value)
-        case 'Matrix': return res.combine(matrix4.init(item.value))
-      }
-      return res
-    }, matrix4.identity())
+    transform.forEach((item) => {
+      result[item.type] = item.value
+    })
+    return result
   }
 }
 
 export function capitalizeFirstLetter (str: string) {
   return str.charAt(0).toUpperCase() + str.slice(1)
-}
+}

package/dist/runtime-ets/index.ts

@@ -10,9 +10,9 @@ export * from './dom/element'
 export * from './dom/event'
 export * from './dom/node'
 export * from './dom/stylesheet'
+export * from './dom/cssNesting'
 export * from './interface'
 export * from './utils'
-export * from './utils/bind'
 export * from './utils/info'
-export { URLSearchParams, eventSource } from '@tarojs/runtime/dist/runtime.esm'
+export { URL, URLSearchParams, eventSource, Events } from '@tarojs/runtime/dist/runtime.esm'
 export { hooks } from '@tarojs/shared'

package/dist/runtime-ets/interface/event.ts

@@ -7,4 +7,4 @@ export interface EventOptions {
 export interface EventHandler<T = any, R = void> {
   (...args: T[]): R
   _stop?: boolean
-}
+}

package/dist/runtime-ets/utils/index.ts

@@ -45,21 +45,37 @@ export function convertNumber2VP (value: number, unit = 'px') {
   return pxTransformHelper(value, 'vp')
 }
 
-export function calcDynamicStyle (styleSheet: Record<string, CSSProperties>, classNames: string, style: CSSProperties): CSSProperties {
+// 合并静态样式，从样式表里面找到对应的样式
+export function calcStaticStyle (styleSheet: Record<string, CSSProperties>, classNames: string, style: CSSProperties): CSSProperties {
   const obj: CSSProperties[] = []
   const classes = typeof classNames === 'string' ? classNames.split(' ') : []
-  for (let i = 0; i < classes.length; i++) {
-    const className = classes[i]
-    if (styleSheet[className]) {
-      obj.push(styleSheet[className])
+  if (classes.length === 1) {
+    if (style) {
+      return Object.assign({}, styleSheet[classNames], style)
+    } else {
+      // 同一个引用
+      return styleSheet[classNames]
     }
+  } else {
+    for (let i = 0; i < classes.length; i++) {
+      const className = classes[i]
+      if (styleSheet[className]) {
+        obj.push(styleSheet[className])
+      }
+    }
+    if (style) {
+      obj.push(style)
+    }
+    return Object.assign.apply(null, [{}].concat(obj))
   }
+}
 
+// 动态样式计算，需要经过web2harmony进行反转
+export function calcDynamicStyle (style: CSSProperties): CSSProperties {
   if (style) {
-    obj.push(convertWebStyle2HmStyle(style))
+    return convertWebStyle2HmStyle(style)
   }
-  
-  return Object.assign.apply(null, [{}].concat(obj))
+  return {}
 }
 
 export function getPageScrollerOrNode (scrollerOrNode: any, page: any) {
@@ -91,7 +107,6 @@ export function bindFn (fn: any, ctx: any, ...args: any) {
   }
 }
 
-
 // 使用深度优先遍历寻找节点树中对应的子节点，且只需要找到第一个
 // 通过 selector 判断是 id 还是 selector，从 node 的 id 和 className 属性中寻找
 export function findChildNodeWithDFS<T extends TaroElement = TaroElement> (node: TaroElement, selector: string | ((ele: T) => boolean), selectAll: true): T[] | null;

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

@@ -237,7 +237,11 @@ export function createReactApp (
     }
   } as unknown as AppInstance
 
-  Current.app = app
+  if (Current.app) {
+    Current.app = Object.assign(app, Current.app)
+  } else {
+    Current.app = app
+  }
 
   return app
 }

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

@@ -7,14 +7,14 @@ import { HOOKS_APP_ID } from './utils'
 
 import type {
   AppInstance,
-  Func,
   Instance,
   PageLifeCycle,
-  PageProps
+  PageProps,
+  TFunc
 } from '@tarojs/runtime/dist/runtime.esm'
 
 const createTaroHook = (lifecycle: keyof PageLifeCycle | keyof AppInstance) => {
-  return (fn: Func) => {
+  return (fn: TFunc) => {
     const { R: React, PageContext } = ReactMeta
     const id = React.useContext(PageContext) || HOOKS_APP_ID
     const instRef = React.useRef<Instance<PageProps>>()

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

@@ -1,5 +1,5 @@
 import { Current, document, requestAnimationFrame, TaroElement, window } from '@tarojs/runtime' // eslint-disable-line import/no-duplicates
-import { CONTEXT_ACTIONS, env, eventCenter, Func } from '@tarojs/runtime/dist/runtime.esm' // eslint-disable-line import/no-duplicates
+import { CONTEXT_ACTIONS, env, eventCenter, TFunc } from '@tarojs/runtime/dist/runtime.esm' // eslint-disable-line import/no-duplicates
 import { ensure, hooks, isUndefined } from '@tarojs/shared'
 
 import { ReactMeta as reactMeta } from './app'
@@ -27,7 +27,7 @@ let nativeComponentApp: AppInstance
 interface InitNativeComponentEntryParams {
   R: typeof React
   ReactDOM: typeof ReactDOM
-  cb?: Func
+  cb?: TFunc
   // 是否使用默认的 DOM 入口 - app；默认为true，false的时候，会创建一个新的dom并且把它挂载在 app 下面
   isDefaultEntryDom?: boolean
 }
@@ -80,7 +80,11 @@ function initNativeComponentEntry (params: InitNativeComponentEntryParams) {
 
     componentDidMount () {
       if (isDefaultEntryDom) {
-        Current.app = this
+        if (Current.app) {
+          Current.app = Object.assign(this, Current.app)
+        } else {
+          Current.app = this
+        }
       } else {
         nativeComponentApp = this
       }
@@ -200,7 +204,7 @@ export function createNativePageConfig (Component, pageName: string, react: type
 
   const pageObj: Record<string, any> = {
     options: pageConfig,
-    [ONLOAD] (options: Readonly<Record<string, unknown>> = {}, cb?: Func) {
+    [ONLOAD] (options: Readonly<Record<string, unknown>> = {}, cb?: TFunc) {
       hasLoaded = new Promise(resolve => { loadResolver = resolve })
       Current.page = this as any
       this.config = pageConfig || {}
@@ -253,7 +257,7 @@ export function createNativePageConfig (Component, pageName: string, react: type
       window.trigger(CONTEXT_ACTIONS.DESTORY, $taroPath)
       // 触发onUnload生命周期
       safeExecute($taroPath, ONUNLOAD)
-      resetCurrent()
+      resetCurrent.call(this)
       unmounting = true
       Current.app!.unmount!($taroPath, () => {
         unmounting = false
@@ -306,12 +310,13 @@ export function createNativePageConfig (Component, pageName: string, react: type
   }
 
   function resetCurrent () {
-    // 小程序插件页面卸载之后返回到宿主页面时，需重置Current页面和路由。否则引发插件组件二次加载异常 fix:#11991
-    Current.page = null
-    Current.router = null
+    if (Current.page === this) {
+      // 小程序插件页面卸载之后返回到宿主页面时，需重置Current页面和路由。否则引发插件组件二次加载异常 fix:#11991
+      Current.page = null
+      Current.router = null
+    }
   }
 
-
   LIFECYCLES.forEach((lifecycle) => {
     pageObj[lifecycle] = function () {
       return safeExecute(this.$taroPath, lifecycle, ...arguments)

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

@@ -184,6 +184,7 @@ export function createPageConfig (component: any, pageName?: string, pageConfig?
         safeExecute(this.$taroPath, ON_READY)
         // 通过事件触发子组件的生命周期
         requestAnimationFrame(() => eventCenter.trigger(getOnReadyEventKey(id)))
+        this.onReady.called = true
       })
     },
     [ONSHOW] (options = {}) {

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

@@ -1,8 +1,8 @@
 import {
   AppInstance,
   Current,
-  Func,
-  PageLifeCycle
+  PageLifeCycle,
+  TFunc
 } from '@tarojs/runtime'
 import { isArray, isFunction } from '@tarojs/shared'
 import {
@@ -16,7 +16,7 @@ import { getPageInstance, injectPageInstance } from './page'
 import { HOOKS_APP_ID } from './utils'
 
 const createTaroHook = (lifecycle: keyof PageLifeCycle | keyof AppInstance) => {
-  return (fn: Func) => {
+  return (fn: TFunc) => {
     const id = ReactMeta.PageContext || HOOKS_APP_ID
 
     createRenderEffect(() => {

package/dist/runtime-framework/solid/reconciler/use.ts

@@ -5,4 +5,3 @@ export function use(fn, ele, accessor) {
     fn(ele, accessor)
   })
 }
-

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

@@ -45,5 +45,3 @@ export function setRouterParams(options) {
     ...options,
   }
 }
-
-