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

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

@@ -1,73 +1,9 @@
 import { eventHandler, convertNumber2VP, getComponentEventCallback, AREA_CHANGE_EVENT_NAME, VISIBLE_CHANGE_EVENT_NAME, convertNumber2PX } from '@tarojs/runtime'
 
-import { getNormalAttributes, shouldBindEvent, getNodeThresholds } from './utils/helper'
+import commonStyleModify from './style'
+import { shouldBindEvent, getNodeThresholds } from './utils/helper'
 
-import type { TaroIconElement, TaroAny, TaroStyleType } from '@tarojs/runtime'
-
-@Extend(Image)
-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 || convertNumber2PX(23))
-  .height(style.height || convertNumber2PX(23))
-  .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)
-  .linearGradient(style.linearGradient)
-  .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)
-}
+import type { TaroIconElement, TaroAny } from '@tarojs/runtime'
 
 const ICON_COLOR_MAP: TaroAny = {
   success: Color.Green,
@@ -112,20 +48,34 @@ function getIconData (node: TaroIconElement): Resource | null {
   }
 }
 
-@Builder
-export default function TaroIcon (node: TaroIconElement) {
-  Image(getIconData(node))
-    .objectFit(ImageFit.Contain)
-    .fillColor(node._attrs.color || ICON_COLOR_MAP[node._attrs.type] || Color.Black)
-    .attrs(getNormalAttributes(node))
-    .size({
-      width: convertNumber2VP(Number(node._attrs.size) || 23),
-      height: convertNumber2VP(Number(node._attrs.size) || 23),
-    })
-    .onComplete(e => eventHandler(e, 'complete', node))
-    .onClick(shouldBindEvent((e: ClickEvent) => eventHandler(e, 'click', node), node, ['click']))
-    .onVisibleAreaChange(getNodeThresholds(node) || [0.0, 1.0], getComponentEventCallback(node, VISIBLE_CHANGE_EVENT_NAME))
-    .onAreaChange(getComponentEventCallback(node, AREA_CHANGE_EVENT_NAME, (res: TaroAny) => {
-      node._nodeInfo.areaInfo = res[1]
-    }))
+@Component
+export default struct TaroIcon {
+  @Builder customBuilder() {}
+  @BuilderParam createLazyChildren: (node: TaroIconElement, layer?: number) => void = this.customBuilder
+  @ObjectLink node: TaroIconElement
+  @State overwriteStyle: Record<string, TaroAny> = {}
+
+  aboutToAppear(): void {
+    if (this.node) {
+      this.node._instance = this
+    }
+  }
+
+  build() {
+    Image(getIconData(this.node))
+      .objectFit(ImageFit.Contain)
+      .fillColor(this.node._attrs.color || ICON_COLOR_MAP[this.node._attrs.type] || Color.Black)
+      .attributeModifier(commonStyleModify.setNode(this.node).setAnimationStyle(this.overwriteStyle))
+      .size({
+        width: Number(this.node._attrs.size) || 23,
+        height: Number(this.node._attrs.size) || 23
+      })
+      .onComplete(e => { eventHandler(e, 'complete', this.node) })
+      .onClick(shouldBindEvent((e: ClickEvent) => { eventHandler(e, 'click', this.node) }, this.node, ['click']))
+      .onVisibleAreaChange(getNodeThresholds(this.node) || [0.0, 1.0], getComponentEventCallback(this.node, VISIBLE_CHANGE_EVENT_NAME))
+      .onAreaChange(getComponentEventCallback(this.node, AREA_CHANGE_EVENT_NAME, (res: TaroAny) => {
+        this.node._nodeInfo.areaInfo = res[1]
+      }))
+  }
 }
+

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

@@ -1,75 +1,11 @@
 import { eventHandler, getComponentEventCallback, AREA_CHANGE_EVENT_NAME, VISIBLE_CHANGE_EVENT_NAME } from '@tarojs/runtime'
 
-import { getNormalAttributes, shouldBindEvent, getNodeThresholds } from './utils/helper'
+import commonStyleModify from './style'
+import { shouldBindEvent, getNodeThresholds } from './utils/helper'
 
-import type { TaroImageElement, TaroAny, TaroStyleType } from '@tarojs/runtime'
+import type { TaroImageElement, TaroAny } from '@tarojs/runtime'
 
-@Extend(Image)
-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)
-  .linearGradient(style.linearGradient)
-  .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)
-}
-
-function getImageMode (mode: string): ImageFit {
+export function getImageMode (mode: string): ImageFit {
   switch (mode) {
     case 'aspectFit': return ImageFit.Contain
     case 'aspectFill': return ImageFit.Cover
@@ -80,15 +16,35 @@ function getImageMode (mode: string): ImageFit {
   }
 }
 
-@Builder
-export default function TaroImage (node: TaroImageElement) {
-  Image(node.getAttribute('src'))
-    .onClick(shouldBindEvent((e: ClickEvent) => eventHandler(e, 'click', node), node, ['click']))
-    .onAreaChange(getComponentEventCallback(node, AREA_CHANGE_EVENT_NAME, (res: TaroAny) => {
-      node._nodeInfo.areaInfo = res[1]
-    }))
-    .objectFit(getImageMode(node.getAttribute('mode')))
-    .attrs(getNormalAttributes(node))
-    .onComplete(e => eventHandler(e, 'complete', node))
-    .onVisibleAreaChange(getNodeThresholds(node) || [0.0, 1.0], getComponentEventCallback(node, VISIBLE_CHANGE_EVENT_NAME))
+@Component
+export default struct TaroImage {
+  @Builder customBuilder() {}
+  @BuilderParam createLazyChildren: (node: TaroImageElement, layer?: number) => void = this.customBuilder
+  @ObjectLink node: TaroImageElement
+  @State overwriteStyle: Record<string, TaroAny> = {}
+
+  aboutToAppear(): void {
+    if (this.node) {
+      this.node._instance = this
+    }
+  }
+
+  build() {
+    Image(this.node.getAttribute('src'))
+      .onClick(shouldBindEvent((e: ClickEvent) => { eventHandler(e, 'click', this.node) }, this.node, ['click']))
+      .onAreaChange(getComponentEventCallback(this.node, AREA_CHANGE_EVENT_NAME, (res: TaroAny) => {
+        this.node._nodeInfo.areaInfo = res[1]
+      }))
+      .objectFit(getImageMode(this.node.getAttribute('mode')))
+      .attributeModifier(commonStyleModify.setNode(this.node).setAnimationStyle(this.overwriteStyle))
+      .onComplete(e => { eventHandler(e, 'complete', this.node) })
+      .onVisibleAreaChange(getNodeThresholds(this.node) || [0.0, 1.0], getComponentEventCallback(this.node, VISIBLE_CHANGE_EVENT_NAME))
+      // TODO: 临时改为申明式，后续等鸿蒙修复modify设置失败的bug后删除该申明
+      .borderRadius({
+        topLeft: this.node._st.hmStyle.borderTopLeftRadius,
+        topRight: this.node._st.hmStyle.borderTopRightRadius,
+        bottomLeft: this.node._st.hmStyle.borderBottomLeftRadius,
+        bottomRight: this.node._st.hmStyle.borderBottomRightRadius
+      })
+  }
 }

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

@@ -0,0 +1,92 @@
+import TaroImage, { getImageMode } from './image'
+import TaroText from './text'
+import TaroView from './view'
+import TaroIcon from './icon'
+import TaroForm from './form'
+import TaroLabel from './label'
+import TaroInput from './input'
+import TaroVideo from './video'
+import TaroCanvas from './canvas'
+import TaroButton from './button'
+import TaroPicker from './picker'
+import TaroSlider from './slider'
+import TaroSwitch from './switch'
+import TaroSwiper from './swiper'
+import TaroWebView from './webView'
+import TaroTextArea from './textArea'
+import TaroRichText from './richText'
+import TaroProgress from './progress'
+import TaroInnerHtml from './innerHtml'
+import TaroScrollView from './scrollView'
+import TaroMovableArea from './movableArea'
+import TaroMovableView from './movableView'
+import { TaroRadio, TaroRadioGroup } from './radio'
+import { TaroCheckboxGroup, TaroCheckbox } from './checkbox'
+import TaroPageMeta from './pageMeta'
+import TaroNavigationBar from './navigationBar'
+
+import TaroListView from './listView'
+import TaroStickySection from './stickySection'
+import TaroScrollList from './scrollList'
+
+import commonStyleModify, { rowModify, columnModify, textModify, setNormalTextAttributeIntoInstance } from './style'
+import { getButtonColor } from './button'
+import { FlexManager } from './utils/flexManager'
+import { DynamicCenter } from './utils/DynamicCenter'
+import { TOUCH_EVENT_MAP } from './utils/constant/event'
+import { BUTTON_THEME_COLOR } from './utils/constant/style'
+import { getStyleAttr } from './utils/styles'
+import { shouldBindEvent, getNodeThresholds, getNormalAttributes, getFontAttributes } from './utils/helper'
+
+export {
+  textModify,
+  getStyleAttr,
+  FlexManager,
+  DynamicCenter,
+  getButtonColor,
+  TOUCH_EVENT_MAP,
+  shouldBindEvent,
+  getFontAttributes,
+  commonStyleModify,
+  rowModify,
+  columnModify,
+  getNodeThresholds,
+  BUTTON_THEME_COLOR,
+  getNormalAttributes,
+  setNormalTextAttributeIntoInstance,
+  getImageMode,
+}
+
+export {
+  TaroImage,
+  TaroCanvas,
+  TaroText,
+  TaroView,
+  TaroIcon,
+  TaroForm,
+  TaroLabel,
+  TaroInput,
+  TaroVideo,
+  TaroButton,
+  TaroPicker,
+  TaroSlider,
+  TaroSwitch,
+  TaroSwiper,
+  TaroWebView,
+  TaroTextArea,
+  TaroRichText,
+  TaroProgress,
+  TaroInnerHtml,
+  TaroScrollView,
+  TaroMovableArea,
+  TaroMovableView,
+  TaroRadio,
+  TaroRadioGroup,
+  TaroCheckboxGroup,
+  TaroCheckbox,
+  TaroPageMeta,
+  TaroNavigationBar,
+  TaroListView,
+  TaroStickySection,
+  TaroScrollList
+}

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

@@ -1,11 +1,16 @@
 import htmlParser from './utils/htmlParser'
-import { createChildItemWithPosition } from './render'
 
-import type { TaroElement } from '@tarojs/runtime'
+import type { TaroElement, TaroInnerHtmlElement } from '@tarojs/runtime'
 
-@Builder
-export default function TaroInnerHtml (node: TaroElement) {
-  if (node.innerHTML) {
-    createChildItemWithPosition(htmlParser(node.innerHTML))
+@Component
+export default struct TaroInnerHtml {
+  @Builder customBuilder() {}
+  @BuilderParam createChildItem: (node: TaroElement, callback?: (node: TaroElement) => void) => void = this.customBuilder
+  @ObjectLink node: TaroInnerHtmlElement
+
+  build() {
+    if (this.node?.hmStyle?.display !== 'none' && this.node.innerHTML) {
+      this.createChildItem(htmlParser(this.node.innerHTML))
+    }
   }
 }

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

@@ -1,77 +1,19 @@
 import { eventHandler, getComponentEventCallback, AREA_CHANGE_EVENT_NAME, VISIBLE_CHANGE_EVENT_NAME, createTaroEvent } from '@tarojs/runtime'
 
-import { getNormalAttributes, parseStyles, shouldBindEvent, getNodeThresholds } from './utils/helper'
+import commonStyleModify from './style'
+import { parseStyles, shouldBindEvent, getNodeThresholds, getStyleAttr } from './utils/helper'
 import { INPUT_TYPE_MAP, INPUT_CONFIRM_MAP } from './utils/constant/style'
 
 import type { TaroStyleType, TaroAny, TaroInputElement, TaroEvent } from '@tarojs/runtime'
 
 interface InputAttrs {
   textAlign?: TextAlign
+  autoFocus?: boolean
+  disabled?: boolean
 }
 
 @Extend(TextInput)
 function styles (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)
-  .linearGradient(style.linearGradient)
-  .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)
   .fontColor(style.color)
   .fontSize(style.fontSize)
   .fontWeight(style.fontWeight)
@@ -82,12 +24,15 @@ function styles (style: TaroStyleType) {
 @Extend(TextInput)
 function attrs(attr: InputAttrs) {
   .textAlign(attr.textAlign)
+  .defaultFocus(attr.autoFocus)
+  .enabled(!attr.disabled)
 }
 
-
 function getAttributes(node: TaroInputElement): InputAttrs {
   return {
     textAlign: node.hmStyle.textAlign,
+    autoFocus: node._attrs.autoFocus || node._attrs.focus || false,
+    disabled: node._attrs.disabled || false,
   }
 }
 
@@ -104,11 +49,26 @@ function getPlaceholderColor (node: TaroInputElement): string {
   return placeholderTextColor || parseStyles(placeholderStyle)?.color
 }
 
+function getPlaceholderFont(node: TaroInputElement): Font {
+  const placeholderStyle: string = node._attrs.placeholderStyle || ''
+  const styles = parseStyles(placeholderStyle);
+  if (styles) {
+    return {
+      size: styles.fontSize,
+    }
+  }
+
+  return {}
+}
+
 @Component
 export default struct TaroInput {
   @State value: string = ''
 
-  node: TaroInputElement | null = null
+  @Builder customBuilder() {}
+  @BuilderParam createLazyChildren: (node: TaroInputElement, layer?: number) => void = this.customBuilder
+  @ObjectLink node: TaroInputElement
+  @State overwriteStyle: Record<string, TaroAny> = {}
 
   aboutToAppear () {
     if (this.node) {
@@ -123,42 +83,45 @@ export default struct TaroInput {
   }
 
   build () {
-    if (this.node) {
-      TextInput({ text: this.value, placeholder: this.node._attrs?.placeholder || '', controller: this.node.controller })
-      .key(this.node._nid)
-      .type(getInputType(this.node))
-      .maxLength(Number(this.node._attrs?.maxlength) || null)
-      .placeholderColor(getPlaceholderColor(this.node))
-      .enterKeyType(INPUT_CONFIRM_MAP.get(this.node._attrs?.confirmType) || EnterKeyType.Done)
-      .styles(getNormalAttributes(this.node))
-      .attrs(getAttributes(this.node))
-      .onChange((value: string) => {
-        const event: TaroEvent = createTaroEvent('input', { detail: { value } }, this.node)
-        
-        this.value = value
-        this.node?.updateFormWidgetValue(value)
-        eventHandler(event, 'input', this.node)
-      })
-      .onSubmit(() => {
-        const event: TaroEvent = createTaroEvent('confirm', { detail: { value: this.value } }, this.node)
-        eventHandler(event, 'confirm', this.node)
-      })
-      .onClick(shouldBindEvent((e: ClickEvent) => eventHandler(e, 'click', this.node), this.node, ['click']))
-      .onBlur(() => {
-        const event: TaroEvent = createTaroEvent('blur', { detail: { value: this.value } }, this.node)
-        eventHandler(event, 'blur', this.node)
-      })
-      .onFocus(() => {
-        const event: TaroEvent = createTaroEvent('focus', { detail: { value: this.value, height: this.node?._height } }, this.node)
-  
-        eventHandler(event, 'focus', this.node)
-      })
-      .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))
-    }
+    TextInput({ text: this.value, placeholder: this.node._attrs?.placeholder || '', controller: this.node.controller })
+    .key(this.node._nid.toString())
+    .type(getInputType(this.node))
+    .maxLength(Number(this.node._attrs?.maxlength) || null)
+    .placeholderColor(getPlaceholderColor(this.node))
+    .placeholderFont(getPlaceholderFont(this.node))
+    .enterKeyType(INPUT_CONFIRM_MAP.get(this.node._attrs?.confirmType) || EnterKeyType.Done)
+    .padding(0) // Note: 移出 Input 默认 padding 设置
+    .backgroundColor(getStyleAttr(this.node, "backgroundColor"))// 
+    .attributeModifier(commonStyleModify.setNode(this.node).setAnimationStyle(this.overwriteStyle))
+    .styles(this.node?.hmStyle)
+    .attrs(getAttributes(this.node))
+    .onChange((value: string) => {
+      const event: TaroEvent = createTaroEvent('input', { detail: { value } }, this.node)
+
+      this.value = value
+      this.node?.updateFormWidgetValue(value)
+      eventHandler(event, 'input', this.node)
+    })
+    .onSubmit(() => {
+      const event: TaroEvent = createTaroEvent('confirm', { detail: { value: this.value } }, this.node)
+      eventHandler(event, 'confirm', this.node)
+    })
+    .onClick(shouldBindEvent((e: ClickEvent) => { eventHandler(e, 'click', this.node) }, this.node, ['click']))
+    .onBlur(() => {
+      const event: TaroEvent = createTaroEvent('blur', { detail: { value: this.value } }, this.node)
+      eventHandler(event, 'blur', this.node)
+    })
+    .onFocus(() => {
+      const event: TaroEvent = createTaroEvent('focus', { detail: { value: this.value, height: this.node?._height } }, this.node)
+
+      eventHandler(event, 'focus', this.node)
+    })
+    .enableKeyboardOnFocus(typeof (this.node._attrs as TaroAny)?.enableKeyboardOnFocus === 'undefined' ? true : (this.node._attrs as TaroAny).enableKeyboardOnFocus)
+    .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))
   }
 }