@tarojs/plugin-platform-harmony-ets 4.0.0-beta.49 → 4.0.0-beta.50

package/dist/apis/ui/background.ts

@@ -11,7 +11,8 @@ export function setBackgroundColor(options: Taro.setBackgroundColor.Option) {
 
   return new Promise((resolve, reject) => {
     eventCenter.trigger('__taroPageStyle', {
-      backgroundColor: options.backgroundColor || options.backgroundColorTop || options.backgroundColorBottom,
+      backgroundColor: options.backgroundColorBottom || options.backgroundColor,
+      backgroundColorContext: options.backgroundColorTop || options.backgroundColor
     })
 
     return handle.success({}, { resolve, reject })

package/dist/apis/ui/interaction/index.ts

@@ -153,7 +153,7 @@ export function showActionSheet (options) {
           reject,
           {
             ...data,
-            errMsg: data.errMsg.replace('showActionMenu', 'showActionSheet')
+            errMsg: data.errMsg?.replace('showActionMenu', 'showActionSheet')
           },
           options
         )

package/dist/apis/ui/navigation-bar/index.ts

@@ -19,7 +19,7 @@ export const setNavigationBarTitle: typeof Taro.setNavigationBarTitle = function
 
 export const setNavigationBarColor: typeof Taro.setNavigationBarColor = function (options) {
   const { success, fail, complete } = options || {}
-  const handle = new MethodHandler({ name: 'setNavigationBarTitle', success, fail, complete })
+  const handle = new MethodHandler({ name: 'setNavigationBarColor', success, fail, complete })
 
   return new Promise((resolve, reject) => {
     eventCenter.trigger('__taroNavigationStyle', {

package/dist/components-harmony-ets/index.ets

@@ -22,6 +22,8 @@ import TaroMovableArea from './movableArea'
 import TaroMovableView from './movableView'
 import { TaroRadio, TaroRadioGroup } from './radio'
 import { TaroCheckboxGroup, TaroCheckbox } from './checkbox'
+import TaroPageMeta from './pageMeta'
+import TaroNavigationBar from './navigationBar'
 
 import commonStyleModify, { rowModify, columnModify, textModify, setNormalTextAttributeIntoInstance } from './style'
 import { getButtonColor } from './button'
@@ -78,4 +80,6 @@ export {
   TaroRadioGroup,
   TaroCheckboxGroup,
   TaroCheckbox,
+  TaroPageMeta,
+  TaroNavigationBar,
 }

package/dist/components-harmony-ets/label.ets

@@ -35,12 +35,11 @@ function handleTargetChange (id: string) {
   }
 }
 
-
 @Component
 export default struct TaroLabel {
   @Builder customBuilder() {}
-  @BuilderParam createLazyChildren: (node:TaroLabelElement) => void = this.customBuilder
-  @ObjectLink node:TaroLabelElement
+  @BuilderParam createLazyChildren: (node: TaroLabelElement) => void = this.customBuilder
+  @ObjectLink node: TaroLabelElement
   @State overwriteStyle: Record<string, TaroAny> = {}
 
   aboutToAppear(): void {
@@ -50,7 +49,6 @@ export default struct TaroLabel {
   }
 
   build() {
-
     if (FlexManager.useFlexLayout(this.node)) {
       Flex(FlexManager.flexOptions(this.node)) {
         this.createLazyChildren(this.node)

package/dist/components-harmony-ets/navigationBar.ets

@@ -0,0 +1,25 @@
+import { isTagFirstChild } from './utils/helper'
+
+import type { TaroNavigationBarElement } from '@tarojs/runtime'
+
+@Component
+export default struct TaroNavigationBar {
+  @Builder customBuilder() {}
+  @BuilderParam createLazyChildren: (node: TaroNavigationBarElement) => void = this.customBuilder
+  @ObjectLink node: TaroNavigationBarElement
+
+  aboutToAppear(): void {
+    if (!isTagFirstChild(this.node, 'page-meta')) {
+      console.error('NavigationBar 只能是 PageMeta 内的第一个节点。')
+    }
+    if (this.node) {
+      this.node._instance = this
+    }
+  }
+
+  build() {
+    if (true) {
+      this.createLazyChildren(this.node)
+    }
+  }
+}

package/dist/components-harmony-ets/pageMeta.ets

@@ -0,0 +1,28 @@
+import { APP } from '@tarojs/runtime/dist/runtime.esm'
+
+import { isTagFirstChild } from './utils/helper'
+
+import type { TaroPageMetaElement } from '@tarojs/runtime'
+
+@Component
+export default struct TaroPageMeta {
+  @Builder customBuilder() {}
+  @BuilderParam createLazyChildren: (node: TaroPageMetaElement) => void = this.customBuilder
+  @ObjectLink node: TaroPageMetaElement
+
+  aboutToAppear(): void {
+    if (!isTagFirstChild(this.node, APP, 2)) {
+      // PageMeta 只能是页面内的第一个元素
+      console.error('PageMeta 只能是页面内的第一个元素。')
+    }
+    if (this.node) {
+      this.node._instance = this
+    }
+  }
+
+  build() {
+    if (true) {
+      this.createLazyChildren(this.node)
+    }
+  }
+}

package/dist/components-harmony-ets/tag.ts

@@ -35,6 +35,8 @@ export const TaroAdTagName = 'ad'
 export const TaroWebViewTagName = 'web-view'
 export const TaroBlockTagName = 'block'
 export const TaroMapTagName = 'map'
+export const TaroPageMetaTagName = 'page-meta'
+export const TaroNavigationBarTagName = 'navigation-bar'
 export const TaroSlotTagName = 'slot'
 export const TaroNativeSlotTagName = 'native-slot'
 export const TaroCustomWrapperTagName = 'custom-wrapper'

package/dist/components-harmony-ets/utils/helper.ets

@@ -1,7 +1,9 @@
+import { VIEW } from '@tarojs/runtime/dist/runtime.esm'
+
 import { getNormalAttributes, getFontAttributes, getStyleAttr } from './styles'
 
 import type { TFunc } from '@tarojs/runtime/dist/runtime.esm'
-import type { TaroElement } from '@tarojs/runtime'
+import type { TaroElement, TaroNode } from '@tarojs/runtime'
 
 export const parseStyles = (styles = ''): Record<string, string> => {
   const styleObj: Record<string, string> = {}
@@ -34,5 +36,16 @@ export function getNodeThresholds (node: TaroElement): number[] | null {
   return node?._nodeInfo?.thresholds || null
 }
 
+export function isTagFirstChild (node: TaroElement, tagName = VIEW, level = 0): boolean {
+  const parent: TaroElement | null = node.parentElement
+  const list: TaroNode[] = node.parentNode?.childNodes || []
+  if (!parent || list.length < 1 || level < 0) return false
+
+  if (parent.nodeName === tagName.toUpperCase()) {
+    return list[0] === node
+  } else {
+    return list[0] === node && isTagFirstChild(parent, tagName, --level)
+  }
+}
 
 export { getNormalAttributes, getFontAttributes, getStyleAttr }

package/dist/components-harmony-ets/utils/styles.ets

@@ -135,6 +135,12 @@ function getPseudoClass (node: TaroElement): HarmonyStyle | null {
           }
           break
         }
+        case "::empty": {
+          if (node.children?.length === 0) {
+            return pseudoStylesheet.hmStyle
+          }
+          break
+        }
         default: {
           // 解析nth-child()
           // 找出当前节点在父节点中的位置

package/dist/runtime-ets/bom/document.ts

@@ -1,3 +1,5 @@
+import { APP, BODY, HEAD, HTML } from '@tarojs/runtime/dist/runtime.esm'
+
 import { TaroDocument } from '../dom/document'
 import { window } from './window'
 
@@ -15,11 +17,11 @@ function createDocument (): TaroDocument {
 
   const doc = new TaroDocument(window)
   const documentCreateElement = doc.createElement.bind(doc)
-  const html = documentCreateElement('html')
-  const head = documentCreateElement('head')
-  const body = documentCreateElement('body')
+  const html = documentCreateElement(HTML)
+  const head = documentCreateElement(HEAD)
+  const body = documentCreateElement(BODY)
   const container = documentCreateElement('container') // 多包一层主要为了兼容 vue
-  const app = documentCreateElement('app')
+  const app = documentCreateElement(APP)
   app.id = 'app'
 
   doc.appendChild(html)
@@ -31,7 +33,7 @@ function createDocument (): TaroDocument {
   doc.documentElement = html
   doc.head = head
   doc.body = body
-  
+
   return doc
 }
 

package/dist/runtime-ets/dom/bind.ts

@@ -70,7 +70,7 @@ export function bindAnimation (node: TaroElement) {
             animateParams.duration = 0
           }
           animateParams.curve = Curve[convertToCamelCase(timingFunction)] || Curve.EaseInOut
-          Current.uiContext.animateTo(animateParams, () => {
+          node._instance.getUIContext()?.animateTo(animateParams, () => {
             const transformOrigin: string = anim.transformOrigin
             if (transformOrigin) {
               const splitOrigin = transformOrigin.split(' ')

package/dist/runtime-ets/dom/element/element.ts

@@ -403,7 +403,7 @@ export class TaroElement<
 
     if (keyframes) {
       let cur_percentage = 0
-      Current.uiContext.keyframeAnimateTo({
+      this._instance.getUIContext()?.keyframeAnimateTo({
         delay: animationDelay,
         iterations: animationIterationCount,
       }, keyframes.map(item => {

package/dist/runtime-ets/dom/element/form.ts

@@ -187,7 +187,7 @@ class TaroInputElement<T extends FormWidgetProps = InputProps> extends TaroFormW
 }
 
 @Observed
-class TaroTextAreaElement extends TaroInputElement<TextareaProps>{
+class TaroTextAreaElement extends TaroInputElement<TextareaProps> {
   controller: TextAreaController = new TextAreaController()
 
   constructor() {
@@ -195,14 +195,14 @@ class TaroTextAreaElement extends TaroInputElement<TextareaProps>{
   }
 }
 @Observed
-class TaroCheckboxElement extends TaroCheckedElement<CheckboxProps>{
+class TaroCheckboxElement extends TaroCheckedElement<CheckboxProps> {
   constructor() {
     super('Checkbox')
   }
 }
 
 @Observed
-class TaroRadioElement extends TaroCheckedElement<RadioProps>{
+class TaroRadioElement extends TaroCheckedElement<RadioProps> {
   public group?: string
 
   constructor() {
@@ -232,7 +232,7 @@ class TaroPickerElement extends TaroFormWidgetElement<PickerSelectorProps | Pick
       case 'selector': {
         const key = this._attrs.rangeKey
         const item = this._attrs.range[this.value]
-        
+
         if (key) {
           return item[key]
         } else {
@@ -261,7 +261,7 @@ class TaroPickerElement extends TaroFormWidgetElement<PickerSelectorProps | Pick
     super.reset()
 
     const event: TaroEvent = createTaroEvent('change', { detail: { value: this._reset } }, this)
-    
+
     event.stopPropagation()
     eventHandler(event, 'change', this)
   }
@@ -337,7 +337,7 @@ class TaroFormElement extends TaroFormWidgetElement {
 
       findChildNodeWithDFS<TaroFormWidgetElement>(this, item => {
         if (!item.name) return false
-        
+
         switch (item.nodeName) {
           case 'INPUT':
           case 'RADIO':
@@ -368,9 +368,9 @@ class TaroFormElement extends TaroFormWidgetElement {
         e.stopPropagation()
         switch (item.nodeName) {
           case 'INPUT':
-          case 'SLIDER': 
+          case 'SLIDER':
           case 'PICKER':
-          case 'RADIO': 
+          case 'RADIO':
           case 'SWITCH':
           case 'CHECKBOX':
           case 'TEXTAREA':

package/dist/runtime-ets/dom/element/index.ts

@@ -22,7 +22,9 @@ import {
   TaroIconElement,
   TaroImageElement,
   TaroLabelElement,
+  TaroNavigationBarElement,
   TaroOtherElement,
+  TaroPageMetaElement,
   TaroRichTextElement,
   TaroSwiperElement,
   TaroSwiperItemElement,
@@ -64,6 +66,8 @@ export function initHarmonyElement () {
       case 'form': return new TaroFormElement()
       case 'web-view': return new TaroWebViewElement()
       case 'inner-html': return new TaroInnerHtmlElement()
+      case 'page-meta': return new TaroPageMetaElement()
+      case 'navigation-bar': return new TaroNavigationBarElement()
       default: return new TaroOtherElement(tagName)
     }
   }
@@ -89,7 +93,9 @@ export {
   TaroLabelElement,
   TaroMovableAreaElement,
   TaroMovableViewElement,
+  TaroNavigationBarElement,
   TaroOtherElement,
+  TaroPageMetaElement,
   TaroPickerElement,
   TaroProgressElement,
   TaroRadioElement,

package/dist/runtime-ets/dom/element/normal.ts

@@ -6,6 +6,8 @@ import type {
   IconProps,
   ImageProps,
   LabelProps,
+  NavigationBarProps,
+  PageMetaProps,
   RichTextProps,
   SwiperItemProps,
   SwiperProps,
@@ -37,27 +39,27 @@ class TaroButtonElement extends TaroElement<ButtonProps> {
 }
 
 @Observed
-class TaroIconElement extends TaroElement<IconProps>{
+class TaroIconElement extends TaroElement<IconProps> {
   constructor() {
     super('Icon')
   }
 }
 @Observed
-class TaroLabelElement extends TaroElement<LabelProps>{
+class TaroLabelElement extends TaroElement<LabelProps> {
   constructor() {
     super('Label')
   }
 }
 
 @Observed
-class TaroRichTextElement extends TaroElement<RichTextProps>{
+class TaroRichTextElement extends TaroElement<RichTextProps> {
   constructor() {
     super('RichText')
   }
 }
 
 @Observed
-class TaroSwiperElement extends TaroElement<SwiperProps>{
+class TaroSwiperElement extends TaroElement<SwiperProps> {
   controller: SwiperController = new SwiperController()
 
   constructor() {
@@ -66,18 +68,34 @@ class TaroSwiperElement extends TaroElement<SwiperProps>{
 }
 
 @Observed
-class TaroSwiperItemElement extends TaroElement<SwiperItemProps>{
+class TaroSwiperItemElement extends TaroElement<SwiperItemProps> {
   constructor() {
     super('SwiperItem')
   }
 }
 
+@Observed
+class TaroPageMetaElement extends TaroElement<PageMetaProps> {
+  constructor() {
+    super('PageMeta')
+  }
+}
+
+@Observed
+class TaroNavigationBarElement extends TaroElement<NavigationBarProps> {
+  constructor() {
+    super('NavigationBar')
+  }
+}
+
 export {
   TaroButtonElement,
   TaroIconElement,
   TaroImageElement,
   TaroLabelElement,
+  TaroNavigationBarElement,
   TaroOtherElement,
+  TaroPageMetaElement,
   TaroRichTextElement,
   TaroSwiperElement,
   TaroSwiperItemElement,

package/dist/runtime-ets/dom/element/webView.ts

@@ -13,13 +13,13 @@ export class TaroInnerHtmlElement extends TaroElement {
 }
 
 @Observed
-export class TaroWebViewElement extends TaroElement<WebViewProps>{
+export class TaroWebViewElement extends TaroElement<WebViewProps> {
   ports: web_webview.WebMessagePort[] = []
 
   nativePort: web_webview.WebMessagePort | null = null
 
   message: web_webview.WebMessageExt = new web_webview.WebMessageExt()
-  
+
   controller: web_webview.WebviewController = new web_webview.WebviewController()
 
   constructor() {
@@ -62,7 +62,7 @@ export class TaroWebViewElement extends TaroElement<WebViewProps>{
     }
     catch (error) {
       const e: business_error.BusinessError = error as business_error.BusinessError
-      
+
       console.error(`ErrorCode: ${e.code},  Message: ${e.message}`)
     }
   }

package/dist/runtime-ets/dom/node.ts

@@ -90,7 +90,7 @@ export class TaroNode extends TaroDataSourceElement {
     return this._nid
   }
 
-  public get firstChild (): TaroNode | null{
+  public get firstChild (): TaroNode | null {
     return this.childNodes[0] || null
   }
 

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

@@ -49,31 +49,39 @@ export function convertNumber2VP (value: number, unit = 'px'): string | number {
   return pxTransformHelper(value, 'vp')
 }
 
-export function parseClasses (classNames: string | string[] = []): string[] {
-  if (typeof classNames === 'string') {
-    return classNames.includes(' ') ? classNames.split(' ') : [classNames]
-  } else if (Array.isArray(classNames)) {
-    return classNames // Note: 不考虑支持单个元素传入多个类名的情况，过于损耗性能
-  }
-
-  return []
+export function parseClasses (classNames = ''): string[] {
+  return classNames.includes(' ') ? classNames.split(' ') : [classNames]
 }
 
 // 合并静态样式，从样式表里面找到对应的样式
-export function calcStaticStyle (styleSheet: Record<string, CSSProperties>, classNames: string | string[] = []): CSSProperties {
+export function calcStaticStyle (styleSheet: Record<string, CSSProperties>, classNames = ''): CSSProperties {
   const obj: CSSProperties[] = []
+
+  if (!styleSheet.cache) {
+    styleSheet.cache = {}
+  }
+  const cache: Record<string, CSSProperties> = styleSheet.cache as Record<string, CSSProperties>
+
   const classes = parseClasses(classNames)
   if (classes.length === 1) {
     // 同一个引用
     return styleSheet[classes[0]]
   } else {
-    for (let i = 0; i < classes.length; i++) {
-      const className = classes[i]
-      if (styleSheet[className]) {
-        obj.push(styleSheet[className])
+    if (cache[classNames]) {
+      return cache[classNames]
+    } else {
+      for (let i = 0; i < classes.length; i++) {
+        const className = classes[i]
+        if (styleSheet[className]) {
+          obj.push(styleSheet[className])
+        }
       }
+      const result = Object.assign.apply(null, [{}].concat(obj))
+
+      cache[classNames] = result
+      
+      return result
     }
-    return Object.assign.apply(null, [{}].concat(obj))
   }
 }
 

package/dist/runtime-utils.js

@@ -3601,7 +3601,8 @@ function setBackgroundColor(options) {
     const handle = new MethodHandler({ name: 'setBackgroundColor', success, fail, complete });
     return new Promise((resolve, reject) => {
         eventCenter.trigger('__taroPageStyle', {
-            backgroundColor: options.backgroundColor || options.backgroundColorTop || options.backgroundColorBottom,
+            backgroundColor: options.backgroundColorBottom || options.backgroundColor,
+            backgroundColorContext: options.backgroundColorTop || options.backgroundColor
         });
         return handle.success({}, { resolve, reject });
     });
@@ -3724,8 +3725,9 @@ function showActionSheet(options) {
             buttons
         };
         promptAction.showActionMenu(actionSheetOptions, (error, data) => {
+            var _a;
             if (error) {
-                callAsyncFail(reject, Object.assign(Object.assign({}, data), { errMsg: data.errMsg.replace('showActionMenu', 'showActionSheet') }), options);
+                callAsyncFail(reject, Object.assign(Object.assign({}, data), { errMsg: (_a = data.errMsg) === null || _a === void 0 ? void 0 : _a.replace('showActionMenu', 'showActionSheet') }), options);
             }
             callAsyncSuccess(resolve, Object.assign(Object.assign({}, data), resCallback('showActionSheet')), options);
         });
@@ -3761,7 +3763,7 @@ const setNavigationBarTitle = function (options) {
 };
 const setNavigationBarColor = function (options) {
     const { success, fail, complete } = options || {};
-    const handle = new MethodHandler({ name: 'setNavigationBarTitle', success, fail, complete });
+    const handle = new MethodHandler({ name: 'setNavigationBarColor', success, fail, complete });
     return new Promise((resolve, reject) => {
         eventCenter.trigger('__taroNavigationStyle', {
             animation: options.animation,