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

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/checkbox.ets

@@ -63,41 +63,60 @@ 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
       }
-    })
+    }
   }
 }
 

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

@@ -80,6 +80,11 @@ export default struct TaroInput {
     if (this.node) {
       this.value = this.node.value
       this.node._instance = this
+
+      if (!this.node._isInit) {
+        this.node._isInit = true
+        this.node._reset = this.node.value || ''
+      }
     }
   }
 

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

@@ -191,7 +191,7 @@ export struct PickerView {
             this.controller?.close()
           })
           Text(this.getText()[0]).fontSize(15).padding({top: 20, bottom: 40}).fontColor('#1aad19').onClick(() => {
-            this.emitEvent('change', { value: this.node?.value})
+            this.emitEvent('change', { value: this.node?.value })
             this.controller?.close()
           })
         }
@@ -278,6 +278,40 @@ export default struct TaroPicker {
 
   aboutToAppear () {
     this.node?.addEventListener('click', this.handleClick)
+
+    if (this.node && !this.node._isInit) {
+      let defaultResetValue: TaroAny = ''
+      switch (this.node._attrs.mode) {
+        case 'selector':
+          defaultResetValue = 0
+          break
+        case 'multiSelector':
+          defaultResetValue = this.node._attrs.range.map((_: TaroAny) => 0)
+          break
+        case 'time': {
+          const hour = new Date().getHours()
+          const minute = new Date().getMinutes() 
+  
+          defaultResetValue = `${('00'+hour).slice(-2)}:${('00'+minute).slice(-2)}`
+          break
+        }
+        case 'date': {
+          const data = new Date().toLocaleDateString().split('/')
+          const day = data[1]
+          const month = data[0]
+          const year = data[2]
+  
+          defaultResetValue = `${year}-${month}-${day}`
+          break
+        }
+        default:
+          defaultResetValue = ''
+          break
+      }
+  
+      this.node._isInit = true
+      this.node._reset = this.node.value || defaultResetValue
+    }
   }
 
   dialogController: CustomDialogController | null = null

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

@@ -5,7 +5,7 @@ import { TOUCH_EVENT_MAP } from './utils/constant/event'
 import { FlexManager } from './utils/FlexManager'
 import { shouldBindEvent, getNormalAttributes, getNodeThresholds } from './utils/helper'
 
-import type { TaroEvent, TaroAny, TaroStyleType, HarmonyType, TaroRadioGroupElement, TaroRadioElement } from '@tarojs/runtime'
+import { TaroEvent, TaroAny, TaroStyleType, HarmonyType, TaroRadioGroupElement, TaroRadioElement } from '@tarojs/runtime'
 
 interface RadioAttrs {
   radioStyle?: HarmonyType.RadioStyle
@@ -63,43 +63,62 @@ function themeStyles(isDisabled: boolean) {
   .opacity(isDisabled ? 0.4 : 1)
 }
 
-@Builder
-export function TaroRadio (node: TaroRadioElement) {
-  Stack() {
-    Row() {
-      Radio({
-        group: node.group || node.parentNode?._nid || '',
-        value: node._attrs.value || '',
-      })
-        .checked(node.checked)
-        .style(getNormalAttributes(node))
-        .radioAttr(getAttributes(node))
-        .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 TaroRadio {
+  node: TaroRadioElement | 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() {
+          Radio({
+            group: this.node.group || this.node.parentNode?._nid || '',
+            value: this.node.value || '',
+          })
+            .checked(this.node.checked)
+            .style(getNormalAttributes(this.node))
+            .radioAttr(getAttributes(this.node))
+            .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._checked && !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._checked && !node?._attrs.disabled) {
-        node.checked = !node.checked
       }
-    })
+    }
   }
 }
 

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

@@ -75,6 +75,11 @@ export default struct TaroSlider {
     if (this.node) {
       this.value = this.node.value
       this.node._instance = this
+
+      if (!this.node._isInit) {
+        this.node._isInit = true
+        this.node._reset = this.node.value || 0
+      }
     }
   }
 

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

@@ -56,28 +56,45 @@ function themeStyles(isDisabled: boolean) {
   .opacity(isDisabled ? 0.4 : 1)
 }
 
-@Builder
-export default function TaroSwitch (node: TaroSwitchElement) {
-  Toggle({
-    type: node._attrs.type !== 'checkbox' ? ToggleType.Switch : ToggleType.Checkbox,
-    isOn: node.checked,
-  })
-    .styles(getNormalAttributes(node))
-    .attrs(getAttributes(node))
-    .themeStyles(!!node._attrs.disabled)
-    .onChange((isOn: boolean) => {
-      if (!node?._attrs.disabled) {
-        const event: TaroEvent = createTaroEvent('change', { detail: { value: isOn } }, node)
+@Component
+export default struct TaroSwitch {
+  node: TaroSwitchElement | null = null
 
-        node.updateCheckedValue(isOn)
-        eventHandler(event, 'change', node)
-      } else {
-        node.updateComponent()
-      }
-    })
-    .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))
+  aboutToAppear () {
+    if (this.node && !this.node._isInit) {
+      this.node._isInit = true
+      this.node._reset = this.node.checked || false
+    }
+  }
+
+  build () {
+    if (this.node) {
+      Toggle({
+        type: this.node._attrs.type !== 'checkbox' ? ToggleType.Switch : ToggleType.Checkbox,
+        isOn: this.node.checked,
+      })
+        .styles(getNormalAttributes(this.node))
+        .attrs(getAttributes(this.node))
+        .themeStyles(!!this.node._attrs.disabled)
+        .onChange((isOn: boolean) => {
+          if (this.node) {
+            if (!this.node?._attrs.disabled) {
+              const event: TaroEvent = createTaroEvent('change', { detail: { value: isOn } }, this.node)
+      
+              this.node.updateCheckedValue(isOn)
+              eventHandler(event, 'change', this.node)
+            } else {
+              this.node.updateComponent()
+            }
+          }
+        })
+        .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))
+    }
+  }
 }

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

@@ -62,6 +62,11 @@ export default struct TaroTextArea {
     if (this.node) {
       this.value = this.node.value
       this.node._instance = this
+
+      if (!this.node._isInit) {
+        this.node._isInit = true
+        this.node._reset = this.node.value || ''
+      }
     }
   }
 

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

@@ -31,6 +31,8 @@ interface FormWidgetProps extends StandardProps {
 class TaroFormWidgetElement<T extends FormWidgetProps = FormWidgetProps> extends TaroElement<T> {
   _instance
 
+  _isInit = false
+
   _name = ''
 
   _value: TaroAny = ''
@@ -44,7 +46,6 @@ class TaroFormWidgetElement<T extends FormWidgetProps = FormWidgetProps> extends
 
     this._name = this._attrs.name || ''
     this._value = this._attrs.value || ''
-    this._reset = this._attrs.value || ''
   }
 
   public setAttribute (name: string, value: any): void {
@@ -104,7 +105,6 @@ class TaroCheckedElement<T extends StandardProps & { checked?: boolean } = Stand
     super(tagName)
 
     this._checked = this._attrs.checked || false
-    this._reset = this._attrs.checked || false
   }
 
   public setAttribute (name: string, value: any): void {
@@ -262,6 +262,15 @@ class TaroPickerElement extends TaroFormWidgetElement<PickerSelectorProps | Pick
         return ''
     }
   }
+
+  public reset() {
+    super.reset()
+
+    const event: TaroEvent = createTaroEvent('change', { detail: { value: this._reset } }, this)
+    
+    event.stopPropagation()
+    eventHandler(event, 'change', this)
+  }
 }
 
 class TaroSwitchElement extends TaroCheckedElement<SwitchProps> {

package/dist/runtime-utils.js

@@ -1,6 +1,6 @@
 import { isFunction, isString, isArray, isObject, isNull, isNumber, isUndefined, queryToJson, PLATFORM_TYPE, singleQuote, internalComponents } from '@tarojs/shared';
 import _display from '@ohos.display';
-import { Current, window, getPageScrollerOrNode, findChildNodeWithDFS, setNodeEventCallbackAndTriggerComponentUpdate, AREA_CHANGE_EVENT_NAME, disconnectEvent, VISIBLE_CHANGE_EVENT_NAME, hooks } from '@tarojs/runtime';
+import { Current, window, document as document$1, getPageScrollerOrNode, findChildNodeWithDFS, setNodeEventCallbackAndTriggerComponentUpdate, AREA_CHANGE_EVENT_NAME, disconnectEvent, VISIBLE_CHANGE_EVENT_NAME, hooks } from '@tarojs/runtime';
 import { eventCenter, Events, History } from '@tarojs/runtime/dist/runtime.esm';
 import deviceInfo from '@ohos.deviceInfo';
 import i18n from '@ohos.i18n';
@@ -2306,21 +2306,51 @@ const stopRecord = /* @__PURE__ */ temporarilyNotSupport('stopRecord');
 const startRecord = /* @__PURE__ */ temporarilyNotSupport('startRecord');
 const getRecorderManager = /* @__PURE__ */ temporarilyNotSupport('getRecorderManager');
 
+// @ts-nocheck
 class VideoContext {
-    constructor() {
+    constructor(id) {
+        this.requestBackgroundPlayback = temporarilyNotSupport('VideoContext.requestBackgroundPlayback');
         this.exitBackgroundPlayback = temporarilyNotSupport('VideoContext.exitBackgroundPlayback');
-        this.exitFullScreen = temporarilyNotSupport('VideoContext.exitFullScreen');
         this.exitPictureInPicture = temporarilyNotSupport('VideoContext.exitPictureInPicture');
         this.hideStatusBar = temporarilyNotSupport('VideoContext.hideStatusBar');
-        this.pause = temporarilyNotSupport('VideoContext.pause');
-        this.play = temporarilyNotSupport('VideoContext.play');
         this.playbackRate = temporarilyNotSupport('VideoContext.playbackRate');
-        this.requestBackgroundPlayback = temporarilyNotSupport('VideoContext.requestBackgroundPlayback');
-        this.requestFullScreen = temporarilyNotSupport('VideoContext.requestFullScreen');
-        this.seek = temporarilyNotSupport('VideoContext.seek');
         this.sendDanmu = temporarilyNotSupport('VideoContext.sendDanmu');
         this.showStatusBar = temporarilyNotSupport('VideoContext.showStatusBar');
-        this.stop = temporarilyNotSupport('VideoContext.stop');
+        this.id = id;
+        this.video = document$1.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) {
+        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();
     }
 }
 
@@ -2349,8 +2379,8 @@ class VideoContext {
 const saveVideoToPhotosAlbumSchema = {
     filePath: 'String'
 };
-const createVideoContext = () => {
-    return new VideoContext();
+const createVideoContext = (id, _) => {
+    return new VideoContext(id);
 };
 // TODO: 1.返回属性补全
 // TODO: 2.只支持从相册选择，补充摄像头拍摄功能，需要HarmonyOS提供选择组件