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

package/dist/apis/device/memory.ts

@@ -1,4 +1,11 @@
-import { temporarilyNotSupport } from '../utils'
+import { hooks } from '@tarojs/runtime'
 
-export const onMemoryWarning = temporarilyNotSupport('onMemoryWarning')
-export const offMemoryWarning = temporarilyNotSupport('offMemoryWarning')
+export const onMemoryWarning = (listener) => {
+  hooks.tap('getMemoryLevel', (res) => {
+    listener(res)
+  })
+}
+
+export const offMemoryWarning = (listener) => {
+  hooks.off('getMemoryLevel', listener)
+}

package/dist/apis/media/video/VideoContext.ts

@@ -1,19 +1,68 @@
+// @ts-nocheck
+import { document } from '@tarojs/runtime'
+
 import { temporarilyNotSupport } from '../../utils'
 
+import type { TaroVideoElement } from '@tarojs/runtime'
 import type Taro from '@tarojs/taro/types'
 
 export class VideoContext implements Taro.VideoContext {
+  id: string
+
+  video: TaroVideoElement
+
+  controller: VideoController
+
+  constructor (id: string) {
+    this.id = id
+    this.video = document.getElementById(id)
+
+    if (this.video) {
+      this.controller = this.video.controller
+    }
+  }
+
+  play () {
+    if (!this.controller) return
+
+    this.controller.play()
+  }
+
+  pause () {
+    if (!this.controller) return
+
+    this.controller.pause()
+  }
+
+  stop () {
+    if (!this.controller) return
+
+    this.controller.stop()
+  }
+
+  seek (position: number) {
+    if (!this.controller) return
+
+    this.controller.setCurrentTime(position)
+  }
+
+  requestFullScreen () {
+    if (!this.controller) return
+
+    this.controller.requestFullscreen(true)
+  }
+
+  exitFullScreen () {
+    if (!this.controller) return
+
+    this.controller.exitFullscreen()
+  }
+
+  requestBackgroundPlayback = temporarilyNotSupport('VideoContext.requestBackgroundPlayback')
   exitBackgroundPlayback = temporarilyNotSupport('VideoContext.exitBackgroundPlayback')
-  exitFullScreen = temporarilyNotSupport('VideoContext.exitFullScreen')
   exitPictureInPicture = temporarilyNotSupport('VideoContext.exitPictureInPicture')
   hideStatusBar = temporarilyNotSupport('VideoContext.hideStatusBar')
-  pause = temporarilyNotSupport('VideoContext.pause')
-  play = temporarilyNotSupport('VideoContext.play')
   playbackRate = temporarilyNotSupport('VideoContext.playbackRate')
-  requestBackgroundPlayback = temporarilyNotSupport('VideoContext.requestBackgroundPlayback')
-  requestFullScreen = temporarilyNotSupport('VideoContext.requestFullScreen')
-  seek = temporarilyNotSupport('VideoContext.seek')
   sendDanmu = temporarilyNotSupport('VideoContext.sendDanmu')
   showStatusBar = temporarilyNotSupport('VideoContext.showStatusBar')
-  stop = temporarilyNotSupport('VideoContext.stop')
 }

package/dist/apis/media/video/index.ts

@@ -26,6 +26,7 @@ import mediaLibrary from '@ohos.multimedia.mediaLibrary'
 import { callAsyncFail, callAsyncSuccess, temporarilyNotSupport, validateParams } from '../../utils'
 import { VideoContext } from './VideoContext'
 
+import type { TaroAny } from '@tarojs/runtime'
 import type Taro from '@tarojs/taro/types'
 
 interface IChooseVideoOptionOHOS {
@@ -43,8 +44,8 @@ const saveVideoToPhotosAlbumSchema = {
   filePath: 'String'
 }
 
-export const createVideoContext: typeof Taro.createVideoContext = () => {
-  return new VideoContext()
+export const createVideoContext: typeof Taro.createVideoContext = (id: string, _: TaroAny) => {
+  return new VideoContext(id)
 }
 
 // TODO: 1.返回属性补全

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

@@ -10,30 +10,45 @@ import type { TaroAny, TaroEvent, TaroButtonElement, TaroStyleType } from '@taro
 function attrs (style: TaroStyleType) {
   .id(style.id)
   .key(style.id)
-  .width(style.width)
-  .height(style.height)
-  .padding({
-    top: style.padding?.top,
-    left: style.padding?.left || 10,
-    right: style.padding?.right || 10,
-    bottom: style.padding?.bottom,
-  })
-  .margin(style.margin)
   .flexGrow(style.flexGrow)
   .flexShrink(style.flexShrink)
   .flexBasis(style.flexBasis)
   .alignSelf(style.alignSelf)
-  .backgroundImage(style.backgroundImage, style.backgroundRepeat)
-  .backgroundImageSize(style.backgroundImageSize)
-  .backgroundImagePosition(style.backgroundImagePosition)
-  .rotate(style.rotate)
-  .scale(style.scale)
-  .translate(style.translate)
-  .transform(style.transform)
-  .borderStyle(style.borderStyle)
-  .linearGradient(style.linearGradient)
+  .padding({
+    top: style.paddingTop,
+    right: style.paddingRight || 10,
+    bottom: style.paddingBottom,
+    left: style.paddingLeft || 10
+  })
+  .margin({
+    top: style.marginTop,
+    right: style.marginRight,
+    bottom: style.marginBottom,
+    left: style.marginLeft
+  })
+  .width(style.width)
+  .height(style.height)
+  .constraintSize({
+    minWidth: style.minWidth,
+    maxWidth: style.maxWidth,
+    minHeight: style.minHeight,
+    maxHeight: style.maxHeight
+  })
+  .backgroundImage(style.backgroundImage?.src, style.backgroundRepeat)
+  .backgroundImageSize(style.backgroundSize)
+  .backgroundImagePosition(style.backgroundPosition)
+  .borderStyle({
+    top: style.borderTopStyle,
+    right: style.borderRightStyle,
+    bottom: style.borderBottomStyle,
+    left: style.borderLeftStyle
+  })
   .zIndex(style.zIndex)
-  .clip(style.clip)
+  .linearGradient(style.linearGradient)
+  .clip(style.overflow)
+  .rotate({ centerX: style.transformOrigin?.x, centerY: style.transformOrigin?.y, angle: 0 })
+  .scale({ centerX: style.transformOrigin?.x, centerY: style.transformOrigin?.y })
+  .transform(style.transform)
 }
 
 @Extend(Button)
@@ -71,9 +86,24 @@ function getThemeAttributes (node: TaroButtonElement): TaroStyleType {
   const type: string = _attrs.type || 'default'
 
   return {
-    borderColor: hmStyle.borderColor || getButtonColor(node, BUTTON_THEME_COLOR.get(type).background),
-    borderWidth: hmStyle.borderWidth || 1,
-    borderRadius: hmStyle.borderRadius || convertNumber2VP(10),
+    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 || getButtonColor(node, BUTTON_THEME_COLOR.get(type).text),
@@ -123,14 +153,14 @@ export default function TaroButton (node: TaroButtonElement) {
   .themeStyles(getThemeAttributes(node))
   .attrs(getNormalAttributes(node))
   .constraintSize({
-    minWidth: node.hmStyle?.constraintSize?.minWidth || getButtonMinWidth(node),
-    minHeight: node.hmStyle?.constraintSize?.minHeight || getButtonMinHeight(node),
-    maxWidth: node.hmStyle?.constraintSize?.maxWidth,
-    maxHeight: node.hmStyle?.constraintSize?.maxHeight,
+    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 (['submit', 'reset'].includes(node._attrs.formType)) {
+    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)

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

@@ -18,31 +18,65 @@ interface CheckboxAttrs {
 function checkboxStyle (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)
+  .padding({
+    top: style.paddingTop,
+    right: style.paddingRight,
+    bottom: style.paddingBottom,
+    left: style.paddingLeft
+  })
+  .margin({
+    top: style.marginTop,
+    right: style.marginRight,
+    bottom: style.marginBottom,
+    left: style.marginLeft
+  })
+  .width(style.width)
+  .height(style.height)
+  .constraintSize({
+    minWidth: style.minWidth,
+    maxWidth: style.maxWidth,
+    minHeight: style.minHeight,
+    maxHeight: style.maxHeight
+  })
   .backgroundColor(style.backgroundColor)
-  .backgroundImage(style.backgroundImage, style.backgroundRepeat)
-  .backgroundImageSize(style.backgroundImageSize)
-  .backgroundImagePosition(style.backgroundImagePosition)
-  .rotate(style.rotate)
-  .scale(style.scale)
-  .translate(style.translate)
-  .transform(style.transform)
-  .borderStyle(style.borderStyle)
-  .borderWidth(style.borderWidth)
-  .borderColor(style.borderColor)
-  .borderRadius(style.borderRadius)
-  .linearGradient(style.linearGradient)
+  .backgroundImage(style.backgroundImage?.src, style.backgroundRepeat)
+  .backgroundImageSize(style.backgroundSize)
+  .backgroundImagePosition(style.backgroundPosition)
+  .borderStyle({
+    top: style.borderTopStyle,
+    right: style.borderRightStyle,
+    bottom: style.borderBottomStyle,
+    left: style.borderLeftStyle
+  })
+  .borderWidth({
+    top: style.borderTopWidth,
+    right: style.borderRightWidth,
+    bottom: style.borderBottomWidth,
+    left: style.borderLeftWidth
+  })
+  .borderColor({
+    top: style.borderTopColor,
+    right: style.borderRightColor,
+    bottom: style.borderBottomColor,
+    left: style.borderLeftColor
+  })
+  .borderRadius({
+    topLeft: style.borderTopLeftRadius,
+    topRight: style.borderTopRightRadius,
+    bottomLeft: style.borderBottomLeftRadius,
+    bottomRight: style.borderBottomRightRadius
+  })
   .zIndex(style.zIndex)
   .opacity(style.opacity)
-  .clip(style.clip)
+  .linearGradient(style.linearGradient)
+  .clip(style.overflow)
+  .rotate({ centerX: style.transformOrigin?.x, centerY: style.transformOrigin?.y, angle: 0 })
+  .scale({ centerX: style.transformOrigin?.x, centerY: style.transformOrigin?.y })
+  .transform(style.transform)
 }
 
 @Extend(Checkbox)
@@ -63,73 +97,191 @@ function getOptions (node: TaroCheckboxElement): CheckboxOptions {
   }
 }
 
-@Builder
-export function TaroCheckbox(node: TaroCheckboxElement) {
-  Stack() {
-    Row() {
-      Checkbox(getOptions(node))
-        .checkboxStyle(getNormalAttributes(node))
-        .checkboxAttr(getAttributes(node))
-        .opacity(!!node._attrs.disabled ? 0.4 : 1)
-        .select(node.checked)
-        .onChange((value: boolean) => {
-          if (!!node?._attrs.disabled) {
-            node.updateComponent()
-          } else {
-            node.updateCheckedValue(value)
-
-            if (value) {
-              const event: TaroEvent = createTaroEvent('change', { detail: { value: node?._attrs.value } }, node)
-              eventHandler(event, 'change', node)
+@Component
+export struct TaroCheckbox {
+  node: TaroCheckboxElement | null = null
+
+  aboutToAppear () {
+    if (this.node && !this.node._isInit) {
+      this.node._isInit = true
+      this.node._reset = this.node.checked || false
+    }
+  }
+
+  build () {
+    if (this.node) {
+      Stack() {
+        Row() {
+          Checkbox(getOptions(this.node))
+            .checkboxStyle(getNormalAttributes(this.node))
+            .checkboxAttr(getAttributes(this.node))
+            .opacity(!!this.node._attrs.disabled ? 0.4 : 1)
+            .select(this.node.checked)
+            .onChange((value: boolean) => {
+              if (this.node) {
+                if (!!this.node?._attrs.disabled) {
+                  this.node.updateComponent()
+                } else {
+                  this.node.updateCheckedValue(value)
+      
+                  if (value) {
+                    const event: TaroEvent = createTaroEvent('change', { detail: { value: this.node?._attrs.value } }, this.node)
+                    eventHandler(event, 'change', this.node)
+                  }
+                }
+              }
+            })
+            .onClick(shouldBindEvent((e: ClickEvent) => eventHandler(e, 'click', this.node), this.node, ['click']))
+            .onAreaChange(getComponentEventCallback(this.node, AREA_CHANGE_EVENT_NAME, (res: TaroAny) => {
+              if (this.node) {
+                this.node._nodeInfo.areaInfo = res[1]
+              }
+            }))
+            .onVisibleAreaChange(getNodeThresholds(this.node) || [0.0, 1.0], getComponentEventCallback(this.node, VISIBLE_CHANGE_EVENT_NAME))
+          Text(this.node.textContent)
+            .textAlign(TextAlign.Center)
+            .opacity(!!this.node._attrs.disabled ? 0.4 : 1)
+        }
+        .onClick(() => {
+          if (this.node) {
+            if (!this.node?._attrs.disabled) {
+              this.node.checked = !this.node.checked
             }
           }
         })
-        .onClick(shouldBindEvent((e: ClickEvent) => eventHandler(e, 'click', node), node, ['click']))
-        .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))
-      Text(node.textContent)
-        .textAlign(TextAlign.Center)
-        .opacity(!!node._attrs.disabled ? 0.4 : 1)
-    }
-    .onClick(() => {
-      if (!node?._attrs.disabled) {
-        node.checked = !node.checked
       }
-    })
+    }
   }
 }
 
-@Extend(Flex)
-function checkboxGroupAttrs (style: TaroStyleType) {
+@Extend(Column)
+function checkboxGroupColumnAttrs (style: TaroStyleType) {
   .id(style.id)
   .key(style.id)
-  .padding(style.padding)
-  .margin(style.margin)
+  .flexGrow(style.flexGrow)
+  .flexShrink(style.flexShrink)
+  .flexBasis(style.flexBasis)
+  .alignSelf(style.alignSelf)
+  .padding({
+    top: style.paddingTop,
+    right: style.paddingRight,
+    bottom: style.paddingBottom,
+    left: style.paddingLeft
+  })
+  .margin({
+    top: style.marginTop,
+    right: style.marginRight,
+    bottom: style.marginBottom,
+    left: style.marginLeft
+  })
   .width(style.width)
   .height(style.height)
-  .constraintSize(style.constraintSize)
+  .constraintSize({
+    minWidth: style.minWidth,
+    maxWidth: style.maxWidth,
+    minHeight: style.minHeight,
+    maxHeight: style.maxHeight
+  })
+  .backgroundColor(style.backgroundColor)
+  .backgroundImage(style.backgroundImage?.src, style.backgroundRepeat)
+  .backgroundImageSize(style.backgroundSize)
+  .backgroundImagePosition(style.backgroundPosition)
+  .borderStyle({
+    top: style.borderTopStyle,
+    right: style.borderRightStyle,
+    bottom: style.borderBottomStyle,
+    left: style.borderLeftStyle
+  })
+  .borderWidth({
+    top: style.borderTopWidth,
+    right: style.borderRightWidth,
+    bottom: style.borderBottomWidth,
+    left: style.borderLeftWidth
+  })
+  .borderColor({
+    top: style.borderTopColor,
+    right: style.borderRightColor,
+    bottom: style.borderBottomColor,
+    left: style.borderLeftColor
+  })
+  .borderRadius({
+    topLeft: style.borderTopLeftRadius,
+    topRight: style.borderTopRightRadius,
+    bottomLeft: style.borderBottomLeftRadius,
+    bottomRight: style.borderBottomRightRadius
+  })
+  .zIndex(style.zIndex)
+  .opacity(style.opacity)
+  .linearGradient(style.linearGradient)
+  .clip(style.overflow)
+  .rotate({ centerX: style.transformOrigin?.x, centerY: style.transformOrigin?.y, angle: 0 })
+  .scale({ centerX: style.transformOrigin?.x, centerY: style.transformOrigin?.y })
+  .transform(style.transform)
+}
+
+@Extend(Row)
+function checkboxGroupRowAttrs (style: TaroStyleType) {
+  .id(style.id)
+  .key(style.id)
   .flexGrow(style.flexGrow)
   .flexShrink(style.flexShrink)
   .flexBasis(style.flexBasis)
   .alignSelf(style.alignSelf)
+  .padding({
+    top: style.paddingTop,
+    right: style.paddingRight,
+    bottom: style.paddingBottom,
+    left: style.paddingLeft
+  })
+  .margin({
+    top: style.marginTop,
+    right: style.marginRight,
+    bottom: style.marginBottom,
+    left: style.marginLeft
+  })
+  .width(style.width)
+  .height(style.height)
+  .constraintSize({
+    minWidth: style.minWidth,
+    maxWidth: style.maxWidth,
+    minHeight: style.minHeight,
+    maxHeight: style.maxHeight
+  })
   .backgroundColor(style.backgroundColor)
-  .backgroundImage(style.backgroundImage, style.backgroundRepeat)
-  .backgroundImageSize(style.backgroundImageSize)
-  .backgroundImagePosition(style.backgroundImagePosition)
-  .rotate(style.rotate)
-  .scale(style.scale)
-  .translate(style.translate)
-  .transform(style.transform)
-  .borderStyle(style.borderStyle)
-  .borderWidth(style.borderWidth)
-  .borderColor(style.borderColor)
-  .borderRadius(style.borderRadius)
-  .linearGradient(style.linearGradient)
+  .backgroundImage(style.backgroundImage?.src, style.backgroundRepeat)
+  .backgroundImageSize(style.backgroundSize)
+  .backgroundImagePosition(style.backgroundPosition)
+  .borderStyle({
+    top: style.borderTopStyle,
+    right: style.borderRightStyle,
+    bottom: style.borderBottomStyle,
+    left: style.borderLeftStyle
+  })
+  .borderWidth({
+    top: style.borderTopWidth,
+    right: style.borderRightWidth,
+    bottom: style.borderBottomWidth,
+    left: style.borderLeftWidth
+  })
+  .borderColor({
+    top: style.borderTopColor,
+    right: style.borderRightColor,
+    bottom: style.borderBottomColor,
+    left: style.borderLeftColor
+  })
+  .borderRadius({
+    topLeft: style.borderTopLeftRadius,
+    topRight: style.borderTopRightRadius,
+    bottomLeft: style.borderBottomLeftRadius,
+    bottomRight: style.borderBottomRightRadius
+  })
   .zIndex(style.zIndex)
   .opacity(style.opacity)
-  .clip(style.clip)
+  .linearGradient(style.linearGradient)
+  .clip(style.overflow)
+  .rotate({ centerX: style.transformOrigin?.x, centerY: style.transformOrigin?.y, angle: 0 })
+  .scale({ centerX: style.transformOrigin?.x, centerY: style.transformOrigin?.y })
+  .transform(style.transform)
 }
 
 interface ChangeEventDetail { value: string[] }
@@ -163,12 +315,25 @@ export struct TaroCheckboxGroup {
 
   build() {
     if (this.node) {
-      Flex(FlexManager.flexOptions(this.node)) {
-        createLazyChildren(this.node)
+      if (FlexManager.isFlexNode(this.node) && FlexManager.flexOptions(this.node).direction !== FlexDirection.Column) {
+        Row() {
+          createLazyChildren(this.node)
+        }
+        .checkboxGroupRowAttrs(getNormalAttributes(this.node))
+        .defaultEvent()
+        .visibleChangeEvent()
+        .alignItems(FlexManager.flexOptions(this.node).alignItems as VerticalAlign)
+        .justifyContent(FlexManager.flexOptions(this.node).justifyContent)
+      } else {
+        Column() {
+          createLazyChildren(this.node)
+        }
+        .checkboxGroupColumnAttrs(getNormalAttributes(this.node))
+        .defaultEvent()
+        .visibleChangeEvent()
+        .alignItems(FlexManager.flexOptions(this.node).alignItems as HorizontalAlign)
+        .justifyContent(FlexManager.flexOptions(this.node).justifyContent)
       }
-      .checkboxGroupAttrs(getNormalAttributes(this.node))
-      .defaultEvent()
-      .visibleChangeEvent()
     }
   }
 }