diff --git a/frameworks/bridge/arkts_frontend/koala_mirror/arkoala-arkts/arkui/generated/component/enums.ets b/frameworks/bridge/arkts_frontend/koala_mirror/arkoala-arkts/arkui/generated/component/enums.ets index bdb8fd0c38a881c905112a895d7b972dda760c9a..a8806feb1aceb5f9b6f6d456a81f6481fae32b1e 100644 --- a/frameworks/bridge/arkts_frontend/koala_mirror/arkoala-arkts/arkui/generated/component/enums.ets +++ b/frameworks/bridge/arkts_frontend/koala_mirror/arkoala-arkts/arkui/generated/component/enums.ets @@ -426,6 +426,14 @@ export enum TextAlign { End = 2, JUSTIFY = 3 } + +export enum TextVerticalAlign { + BASELINE = 0, + BOTTOM = 1, + CENTER = 2, + TOP = 3, +}; + export enum TextOverflow { NONE = 0, None = 0, diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/generated/component/richEditor.ets b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/generated/component/richEditor.ets index a66f2a35759fa010440bc3e4cb2dc081d23f7f51..73414e81a20063131835830d729576be0339983b 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/generated/component/richEditor.ets +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/generated/component/richEditor.ets @@ -26,7 +26,7 @@ import { Resource_serializer } from "./../framework/resource" import { ComponentBase } from "./../ComponentBase" import { PeerNode } from "./../PeerNode" import { VoidCallback, ResourceColor, ResourceStr, Font, Length, Dimension, Padding, BorderRadiuses, Font_serializer, Padding_serializer, BorderRadiuses_serializer } from "./units" -import { CopyOptions, Color, BarState, ResponseType, FontStyle, FontWeight, TextAlign, WordBreak, LineBreakStrategy, ImageSpanAlignment, ImageFit } from "./enums" +import { CopyOptions, Color, BarState, ResponseType, FontStyle, FontWeight, TextAlign,TextVerticalAlign, WordBreak, LineBreakStrategy, ImageSpanAlignment, ImageFit } from "./enums" import { Resource } from "global.resource" import { EnterKeyType, SubmitEvent } from "./textInput" import { AttributeModifier, extractors, hookRichEditorAttributeModifier, AttributeUpdater } from "#handwritten" @@ -722,6 +722,7 @@ export interface LeadingMarginPlaceholder { } export interface RichEditorParagraphStyle { textAlign?: TextAlign; + textVerticalAlign?: TextVerticalAlign; leadingMargin?: Dimension | LeadingMarginPlaceholder; wordBreak?: WordBreak; lineBreakStrategy?: LineBreakStrategy; @@ -2746,6 +2747,16 @@ export class RichEditorParagraphStyle_serializer { } else { valueSerializer.writeInt8(RuntimeType.UNDEFINED) } + + const valueHolderForTextVerticalAlign = value.textVerticalAlign + if (valueHolderForTextVerticalAlign !== undefined) { + valueSerializer.writeInt8(RuntimeType.OBJECT) + const valueHolderForTextVerticalAlignTmpValue = (valueHolderForTextVerticalAlign as TextVerticalAlign) + valueSerializer.writeInt32(valueHolderForTextVerticalAlignTmpValue.valueOf()) + } else { + valueSerializer.writeInt8(RuntimeType.UNDEFINED) + } + const valueHolderForLeadingMargin = value.leadingMargin if (valueHolderForLeadingMargin !== undefined) { valueSerializer.writeInt8(RuntimeType.OBJECT) @@ -2807,6 +2818,14 @@ export class RichEditorParagraphStyle_serializer { textAlignTmpBuf = TextAlign.fromValue(valueDeserializer.readInt32()) } const textAlignTmpResult : TextAlign | undefined = textAlignTmpBuf + + const textVerticalAlignTmpBuf_runtimeType = valueDeserializer.readInt8().toInt() + let textVerticalAlignTmpBuf : TextVerticalAlign | undefined = undefined + if ((textVerticalAlignTmpBuf_runtimeType) != (RuntimeType.UNDEFINED)) { + textVerticalAlignTmpBuf = TextVerticalAlign.fromValue(valueDeserializer.readInt32()) + } + const textVerticalAlignTmpResult : TextVerticalAlign | undefined = textVerticalAlignTmpBuf + const leadingMarginTmpBuf_runtimeType = valueDeserializer.readInt8().toInt() let leadingMarginTmpBuf : Dimension | LeadingMarginPlaceholder | undefined = undefined if ((leadingMarginTmpBuf_runtimeType) != (RuntimeType.UNDEFINED)) { @@ -2851,7 +2870,7 @@ export class RichEditorParagraphStyle_serializer { paragraphSpacingTmpBuf = (valueDeserializer.readNumber() as number) } const paragraphSpacingTmpResult : number | undefined = paragraphSpacingTmpBuf - let value : RichEditorParagraphStyle = ({textAlign: textAlignTmpResult, leadingMargin: leadingMarginTmpResult, wordBreak: wordBreakTmpResult, lineBreakStrategy: lineBreakStrategyTmpResult, paragraphSpacing: paragraphSpacingTmpResult} as RichEditorParagraphStyle) + let value : RichEditorParagraphStyle = ({textAlign: textAlignTmpResult, textVerticalAlign:textVerticalAlignTmpResult,leadingMargin: leadingMarginTmpResult, wordBreak: wordBreakTmpResult, lineBreakStrategy: lineBreakStrategyTmpResult, paragraphSpacing: paragraphSpacingTmpResult} as RichEditorParagraphStyle) return value } } diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/framework/native/src/generated/arkoala_api_generated.h b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/framework/native/src/generated/arkoala_api_generated.h index 90c520ec12ba454e4a5cc78417f671b6b1501f30..323cfb57b9b037e23e4f7f09d2eaa9c64a33cc92 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/framework/native/src/generated/arkoala_api_generated.h +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/framework/native/src/generated/arkoala_api_generated.h @@ -759,6 +759,10 @@ typedef struct Ark_Union_Number_String_FontWeight Ark_Union_Number_String_FontWe typedef struct Opt_Union_Number_String_FontWeight Opt_Union_Number_String_FontWeight; typedef struct Ark_Union_Number_TextAlign Ark_Union_Number_TextAlign; typedef struct Opt_Union_Number_TextAlign Opt_Union_Number_TextAlign; + +typedef struct Ark_Union_Number_TextVerticalAlign Ark_Union_Number_TextVerticalAlign; +typedef struct Opt_Union_Number_TextVerticalAlign Opt_Union_Number_TextVerticalAlign; + typedef struct Ark_Union_Number_TextCase Ark_Union_Number_TextCase; typedef struct Opt_Union_Number_TextCase Opt_Union_Number_TextCase; typedef struct Ark_Union_Number_TextOverflow Ark_Union_Number_TextOverflow; @@ -6032,6 +6036,18 @@ typedef struct Opt_TextAlign { Ark_Tag tag; Ark_TextAlign value; } Opt_TextAlign; + +typedef enum Ark_TextVerticalAlign { + ARK_TEXT_ALIGN_BASELINE = 0, + ARK_TEXT_ALIGN_BOTTOM = 1, + ARK_TEXT_ALIGN_CENTER = 2, + ARK_TEXT_ALIGN_TOP = 3, +} Ark_TextVerticalAlign; +typedef struct Opt_TextVerticalAlign { + Ark_Tag tag; + Ark_TextVerticalAlign value; +} Opt_TextVerticalAlign; + typedef enum Ark_TextAreaType { ARK_TEXT_AREA_TYPE_NORMAL = 0, ARK_TEXT_AREA_TYPE_NUMBER = 2, @@ -7885,6 +7901,20 @@ typedef struct Opt_Union_Number_TextAlign { Ark_Tag tag; Ark_Union_Number_TextAlign value; } Opt_Union_Number_TextAlign; + +typedef struct Ark_Union_Number_TextVerticalAlign { + /* kind: UnionType */ + Ark_Int32 selector; + union { + Ark_Number value0; + Ark_TextVerticalAlign value1; + }; +} Ark_Union_Number_TextVerticalAlign; +typedef struct Opt_Union_Number_TextVerticalAlign { + Ark_Tag tag; + Ark_Union_Number_TextVerticalAlign value; +} Opt_Union_Number_TextVerticalAlign; + typedef struct Ark_Union_Number_TextCase { /* kind: UnionType */ Ark_Int32 selector; @@ -15967,6 +15997,10 @@ typedef struct Ark_MeasureOptions { Opt_Union_String_Resource fontFamily; Opt_Union_Number_String letterSpacing; Opt_Union_Number_TextAlign textAlign; + + Opt_Union_Number_TextVerticalAlign textVerticalAlign; + + Opt_Union_Number_TextOverflow overflow; Opt_Number maxLines; Opt_Union_Number_String_Resource lineHeight; @@ -18544,6 +18578,9 @@ typedef struct Opt_ParagraphStyle { typedef struct Ark_ParagraphStyleInterface { /* kind: Interface */ Opt_TextAlign textAlign; + + Opt_TextVerticalAlign textVerticalAlign; + Opt_LengthMetrics textIndent; Opt_Number maxLines; Opt_TextOverflow overflow; @@ -18654,6 +18691,9 @@ typedef struct Opt_RichEditorLayoutStyle { typedef struct Ark_RichEditorParagraphStyle { /* kind: Interface */ Opt_TextAlign textAlign; + + Opt_TextVerticalAlign textVerticalAlign; + Opt_Union_Dimension_LeadingMarginPlaceholder leadingMargin; Opt_WordBreak wordBreak; Opt_LineBreakStrategy lineBreakStrategy; @@ -21407,6 +21447,10 @@ typedef struct GENERATED_ArkUISearchModifier { const Opt_Number* value); void (*setTextAlign)(Ark_NativePointer node, const Opt_TextAlign* value); + + void (*setTextVerticalAlign)(Ark_NativePointer node, + const Opt_TextVerticalAlign* value); + void (*setEnableKeyboardOnFocus)(Ark_NativePointer node, const Opt_Boolean* value); void (*setSelectionMenuHidden)(Ark_NativePointer node, @@ -22001,6 +22045,10 @@ typedef struct GENERATED_ArkUITextModifier { const Opt_LengthMetrics* value); void (*setTextAlign)(Ark_NativePointer node, const Opt_TextAlign* value); + + void (*setTextVerticalAlign)(Ark_NativePointer node, + const Opt_TextVerticalAlign* value); + void (*setLineHeight)(Ark_NativePointer node, const Opt_Union_Number_String_Resource* value); void (*setTextOverflow)(Ark_NativePointer node, @@ -22090,6 +22138,10 @@ typedef struct GENERATED_ArkUITextAreaModifier { const Opt_EnterKeyType* value); void (*setTextAlign)(Ark_NativePointer node, const Opt_TextAlign* value); + + void (*setTextVerticalAlign)(Ark_NativePointer node, + const Opt_TextVerticalAlign* value); + void (*setCaretColor)(Ark_NativePointer node, const Opt_ResourceColor* value); void (*setFontColor)(Ark_NativePointer node, @@ -22289,6 +22341,10 @@ typedef struct GENERATED_ArkUITextInputModifier { const Opt_Boolean* value); void (*setTextAlign)(Ark_NativePointer node, const Opt_TextAlign* value); + + void (*setTextVerticalAlign)(Ark_NativePointer node, + const Opt_TextVerticalAlign* value); + void (*setStyle)(Ark_NativePointer node, const Opt_Union_TextInputStyle_TextContentStyle* value); void (*setCaretStyle)(Ark_NativePointer node, @@ -23356,6 +23412,12 @@ typedef struct GENERATED_ArkUICanvasRendererAccessor { Ark_String (*getTextAlign)(Ark_CanvasRenderer peer); void (*setTextAlign)(Ark_CanvasRenderer peer, const Ark_String* textAlign); + + Ark_String (*getTextVerticalAlign)(Ark_CanvasRenderer peer); + void (*setTextVerticalAlign)(Ark_CanvasRenderer peer, + const Ark_String* textVerticalAlign); + + Ark_String (*getTextBaseline)(Ark_CanvasRenderer peer); void (*setTextBaseline)(Ark_CanvasRenderer peer, const Ark_String* textBaseline); @@ -24700,6 +24762,9 @@ typedef struct GENERATED_ArkUIParagraphStyleAccessor { Ark_ParagraphStyle (*construct)(const Opt_ParagraphStyleInterface* value); Ark_NativePointer (*getFinalizer)(); Opt_TextAlign (*getTextAlign)(Ark_ParagraphStyle peer); + + Opt_TextVerticalAlign (*getTextVerticalAlign)(Ark_ParagraphStyle peer); + Opt_Number (*getTextIndent)(Ark_ParagraphStyle peer); Opt_Number (*getMaxLines)(Ark_ParagraphStyle peer); Opt_TextOverflow (*getOverflow)(Ark_ParagraphStyle peer); diff --git a/frameworks/core/interfaces/native/generated/interface/arkoala_api_generated.h b/frameworks/core/interfaces/native/generated/interface/arkoala_api_generated.h index 90c520ec12ba454e4a5cc78417f671b6b1501f30..e437e6605ac6afff77f56367b1c1fe8c6fc6413d 100644 --- a/frameworks/core/interfaces/native/generated/interface/arkoala_api_generated.h +++ b/frameworks/core/interfaces/native/generated/interface/arkoala_api_generated.h @@ -759,6 +759,10 @@ typedef struct Ark_Union_Number_String_FontWeight Ark_Union_Number_String_FontWe typedef struct Opt_Union_Number_String_FontWeight Opt_Union_Number_String_FontWeight; typedef struct Ark_Union_Number_TextAlign Ark_Union_Number_TextAlign; typedef struct Opt_Union_Number_TextAlign Opt_Union_Number_TextAlign; + +typedef struct Ark_Union_Number_TextVerticalAlign Ark_Union_Number_TextVerticalAlign; +typedef struct Opt_Union_Number_TextVerticalAlign Opt_Union_Number_TextVerticalAlign; + typedef struct Ark_Union_Number_TextCase Ark_Union_Number_TextCase; typedef struct Opt_Union_Number_TextCase Opt_Union_Number_TextCase; typedef struct Ark_Union_Number_TextOverflow Ark_Union_Number_TextOverflow; @@ -6032,6 +6036,19 @@ typedef struct Opt_TextAlign { Ark_Tag tag; Ark_TextAlign value; } Opt_TextAlign; + +typedef enum Ark_TextVerticalAlign { + ARK_TEXT_ALIGN_BASELINE = 0, + ARK_TEXT_ALIGN_BOTTOM = 1, + ARK_TEXT_ALIGN_CENTER = 2, + ARK_TEXT_ALIGN_TOP = 3, +} Ark_TextVerticalAlign; +typedef struct Opt_TextVerticalAlign { + Ark_Tag tag; + Ark_TextVerticalAlign value; +} Opt_TextVerticalAlign; + + typedef enum Ark_TextAreaType { ARK_TEXT_AREA_TYPE_NORMAL = 0, ARK_TEXT_AREA_TYPE_NUMBER = 2, @@ -7885,6 +7902,20 @@ typedef struct Opt_Union_Number_TextAlign { Ark_Tag tag; Ark_Union_Number_TextAlign value; } Opt_Union_Number_TextAlign; + +typedef struct Ark_Union_Number_TextVerticalAlign { + /* kind: UnionType */ + Ark_Int32 selector; + union { + Ark_Number value0; + Ark_TextVerticalAlign value1; + }; +} Ark_Union_Number_TextVerticalAlign; +typedef struct Opt_Union_Number_TextVerticalAlign { + Ark_Tag tag; + Ark_Union_Number_TextVerticalAlign value; +} Opt_Union_Number_TextVerticalAlign; + typedef struct Ark_Union_Number_TextCase { /* kind: UnionType */ Ark_Int32 selector; @@ -15967,6 +15998,9 @@ typedef struct Ark_MeasureOptions { Opt_Union_String_Resource fontFamily; Opt_Union_Number_String letterSpacing; Opt_Union_Number_TextAlign textAlign; + + Opt_Union_Number_TextVerticalAlign textVerticalAlign; + Opt_Union_Number_TextOverflow overflow; Opt_Number maxLines; Opt_Union_Number_String_Resource lineHeight; @@ -18544,6 +18578,9 @@ typedef struct Opt_ParagraphStyle { typedef struct Ark_ParagraphStyleInterface { /* kind: Interface */ Opt_TextAlign textAlign; + + Opt_TextVerticalAlign textVerticalAlign; + Opt_LengthMetrics textIndent; Opt_Number maxLines; Opt_TextOverflow overflow; @@ -18654,6 +18691,9 @@ typedef struct Opt_RichEditorLayoutStyle { typedef struct Ark_RichEditorParagraphStyle { /* kind: Interface */ Opt_TextAlign textAlign; + + Opt_TextVerticalAlign textVerticalAlign; + Opt_Union_Dimension_LeadingMarginPlaceholder leadingMargin; Opt_WordBreak wordBreak; Opt_LineBreakStrategy lineBreakStrategy; @@ -21407,6 +21447,11 @@ typedef struct GENERATED_ArkUISearchModifier { const Opt_Number* value); void (*setTextAlign)(Ark_NativePointer node, const Opt_TextAlign* value); + + void (*setTextVerticalAlign)(Ark_NativePointer node, + const Opt_TextVerticalAlign* value); + + void (*setEnableKeyboardOnFocus)(Ark_NativePointer node, const Opt_Boolean* value); void (*setSelectionMenuHidden)(Ark_NativePointer node, @@ -22001,6 +22046,10 @@ typedef struct GENERATED_ArkUITextModifier { const Opt_LengthMetrics* value); void (*setTextAlign)(Ark_NativePointer node, const Opt_TextAlign* value); + + void (*setTextVerticalAlign)(Ark_NativePointer node, + const Opt_TextVerticalAlign* value); + void (*setLineHeight)(Ark_NativePointer node, const Opt_Union_Number_String_Resource* value); void (*setTextOverflow)(Ark_NativePointer node, @@ -22090,6 +22139,10 @@ typedef struct GENERATED_ArkUITextAreaModifier { const Opt_EnterKeyType* value); void (*setTextAlign)(Ark_NativePointer node, const Opt_TextAlign* value); + + void (*setTextVerticalAlign)(Ark_NativePointer node, + const Opt_TextVerticalAlign* value); + void (*setCaretColor)(Ark_NativePointer node, const Opt_ResourceColor* value); void (*setFontColor)(Ark_NativePointer node, @@ -22289,6 +22342,10 @@ typedef struct GENERATED_ArkUITextInputModifier { const Opt_Boolean* value); void (*setTextAlign)(Ark_NativePointer node, const Opt_TextAlign* value); + + void (*setTextVerticalAlign)(Ark_NativePointer node, + const Opt_TextVerticalAlign* value); + void (*setStyle)(Ark_NativePointer node, const Opt_Union_TextInputStyle_TextContentStyle* value); void (*setCaretStyle)(Ark_NativePointer node, @@ -23356,6 +23413,11 @@ typedef struct GENERATED_ArkUICanvasRendererAccessor { Ark_String (*getTextAlign)(Ark_CanvasRenderer peer); void (*setTextAlign)(Ark_CanvasRenderer peer, const Ark_String* textAlign); + + Ark_String (*getTextVerticalAlign)(Ark_CanvasRenderer peer); + void (*setTextVerticalAlign)(Ark_CanvasRenderer peer, + const Ark_String* textVerticalAlign); + Ark_String (*getTextBaseline)(Ark_CanvasRenderer peer); void (*setTextBaseline)(Ark_CanvasRenderer peer, const Ark_String* textBaseline); @@ -24700,6 +24762,9 @@ typedef struct GENERATED_ArkUIParagraphStyleAccessor { Ark_ParagraphStyle (*construct)(const Opt_ParagraphStyleInterface* value); Ark_NativePointer (*getFinalizer)(); Opt_TextAlign (*getTextAlign)(Ark_ParagraphStyle peer); + + Opt_TextVerticalAlign (*getTextVerticalAlign)(Ark_ParagraphStyle peer); + Opt_Number (*getTextIndent)(Ark_ParagraphStyle peer); Opt_Number (*getMaxLines)(Ark_ParagraphStyle peer); Opt_TextOverflow (*getOverflow)(Ark_ParagraphStyle peer); diff --git a/frameworks/core/interfaces/native/utility/reverse_converter_enums.cpp b/frameworks/core/interfaces/native/utility/reverse_converter_enums.cpp index 3ed759c17631fafc9148ce0705c2afcf81bd20c6..73e81c26c81f8960e8069b37f595c6814b5d1592 100644 --- a/frameworks/core/interfaces/native/utility/reverse_converter_enums.cpp +++ b/frameworks/core/interfaces/native/utility/reverse_converter_enums.cpp @@ -708,6 +708,21 @@ void AssignArkValue(Ark_TextAlign& dst, const TextAlign& src) LOGE("Unexpected enum value in TextAlign: %{public}d", src); } } + +void AssignArkValue(Ark_TextVerticalAlign& dst, const TextVerticalAlign& src) +{ + switch (src) { + case TextVerticalAlign::BASELINE: dst = ARK_TEXT_ALIGN_BASELINE; break; + case TextVerticalAlign::BOTTOM: dst = ARK_TEXT_ALIGN_BOTTOM; break; + case TextVerticalAlign::CENTER: dst = ARK_TEXT_ALIGN_CENTER; break; + case TextVerticalAlign::TOP: dst = ARK_TEXT_ALIGN_TOP; break; + default: + dst = static_cast(-1); + LOGE("Unexpected enum value in TextVerticalAlign: %{public}d", src); + } +} + + void AssignArkValue(Ark_TextOverflow& dst, const TextOverflow& src) { switch (src) {