@tarojs/plugin-platform-harmony-ets 3.7.0-alpha.27 → 4.0.0-alpha.2

package/dist/apis/{page → ui/scroll}/index.ts

@@ -1,4 +1,3 @@
-// @ts-nocheck
 /**
  * 鸿蒙SDK API Version 6
  * 将页面滚动到目标位置
@@ -9,26 +8,31 @@
 import { AREA_CHANGE_EVENT_NAME, Current, findChildNodeWithDFS, getPageScrollerOrNode, setNodeEventCallbackAndTriggerComponentUpdate } from '@tarojs/runtime'
 import { pxTransformHelper } from '@tarojs/taro'
 
-import { callAsyncFail, callAsyncSuccess } from '../utils'
+import { MethodHandler } from '../../utils/handler'
 
-import type Taro from '@tarojs/api'
-
-// TODO
-export const getCurrentPages = () => []
+import type Taro from '@tarojs/taro/types'
 
+/**
+ * 将页面滚动到目标位置
+ */
 export const pageScrollTo: typeof Taro.pageScrollTo = (options) => {
+  const { scrollTop, selector = '', duration = 300, offsetTop = 0, success, fail, complete } = options || {}
+  const handle = new MethodHandler({ name: 'pageScrollTo', success, fail, complete })
   // eslint-disable-next-line no-async-promise-executor
   return new Promise(async (resolve, reject) => {
-    const taro = (Current as any).taro
-    const page = taro.getCurrentInstance().page
-    const res = { errMsg: 'pageScrollTo:ok' }
-    const error = { errMsg: 'pageScrollTo:fail' }
-    const { scrollTop, selector = '', duration = 300, offsetTop = 0 } = options
+    if (scrollTop === undefined && !selector) {
+      return handle.fail({
+        errMsg: 'scrollTop" 或 "selector" 需要其之一'
+      }, { resolve, reject })
+    }
 
     if (scrollTop && selector) {
       console.warn('"scrollTop" 或 "selector" 建议只设一个值，全部设置会忽略selector')
     }
 
+    const taro = (Current as any).taro
+    const page = taro.getCurrentInstance().page
+
     let scrollValue = -1
     let scroller = page.scroller
     const currentPageNode = getPageScrollerOrNode(page.node, page)
@@ -38,20 +42,17 @@ export const pageScrollTo: typeof Taro.pageScrollTo = (options) => {
     } else if (selector) {
       const node = findChildNodeWithDFS(currentPageNode, selector)
 
-      if (!node || !node._instance) return
-
-      const instance = node._instance
-      const id = node?._nid
+      if (!node) return
 
       // 获取 areaInfo，需要先调用 setNodeEventCallbackAndTriggerComponentUpdate 更新一次组件并获取组件信息
       await setNodeEventCallbackAndTriggerComponentUpdate(node, AREA_CHANGE_EVENT_NAME, null, true)
 
-      const { areaInfo } = instance?.nodeInfoMap?.[id] || {}
+      const { areaInfo } = node._nodeInfo || {}
 
       let parent = node?.parentNode
       while (!!parent && parent !== currentPageNode) {
-        if (parent?._instance?.scroller) {
-          scroller = parent._instance.scroller
+        if (parent?.scroller) {
+          scroller = parent.scroller
           break
         }
         parent = parent?.parentNode
@@ -68,7 +69,9 @@ export const pageScrollTo: typeof Taro.pageScrollTo = (options) => {
     const { xOffset } = scroller.currentOffset()
 
     if (scrollValue === -1) {
-      return callAsyncFail(reject, { errMsg: 'pageScrollTo:fail, 请检查传入的 scrollTop 或 selector 是否合法' }, options)
+      return handle.fail({
+        errMsg: '请检查传入的 scrollTop 或 selector 是否合法'
+      }, { resolve, reject })
     }
 
     try {
@@ -83,10 +86,12 @@ export const pageScrollTo: typeof Taro.pageScrollTo = (options) => {
       })
 
       setTimeout(() => {
-        callAsyncSuccess(resolve, res, options)
+        handle.success({}, { resolve, reject })
       }, duration)
-    } catch (_) {
-      callAsyncFail(reject, error, options)
+    } catch (err) {
+      return handle.fail({
+        errMsg: err.message
+      }, { resolve, reject })
     }
   })
 }

package/dist/apis/ui/sticky.ts

@@ -0,0 +1,4 @@
+import { temporarilyNotSupport } from '../utils'
+
+// 置顶
+export const setTopBarText = /* @__PURE__ */ temporarilyNotSupport('setTopBarText')

package/dist/apis/{tabbar/index.ts → ui/tab-bar.ts}

@@ -1,11 +1,9 @@
-// eslint-disable-next-line import/no-duplicates
-import { Current } from '@tarojs/runtime'
-// eslint-disable-next-line import/no-duplicates
-import { eventCenter } from '@tarojs/runtime/dist/runtime.esm'
+import { Current } from '@tarojs/runtime' // eslint-disable-line import/no-duplicates
+import { eventCenter } from '@tarojs/runtime/dist/runtime.esm' // eslint-disable-line import/no-duplicates
 
 import { callAsyncFail, callAsyncSuccess } from '../utils'
 
-import type Taro from '@tarojs/api'
+import type Taro from '@tarojs/taro/types'
 
 interface ShowTabBar {
   type: 'show'

package/dist/apis/ui/window.ts

@@ -0,0 +1,20 @@
+import { temporarilyNotSupport } from '../utils'
+
+import type Taro from '@tarojs/taro/types'
+
+/**
+ * 设置窗口大小，该接口仅适用于 PC 平台，使用细则请参见指南
+ */
+export const setWindowSize = /* @__PURE__ */ temporarilyNotSupport('setWindowSize')
+
+/**
+ * 监听窗口尺寸变化事件
+ */
+export const onWindowResize: typeof Taro.onWindowResize = /* @__PURE__ */ temporarilyNotSupport('onWindowResize')
+
+/**
+ * 取消监听窗口尺寸变化事件
+ */
+export const offWindowResize: typeof Taro.offWindowResize = /* @__PURE__ */ temporarilyNotSupport('offWindowResize')
+
+export const checkIsPictureInPictureActive = /* @__PURE__ */ temporarilyNotSupport('checkIsPictureInPictureActive')

package/dist/apis/utils/handler.ts

@@ -11,7 +11,7 @@ interface IMethodParam<T = Partial<ICallbackResult>> {
   name: string
   success?: TCallback<T & ICallbackResult>
   fail?: TCallback
-  complete?: TCallback
+  complete?: TCallback<T | ICallbackResult>
 }
 interface IMockPromise {
   resolve?: typeof Promise.resolve | TFunc
@@ -23,7 +23,7 @@ export class MethodHandler<T = Partial<ICallbackResult>> {
 
   protected __success?: TCallback<T>
   protected __fail?: TCallback
-  protected __complete?: TCallback
+  protected __complete?: TCallback<T | ICallbackResult>
 
   protected isHandlerError = false
 
@@ -41,7 +41,7 @@ export class MethodHandler<T = Partial<ICallbackResult>> {
       res.errMsg = `${this.methodName}:ok`
     }
     isFunction(this.__success) && this.__success(res as T)
-    isFunction(this.__complete) && this.__complete(res)
+    isFunction(this.__complete) && this.__complete(res as T)
 
     const { resolve = Promise.resolve.bind(Promise) } = promise
     return resolve(res as Required<T & U & ICallbackResult>)
@@ -54,7 +54,7 @@ export class MethodHandler<T = Partial<ICallbackResult>> {
       res.errMsg = `${this.methodName}:fail ${res.errMsg}`
     }
     isFunction(this.__fail) && this.__fail(res)
-    isFunction(this.__complete) && this.__complete(res)
+    isFunction(this.__complete) && this.__complete(res as ICallbackResult)
 
     const {
       resolve = Promise.resolve.bind(Promise),

package/dist/apis/worker/index.ts

@@ -0,0 +1,4 @@
+import { temporarilyNotSupport } from '../utils'
+
+// Worker
+export const createWorker = /* @__PURE__ */ temporarilyNotSupport('createWorker')

package/dist/apis/wxml/IntersectionObserver.ts

@@ -1,9 +1,9 @@
-import Taro from '@tarojs/api'
-// @ts-ignore
 import { Current, disconnectEvent, findChildNodeWithDFS, getPageScrollerOrNode, setNodeEventCallbackAndTriggerComponentUpdate, TaroElement, VISIBLE_CHANGE_EVENT_NAME } from '@tarojs/runtime'
 
 import { temporarilyNotSupport } from '../utils'
 
+import type Taro from '@tarojs/taro/types'
+
 export class IntersectionObserver implements Taro.IntersectionObserver {
   // 自定义组件实例
   private _component: any
@@ -29,17 +29,15 @@ export class IntersectionObserver implements Taro.IntersectionObserver {
       if (this._observerNodes instanceof Array) {
         this._observerNodes.forEach((n: TaroElement & any) => {
           disconnectEvent(n, VISIBLE_CHANGE_EVENT_NAME)
-          if (n._instance) {
-            // @ts-ignore
-            n._instance?.nodeInfoMap?.[n._nid]?.thresholds = null
-          }
+          // @ts-ignore
+          n._nodeInfo?.thresholds = null
         })
       } else {
         disconnectEvent(this._observerNodes, VISIBLE_CHANGE_EVENT_NAME)
         // @ts-ignore
-        if (this._observerNodes._instance) {
+        if (this._observerNodes._nodeInfo) {
           // @ts-ignore
-          this._observerNodes._instance?.nodeInfoMap?.[this._observerNodes._nid]?.thresholds = null
+          this._observerNodes._nodeInfo?.thresholds = null
         }
       }
     }
@@ -50,29 +48,22 @@ export class IntersectionObserver implements Taro.IntersectionObserver {
     const node = findChildNodeWithDFS(this._component, targetSelector, observeAll)
     this._observerNodes = node
 
-
     if (node) {
       if (node instanceof Array) {
         node.forEach(n => {
           // @ts-ignore
-          n.awaitAppear.then(() => {
-            // @ts-ignore
-            n._instance?.nodeInfoMap?.[n._nid]?.thresholds = thresholds
+          n._nodeInfo?.thresholds = thresholds
 
-            setNodeEventCallbackAndTriggerComponentUpdate(n, VISIBLE_CHANGE_EVENT_NAME, (isVisible: boolean, currentRatio: number) => {
-              callback(this.handleResult(isVisible, currentRatio))
-            })
+          setNodeEventCallbackAndTriggerComponentUpdate(n, VISIBLE_CHANGE_EVENT_NAME, (isVisible: boolean, currentRatio: number) => {
+            callback(this.handleResult(isVisible, currentRatio))
           })
         })
       } else {
         // @ts-ignore
-        node.awaitAppear.then(() => {
-          // @ts-ignore
-          node._instance?.nodeInfoMap?.[node._nid]?.thresholds = thresholds
+        node._nodeInfo?.thresholds = thresholds
 
-          setNodeEventCallbackAndTriggerComponentUpdate(node, VISIBLE_CHANGE_EVENT_NAME, (isVisible: boolean, currentRatio: number) => {
-            callback(this.handleResult(isVisible, currentRatio))
-          })
+        setNodeEventCallbackAndTriggerComponentUpdate(node, VISIBLE_CHANGE_EVENT_NAME, (isVisible: boolean, currentRatio: number) => {
+          callback(this.handleResult(isVisible, currentRatio))
         })
       }
     }

package/dist/apis/wxml/index.ts

@@ -1,8 +1,9 @@
-import Taro from '@tarojs/taro'
-
+import { temporarilyNotSupport } from '../utils'
 import { IntersectionObserver } from './IntersectionObserver'
 import { SelectorQuery } from './selectorQuery'
 
+import type Taro from '@tarojs/taro/types'
+
 export const createSelectorQuery = () => {
   return new SelectorQuery()
 }
@@ -10,3 +11,7 @@ export const createSelectorQuery = () => {
 export const createIntersectionObserver: typeof Taro.createIntersectionObserver = (component, options) => {
   return new IntersectionObserver(component, options)
 }
+
+export const createMediaQueryObserver = /* @__PURE__ */ temporarilyNotSupport('createMediaQueryObserver')
+
+export { IntersectionObserver }

package/dist/apis/wxml/nodesRef.ts

@@ -1,7 +1,7 @@
-import Taro from '@tarojs/api'
-
 import { SelectorQuery } from './selectorQuery'
 
+import type Taro from '@tarojs/taro/types'
+
 export class NodesRef implements Taro.NodesRef {
   _component?: any
   _selector: string

package/dist/apis/wxml/selectorQuery.ts

@@ -2,7 +2,7 @@ import { AREA_CHANGE_EVENT_NAME, Current, getPageScrollerOrNode, setNodeEventCal
 
 import { NodesRef } from './nodesRef'
 
-import type Taro from '@tarojs/api'
+import type Taro from '@tarojs/taro/types'
 
 interface ISelectorQueryQueue {
   component: any
@@ -135,8 +135,7 @@ function filter (fields, dom) {
   // if (dataset) res.dataset = Object.assign({}, dom.dataset)
 
   if (rect || size) {
-    const id = dom?._nid
-    const { areaInfo } = dom?._instance?.nodeInfoMap?.[id] || {}
+    const { areaInfo } = dom?._nodeInfo || {}
 
     if (areaInfo) {
       if (rect) {
@@ -153,7 +152,7 @@ function filter (fields, dom) {
     }
   }
   if (scrollOffset) {
-    const scroller = dom._instance.scroller
+    const scroller = dom.scroller
 
     if (scroller) {
       const { xOffset, yOffset } = scroller.currentOffset()

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

@@ -1,56 +1,37 @@
-import { bindInstanceToNode, eventHandler, getComponentEventCallback, AREA_CHANGE_EVENT_NAME, VISIBLE_CHANGE_EVENT_NAME, initComponentNodeInfo } from '@tarojs/runtime'
-import { createNode } from './render'
-import TaroComponentWrapper from './base'
-import { createTaroEvent } from './utils/events'
+import { eventHandler, createTaroEvent, convertNumber2VP, getComponentEventCallback, AREA_CHANGE_EVENT_NAME, VISIBLE_CHANGE_EVENT_NAME } from '@tarojs/runtime'
+import { createLazyChildren } from './render'
+import commonStyleModify from './style'
 import { BUTTON_THEME_COLOR } from './utils/constant/style'
-import { AttributeManager } from './utils/AttributeManager'
 import { TOUCH_EVENT_MAP } from './utils/constant/event'
-import { getNormalAttributes, shouldBindEvent, getNodeThresholds, bindAnimation } from './utils/helper'
+import { shouldBindEvent, getNodeThresholds } from './utils/helper'
 
-import type { TaroAny, TaroEvent } from '@tarojs/runtime'
-import type { TaroButtonElement, TaroElement } from './element'
-import type { TaroStyleType } from '@tarojs/runtime'
+import type { TaroAny, TaroEvent, TaroButtonElement, TaroStyleType } from '@tarojs/runtime'
 
 @Extend(Button)
-function attrs (style: TaroStyleType) {
-  .id(style.id)
-  .key(style.id)
-  .padding(style.padding)
-  .margin(style.margin)
-  .width(style.width)
-  .height(style.height)
-  .constraintSize(style.constraintSize)
-  .flexGrow(style.flexGrow)
-  .flexShrink(style.flexShrink)
-  .flexBasis(style.flexBasis)
-  .alignSelf(style.alignSelf)
-  .backgroundColor(style.backgroundColor)
-  .backgroundImage(style.backgroundImage, style.backgroundRepeat)
-  .backgroundImageSize(style.backgroundImageSize)
-  .rotate(style.rotate)
-  .scale(style.scale)
-  .translate(style.translate)
-  .transform(style.transform)
-  .borderStyle(style.borderStyle)
-  .borderWidth(style.borderWidth)
+function themeStyles(style: TaroStyleType) {
+  .fontColor(style.color)
+  .opacity(style.opacity)
   .borderColor(style.borderColor)
+  .borderWidth(style.borderWidth)
   .borderRadius(style.borderRadius)
-  .linearGradient(style.linearGradient)
-  .zIndex(style.zIndex)
-  .opacity(style.opacity)
-  .clip(style.clip)
+  .backgroundColor(style.backgroundColor)
 }
 
+export function getButtonColor (node: TaroButtonElement, color: ResourceColor) {
+  const _attrs = node._attrs
+  const isDisabled: boolean = _attrs.disabled || false
+  const isPlain: boolean = _attrs.plain || false
+  const type: string = _attrs.type || 'default'
 
-@Extend(Button)
-function themeStyles(style: TaroStyleType) {
-  .border({
-    width: 1,
-    color: style.backgroundColor
-  })
-  .fontColor(style.color)
-  .opacity(style.opacity)
-  .backgroundColor(style.backgroundColor)
+  if (isDisabled && isPlain) {
+    return Color.Black
+  }
+
+  if (isPlain) {
+    return BUTTON_THEME_COLOR.get(type).plainText
+  }
+
+  return color
 }
 
 function getThemeAttributes (node: TaroButtonElement): TaroStyleType {
@@ -61,59 +42,90 @@ function getThemeAttributes (node: TaroButtonElement): TaroStyleType {
   const type: string = _attrs.type || 'default'
 
   return {
-    opacity: isDisabled ? 0.4 : 1,
+    borderColor: {
+      top: hmStyle.borderTopColor || getButtonColor(node, BUTTON_THEME_COLOR.get(type).background),
+      right: hmStyle.borderRightColor || getButtonColor(node, BUTTON_THEME_COLOR.get(type).background),
+      bottom: hmStyle.borderBottomColor || getButtonColor(node, BUTTON_THEME_COLOR.get(type).background),
+      left: hmStyle.borderLeftColor || getButtonColor(node, BUTTON_THEME_COLOR.get(type).background)
+    },
+    borderWidth: {
+      top: hmStyle.borderTopWidth || 1,
+      right: hmStyle.borderRightWidth || 1,
+      bottom: hmStyle.borderBottomWidth || 1,
+      left: hmStyle.borderLeftWidth || 1
+    },
+    borderRadius: {
+      topLeft: hmStyle.borderTopLeftRadius || convertNumber2VP(10),
+      topRight: hmStyle.borderTopRightRadius || convertNumber2VP(10),
+      bottomLeft: hmStyle.borderBottomLeftRadius || convertNumber2VP(10),
+      bottomRight: hmStyle.borderBottomRightRadius || convertNumber2VP(10)
+    },
+    opacity: isDisabled ? 0.4 : hmStyle.opacity,
     backgroundColor: isPlain ? Color.Transparent : (hmStyle.backgroundColor || BUTTON_THEME_COLOR.get(type).background),
-    color: hmStyle.color || BUTTON_THEME_COLOR.get(type).text,
+    color: hmStyle.color || getButtonColor(node, BUTTON_THEME_COLOR.get(type).text),
   }
 }
 
-@Component
-export default struct TaroButton {
-  nodeInfoMap: TaroAny = {}
+function getButtonWidth (node: TaroButtonElement) {
+  const isMini = node._attrs.size === 'mini'
+
+  return isMini ? convertNumber2VP(120) : '100%'
+}
+
+function getButtonHeight (node: TaroButtonElement) {
+  const isMini = node._attrs.size === 'mini'
 
-  @ObjectLink node: TaroButtonElement
+  return isMini ? convertNumber2VP(60) : convertNumber2VP(92)
+}
 
-  @Styles visibleChangeEvent () {
-    .onVisibleAreaChange(getNodeThresholds(this.node) || [0.0, 1.0], getComponentEventCallback(this.node, VISIBLE_CHANGE_EVENT_NAME))
+function getButtonMinWidth (node: TaroButtonElement): string | number | undefined {
+  if (node.hmStyle.width) {
+    return undefined
   }
 
-  aboutToAppear () {
-    initComponentNodeInfo(this, this.node)
-    bindInstanceToNode(this.node, this)
-    // 绑定动画
-    bindAnimation(this.node)
+  return getButtonWidth(node)
+}
+
+function getButtonMinHeight (node: TaroButtonElement): string | number | undefined {
+  if (node.hmStyle.height) {
+    return undefined
   }
 
-  build() {
-    TaroComponentWrapper({ node: this.node }) {
-      Button({ stateEffect: !this.node._attrs.disabled }) {
-        Row() {
-          if (this.node._attrs.loading) {
-            LoadingProgress()
-            .width(20).height(20)
-            .color(getThemeAttributes(this.node).color)
-          }
-          ForEach(this.node.childNodes, (item: TaroElement) => {
-            createNode(item)
-          }, (item: TaroElement) => item._nid)
-        }
+  return getButtonHeight(node)
+}
+
+@Builder
+export default function TaroButton (node: TaroButtonElement) {
+  Button({ stateEffect: !node._attrs.disabled }) {
+    Row() {
+      if (node._attrs.loading) {
+        LoadingProgress()
+        .width(20).height(20)
+        .color(getThemeAttributes(node).color)
       }
-      .attrs(getNormalAttributes(this.node))
-      .themeStyles(getThemeAttributes(this.node))
-      .onClick((e: ClickEvent) => {
-        if (['submit', 'reset'].includes(this.node._attrs.formType)) {
-          const eventName = this.node._attrs.formType + '-btn'
-          const event: TaroEvent = createTaroEvent(eventName, {}, this.node)
-          eventHandler(event, eventName, this.node)
-        }
-        eventHandler(e, 'click', this.node)
-      })
-      .onTouch(shouldBindEvent((e: TouchEvent) => eventHandler(e, TOUCH_EVENT_MAP.get(e.type), this.node), this.node, TOUCH_EVENT_MAP.values()))
-      .onAreaChange(getComponentEventCallback(this.node, AREA_CHANGE_EVENT_NAME, res => {
-        const eventResult: TaroAny = res.eventResult
-        this.nodeInfoMap[this.node._nid].areaInfo = eventResult[1]
-      }))
-      .visibleChangeEvent()
+      createLazyChildren(node)
     }
   }
+  .themeStyles(getThemeAttributes(node))
+  .attributeModifier(commonStyleModify.setNode(node))
+  .constraintSize({
+    minWidth: node.hmStyle?.minWidth || getButtonMinWidth(node),
+    minHeight: node.hmStyle?.minHeight || getButtonMinHeight(node),
+    maxWidth: node.hmStyle?.maxWidth,
+    maxHeight: node.hmStyle?.maxHeight,
+  })
+  .type(ButtonType.Normal)
+  .onClick((e: ClickEvent) => {
+    if (node._attrs.formType && ['submit', 'reset'].includes(node._attrs.formType)) {
+      const eventName = node._attrs.formType + '-btn'
+      const event: TaroEvent = createTaroEvent(eventName, {}, node)
+      eventHandler(event, eventName, node)
+    }
+    eventHandler(e, 'click', node)
+  })
+  .onTouch(shouldBindEvent((e: TouchEvent) => eventHandler(e, TOUCH_EVENT_MAP.get(e.type), node), node, TOUCH_EVENT_MAP.values()))
+  .onAreaChange(getComponentEventCallback(node, AREA_CHANGE_EVENT_NAME, (res: TaroAny) => {
+    node._nodeInfo.areaInfo = res[1]
+  }))
+  .onVisibleAreaChange(getNodeThresholds(node) || [0.0, 1.0], getComponentEventCallback(node, VISIBLE_CHANGE_EVENT_NAME))
 }