@tarojs/plugin-platform-harmony-ets 4.0.0-beta.61 → 4.0.0-beta.63

package/dist/runtime-ets/dom/cssNesting.ts

@@ -95,7 +95,7 @@ function depthTraversal(root: ReactElement) {
             // eslint-disable-next-line @typescript-eslint/no-use-before-define
             processLeaf(tree.props.children[i], descendant_map)
           }
-        } else if (typeof tree.props.children !== 'string'){
+        } else if (typeof tree.props.children !== 'string') {
           // 收集叶子节点所拥有的类名
           // eslint-disable-next-line @typescript-eslint/no-use-before-define
           processLeaf(tree.props.children, descendant_map)
@@ -161,7 +161,6 @@ function depthTraversal(root: ReactElement) {
 
 // 将嵌套样式与节点合并
 function combineStyle(nestingStyle: NestingStyle, class_mapping: TMapping, alias: Record<string, string[]>) {
-
   const findElement = (selector_string, combinator_type, selector_mapping, remainder_selector, declaration) => {
     // 防止修改原数组
     if (selector_string instanceof Array) {
@@ -208,8 +207,8 @@ function combineStyle(nestingStyle: NestingStyle, class_mapping: TMapping, alias
                 selectors: [selector_string, combinator_type, ...remainder_selector.slice()],
                 declaration: declaration
               }
-              obj.node.props.__nesting = obj.node.props.__nesting ?
-                [...obj.node.props.__nesting, nestingData] : [nestingData]
+              obj.node.props.__nesting = obj.node.props.__nesting
+                ? [...obj.node.props.__nesting, nestingData] : [nestingData]
             }
             selector_nodes.push({
               // @ts-ignore
@@ -228,8 +227,8 @@ function combineStyle(nestingStyle: NestingStyle, class_mapping: TMapping, alias
               selectors: [selector_string, combinator_type, ...remainder_selector.slice()],
               declaration: declaration
             }
-            object.node.props.__nesting = object.node.props.__nesting ?
-              [...object.node.props.__nesting, nestingData] : [nestingData]
+            object.node.props.__nesting = object.node.props.__nesting
+              ? [...object.node.props.__nesting, nestingData] : [nestingData]
           }
           selector_nodes.push({
             mapping: (object.ref || object)[combinator_type === ' > ' ? 'children' : 'descendants'],
@@ -342,7 +341,7 @@ function findSendNode (selectorArr: string[], selector_mapping: TMapping) {
 function insertParentStyle(data: {key: string, value: CSSProperties}, class_mapping: TMapping, alias: Record<string, string[]>) {
   const { key, value } = data
   key.split(' ').forEach(key => {
-    let classnames = [key] 
+    let classnames = [key]
     if (alias[key]) {
       classnames = classnames.concat(alias[key])
     }
@@ -362,7 +361,6 @@ function insertParentStyle(data: {key: string, value: CSSProperties}, class_mapp
       }
     })
   })
-
 }
 
 // 合并嵌套样式
@@ -374,7 +372,7 @@ export function __combine_nesting_style__(react_tree: ReactElement, styles: Nest
     const parentProps: {
       __styleSheet?: {key: string, value: CSSProperties}
       __nesting?: NestingStyle
-    } = // @ts-ignore 
+    } = // @ts-ignore
     react_tree._owner?.pendingProps // Hack：取出父组件的props，考虑版本问题，取的内部属性，可能会有问题
 
     if (newStyle || (parentProps && (parentProps.__styleSheet || parentProps.__nesting))) {

package/dist/runtime-ets/dom/cssStyleDeclaration.ts

@@ -42,7 +42,7 @@ class CSSStyleDeclaration {
       const [propName, ...valList] = rule.split(':')
       const val = valList.join(':')
 
-      if (typeof val === undefined) {
+      if (typeof val === 'undefined') {
         continue
       }
       this.setProperty(propName.trim(), val.trim())

package/dist/runtime-ets/dom/document.ts

@@ -70,9 +70,9 @@ class TaroDocument extends TaroNode {
     const taro = (Current as any).taro
     const page = taro.getCurrentInstance().page
     const element = getPageScrollerOrNode(page.node, page)
-  
+
     if (element == null) return null
-    
+
     return findChildNodeWithDFS(element, selectors)
   }
 
@@ -80,9 +80,9 @@ class TaroDocument extends TaroNode {
     const taro = (Current as any).taro
     const page = taro.getCurrentInstance().page
     const element = getPageScrollerOrNode(page.node, page)
-  
+
     if (element == null) return []
-    
+
     return findChildNodeWithDFS(element, selectors, true) || []
   }
   // @Todo

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

@@ -342,7 +342,7 @@ export class TaroElement<
         this.setLayer(0)
       } else {
         Object.keys(currentLayerParents).forEach(fixedId => {
-          const parentIds =currentLayerParents[fixedId]
+          const parentIds = currentLayerParents[fixedId]
           if (parentIds[this._nid]) {
             // 需要移除fixedId
             delete currentLayerParents[fixedId]

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

@@ -5,7 +5,6 @@ import type { MovableAreaProps } from '@tarojs/components/types'
 
 @Observed
 export class TaroMovableAreaElement extends TaroElement<MovableAreaProps> {
-
   constructor() {
     super('MovableArea')
   }

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

@@ -5,7 +5,6 @@ import type { ProgressProps } from '@tarojs/components/types'
 
 @Observed
 export class TaroProgressElement extends TaroElement<ProgressProps> {
-
   constructor() {
     super('Progress')
   }

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

@@ -4,7 +4,6 @@ import type { VideoProps } from '@tarojs/components/types'
 
 @Observed
 export class TaroVideoElement extends TaroElement<VideoProps> {
-
   controller: VideoController = new VideoController()
 
   constructor() {

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

@@ -59,8 +59,7 @@ export class TaroWebViewElement extends TaroElement<WebViewProps> {
           return null
         }
       }
-    }
-    catch (error) {
+    } catch (error) {
       const e: business_error.BusinessError = error as business_error.BusinessError
 
       console.error(`ErrorCode: ${e.code},  Message: ${e.message}`)

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

@@ -110,7 +110,7 @@ const BUBBLE_EVENTS = new Set([
   'longTap',
   'change',
   'submit',
-  'submit-btn', 
+  'submit-btn',
   'reset-btn'
 ])
 
@@ -143,7 +143,7 @@ export function eventHandler (event, type: string, node: TaroElement) {
 
     // hooks.call('dispatchTaroEventFinish', e, node)
   }
-  
+
   dispatch()
   if (isBatchUpdates) {
     // collectBatchFunction(type, dispatch)

package/dist/runtime-ets/dom/node.ts

@@ -243,7 +243,6 @@ export class TaroNode extends TaroDataSourceElement {
     this.parentNode = null
     this.childNodes = []
   }
-
 }
 
 @Observed

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

@@ -7,7 +7,6 @@ import type { HarmonyStyle, HarmonyType, TaroStyleType, TaroTextStyleType } from
 export { HarmonyStyle, HarmonyType, TaroStyleType, TaroTextStyleType }
 
 export default class StyleSheet {
-
   public hmStyle: HarmonyStyle = {}
 
   get display () {
@@ -157,7 +156,7 @@ export default class StyleSheet {
         case ImageRepeat.Y: return 'repeat-y'; break
         case ImageRepeat.XY: return 'repeat'; break
         case ImageRepeat.NoRepeat: return 'no-repeat'; break
-      } 
+      }
     }
   }
 
@@ -196,7 +195,7 @@ export default class StyleSheet {
     return this.hmStyle.borderWidth
   }
 
-  get borderLeftWidth () { 
+  get borderLeftWidth () {
     return this.hmStyle.borderLeftWidth
   }
 
@@ -378,5 +377,4 @@ export default class StyleSheet {
   get content () {
     return this.hmStyle._content
   }
-
 }

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

@@ -40,7 +40,7 @@ export function convertNumber2PX (value: number) {
 
 export function convertNumber2VP (value: number, unit = 'px'): string | number {
   if (unit === 'vw' || unit === 'vh') {
-    return (value / 100 * (unit === 'vw' ? display.width: display.height)) + 'px'
+    return (value / 100 * (unit === 'vw' ? display.width : display.height)) + 'px'
   }
   if (unit === 'PX') {
     // 特殊单位：相当于PX、pX、Px
@@ -80,7 +80,7 @@ export function calcStaticStyle (styleSheet: Record<string, CSSProperties>, clas
       const result = Object.assign.apply(null, [{}].concat(obj))
 
       cache[classNames] = result
-      
+
       return result
     }
   }
@@ -97,7 +97,7 @@ export function calcDynamicStyle (style: CSSProperties): CSSProperties {
 // css env()环境样式获取
 export function __env__(safeAreaType: string, fallback?: string | number) {
   const sysInfo = getSystemInfoSync()
-  
+
   switch (safeAreaType) {
     case 'safe-area-inset-top': {
       return sysInfo.safeArea?.top ? `${sysInfo.safeArea?.top}px` : fallback

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

@@ -91,7 +91,7 @@ export function triggerAttributesCallback (node, attributeName) {
 
   const value = node._attrs[attributeName]
   const cb = node._nodeInfo.attributeCallback[attributeName]
-    
+
   isFunction(cb) && cb(value)
 }
 

package/dist/runtime-framework/react/hooks.ts

@@ -24,7 +24,6 @@ const createTaroHook = (lifecycle: keyof PageLifeCycle | keyof AppInstance) => {
     if (fnRef.current !== fn) fnRef.current = fn
 
     React.useLayoutEffect(() => {
-
       let inst = instRef.current = getPageInstance(id)
       let first = false
       if (!inst) {

package/dist/runtime-framework/solid/reconciler/props.ts

@@ -18,19 +18,19 @@ function isEqual (obj1, obj2) {
 
 export function updateProps (dom: TaroElement, oldProps: Props, newProps: Props) {
   const updatePayload = getUpdatePayload(dom, oldProps, newProps)
-  if (updatePayload){
+  if (updatePayload) {
     updatePropsByPayload(dom, oldProps, updatePayload)
   }
 }
 
-export function updatePropsByPayload (dom: TaroElement, oldProps: Props, updatePayload: any[]){
-  for (let i = 0; i < updatePayload.length; i += 2){ // key, value 成对出现
-    const key = updatePayload[i]; const newProp = updatePayload[i+1]; const oldProp = oldProps[key]
+export function updatePropsByPayload (dom: TaroElement, oldProps: Props, updatePayload: any[]) {
+  for (let i = 0; i < updatePayload.length; i += 2) { // key, value 成对出现
+    const key = updatePayload[i]; const newProp = updatePayload[i + 1]; const oldProp = oldProps[key]
     setProperty(dom, key, newProp, oldProp)
   }
 }
 
-export function getUpdatePayload (dom: TaroElement, oldProps: Props, newProps: Props){
+export function getUpdatePayload (dom: TaroElement, oldProps: Props, newProps: Props) {
   let i: string
   let updatePayload: any[] | null = null
 
@@ -185,7 +185,7 @@ export function setProperty (dom: TaroElement, name: string, value: unknown, old
 }
 
 // 设置鸿蒙伪类属性(特殊设置)
-function setPseudo(dom: TaroElement, name: '::after' | '::before', value: StyleValue | null){
+function setPseudo(dom: TaroElement, name: '::after' | '::before', value: StyleValue | null) {
   if (name === '::after') {
     // @ts-ignore
     dom.set_pseudo_after(value)