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

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

@@ -1,5 +1,7 @@
+import { isUndefined } from '@tarojs/shared'
 import { ObjectAssign } from '@tarojs/runtime'
 
+import { FlexManager } from './FlexManager'
 import { TEXT_DEFAULT_STYLE } from './constant/style'
 
 import type { StandardProps, TextProps } from '@tarojs/components/types'
@@ -20,6 +22,14 @@ export function getFontAttributes (node: TaroElement): TaroTextStyleType {
   return attributes
 }
 
+// 模拟 div 自动撑满父元素的情况
+function isMaxWidthView (node: TaroElement) {
+  const parentNode: TaroElement = node.parentNode as TaroElement
+  
+  return node.tagName === 'VIEW' && parentNode.tagName === 'VIEW' &&
+    !(FlexManager.isFlexNode(parentNode) && FlexManager.flexOptions(parentNode).direction !== FlexDirection.Column)
+}
+
 export function getNormalAttributes (node: TaroElement): TaroStyleType {
   const hmStyle = node.hmStyle
 
@@ -39,7 +49,7 @@ export function getNormalAttributes (node: TaroElement): TaroStyleType {
     flexShrink: hmStyle.flexShrink,
     alignSelf: hmStyle.alignSelf,
     // 尺寸相关
-    width: hmStyle.width,
+    width: isMaxWidthView(node) && isUndefined(hmStyle.width) ? '100%' : hmStyle.width,
     height: hmStyle.height,
     minHeight: hmStyle.minHeight,
     maxHeight: hmStyle.maxHeight,

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

@@ -7,8 +7,8 @@ import { getNodeThresholds, getNormalAttributes, shouldBindEvent } from './utils
 
 import type { TaroViewElement, TaroAny, TaroStyleType } from '@tarojs/runtime'
 
-@Extend(Flex)
-function flexAttrs (style: TaroStyleType) {
+@Extend(Column)
+function columnAttrs (style: TaroStyleType) {
   .id(style.id)
   .key(style.id)
   .flexGrow(style.flexGrow)
@@ -72,9 +72,8 @@ function flexAttrs (style: TaroStyleType) {
   .transform(style.transform)
 }
 
-
-@Extend(Column)
-function columnAttrs (style: TaroStyleType) {
+@Extend(Row)
+function rowAttrs (style: TaroStyleType) {
   .id(style.id)
   .key(style.id)
   .flexGrow(style.flexGrow)
@@ -138,23 +137,21 @@ function columnAttrs (style: TaroStyleType) {
   .transform(style.transform)
 }
 
-function isFlexNode (node: TaroViewElement) {
-  return !!node.hmStyle?.display?.includes('flex')
-}
-
 @Builder
 export default function TaroView (node: TaroViewElement) {
-  if (isFlexNode(node)) {
-    Flex(FlexManager.flexOptions(node)) {
+  if (FlexManager.isFlexNode(node) && FlexManager.flexOptions(node).direction !== FlexDirection.Column) {
+    Row() {
       createLazyChildren(node)
     }
-    .flexAttrs(getNormalAttributes(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) => {
       node._nodeInfo.areaInfo = res[1]
     }))
     .onVisibleAreaChange(getNodeThresholds(node) || [0.0, 1.0], getComponentEventCallback(node, VISIBLE_CHANGE_EVENT_NAME))
+    .alignItems(FlexManager.flexOptions(node).alignItems as VerticalAlign)
+    .justifyContent(FlexManager.flexOptions(node).justifyContent)
   } else {
     Column() {
       createLazyChildren(node)
@@ -166,7 +163,7 @@ export default function TaroView (node: TaroViewElement) {
       node._nodeInfo.areaInfo = res[1]
     }))
     .onVisibleAreaChange(getNodeThresholds(node) || [0.0, 1.0], getComponentEventCallback(node, VISIBLE_CHANGE_EVENT_NAME))
-    .alignItems(HorizontalAlign.Start)
-    .justifyContent(node.hmStyle.justifyContent)
+    .alignItems(FlexManager.flexOptions(node).alignItems as HorizontalAlign)
+    .justifyContent(FlexManager.flexOptions(node).justifyContent)
   }
 }

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

@@ -0,0 +1,113 @@
+import { AREA_CHANGE_EVENT_NAME, eventHandler, getComponentEventCallback, VISIBLE_CHANGE_EVENT_NAME, createTaroEvent } from '@tarojs/runtime'
+
+import { getNormalAttributes, shouldBindEvent, getNodeThresholds } from './utils/helper'
+
+import type { TaroAny, TaroWebViewElement, TaroStyleType, TaroEvent } from '@tarojs/runtime'
+
+interface IPageLoad {
+  url: string
+}
+
+interface IError {
+  request: WebResourceRequest
+  error: WebResourceError
+}
+
+@Extend(Web)
+function attrs (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?.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.overflow)
+  .rotate({ centerX: style.transformOrigin?.x, centerY: style.transformOrigin?.y, angle: 0 })
+  .scale({ centerX: style.transformOrigin?.x, centerY: style.transformOrigin?.y })
+  .transform(style.transform)
+}
+
+@Builder
+export default function TaroWebView (node: TaroWebViewElement) {
+  Web({ src: node._attrs.src, controller: node.controller })
+    .attrs(getNormalAttributes(node))
+    .onPageEnd((e: IPageLoad) => {
+      // 1. 创建消息端口
+      node.ports = node.controller.createWebMessagePorts(true)
+      // 2. 发送端口1到HTML5
+      node.controller.postMessage('init_web_messageport', [node.ports[1]], '*');
+      // 3. 保存端口0到本地
+      node.nativePort = node.ports[0]
+      // 4. 设置回调函数
+      node.nativePort.onMessageEventExt((result) => {
+        const message = node.handleMessageFromWeb(result)
+        const messageEvent: TaroEvent = createTaroEvent('message', { detail: { data: message } }, node)
+
+        eventHandler(messageEvent, 'message', node)
+      })
+
+      const onLoadEvent: TaroEvent = createTaroEvent('load', { detail: { src: node._attrs.src } }, node)
+
+      eventHandler(onLoadEvent, 'load', node)
+    })
+    .onErrorReceive(shouldBindEvent((e: IError) => {
+      const event: TaroEvent = createTaroEvent('error', { detail: { url: node._attrs.src, fullUrl: e.request.getRequestUrl() } }, node)
+      
+      eventHandler(event, 'error', node)
+    }, node, ['error']))
+    .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))
+}

package/dist/index.js

@@ -75,6 +75,86 @@ typeof SuppressedError === "function" ? SuppressedError : function (error, suppr
     return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
 };
 
+function apiLoader(str) {
+    return `import {
+  useAddToFavorites,
+  useDidHide,
+  useDidShow,
+  useError,
+  useLaunch,
+  useLoad,
+  useOptionMenuClick,
+  usePageNotFound,
+  usePageScroll,
+  usePullDownRefresh,
+  usePullIntercept,
+  useReachBottom,
+  useReady,
+  useResize,
+  useRouter,
+  useSaveExitState,
+  useShareAppMessage,
+  useShareTimeline,
+  useTabItemTap,
+  useTitleClick,
+  useScope,
+  useUnhandledRejection,
+  useUnload
+} from '@tarojs/plugin-framework-react/dist/runtime'
+${str}
+
+taro.useAddToFavorites = useAddToFavorites
+taro.useDidHide = useDidHide
+taro.useDidShow = useDidShow
+taro.useError = useError
+taro.useLaunch = useLaunch
+taro.useLoad = useLoad
+taro.useOptionMenuClick = useOptionMenuClick
+taro.usePageNotFound = usePageNotFound
+taro.usePageScroll = usePageScroll
+taro.usePullDownRefresh = usePullDownRefresh
+taro.usePullIntercept = usePullIntercept
+taro.useReachBottom = useReachBottom
+taro.useReady = useReady
+taro.useResize = useResize
+taro.useRouter = useRouter
+taro.useSaveExitState = useSaveExitState
+taro.useShareAppMessage = useShareAppMessage
+taro.useShareTimeline = useShareTimeline
+taro.useTabItemTap = useTabItemTap
+taro.useTitleClick = useTitleClick
+taro.useScope = useScope
+taro.useUnhandledRejection = useUnhandledRejection
+taro.useUnload = useUnload
+
+export {
+  useAddToFavorites,
+  useDidHide,
+  useDidShow,
+  useError,
+  useLaunch,
+  useLoad,
+  useOptionMenuClick,
+  usePageNotFound,
+  usePageScroll,
+  usePullDownRefresh,
+  usePullIntercept,
+  useReachBottom,
+  useReady,
+  useResize,
+  useRouter,
+  useSaveExitState,
+  useShareAppMessage,
+  useShareTimeline,
+  useTabItemTap,
+  useTitleClick,
+  useScope,
+  useUnhandledRejection,
+  useUnload
+}
+`;
+}
+
 const PLATFORM_NAME = 'harmony';
 const PACKAGE_NAME = '@tarojs/plugin-platform-harmony-ets';
 const PLUGIN_NAME = 'TaroHarmony';
@@ -393,6 +473,10 @@ let Harmony$1 = class Harmony extends TaroPlatformHarmony {
         }
         else if (stat.isFile()) {
             let code = helper.fs.readFileSync(lib, { encoding: 'utf8' });
+            // TODO: 后续这部分代码应该根据使用的框架抽离到对应的平台插件处
+            if ([/taro-platform-harmony[\\/]dist[\\/]apis[\\/]index\.ts/].some(e => e.test(lib))) {
+                code = apiLoader(code);
+            }
             if (this.extensions.includes(path__namespace.extname(lib))) {
                 code = code.replace(/(?:import\s|from\s|require\()['"]([^.][^'"\s]+)['"]\)?/g, (src, p1) => {
                     const { outputRoot } = this.ctx.runOpts.config;
@@ -565,7 +649,7 @@ function App(props) {
             isFile: (file) => {
                 try {
                     const stat = helper.fs.lstatSync(file);
-                    return stat.isFile() || (file.endsWith(mediaPath) && stat.isDirectory());
+                    return stat.isFile() || (file.endsWith(mediaPath.replace('/', path__namespace.sep)) && stat.isDirectory());
                 }
                 catch (_) { } // eslint-disable-line no-empty
                 return false;