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

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

@@ -1,20 +1,33 @@
+// @ts-nocheck
 import matrix4 from '@ohos.matrix4'
 
 export interface HarmonyStyle extends TaroStyleType {
   textAlign?: TextAlign
   textOverflow?: HarmonyType.Overflow
-  maxLines?: number
+  WebkitLineClamp?: number
   letterSpacing?: number | string
 }
 
 export interface TaroStyleType {
   id?: string
 
-  padding?: Padding
-  margin?: Margin
+  paddingTop?: Length
+  paddingRight?: Length
+  paddingBottom?: Length
+  paddingLeft?: Length
+
+  marginTop?: Length
+  marginRight?: Length
+  marginBottom?: Length
+  marginLeft?: Length
+
   width?: Length
   height?: Length
-  constraintSize?: ConstraintSizeOptions
+
+  minHeight?: Length
+  maxHeight?: Length
+  minWidth?: Length
+  maxWidth?: Length
 
   display?: 'flex' | 'block' | 'none'
 
@@ -28,7 +41,7 @@ export interface TaroStyleType {
   flexGrow?: number
   flexShrink?: number
   alignSelf?: ItemAlign
-  direction?: FlexDirection
+  flexDirection?: FlexDirection
   justifyContent?: FlexAlign
   alignItems?: ItemAlign
   flexWrap?: FlexWrap
@@ -36,22 +49,39 @@ export interface TaroStyleType {
 
   // background
   backgroundColor?: ResourceColor
-  backgroundImage?: ResourceStr
+  backgroundImage?: HarmonyType.Background.BackgroundImage
   backgroundRepeat?: ImageRepeat
-  backgroundImageSize?: SizeOptions | ImageSize
-  backgroundImagePosition?: Position | Alignment
+  backgroundSize?: SizeOptions | ImageSize
+  backgroundPosition?: Position | Alignment
 
   // transform
   rotate?: HarmonyType.Transform.Rotate
   translate?: HarmonyType.Transform.Translate
   scale?: HarmonyType.Transform.Scale
   transform?: HarmonyType.Transform.Transform
+  transformOrigin?: HarmonyType.Transform.Origin
 
   // border
   borderWidth?: Length | EdgeWidths
+  borderLeftWidth?: Length
+  borderRightWidth?: Length
+  borderTopWidth?: Length
+  borderBottomWidth?: Length
   borderColor?: ResourceColor | EdgeColors
+  borderLeftColor?: ResourceColor
+  borderRightColor?: ResourceColor
+  borderTopColor?: ResourceColor
+  borderBottomColor?: ResourceColor
   borderStyle?: BorderStyle | EdgeStyles
+  borderLeftStyle?: BorderStyle
+  borderRightStyle?: BorderStyle
+  borderTopStyle?: BorderStyle
+  borderBottomStyle?: BorderStyle
   borderRadius?: Length | BorderRadiuses
+  borderTopLeftRadius?: Length
+  borderTopRightRadius?: Length
+  borderBottomLeftRadius?: Length
+  borderBottomRightRadius?: Length
 
   // text
   color?: ResourceColor
@@ -60,7 +90,7 @@ export interface TaroStyleType {
   fontWeight?: number | FontWeight | string
   fontFamily?: string | Resource
   lineHeight?: string | number | Resource
-  decoration?: TextDecorationType
+  textDecoration?: TextDecorationType
 
   // gradient
   linearGradient?: HarmonyType.LinearGradient
@@ -68,14 +98,14 @@ export interface TaroStyleType {
   // other
   opacity?: number | Resource
   zIndex?: number
-  clip?: boolean
+  overflow?: boolean
   focus?: boolean
 }
 
 export interface TaroTextStyleType {
   textAlign?: TextAlign
   textOverflow?: HarmonyType.Overflow
-  maxLines?: number
+  WebkitLineClamp?: number
   letterSpacing?: number | string
 }
 
@@ -104,11 +134,16 @@ export namespace HarmonyType {
     export interface backgroundImage {
       src: ResourceStr
       repeat?: ImageRepeat
+      colors?: Array<[ResourceColor, number]>
     }
     export type backgroundImageSize = SizeOptions | ImageSize
     export type backgroundImagePosition = Position | Alignment
   }
   export namespace Transform {
+    export interface Origin {
+      x?: number
+      y?: number
+    }
     export interface Rotate {
       x?: number
       y?: number

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

@@ -1,4 +1,5 @@
 // @ts-nocheck
+import matrix4 from '@ohos.matrix4'
 import { isNumber } from '@tarojs/shared'
 
 import { convertNumber2VP } from '../../'
@@ -163,6 +164,32 @@ export class FlexManager {
   }
 }
 
+
+export class BORDER_STYLE_MAP {
+  static solid = BorderStyle.Solid
+  static dotted = BorderStyle.Dotted
+  static dashed = BorderStyle.Dashed
+
+  static get(type: string): BorderStyle {
+    switch (type) {
+      case 'dotted': return BorderStyle.Dotted
+      case 'dashed': return BorderStyle.Dashed
+      default: return BorderStyle.Solid
+    }
+  }
+
+  static reverse(type: BorderStyle): string {
+    switch (type) {
+      case BorderStyle.Dotted: return 'dotted'
+      case BorderStyle.Dashed: return 'dashed'
+      case BorderStyle.Solid: return 'solid'
+      default: return ''
+    }
+  
+  }
+}
+
+
 export function getNodeMarginOrPaddingData (dataValue: string) {
   let res: any = {}
   if (dataValue) {
@@ -184,10 +211,7 @@ export function getNodeMarginOrPaddingData (dataValue: string) {
         break
     }
     Object.keys(res).forEach(key => {
-      const exec = `${res[key]}`.match(/(\d+)(px)$/)
-      if (exec && values.length > 1) {
-        res[key] = getUnit(+exec[1])
-      }
+      res[key] = getUnit(res[key]) || 0
     })
   }
   return res
@@ -197,8 +221,34 @@ export function getNodeMarginOrPaddingData (dataValue: string) {
 export function getUnit (val) {
   if (/\d+(vp)$/.test(val)) {
     return val
-  } else if (isNumber(val) || /\d+px$/.test(val)) {
+  } else if (isNumber(val)) {
     return convertNumber2VP(parseFloat(val))
   }
+  if (val) {
+    // 匹配vw\vh
+    const exec = val.match(/(\d+)(vw|vh|px)$/)
+    if (exec) {
+      const [, num, unit] = exec
+      return convertNumber2VP(parseFloat(num), unit)
+    }
+  }
   return 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())
+  }
+}
+
+export function capitalizeFirstLetter (str: string) {
+  return str.charAt(0).toUpperCase() + str.slice(1)
+}

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

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

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

@@ -2,6 +2,7 @@ import _display from '@ohos.display'
 import { pxTransformHelper } from '@tarojs/taro'
 
 import { NodeType } from '../dom/node'
+import convertWebStyle2HmStyle from '../dom/stylesheet/covertWeb2Hm'
 
 import type { CSSProperties } from 'react'
 import type { TaroElement } from '../dom/element/element'
@@ -53,7 +54,8 @@ export function calcDynamicStyle (styleSheet: Record<string, CSSProperties>, cla
       obj.push(styleSheet[className])
     }
   }
-  obj.push(style)
+  obj.push(convertWebStyle2HmStyle(style))
+  
   return Object.assign.apply(null, [{}].concat(obj))
 }
 

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

@@ -50,7 +50,9 @@ function tapCallbackToNodeAndUpdate (node: TaroElement, eventName: string, callb
     callback && callback(...eventResult)
   }
 
-  node.updateComponent()
+  if (!node._isDynamicNode || !node._isCompileMode) {
+    node.updateComponent()
+  }
 }
 
 // eslint-disable-next-line @typescript-eslint/ban-types

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';
@@ -509,7 +509,7 @@ LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
 OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 PERFORMANCE OF THIS SOFTWARE.
 ***************************************************************************** */
-/* global Reflect, Promise */
+/* global Reflect, Promise, SuppressedError, Symbol */
 
 
 function __awaiter(thisArg, _arguments, P, generator) {
@@ -520,7 +520,12 @@ function __awaiter(thisArg, _arguments, P, generator) {
         function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
-}
+}
+
+typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) {
+    var e = new Error(message);
+    return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
+};
 
 // 电量
 const getBatteryInfoSync = () => ({
@@ -2306,21 +2311,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 +2384,8 @@ class VideoContext {
 const saveVideoToPhotosAlbumSchema = {
     filePath: 'String'
 };
-const createVideoContext = () => {
-    return new VideoContext();
+const createVideoContext = (id, _) => {
+    return new VideoContext(id);
 };
 // TODO: 1.返回属性补全
 // TODO: 2.只支持从相册选择，补充摄像头拍摄功能，需要HarmonyOS提供选择组件