@tarojs/plugin-platform-harmony-ets 4.0.0-beta.4 → 4.0.0-beta.5

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

@@ -2,10 +2,11 @@ import { eventHandler, getComponentEventCallback, AREA_CHANGE_EVENT_NAME, VISIBL
 
 import commonStyleModify from './style'
 import { createLazyChildren } from './render'
+import { FlexManager } from './utils/FlexManager'
 import { TOUCH_EVENT_MAP } from './utils/constant/event'
 import { getNodeThresholds, getNormalAttributes, shouldBindEvent } from './utils/helper'
 
-import type { TaroAny, TaroScrollViewElement, TaroEvent } from '@tarojs/runtime'
+import type { TaroAny, TaroStyleType, TaroScrollViewElement, TaroEvent } from '@tarojs/runtime'
 
 interface ScrollViewAttrs {
   scrollBar: BarState
@@ -56,6 +57,26 @@ function handleScrollEvent (node: TaroScrollViewElement, eventName = 'scroll', x
   eventHandler(event, eventName, node)
 }
 
+@Extend(Row)
+function rowAttrs (style: TaroStyleType) {
+  .constraintSize({
+    minWidth: style.minWidth || style.width,
+    maxWidth: style.maxWidth,
+    minHeight: style.minHeight,
+    maxHeight: style.maxHeight
+  })
+}
+
+@Extend(Column)
+function columnAttrs (style: TaroStyleType) {
+  .constraintSize({
+    minWidth: style.minWidth,
+    maxWidth: style.maxWidth,
+    minHeight: style.minHeight || style.height,
+    maxHeight: style.maxHeight
+  })
+}
+
 @Builder
 export default function TaroScrollView (node: TaroScrollViewElement) {
     Scroll(node.scroller) {
@@ -63,26 +84,35 @@ export default function TaroScrollView (node: TaroScrollViewElement) {
         Row() {
           createLazyChildren(node)
         }
-        .width(null)
         .attributeModifier(commonStyleModify.setNode(node))
+        .rowAttrs(getNormalAttributes(node))
+        .width(null)
         .onAreaChange(shouldBindEvent((_: Area, areaResult: Area) => {
           node._scroll = areaResult
         }, node, ['scroll', 'scrollstart', 'scrollend']))
+        .alignItems(FlexManager.flexOptions(node).alignItems as VerticalAlign)
+        .justifyContent(FlexManager.flexOptions(node).justifyContent)
+        .flexGrow(0).flexShrink(0)
       } else {
         Column() {
           createLazyChildren(node)
         }
-        .height(null)
         .attributeModifier(commonStyleModify.setNode(node))
+        .columnAttrs(getNormalAttributes(node))
+        .height(null)
         .alignItems(HorizontalAlign.Start)
         .onAreaChange(shouldBindEvent((_: Area, areaResult: Area) => {
           node._scroll = areaResult
         }, node, ['scroll', 'scrollstart', 'scrollend']))
+        .alignItems(FlexManager.flexOptions(node).alignItems as HorizontalAlign)
+        .justifyContent(FlexManager.flexOptions(node).justifyContent)
+        .flexGrow(0).flexShrink(0)
       }
     }
     .width(getNormalAttributes(node).width)
     .height(getNormalAttributes(node).height)
     .flexGrow(getNormalAttributes(node).flexGrow)
+    .flexShrink(getNormalAttributes(node).flexShrink)
     .scrollable(getScrollable(node))
     .scrollBar(getAttributes(node).scrollBar)
     .onClick(shouldBindEvent((e: ClickEvent) => eventHandler(e, 'click', node), node, ['click']))

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

@@ -1,4 +1,5 @@
 import type { TaroElement } from '@tarojs/runtime'
+import { isUndefined } from '@tarojs/shared'
 
 interface IFlexOptions {
   direction: FlexDirection,
@@ -39,7 +40,7 @@ class FlexManager {
   static flexOptions (node: TaroElement): IFlexOptions {
     const hmStyle = node.hmStyle
     const isFlex = FlexManager.isFlexNode(node)
-    const justifyContent: FlexAlign = isFlex ? (hmStyle.justifyContent || FlexAlign.Center) : FlexAlign.Start
+    const justifyContent: FlexAlign = isFlex ? (isUndefined(hmStyle.justifyContent) ? FlexAlign.Start : hmStyle.justifyContent) : FlexAlign.Start
 
     let flexDirection = hmStyle.flexDirection
     if (!flexDirection && flexDirection !== 0) {

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

@@ -109,6 +109,7 @@ export function getNormalAttributes (node: TaroElement): TaroStyleType {
     overflow: hmStyle.overflow,
     id: _attrs.id || _nid,
     opacity: hmStyle.opacity,
+    zIndex: hmStyle.zIndex
     // focus: _attrs.focus || false,
   }
 

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

@@ -4,9 +4,29 @@ import commonStyleModify from './style'
 import { createLazyChildren } from './render'
 import { TOUCH_EVENT_MAP } from './utils/constant/event'
 import { FlexManager } from './utils/FlexManager'
-import { getNodeThresholds, shouldBindEvent } from './utils/helper'
+import { getNodeThresholds, getNormalAttributes, shouldBindEvent } from './utils/helper'
 
-import type { TaroViewElement, TaroAny } from '@tarojs/runtime'
+import type { TaroViewElement, TaroStyleType, TaroAny } from '@tarojs/runtime'
+
+@Extend(Row)
+function rowAttrs (style: TaroStyleType) {
+  .constraintSize({
+    minWidth: style.minWidth || style.width,
+    maxWidth: style.maxWidth,
+    minHeight: style.minHeight,
+    maxHeight: style.maxHeight
+  })
+}
+
+@Extend(Column)
+function columnAttrs (style: TaroStyleType) {
+  .constraintSize({
+    minWidth: style.minWidth,
+    maxWidth: style.maxWidth,
+    minHeight: style.minHeight || style.height,
+    maxHeight: style.maxHeight
+  })
+}
 
 @Builder
 export default function TaroView (node: TaroViewElement) {
@@ -15,6 +35,7 @@ export default function TaroView (node: TaroViewElement) {
       createLazyChildren(node)
     }
     .attributeModifier(commonStyleModify.setNode(node))
+    .rowAttrs(getNormalAttributes(node))
     .onClick(shouldBindEvent((e: ClickEvent) => eventHandler(e, 'click', node), node, ['click']))
     .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) => {
@@ -28,6 +49,7 @@ export default function TaroView (node: TaroViewElement) {
       createLazyChildren(node)
     }
     .attributeModifier(commonStyleModify.setNode(node))
+    .columnAttrs(getNormalAttributes(node))
     .onClick(shouldBindEvent((e: ClickEvent) => eventHandler(e, 'click', node), node, ['click']))
     .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) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/plugin-platform-harmony-ets",
-  "version": "4.0.0-beta.4",
+  "version": "4.0.0-beta.5",
   "description": "OpenHarmony & 鸿蒙系统插件",
   "author": "O2Team",
   "homepage": "https://gitee.com/openharmony-sig/taro",
@@ -25,13 +25,13 @@
   },
   "dependencies": {
     "webpack-sources": "^3.2.3",
-    "@tarojs/components": "4.0.0-beta.4",
-    "@tarojs/helper": "4.0.0-beta.4",
-    "@tarojs/runner-utils": "4.0.0-beta.4",
-    "@tarojs/runtime": "4.0.0-beta.4",
-    "@tarojs/shared": "4.0.0-beta.4",
-    "@tarojs/service": "4.0.0-beta.4",
-    "@tarojs/taro": "4.0.0-beta.4"
+    "@tarojs/helper": "4.0.0-beta.5",
+    "@tarojs/runner-utils": "4.0.0-beta.5",
+    "@tarojs/service": "4.0.0-beta.5",
+    "@tarojs/shared": "4.0.0-beta.5",
+    "@tarojs/runtime": "4.0.0-beta.5",
+    "@tarojs/taro": "4.0.0-beta.5",
+    "@tarojs/components": "4.0.0-beta.5"
   },
   "devDependencies": {
     "@rollup/plugin-commonjs": "^20.0.0",

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

@@ -1,24 +0,0 @@
-import { bindAttributesCallback } from './info'
-
-import type { TaroElement } from '../dom/element/element'
-
-// function convertToCamelCase(str) {
-//   return str.replace(/-(.)/g, (_, char) => char.toUpperCase()).replace(/^\w/, firstChar => firstChar.toUpperCase())
-// }
-
-export function bindScrollTo (node: TaroElement) {
-  bindAttributesCallback(node, 'scrollTo', () => {
-    node.scroller.scrollTo({
-      xOffset: node._attrs.scrollLeft || 0,
-      yOffset: node._attrs.scrollTop || 0,
-    })
-  })
-}
-
-export function bindFocus (node: TaroElement) {
-  bindAttributesCallback(node, 'focus', () => {
-    // TODO: ETS转TS
-    // focusControl.requestFocus(node._nid)
-  })
-}
-