From 97034f682fe609de31e54b2af8c02b35201ba7eb Mon Sep 17 00:00:00 2001 From: song-song-song Date: Mon, 18 Aug 2025 11:22:51 +0800 Subject: [PATCH] =?UTF-8?q?folderstack=20alignrules=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: song-song-song --- .../src/component/arkts/type_check.ts | 10 ++-- .../arkui-ohos/src/component/common.ts | 24 ++++++--- .../src/component/peers/Deserializer.ts | 38 +++++++------- .../src/component/peers/Serializer.ts | 2 +- .../arkui-ohos/src/component/ts/type_check.ts | 10 ++-- .../native/src/generated/Serializers.h | 52 +++++++++---------- .../src/generated/arkoala_api_generated.h | 42 ++++++++------- .../base/view_abstract_model_static.cpp | 17 +++--- .../core/interfaces/native/common/BUILD.gn | 7 +++ .../interface/arkoala_api_generated.h | 42 ++++++++------- .../generated/interface/node_interface.gni | 6 ++- .../native/implementation/all_modifiers.cpp | 4 ++ .../implementation/common_method_modifier.cpp | 4 +- .../utility/generated/converter_generated.h | 8 +-- .../core/pattern/flex/flex_new_test_ng.cpp | 2 + 15 files changed, 149 insertions(+), 119 deletions(-) diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/arkts/type_check.ts b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/arkts/type_check.ts index 063d12db4ea..89f91edb75b 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/arkts/type_check.ts +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/arkts/type_check.ts @@ -19,7 +19,7 @@ import { KBoolean, KStringPtr, NativeBuffer, MaterializedBase } from "@koalaui/interop" import { int32 } from "@koalaui/common" import { AccessibilityHoverType, Alignment, AnimationStatus, AppRotation, ArrowPointPosition, Axis, AxisAction, AxisModel, BarState, BorderStyle, CheckBoxShape, ClickEffectLevel, Color, ColoringStrategy, CopyOptions, CrownAction, CrownSensitivity, Curve, DialogButtonStyle, Direction, DividerMode, Edge, EdgeEffect, EllipsisMode, EmbeddedType, FillMode, FlexAlign, FlexDirection, FlexWrap, FocusDrawLevel, FoldStatus, FontStyle, FontWeight, FunctionKey, GradientDirection, HeightBreakpoint, HitTestMode, HorizontalAlign, HoverEffect, IlluminatedType, ImageFit, ImageRepeat, ImageSize, ImageSpanAlignment, InteractionHand, ItemAlign, KeySource, KeyType, LineBreakStrategy, LineCapStyle, LineJoinStyle, MarqueeUpdateStrategy, ModifierKey, MouseAction, MouseButton, NestedScrollMode, ObscuredReasons, OptionWidthMode, PageFlipMode, PixelRoundCalcPolicy, PixelRoundMode, Placement, PlayMode, RelateType, RenderFit, ResponseType, ScrollSource, TextAlign, SharedTransitionEffectType, TextOverflow, TextContentStyle, TextHeightAdaptivePolicy, WordBreak, TextCase, TextSelectableMode, TextDecorationStyle, TextDecorationType, TitleHeight, TouchType, TransitionType, VerticalAlign, Visibility, Week, WidthBreakpoint, XComponentType } from "./../enums" -import { AccessibilityRoleType, AccessibilitySamePageMode, AdaptiveColor, Bindable, CommonMethod, BlurStyle, BlendApplyType, BlurStyleActivePolicy, PickerTextStyle, ChainStyle, ContentClipMode, DismissReason, DragBehavior, DragEvent, DragResult, Rectangle, DataSyncOptions, DraggingSizeChangeEffect, DragPreviewMode, DrawModifier, EffectEdge, EffectType, FinishCallbackType, GestureModifier, UIGestureEvent, ScrollableCommonMethod, ItemDragInfo, CustomBuilder, NestedScrollOptions, EdgeEffectOptions, HapticFeedbackMode, HoverModeAreaType, ICurve, KeyboardAvoidMode, LayoutPolicy, LayoutSafeAreaEdge, LayoutSafeAreaType, ChildrenMainSize, RectResult, Literal_Boolean_isVisible, MenuPolicy, MenuPreviewMode, ModalTransition, OutlineStyle, PixelMapMock, PopupStateChangeParam, PreDragStatus, ProgressMask, RepeatMode, SelectionOptions, SafeAreaEdge, SafeAreaType, ScrollSizeMode, TextDecorationOptions, TextContentControllerBase, ShadowStyle, ShadowType, SheetKeyboardAvoidMode, SheetMode, SheetSize, SheetType, SourceTool, SourceType, BackgroundEffectOptions, BackgroundBlurStyleOptions, TranslateOptions, InputCounterOptions, ShadowOptions, CaretOffset, TextContentControllerOptions, ThemeColorMode, TouchTestInfo, TouchTestStrategy, TransitionEdge, TransitionEffect, TransitionEffects, RotateOptions, ScaleOptions, AnimateParam, TransitionHierarchyStrategy, UICommonEvent, Callback_ClickEvent_Void, ClickEvent, Callback_TouchEvent_Void, TouchEvent, Callback_KeyEvent_Void, KeyEvent, HoverCallback, HoverEvent, Callback_MouseEvent_Void, MouseEvent, SizeChangeCallback, VisibleAreaEventOptions, VisibleAreaChangeCallback, SheetOptions, View, Callback_KeyEvent_Boolean, BackgroundBrightnessOptions, BackgroundImageOptions, BlurOptions, ClickEffect, CrownEvent, DateRange, DismissContentCoverAction, DismissPopupAction, DismissSheetAction, DragInteractionOptions, DragItemInfo, DropOptions, ExpectedFrameRateRange, FocusMovement, ForegroundEffectOptions, GeometryTransitionOptions, InvertOptions, Tuple_ResourceColor_Number, LinearGradient_common, FractionStop, LinearGradientBlurOptions, LinearGradientOptions, Literal_Alignment_align, Literal_Number_offset_span, HorizontalAlignOptions, VerticalAlignOptions, Literal_String_value_Callback_Void_action, Literal_TransitionEffect_appear_disappear, LocalizedHorizontalAlignParam, LocalizedVerticalAlignParam, Measurable, MeasureResult, SizeResult, MotionBlurAnchor, MotionBlurOptions, MotionPathOptions, OverlayOffset, PixelRoundPolicy, PixelStretchEffectOptions, PreviewConfiguration, RadialGradientOptions, Tuple_Length_Length, SheetDismiss, SpringBackAction, StateStyles, SweepGradientOptions, SystemAdaptiveOptions, TipsOptions, TouchObject, TouchResult, AlignRuleOption, BlurStyleOptions, ContentCoverOptions, BindOptions, Callback_DismissContentCoverAction_Void, ContextMenuAnimationOptions, MultiShadowOptions, DragPreviewOptions, EventTarget, FadingEdgeOptions, FocusAxisEvent, BaseEvent, ForegroundBlurStyleOptions, HistoricalPoint, LightSource, Literal_ResourceColor_color, Literal_Union_Number_Literal_Number_offset_span_lg_md_sm_xs, LocalizedAlignRuleOptions, MenuElement, OverlayOptions, PickerDialogButtonStyle, ReuseOptions, ReuseIdCallback, sharedTransitionOptions, SheetTitleOptions, TransitionOptions, AccessibilityHoverEvent, AxisEvent, BorderImageOption, CustomPopupOptions, Callback_Literal_Boolean_isVisible_Void, Callback_DismissPopupAction_Void, PointLightStyle, PopupMessageOptions, Type_SheetOptions_detents, Callback_SheetDismiss_Void, Callback_DismissSheetAction_Void, Callback_SpringBackAction_Void, Callback_SheetType_Void, ContextMenuOptions, BorderRadiusType, MenuOptions, PopupOptions, NavDestinationInfo, NavigationInfo, RouterPageInfo, Theme, PromptActionDialogController, LayoutChild, Layoutable, PopupButton, PopupMaskType, DividerStyle, BlendMode } from "./../common" +import { AccessibilityRoleType, AccessibilitySamePageMode, AdaptiveColor, Bindable, CommonMethod, BlurStyle, BlendApplyType, BlurStyleActivePolicy, PickerTextStyle, ChainStyle, ContentClipMode, DismissReason, DragBehavior, DragEvent, DragResult, Rectangle, DataSyncOptions, DraggingSizeChangeEffect, DragPreviewMode, DrawModifier, EffectEdge, EffectType, FinishCallbackType, GestureModifier, UIGestureEvent, ScrollableCommonMethod, ItemDragInfo, CustomBuilder, NestedScrollOptions, EdgeEffectOptions, HapticFeedbackMode, HoverModeAreaType, ICurve, KeyboardAvoidMode, LayoutPolicy, LayoutSafeAreaEdge, LayoutSafeAreaType, ChildrenMainSize, RectResult, Literal_Boolean_isVisible, MenuPolicy, MenuPreviewMode, ModalTransition, OutlineStyle, PixelMapMock, PopupStateChangeParam, PreDragStatus, ProgressMask, RepeatMode, SelectionOptions, SafeAreaEdge, SafeAreaType, ScrollSizeMode, TextDecorationOptions, TextContentControllerBase, ShadowStyle, ShadowType, SheetKeyboardAvoidMode, SheetMode, SheetSize, SheetType, SourceTool, SourceType, BackgroundEffectOptions, BackgroundBlurStyleOptions, TranslateOptions, InputCounterOptions, ShadowOptions, CaretOffset, TextContentControllerOptions, ThemeColorMode, TouchTestInfo, TouchTestStrategy, TransitionEdge, TransitionEffect, TransitionEffects, RotateOptions, ScaleOptions, AnimateParam, TransitionHierarchyStrategy, UICommonEvent, Callback_ClickEvent_Void, ClickEvent, Callback_TouchEvent_Void, TouchEvent, Callback_KeyEvent_Void, KeyEvent, HoverCallback, HoverEvent, Callback_MouseEvent_Void, MouseEvent, SizeChangeCallback, VisibleAreaEventOptions, VisibleAreaChangeCallback, SheetOptions, View, Callback_KeyEvent_Boolean, BackgroundBrightnessOptions, BackgroundImageOptions, BlurOptions, ClickEffect, CrownEvent, DateRange, DismissContentCoverAction, DismissPopupAction, DismissSheetAction, DragInteractionOptions, DragItemInfo, DropOptions, ExpectedFrameRateRange, FocusMovement, ForegroundEffectOptions, GeometryTransitionOptions, InvertOptions, Tuple_ResourceColor_Number, LinearGradient_common, FractionStop, LinearGradientBlurOptions, LinearGradientOptions, Literal_Alignment_align, Literal_Number_offset_span, HorizontalAlignParam, VerticalAlignParam, Literal_String_value_Callback_Void_action, Literal_TransitionEffect_appear_disappear, LocalizedHorizontalAlignParam, LocalizedVerticalAlignParam, Measurable, MeasureResult, SizeResult, MotionBlurAnchor, MotionBlurOptions, MotionPathOptions, OverlayOffset, PixelRoundPolicy, PixelStretchEffectOptions, PreviewConfiguration, RadialGradientOptions, Tuple_Length_Length, SheetDismiss, SpringBackAction, StateStyles, SweepGradientOptions, SystemAdaptiveOptions, TipsOptions, TouchObject, TouchResult, AlignRuleOption, BlurStyleOptions, ContentCoverOptions, BindOptions, Callback_DismissContentCoverAction_Void, ContextMenuAnimationOptions, MultiShadowOptions, DragPreviewOptions, EventTarget, FadingEdgeOptions, FocusAxisEvent, BaseEvent, ForegroundBlurStyleOptions, HistoricalPoint, LightSource, Literal_ResourceColor_color, Literal_Union_Number_Literal_Number_offset_span_lg_md_sm_xs, LocalizedAlignRuleOptions, MenuElement, OverlayOptions, PickerDialogButtonStyle, ReuseOptions, ReuseIdCallback, sharedTransitionOptions, SheetTitleOptions, TransitionOptions, AccessibilityHoverEvent, AxisEvent, BorderImageOption, CustomPopupOptions, Callback_Literal_Boolean_isVisible_Void, Callback_DismissPopupAction_Void, PointLightStyle, PopupMessageOptions, Type_SheetOptions_detents, Callback_SheetDismiss_Void, Callback_DismissSheetAction_Void, Callback_SpringBackAction_Void, Callback_SheetType_Void, ContextMenuOptions, BorderRadiusType, MenuOptions, PopupOptions, NavDestinationInfo, NavigationInfo, RouterPageInfo, Theme, PromptActionDialogController, LayoutChild, Layoutable, PopupButton, PopupMaskType, DividerStyle, BlendMode } from "./../common" import { Affinity, TextBox, LineMetrics, RunMetrics, TextDirection } from "./../arkui-graphics-text" import { AlphabetIndexerAttribute, Callback_Number_Void, OnAlphabetIndexerSelectCallback, OnAlphabetIndexerRequestPopupDataCallback, OnAlphabetIndexerPopupSelectCallback, IndexerAlign, Callback_Opt_Number_Void, AlphabetIndexerOptions } from "./../alphabetIndexer" import { ResourceColor, Font, Position, Length, SizeOptions, Offset, ColorFilter, ResourceStr, Dimension, LengthConstrain, VoidCallback, DividerStyleOptions, ConstraintSizeOptions, AccessibilityOptions, Bias, BorderRadiuses, ChainWeightOptions, DirectionalEdgesT, EdgeOutlineStyles, EdgeOutlineWidths, EdgeWidths, OutlineRadiuses, Padding, VP, Area, EdgeColors, PX, LPX, LocalizedBorderRadiuses, LocalizedEdgeColors, LocalizedEdges, LocalizedEdgeWidths, LocalizedPadding, LocalizedPosition, MarkStyle, BorderOptions, OutlineOptions, EdgeStyles, Edges } from "./../units" @@ -1565,11 +1565,11 @@ export class TypeChecker { static isLiteral_ResourceColor_color(value: Object | string | number | undefined, arg0: boolean): boolean { return value instanceof Literal_ResourceColor_color } - static isHorizontalAlignOptions(value: Object | string | number | undefined, arg0: boolean, arg1: boolean): boolean { - return value instanceof HorizontalAlignOptions + static isHorizontalAlignParam(value: Object | string | number | undefined, arg0: boolean, arg1: boolean): boolean { + return value instanceof HorizontalAlignParam } - static isVerticalAlignOptions(value: Object | string | number | undefined, arg0: boolean, arg1: boolean): boolean { - return value instanceof VerticalAlignOptions + static isVerticalAlignParam(value: Object | string | number | undefined, arg0: boolean, arg1: boolean): boolean { + return value instanceof VerticalAlignParam } static isLiteral_String_baseUrl_data_encoding_historyUrl_mimeType(value: Object | string | number | undefined, arg0: boolean, arg1: boolean, arg2: boolean, arg3: boolean, arg4: boolean): boolean { return value instanceof Literal_String_baseUrl_data_encoding_historyUrl_mimeType diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/common.ts b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/common.ts index f3399b2457a..a6352463bed 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/common.ts +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/common.ts @@ -7272,21 +7272,21 @@ export interface ScaleOptions { centerX?: number | string; centerY?: number | string; } -export interface HorizontalAlignOptions { +export interface HorizontalAlignParam { anchor: string; align: HorizontalAlign; } -export interface VerticalAlignOptions { +export interface VerticalAlignParam { anchor: string; align: VerticalAlign; } export interface AlignRuleOption { - left?: HorizontalAlignOptions; - right?: HorizontalAlignOptions; - middle?: HorizontalAlignOptions; - top?: VerticalAlignOptions; - bottom?: VerticalAlignOptions; - center?: VerticalAlignOptions; + left?: HorizontalAlignParam; + right?: HorizontalAlignParam; + middle?: HorizontalAlignParam; + top?: VerticalAlignParam; + bottom?: VerticalAlignParam; + center?: VerticalAlignParam; bias?: Bias; } export interface LocalizedHorizontalAlignParam { @@ -8157,6 +8157,14 @@ export interface CommonMethod { enabled(value: boolean | undefined): this useSizeType(value: Literal_Union_Number_Literal_Number_offset_span_lg_md_sm_xs | undefined): this alignRules(value: AlignRuleOption | undefined | LocalizedAlignRuleOptions | undefined): this + alignRulesWithAlignRuleOptionTypedValue(value: AlignRuleOption | undefined): this { + this.alignRules(value); + return this; + } + alignRulesWithLocalizedAlignRuleOptionsTypedValue(value: LocalizedAlignRuleOptions | undefined): this { + this.alignRules(value); + return this; + } aspectRatio(value: number | undefined): this clickEffect(value: ClickEffect | undefined): this onDragStart(value: ((event: DragEvent,extraParams?: string) => CustomBuilder | DragItemInfo) | undefined): this diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/peers/Deserializer.ts b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/peers/Deserializer.ts index 6f4fa099be9..1222012b5fa 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/peers/Deserializer.ts +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/peers/Deserializer.ts @@ -22,7 +22,7 @@ import { CallbackKind } from "./CallbackKind" import { Serializer } from "./Serializer" import { TypeChecker } from "#components" import { CallbackTransformer } from "./CallbackTransformer" -import { AccessibilityCallback, AccessibilityFocusCallback, GestureRecognizerJudgeBeginCallback, HoverCallback, OnDragEventCallback, OnMoveHandler, OnScrollCallback, PopupStateChangeCallback, ReuseIdCallback, ShouldBuiltInRecognizerParallelWithCallback, SizeChangeCallback, TransitionFinishCallback, VisibleAreaChangeCallback, AccessibilityHoverEvent, AccessibilityHoverEventInternal, AccessibilityRoleType, AccessibilitySamePageMode, AdaptiveColor, CommonMethod, BlurStyle, BlendApplyType, BlurStyleActivePolicy, PickerTextStyle, ChainStyle, ContentClipMode, DismissReason, DragBehavior, DragEvent, DragEventInternal, DragResult, Rectangle, DataSyncOptions, DraggingSizeChangeEffect, DragPreviewMode, DrawModifier, DrawModifierInternal, EffectEdge, EffectType, FinishCallbackType, GestureModifier, GestureModifierInternal, UIGestureEvent, ScrollableCommonMethod, ItemDragInfo, CustomBuilder, NestedScrollOptions, EdgeEffectOptions, HapticFeedbackMode, HoverModeAreaType, ICurve, ICurveInternal, KeyboardAvoidMode, LayoutPolicy, LayoutSafeAreaEdge, LayoutSafeAreaType, ChildrenMainSize, ChildrenMainSizeInternal, RectResult, MenuPolicy, MenuPreviewMode, ModalTransition, OutlineStyle, PixelMapMock, PixelMapMockInternal, PopupStateChangeParam, PreDragStatus, ProgressMask, ProgressMaskInternal, RepeatMode, SelectionOptions, SafeAreaEdge, SafeAreaType, ScrollSizeMode, TextDecorationOptions, TextContentControllerBase, TextContentControllerBaseInternal, ShadowStyle, ShadowType, SheetKeyboardAvoidMode, SheetMode, SheetSize, SheetType, SourceTool, SourceType, BackgroundEffectOptions, BackgroundBlurStyleOptions, TranslateOptions, InputCounterOptions, ShadowOptions, CaretOffset, TextContentControllerOptions, ThemeColorMode, TouchTestInfo, TouchTestStrategy, TransitionEdge, TransitionEffect, TransitionEffectInternal, TransitionEffects, RotateOptions, ScaleOptions, AnimateParam, TransitionHierarchyStrategy, UICommonEvent, UICommonEventInternal, Callback_ClickEvent_Void, ClickEvent, ClickEventInternal, Callback_TouchEvent_Void, TouchEvent, TouchEventInternal, Callback_KeyEvent_Void, KeyEvent, KeyEventInternal, HoverEvent, HoverEventInternal, Callback_MouseEvent_Void, MouseEvent, MouseEventInternal, VisibleAreaEventOptions, SheetOptions, View, ViewInternal, Callback_KeyEvent_Boolean, Callback_Area_Area_Void, Callback_Array_TouchTestInfo_TouchResult, TouchResult, Callback_AxisEvent_Void, AxisEvent, AxisEventInternal, Callback_Boolean_HoverEvent_Void, Callback_CrownEvent_Void, CrownEvent, Callback_DismissContentCoverAction_Void, DismissContentCoverAction, Callback_DismissPopupAction_Void, DismissPopupAction, Callback_DismissSheetAction_Void, DismissSheetAction, Callback_DragEvent_String_Union_CustomBuilder_DragItemInfo, DragItemInfo, Callback_DragEvent_String_Void, Callback_FocusAxisEvent_Void, FocusAxisEvent, FocusAxisEventInternal, Callback_GestureInfo_BaseGestureEvent_GestureJudgeResult, Callback_HoverEvent_Void, Callback_Literal_Boolean_isVisible_Void, Literal_Boolean_isVisible, Callback_PreDragStatus_Void, Callback_SheetDismiss_Void, SheetDismiss, Callback_SheetType_Void, Callback_SpringBackAction_Void, SpringBackAction, Callback_TouchEvent_HitTestMode, BackgroundBrightnessOptions, BackgroundImageOptions, BlurOptions, ClickEffect, DateRange, DragInteractionOptions, DropOptions, ExpectedFrameRateRange, FocusMovement, ForegroundEffectOptions, GeometryTransitionOptions, InvertOptions, LinearGradient_common, Tuple_ResourceColor_Number, LinearGradientBlurOptions, FractionStop, LinearGradientOptions, LocalizedHorizontalAlignParam, LocalizedVerticalAlignParam, Measurable, MeasurableInternal, MeasureResult, SizeResult, MotionBlurAnchor, MotionBlurOptions, MotionPathOptions, OverlayOffset, PixelRoundPolicy, PixelStretchEffectOptions, PreviewConfiguration, RadialGradientOptions, Tuple_Length_Length, StateStyles, SweepGradientOptions, SystemAdaptiveOptions, TipsOptions, TouchObject, AlignRuleOption, HorizontalAlignOptions, VerticalAlignOptions, BlurStyleOptions, ContentCoverOptions, BindOptions, ContextMenuAnimationOptions, MultiShadowOptions, DragPreviewOptions, EventTarget, FadingEdgeOptions, BaseEvent, BaseEventInternal, ForegroundBlurStyleOptions, HistoricalPoint, LightSource, LocalizedAlignRuleOptions, MenuElement, OverlayOptions, PickerDialogButtonStyle, ReuseOptions, sharedTransitionOptions, SheetTitleOptions, TransitionOptions, BorderImageOption, CustomPopupOptions, Literal_ResourceColor_color, PointLightStyle, PopupMessageOptions, Type_SheetOptions_detents, ContextMenuOptions, BorderRadiusType, MenuOptions, PopupOptions, PopupButton, OnWillScrollCallback, ScrollResult, PopupMaskType, DividerStyle, BlendMode } from "./../common" +import { AccessibilityCallback, AccessibilityFocusCallback, GestureRecognizerJudgeBeginCallback, HoverCallback, OnDragEventCallback, OnMoveHandler, OnScrollCallback, PopupStateChangeCallback, ReuseIdCallback, ShouldBuiltInRecognizerParallelWithCallback, SizeChangeCallback, TransitionFinishCallback, VisibleAreaChangeCallback, AccessibilityHoverEvent, AccessibilityHoverEventInternal, AccessibilityRoleType, AccessibilitySamePageMode, AdaptiveColor, CommonMethod, BlurStyle, BlendApplyType, BlurStyleActivePolicy, PickerTextStyle, ChainStyle, ContentClipMode, DismissReason, DragBehavior, DragEvent, DragEventInternal, DragResult, Rectangle, DataSyncOptions, DraggingSizeChangeEffect, DragPreviewMode, DrawModifier, DrawModifierInternal, EffectEdge, EffectType, FinishCallbackType, GestureModifier, GestureModifierInternal, UIGestureEvent, ScrollableCommonMethod, ItemDragInfo, CustomBuilder, NestedScrollOptions, EdgeEffectOptions, HapticFeedbackMode, HoverModeAreaType, ICurve, ICurveInternal, KeyboardAvoidMode, LayoutPolicy, LayoutSafeAreaEdge, LayoutSafeAreaType, ChildrenMainSize, ChildrenMainSizeInternal, RectResult, MenuPolicy, MenuPreviewMode, ModalTransition, OutlineStyle, PixelMapMock, PixelMapMockInternal, PopupStateChangeParam, PreDragStatus, ProgressMask, ProgressMaskInternal, RepeatMode, SelectionOptions, SafeAreaEdge, SafeAreaType, ScrollSizeMode, TextDecorationOptions, TextContentControllerBase, TextContentControllerBaseInternal, ShadowStyle, ShadowType, SheetKeyboardAvoidMode, SheetMode, SheetSize, SheetType, SourceTool, SourceType, BackgroundEffectOptions, BackgroundBlurStyleOptions, TranslateOptions, InputCounterOptions, ShadowOptions, CaretOffset, TextContentControllerOptions, ThemeColorMode, TouchTestInfo, TouchTestStrategy, TransitionEdge, TransitionEffect, TransitionEffectInternal, TransitionEffects, RotateOptions, ScaleOptions, AnimateParam, TransitionHierarchyStrategy, UICommonEvent, UICommonEventInternal, Callback_ClickEvent_Void, ClickEvent, ClickEventInternal, Callback_TouchEvent_Void, TouchEvent, TouchEventInternal, Callback_KeyEvent_Void, KeyEvent, KeyEventInternal, HoverEvent, HoverEventInternal, Callback_MouseEvent_Void, MouseEvent, MouseEventInternal, VisibleAreaEventOptions, SheetOptions, View, ViewInternal, Callback_KeyEvent_Boolean, Callback_Area_Area_Void, Callback_Array_TouchTestInfo_TouchResult, TouchResult, Callback_AxisEvent_Void, AxisEvent, AxisEventInternal, Callback_Boolean_HoverEvent_Void, Callback_CrownEvent_Void, CrownEvent, Callback_DismissContentCoverAction_Void, DismissContentCoverAction, Callback_DismissPopupAction_Void, DismissPopupAction, Callback_DismissSheetAction_Void, DismissSheetAction, Callback_DragEvent_String_Union_CustomBuilder_DragItemInfo, DragItemInfo, Callback_DragEvent_String_Void, Callback_FocusAxisEvent_Void, FocusAxisEvent, FocusAxisEventInternal, Callback_GestureInfo_BaseGestureEvent_GestureJudgeResult, Callback_HoverEvent_Void, Callback_Literal_Boolean_isVisible_Void, Literal_Boolean_isVisible, Callback_PreDragStatus_Void, Callback_SheetDismiss_Void, SheetDismiss, Callback_SheetType_Void, Callback_SpringBackAction_Void, SpringBackAction, Callback_TouchEvent_HitTestMode, BackgroundBrightnessOptions, BackgroundImageOptions, BlurOptions, ClickEffect, DateRange, DragInteractionOptions, DropOptions, ExpectedFrameRateRange, FocusMovement, ForegroundEffectOptions, GeometryTransitionOptions, InvertOptions, LinearGradient_common, Tuple_ResourceColor_Number, LinearGradientBlurOptions, FractionStop, LinearGradientOptions, LocalizedHorizontalAlignParam, LocalizedVerticalAlignParam, Measurable, MeasurableInternal, MeasureResult, SizeResult, MotionBlurAnchor, MotionBlurOptions, MotionPathOptions, OverlayOffset, PixelRoundPolicy, PixelStretchEffectOptions, PreviewConfiguration, RadialGradientOptions, Tuple_Length_Length, StateStyles, SweepGradientOptions, SystemAdaptiveOptions, TipsOptions, TouchObject, AlignRuleOption, HorizontalAlignParam, VerticalAlignParam, BlurStyleOptions, ContentCoverOptions, BindOptions, ContextMenuAnimationOptions, MultiShadowOptions, DragPreviewOptions, EventTarget, FadingEdgeOptions, BaseEvent, BaseEventInternal, ForegroundBlurStyleOptions, HistoricalPoint, LightSource, LocalizedAlignRuleOptions, MenuElement, OverlayOptions, PickerDialogButtonStyle, ReuseOptions, sharedTransitionOptions, SheetTitleOptions, TransitionOptions, BorderImageOption, CustomPopupOptions, Literal_ResourceColor_color, PointLightStyle, PopupMessageOptions, Type_SheetOptions_detents, ContextMenuOptions, BorderRadiusType, MenuOptions, PopupOptions, PopupButton, OnWillScrollCallback, ScrollResult, PopupMaskType, DividerStyle, BlendMode } from "./../common" import { ButtonTriggerClickCallback, ButtonRole, ButtonStyleMode, ButtonType, ControlSize, ButtonOptions } from "./../button" import { Callback_Extender_OnFinish, Callback_Extender_OnProgress, DoubleAnimationParam } from "./../animationExtender" import { Callback_RangeUpdate, Callback_CreateItem, Context_getGroupDir_Callback, RestrictedWorker_onerror_Callback, RestrictedWorker_onexit_Callback, RestrictedWorker_onmessage_Callback, ComponentContent, ComponentContentInternal, UnifiedData, UnifiedDataInternal, SystemBarStyle, PointerStyle, Scene, SceneInternal, Context, ContextInternal, WorkerEventListener, WorkerEventListenerInternal, Event, ErrorEvent, MessageEvents, BaseContext, BaseContextInternal, PostMessageOptions, WorkerOptions, CustomColors, RestrictedWorker, RestrictedWorkerInternal, CustomTheme } from "./../arkui-custom" @@ -12598,59 +12598,59 @@ export class Deserializer extends DeserializerBase { readAlignRuleOption(): AlignRuleOption { let valueDeserializer : Deserializer = this const left_buf_runtimeType = (valueDeserializer.readInt8() as int32) - let left_buf : HorizontalAlignOptions | undefined + let left_buf : HorizontalAlignParam | undefined if ((RuntimeType.UNDEFINED) != (left_buf_runtimeType)) { const left_buf__anchor : string = (valueDeserializer.readString() as string) const left_buf__align : HorizontalAlign = TypeChecker.HorizontalAlign_FromNumeric(valueDeserializer.readInt32()) - left_buf = ({anchor: left_buf__anchor, align: left_buf__align} as HorizontalAlignOptions) + left_buf = ({anchor: left_buf__anchor, align: left_buf__align} as HorizontalAlignParam) } - const left_result : HorizontalAlignOptions | undefined = left_buf + const left_result : HorizontalAlignParam | undefined = left_buf const right_buf_runtimeType = (valueDeserializer.readInt8() as int32) - let right_buf : HorizontalAlignOptions | undefined + let right_buf : HorizontalAlignParam | undefined if ((RuntimeType.UNDEFINED) != (right_buf_runtimeType)) { const right_buf__anchor : string = (valueDeserializer.readString() as string) const right_buf__align : HorizontalAlign = TypeChecker.HorizontalAlign_FromNumeric(valueDeserializer.readInt32()) - right_buf = ({anchor: right_buf__anchor, align: right_buf__align} as HorizontalAlignOptions) + right_buf = ({anchor: right_buf__anchor, align: right_buf__align} as HorizontalAlignParam) } - const right_result : HorizontalAlignOptions | undefined = right_buf + const right_result : HorizontalAlignParam | undefined = right_buf const middle_buf_runtimeType = (valueDeserializer.readInt8() as int32) - let middle_buf : HorizontalAlignOptions | undefined + let middle_buf : HorizontalAlignParam | undefined if ((RuntimeType.UNDEFINED) != (middle_buf_runtimeType)) { const middle_buf__anchor : string = (valueDeserializer.readString() as string) const middle_buf__align : HorizontalAlign = TypeChecker.HorizontalAlign_FromNumeric(valueDeserializer.readInt32()) - middle_buf = ({anchor: middle_buf__anchor, align: middle_buf__align} as HorizontalAlignOptions) + middle_buf = ({anchor: middle_buf__anchor, align: middle_buf__align} as HorizontalAlignParam) } - const middle_result : HorizontalAlignOptions | undefined = middle_buf + const middle_result : HorizontalAlignParam | undefined = middle_buf const top_buf_runtimeType = (valueDeserializer.readInt8() as int32) - let top_buf : VerticalAlignOptions | undefined + let top_buf : VerticalAlignParam | undefined if ((RuntimeType.UNDEFINED) != (top_buf_runtimeType)) { const top_buf__anchor : string = (valueDeserializer.readString() as string) const top_buf__align : VerticalAlign = TypeChecker.VerticalAlign_FromNumeric(valueDeserializer.readInt32()) - top_buf = ({anchor: top_buf__anchor, align: top_buf__align} as VerticalAlignOptions) + top_buf = ({anchor: top_buf__anchor, align: top_buf__align} as VerticalAlignParam) } - const top_result : VerticalAlignOptions | undefined = top_buf + const top_result : VerticalAlignParam | undefined = top_buf const bottom_buf_runtimeType = (valueDeserializer.readInt8() as int32) - let bottom_buf : VerticalAlignOptions | undefined + let bottom_buf : VerticalAlignParam | undefined if ((RuntimeType.UNDEFINED) != (bottom_buf_runtimeType)) { const bottom_buf__anchor : string = (valueDeserializer.readString() as string) const bottom_buf__align : VerticalAlign = TypeChecker.VerticalAlign_FromNumeric(valueDeserializer.readInt32()) - bottom_buf = ({anchor: bottom_buf__anchor, align: bottom_buf__align} as VerticalAlignOptions) + bottom_buf = ({anchor: bottom_buf__anchor, align: bottom_buf__align} as VerticalAlignParam) } - const bottom_result : VerticalAlignOptions | undefined = bottom_buf + const bottom_result : VerticalAlignParam | undefined = bottom_buf const center_buf_runtimeType = (valueDeserializer.readInt8() as int32) - let center_buf : VerticalAlignOptions | undefined + let center_buf : VerticalAlignParam | undefined if ((RuntimeType.UNDEFINED) != (center_buf_runtimeType)) { const center_buf__anchor : string = (valueDeserializer.readString() as string) const center_buf__align : VerticalAlign = TypeChecker.VerticalAlign_FromNumeric(valueDeserializer.readInt32()) - center_buf = ({anchor: center_buf__anchor, align: center_buf__align} as VerticalAlignOptions) + center_buf = ({anchor: center_buf__anchor, align: center_buf__align} as VerticalAlignParam) } - const center_result : VerticalAlignOptions | undefined = center_buf + const center_result : VerticalAlignParam | undefined = center_buf const bias_buf_runtimeType = (valueDeserializer.readInt8() as int32) let bias_buf : Bias | undefined if ((RuntimeType.UNDEFINED) != (bias_buf_runtimeType)) diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/peers/Serializer.ts b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/peers/Serializer.ts index 1dd7c5f8efb..66e641ea3ea 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/peers/Serializer.ts +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/peers/Serializer.ts @@ -21,7 +21,7 @@ import { int32, int64, float32, unsafeCast } from "@koalaui/common" import { CallbackKind } from "./CallbackKind" import { TypeChecker } from "#components" import { CallbackTransformer } from "./CallbackTransformer" -import { SingleLengthDetent, DoubleLengthDetents, TripleLengthDetents, AccessibilityCallback, AccessibilityFocusCallback, Bindable, GestureRecognizerJudgeBeginCallback, HoverCallback, OnDragEventCallback, OnMoveHandler, OnScrollCallback, PopupStateChangeCallback, ReuseIdCallback, ShouldBuiltInRecognizerParallelWithCallback, SizeChangeCallback, TransitionFinishCallback, VisibleAreaChangeCallback, AccessibilityHoverEvent, AccessibilityHoverEventInternal, AccessibilityRoleType, AccessibilitySamePageMode, AdaptiveColor, CommonMethod, BlurStyle, BlendApplyType, BlurStyleActivePolicy, PickerTextStyle, ChainStyle, ContentClipMode, DismissReason, DragBehavior, DragEvent, DragEventInternal, DragResult, Rectangle, DataSyncOptions, DraggingSizeChangeEffect, DragPreviewMode, DrawModifier, DrawModifierInternal, EffectEdge, EffectType, FinishCallbackType, GestureModifier, GestureModifierInternal, UIGestureEvent, ScrollableCommonMethod, ItemDragInfo, CustomBuilder, NestedScrollOptions, EdgeEffectOptions, HapticFeedbackMode, HoverModeAreaType, ICurve, ICurveInternal, KeyboardAvoidMode, LayoutPolicy, LayoutSafeAreaEdge, LayoutSafeAreaType, ChildrenMainSize, ChildrenMainSizeInternal, RectResult, MenuPolicy, MenuPreviewMode, ModalTransition, OutlineStyle, PixelMapMock, PixelMapMockInternal, PopupStateChangeParam, PreDragStatus, ProgressMask, ProgressMaskInternal, RepeatMode, SelectionOptions, SafeAreaEdge, SafeAreaType, ScrollSizeMode, TextDecorationOptions, TextContentControllerBase, TextContentControllerBaseInternal, ShadowStyle, ShadowType, SheetKeyboardAvoidMode, SheetMode, SheetSize, SheetType, SourceTool, SourceType, BackgroundEffectOptions, BackgroundBlurStyleOptions, TranslateOptions, InputCounterOptions, ShadowOptions, CaretOffset, TextContentControllerOptions, ThemeColorMode, TouchTestInfo, TouchTestStrategy, TransitionEdge, TransitionEffect, TransitionEffectInternal, TransitionEffects, RotateOptions, ScaleOptions, AnimateParam, TransitionHierarchyStrategy, UICommonEvent, UICommonEventInternal, Callback_ClickEvent_Void, ClickEvent, ClickEventInternal, Callback_TouchEvent_Void, TouchEvent, TouchEventInternal, Callback_KeyEvent_Void, KeyEvent, KeyEventInternal, HoverEvent, HoverEventInternal, Callback_MouseEvent_Void, MouseEvent, MouseEventInternal, VisibleAreaEventOptions, SheetOptions, View, ViewInternal, Callback_KeyEvent_Boolean, Callback_Area_Area_Void, Callback_Array_TouchTestInfo_TouchResult, TouchResult, Callback_AxisEvent_Void, AxisEvent, AxisEventInternal, Callback_Boolean_HoverEvent_Void, Callback_CrownEvent_Void, CrownEvent, Callback_DismissContentCoverAction_Void, DismissContentCoverAction, Callback_DismissPopupAction_Void, DismissPopupAction, Callback_DismissSheetAction_Void, DismissSheetAction, Callback_DragEvent_String_Union_CustomBuilder_DragItemInfo, DragItemInfo, Callback_DragEvent_String_Void, Callback_FocusAxisEvent_Void, FocusAxisEvent, FocusAxisEventInternal, Callback_GestureInfo_BaseGestureEvent_GestureJudgeResult, Callback_HoverEvent_Void, Callback_Literal_Boolean_isVisible_Void, Literal_Boolean_isVisible, Callback_PreDragStatus_Void, Callback_SheetDismiss_Void, SheetDismiss, Callback_SheetType_Void, Callback_SpringBackAction_Void, SpringBackAction, Callback_TouchEvent_HitTestMode, BackgroundBrightnessOptions, BackgroundImageOptions, BlurOptions, ClickEffect, DateRange, DragInteractionOptions, DropOptions, ExpectedFrameRateRange, FocusMovement, ForegroundEffectOptions, GeometryTransitionOptions, InvertOptions, LinearGradient_common, Tuple_ResourceColor_Number, LinearGradientBlurOptions, FractionStop, LinearGradientOptions, LocalizedHorizontalAlignParam, LocalizedVerticalAlignParam, Measurable, MeasurableInternal, MeasureResult, SizeResult, MotionBlurAnchor, MotionBlurOptions, MotionPathOptions, OverlayOffset, PixelRoundPolicy, PixelStretchEffectOptions, PreviewConfiguration, RadialGradientOptions, Tuple_Length_Length, StateStyles, SweepGradientOptions, SystemAdaptiveOptions, TipsOptions, TouchObject, AlignRuleOption, HorizontalAlignOptions, VerticalAlignOptions, BlurStyleOptions, ContentCoverOptions, BindOptions, ContextMenuAnimationOptions, MultiShadowOptions, DragPreviewOptions, EventTarget, FadingEdgeOptions, BaseEvent, BaseEventInternal, ForegroundBlurStyleOptions, HistoricalPoint, LightSource, LocalizedAlignRuleOptions, MenuElement, OverlayOptions, PickerDialogButtonStyle, ReuseOptions, sharedTransitionOptions, SheetTitleOptions, TransitionOptions, BorderImageOption, CustomPopupOptions, Literal_ResourceColor_color, PointLightStyle, PopupMessageOptions, Type_SheetOptions_detents, ContextMenuOptions, BorderRadiusType, MenuOptions, PopupOptions, Literal_String_value_Callback_Void_action, ScrollResult, PopupMaskType, DividerStyle, BlendMode, PopupButton } from "./../common" +import { SingleLengthDetent, DoubleLengthDetents, TripleLengthDetents, AccessibilityCallback, AccessibilityFocusCallback, Bindable, GestureRecognizerJudgeBeginCallback, HoverCallback, OnDragEventCallback, OnMoveHandler, OnScrollCallback, PopupStateChangeCallback, ReuseIdCallback, ShouldBuiltInRecognizerParallelWithCallback, SizeChangeCallback, TransitionFinishCallback, VisibleAreaChangeCallback, AccessibilityHoverEvent, AccessibilityHoverEventInternal, AccessibilityRoleType, AccessibilitySamePageMode, AdaptiveColor, CommonMethod, BlurStyle, BlendApplyType, BlurStyleActivePolicy, PickerTextStyle, ChainStyle, ContentClipMode, DismissReason, DragBehavior, DragEvent, DragEventInternal, DragResult, Rectangle, DataSyncOptions, DraggingSizeChangeEffect, DragPreviewMode, DrawModifier, DrawModifierInternal, EffectEdge, EffectType, FinishCallbackType, GestureModifier, GestureModifierInternal, UIGestureEvent, ScrollableCommonMethod, ItemDragInfo, CustomBuilder, NestedScrollOptions, EdgeEffectOptions, HapticFeedbackMode, HoverModeAreaType, ICurve, ICurveInternal, KeyboardAvoidMode, LayoutPolicy, LayoutSafeAreaEdge, LayoutSafeAreaType, ChildrenMainSize, ChildrenMainSizeInternal, RectResult, MenuPolicy, MenuPreviewMode, ModalTransition, OutlineStyle, PixelMapMock, PixelMapMockInternal, PopupStateChangeParam, PreDragStatus, ProgressMask, ProgressMaskInternal, RepeatMode, SelectionOptions, SafeAreaEdge, SafeAreaType, ScrollSizeMode, TextDecorationOptions, TextContentControllerBase, TextContentControllerBaseInternal, ShadowStyle, ShadowType, SheetKeyboardAvoidMode, SheetMode, SheetSize, SheetType, SourceTool, SourceType, BackgroundEffectOptions, BackgroundBlurStyleOptions, TranslateOptions, InputCounterOptions, ShadowOptions, CaretOffset, TextContentControllerOptions, ThemeColorMode, TouchTestInfo, TouchTestStrategy, TransitionEdge, TransitionEffect, TransitionEffectInternal, TransitionEffects, RotateOptions, ScaleOptions, AnimateParam, TransitionHierarchyStrategy, UICommonEvent, UICommonEventInternal, Callback_ClickEvent_Void, ClickEvent, ClickEventInternal, Callback_TouchEvent_Void, TouchEvent, TouchEventInternal, Callback_KeyEvent_Void, KeyEvent, KeyEventInternal, HoverEvent, HoverEventInternal, Callback_MouseEvent_Void, MouseEvent, MouseEventInternal, VisibleAreaEventOptions, SheetOptions, View, ViewInternal, Callback_KeyEvent_Boolean, Callback_Area_Area_Void, Callback_Array_TouchTestInfo_TouchResult, TouchResult, Callback_AxisEvent_Void, AxisEvent, AxisEventInternal, Callback_Boolean_HoverEvent_Void, Callback_CrownEvent_Void, CrownEvent, Callback_DismissContentCoverAction_Void, DismissContentCoverAction, Callback_DismissPopupAction_Void, DismissPopupAction, Callback_DismissSheetAction_Void, DismissSheetAction, Callback_DragEvent_String_Union_CustomBuilder_DragItemInfo, DragItemInfo, Callback_DragEvent_String_Void, Callback_FocusAxisEvent_Void, FocusAxisEvent, FocusAxisEventInternal, Callback_GestureInfo_BaseGestureEvent_GestureJudgeResult, Callback_HoverEvent_Void, Callback_Literal_Boolean_isVisible_Void, Literal_Boolean_isVisible, Callback_PreDragStatus_Void, Callback_SheetDismiss_Void, SheetDismiss, Callback_SheetType_Void, Callback_SpringBackAction_Void, SpringBackAction, Callback_TouchEvent_HitTestMode, BackgroundBrightnessOptions, BackgroundImageOptions, BlurOptions, ClickEffect, DateRange, DragInteractionOptions, DropOptions, ExpectedFrameRateRange, FocusMovement, ForegroundEffectOptions, GeometryTransitionOptions, InvertOptions, LinearGradient_common, Tuple_ResourceColor_Number, LinearGradientBlurOptions, FractionStop, LinearGradientOptions, LocalizedHorizontalAlignParam, LocalizedVerticalAlignParam, Measurable, MeasurableInternal, MeasureResult, SizeResult, MotionBlurAnchor, MotionBlurOptions, MotionPathOptions, OverlayOffset, PixelRoundPolicy, PixelStretchEffectOptions, PreviewConfiguration, RadialGradientOptions, Tuple_Length_Length, StateStyles, SweepGradientOptions, SystemAdaptiveOptions, TipsOptions, TouchObject, AlignRuleOption, HorizontalAlignParam, VerticalAlignParam, BlurStyleOptions, ContentCoverOptions, BindOptions, ContextMenuAnimationOptions, MultiShadowOptions, DragPreviewOptions, EventTarget, FadingEdgeOptions, BaseEvent, BaseEventInternal, ForegroundBlurStyleOptions, HistoricalPoint, LightSource, LocalizedAlignRuleOptions, MenuElement, OverlayOptions, PickerDialogButtonStyle, ReuseOptions, sharedTransitionOptions, SheetTitleOptions, TransitionOptions, BorderImageOption, CustomPopupOptions, Literal_ResourceColor_color, PointLightStyle, PopupMessageOptions, Type_SheetOptions_detents, ContextMenuOptions, BorderRadiusType, MenuOptions, PopupOptions, Literal_String_value_Callback_Void_action, ScrollResult, PopupMaskType, DividerStyle, BlendMode, PopupButton } from "./../common" import { ButtonTriggerClickCallback, ButtonRole, ButtonStyleMode, ButtonType, ControlSize, ButtonOptions } from "./../button" import { Callback_Extender_OnFinish, Callback_Extender_OnProgress, DoubleAnimationParam } from "./../animationExtender" import { Callback_RangeUpdate, Context_getGroupDir_Callback, RestrictedWorker_onerror_Callback, RestrictedWorker_onexit_Callback, RestrictedWorker_onmessage_Callback, ComponentContent, ComponentContentInternal, UnifiedData, UnifiedDataInternal, SystemBarStyle, PointerStyle, Scene, SceneInternal, Context, ContextInternal, WorkerEventListener, WorkerEventListenerInternal, Event, ErrorEvent, MessageEvents, BaseContext, BaseContextInternal, PostMessageOptions, WorkerOptions, CustomColors, RestrictedWorker, RestrictedWorkerInternal, CustomTheme } from "./../arkui-custom" diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/ts/type_check.ts b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/ts/type_check.ts index f51ee617f08..81915e0d0fd 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/ts/type_check.ts +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/ts/type_check.ts @@ -19,7 +19,7 @@ import { KBoolean, KStringPtr, NativeBuffer, MaterializedBase } from "@koalaui/interop" import { int32 } from "@koalaui/common" import { AccessibilityHoverType, Alignment, AnimationStatus, AppRotation, ArrowPointPosition, Axis, AxisAction, AxisModel, BarState, BorderStyle, CheckBoxShape, ClickEffectLevel, Color, ColoringStrategy, CopyOptions, CrownAction, CrownSensitivity, Curve, DialogButtonStyle, Direction, DividerMode, Edge, EdgeEffect, EllipsisMode, EmbeddedType, FillMode, FlexAlign, FlexDirection, FlexWrap, FocusDrawLevel, FoldStatus, FontStyle, FontWeight, FunctionKey, GradientDirection, HeightBreakpoint, HitTestMode, HorizontalAlign, HoverEffect, IlluminatedType, ImageFit, ImageRepeat, ImageSize, ImageSpanAlignment, InteractionHand, ItemAlign, KeySource, KeyType, LineBreakStrategy, LineCapStyle, LineJoinStyle, MarqueeUpdateStrategy, ModifierKey, MouseAction, MouseButton, NestedScrollMode, ObscuredReasons, OptionWidthMode, PageFlipMode, PixelRoundCalcPolicy, PixelRoundMode, Placement, PlayMode, RelateType, RenderFit, ResponseType, ScrollSource, TextAlign, SharedTransitionEffectType, TextOverflow, TextContentStyle, TextHeightAdaptivePolicy, WordBreak, TextCase, TextSelectableMode, TextDecorationStyle, TextDecorationType, TitleHeight, TouchType, TransitionType, VerticalAlign, Visibility, Week, WidthBreakpoint, XComponentType } from "./../enums" -import { AccessibilityRoleType, AccessibilitySamePageMode, AdaptiveColor, CommonMethod, BlurStyle, BlendApplyType, BlurStyleActivePolicy, PickerTextStyle, ChainStyle, ContentClipMode, DismissReason, DragBehavior, DragEvent, DragResult, Rectangle, DataSyncOptions, DraggingSizeChangeEffect, DragPreviewMode, DrawModifier, EffectEdge, EffectType, FinishCallbackType, GestureModifier, UIGestureEvent, ScrollableCommonMethod, ItemDragInfo, CustomBuilder, NestedScrollOptions, EdgeEffectOptions, HapticFeedbackMode, HoverModeAreaType, ICurve, KeyboardAvoidMode, LayoutPolicy, LayoutSafeAreaEdge, LayoutSafeAreaType, ChildrenMainSize, RectResult, Literal_Boolean_isVisible, MenuPolicy, MenuPreviewMode, ModalTransition, OutlineStyle, PixelMapMock, PopupStateChangeParam, PreDragStatus, ProgressMask, RepeatMode, SelectionOptions, SafeAreaEdge, SafeAreaType, ScrollSizeMode, TextDecorationOptions, TextContentControllerBase, ShadowStyle, ShadowType, SheetKeyboardAvoidMode, SheetMode, SheetSize, SheetType, SourceTool, SourceType, BackgroundEffectOptions, BackgroundBlurStyleOptions, TranslateOptions, InputCounterOptions, ShadowOptions, CaretOffset, TextContentControllerOptions, ThemeColorMode, TouchTestInfo, TouchTestStrategy, TransitionEdge, TransitionEffect, TransitionEffects, RotateOptions, ScaleOptions, AnimateParam, TransitionHierarchyStrategy, UICommonEvent, Callback_ClickEvent_Void, ClickEvent, Callback_TouchEvent_Void, TouchEvent, Callback_KeyEvent_Void, KeyEvent, HoverCallback, HoverEvent, Callback_MouseEvent_Void, MouseEvent, SizeChangeCallback, VisibleAreaEventOptions, VisibleAreaChangeCallback, SheetOptions, View, Callback_KeyEvent_Boolean, BackgroundBrightnessOptions, BackgroundImageOptions, BlurOptions, ClickEffect, CrownEvent, DateRange, DismissContentCoverAction, DismissPopupAction, DismissSheetAction, DragInteractionOptions, DragItemInfo, DropOptions, ExpectedFrameRateRange, FocusMovement, ForegroundEffectOptions, GeometryTransitionOptions, InvertOptions, Tuple_ResourceColor_Number, LinearGradient_common, FractionStop, LinearGradientBlurOptions, LinearGradientOptions, Literal_Alignment_align, Literal_Number_offset_span, HorizontalAlignOptions, VerticalAlignOptions, Literal_String_value_Callback_Void_action, Literal_TransitionEffect_appear_disappear, LocalizedHorizontalAlignParam, LocalizedVerticalAlignParam, Measurable, MeasureResult, SizeResult, MotionBlurAnchor, MotionBlurOptions, MotionPathOptions, OverlayOffset, PixelRoundPolicy, PixelStretchEffectOptions, PreviewConfiguration, RadialGradientOptions, Tuple_Length_Length, SheetDismiss, SpringBackAction, StateStyles, SweepGradientOptions, SystemAdaptiveOptions, TipsOptions, TouchObject, TouchResult, AlignRuleOption, BlurStyleOptions, ContentCoverOptions, BindOptions, Callback_DismissContentCoverAction_Void, ContextMenuAnimationOptions, MultiShadowOptions, DragPreviewOptions, EventTarget, FadingEdgeOptions, FocusAxisEvent, BaseEvent, ForegroundBlurStyleOptions, HistoricalPoint, LightSource, Literal_ResourceColor_color, Literal_Union_Number_Literal_Number_offset_span_lg_md_sm_xs, LocalizedAlignRuleOptions, MenuElement, OverlayOptions, PickerDialogButtonStyle, ReuseOptions, ReuseIdCallback, sharedTransitionOptions, SheetTitleOptions, TransitionOptions, AccessibilityHoverEvent, AxisEvent, BorderImageOption, CustomPopupOptions, Callback_Literal_Boolean_isVisible_Void, Callback_DismissPopupAction_Void, PointLightStyle, PopupMessageOptions, Type_SheetOptions_detents, Callback_SheetDismiss_Void, Callback_DismissSheetAction_Void, Callback_SpringBackAction_Void, Callback_SheetType_Void, ContextMenuOptions, BorderRadiusType, MenuOptions, PopupOptions, NavDestinationInfo, NavigationInfo, RouterPageInfo, Theme, PromptActionDialogController, LayoutChild, Layoutable, DividerStyle, BlendMode } from "./../common" +import { AccessibilityRoleType, AccessibilitySamePageMode, AdaptiveColor, CommonMethod, BlurStyle, BlendApplyType, BlurStyleActivePolicy, PickerTextStyle, ChainStyle, ContentClipMode, DismissReason, DragBehavior, DragEvent, DragResult, Rectangle, DataSyncOptions, DraggingSizeChangeEffect, DragPreviewMode, DrawModifier, EffectEdge, EffectType, FinishCallbackType, GestureModifier, UIGestureEvent, ScrollableCommonMethod, ItemDragInfo, CustomBuilder, NestedScrollOptions, EdgeEffectOptions, HapticFeedbackMode, HoverModeAreaType, ICurve, KeyboardAvoidMode, LayoutPolicy, LayoutSafeAreaEdge, LayoutSafeAreaType, ChildrenMainSize, RectResult, Literal_Boolean_isVisible, MenuPolicy, MenuPreviewMode, ModalTransition, OutlineStyle, PixelMapMock, PopupStateChangeParam, PreDragStatus, ProgressMask, RepeatMode, SelectionOptions, SafeAreaEdge, SafeAreaType, ScrollSizeMode, TextDecorationOptions, TextContentControllerBase, ShadowStyle, ShadowType, SheetKeyboardAvoidMode, SheetMode, SheetSize, SheetType, SourceTool, SourceType, BackgroundEffectOptions, BackgroundBlurStyleOptions, TranslateOptions, InputCounterOptions, ShadowOptions, CaretOffset, TextContentControllerOptions, ThemeColorMode, TouchTestInfo, TouchTestStrategy, TransitionEdge, TransitionEffect, TransitionEffects, RotateOptions, ScaleOptions, AnimateParam, TransitionHierarchyStrategy, UICommonEvent, Callback_ClickEvent_Void, ClickEvent, Callback_TouchEvent_Void, TouchEvent, Callback_KeyEvent_Void, KeyEvent, HoverCallback, HoverEvent, Callback_MouseEvent_Void, MouseEvent, SizeChangeCallback, VisibleAreaEventOptions, VisibleAreaChangeCallback, SheetOptions, View, Callback_KeyEvent_Boolean, BackgroundBrightnessOptions, BackgroundImageOptions, BlurOptions, ClickEffect, CrownEvent, DateRange, DismissContentCoverAction, DismissPopupAction, DismissSheetAction, DragInteractionOptions, DragItemInfo, DropOptions, ExpectedFrameRateRange, FocusMovement, ForegroundEffectOptions, GeometryTransitionOptions, InvertOptions, Tuple_ResourceColor_Number, LinearGradient_common, FractionStop, LinearGradientBlurOptions, LinearGradientOptions, Literal_Alignment_align, Literal_Number_offset_span, HorizontalAlignParam, VerticalAlignParam, Literal_String_value_Callback_Void_action, Literal_TransitionEffect_appear_disappear, LocalizedHorizontalAlignParam, LocalizedVerticalAlignParam, Measurable, MeasureResult, SizeResult, MotionBlurAnchor, MotionBlurOptions, MotionPathOptions, OverlayOffset, PixelRoundPolicy, PixelStretchEffectOptions, PreviewConfiguration, RadialGradientOptions, Tuple_Length_Length, SheetDismiss, SpringBackAction, StateStyles, SweepGradientOptions, SystemAdaptiveOptions, TipsOptions, TouchObject, TouchResult, AlignRuleOption, BlurStyleOptions, ContentCoverOptions, BindOptions, Callback_DismissContentCoverAction_Void, ContextMenuAnimationOptions, MultiShadowOptions, DragPreviewOptions, EventTarget, FadingEdgeOptions, FocusAxisEvent, BaseEvent, ForegroundBlurStyleOptions, HistoricalPoint, LightSource, Literal_ResourceColor_color, Literal_Union_Number_Literal_Number_offset_span_lg_md_sm_xs, LocalizedAlignRuleOptions, MenuElement, OverlayOptions, PickerDialogButtonStyle, ReuseOptions, ReuseIdCallback, sharedTransitionOptions, SheetTitleOptions, TransitionOptions, AccessibilityHoverEvent, AxisEvent, BorderImageOption, CustomPopupOptions, Callback_Literal_Boolean_isVisible_Void, Callback_DismissPopupAction_Void, PointLightStyle, PopupMessageOptions, Type_SheetOptions_detents, Callback_SheetDismiss_Void, Callback_DismissSheetAction_Void, Callback_SpringBackAction_Void, Callback_SheetType_Void, ContextMenuOptions, BorderRadiusType, MenuOptions, PopupOptions, NavDestinationInfo, NavigationInfo, RouterPageInfo, Theme, PromptActionDialogController, LayoutChild, Layoutable, DividerStyle, BlendMode } from "./../common" import { Affinity, TextBox, LineMetrics, RunMetrics, TextDirection } from "./../arkui-graphics-text" import { AlphabetIndexerAttribute, Callback_Number_Void, OnAlphabetIndexerSelectCallback, OnAlphabetIndexerRequestPopupDataCallback, OnAlphabetIndexerPopupSelectCallback, IndexerAlign, Callback_Opt_Number_Void, AlphabetIndexerOptions } from "./../alphabetIndexer" import { ResourceColor, Font, Position, Length, SizeOptions, Offset, ColorFilter, ResourceStr, Dimension, LengthConstrain, VoidCallback, DividerStyleOptions, ConstraintSizeOptions, AccessibilityOptions, Bias, BorderRadiuses, ChainWeightOptions, DirectionalEdgesT, EdgeOutlineStyles, EdgeOutlineWidths, EdgeWidths, OutlineRadiuses, Padding, VP, Area, EdgeColors, PX, LPX, LocalizedBorderRadiuses, LocalizedEdgeColors, LocalizedEdges, LocalizedEdgeWidths, LocalizedPadding, LocalizedPosition, MarkStyle, BorderOptions, OutlineOptions, EdgeStyles } from "./../units" @@ -8333,7 +8333,7 @@ export class TypeChecker { throw new Error("Can not discriminate value typeof Literal_ResourceColor_color") } } - static isHorizontalAlignOptions(value: Object | string | number | undefined | boolean, duplicated_anchor: boolean, duplicated_align: boolean): boolean { + static isHorizontalAlignParam(value: Object | string | number | undefined | boolean, duplicated_anchor: boolean, duplicated_align: boolean): boolean { if ((!duplicated_anchor) && (value?.hasOwnProperty("anchor"))) { return true } @@ -8341,10 +8341,10 @@ export class TypeChecker { return true } else { - throw new Error("Can not discriminate value typeof HorizontalAlignOptions") + throw new Error("Can not discriminate value typeof HorizontalAlignParam") } } - static isVerticalAlignOptions(value: Object | string | number | undefined | boolean, duplicated_anchor: boolean, duplicated_align: boolean): boolean { + static isVerticalAlignParam(value: Object | string | number | undefined | boolean, duplicated_anchor: boolean, duplicated_align: boolean): boolean { if ((!duplicated_anchor) && (value?.hasOwnProperty("anchor"))) { return true } @@ -8352,7 +8352,7 @@ export class TypeChecker { return true } else { - throw new Error("Can not discriminate value typeof VerticalAlignOptions") + throw new Error("Can not discriminate value typeof VerticalAlignParam") } } static isLiteral_String_baseUrl_data_encoding_historyUrl_mimeType(value: Object | string | number | undefined | boolean, duplicated_data: boolean, duplicated_mimeType: boolean, duplicated_encoding: boolean, duplicated_baseUrl: boolean, duplicated_historyUrl: boolean): boolean { diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala/framework/native/src/generated/Serializers.h b/frameworks/bridge/arkts_frontend/koala_projects/arkoala/framework/native/src/generated/Serializers.h index 28e1ca18848..e9d79ae841d 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala/framework/native/src/generated/Serializers.h +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala/framework/native/src/generated/Serializers.h @@ -36006,12 +36006,12 @@ inline Ark_RuntimeType runtimeType(const Opt_Literal_Object_object__String_name_ return (value.tag != INTEROP_TAG_UNDEFINED) ? (INTEROP_RUNTIME_OBJECT) : (INTEROP_RUNTIME_UNDEFINED); } template <> -inline Ark_RuntimeType runtimeType(const Ark_HorizontalAlignOptions& value) +inline Ark_RuntimeType runtimeType(const Ark_HorizontalAlignParam& value) { return INTEROP_RUNTIME_OBJECT; } template <> -inline void WriteToString(std::string* result, const Ark_HorizontalAlignOptions* value) { +inline void WriteToString(std::string* result, const Ark_HorizontalAlignParam* value) { result->append("{"); // Ark_String anchor result->append(".anchor="); @@ -36023,7 +36023,7 @@ inline void WriteToString(std::string* result, const Ark_HorizontalAlignOptions* result->append("}"); } template <> -inline void WriteToString(std::string* result, const Opt_HorizontalAlignOptions* value) { +inline void WriteToString(std::string* result, const Opt_HorizontalAlignParam* value) { result->append("{.tag="); result->append(tagNameExact((Ark_Tag)(value->tag))); result->append(", .value="); @@ -36036,17 +36036,17 @@ inline void WriteToString(std::string* result, const Opt_HorizontalAlignOptions* result->append("}"); } template <> -inline Ark_RuntimeType runtimeType(const Opt_HorizontalAlignOptions& value) +inline Ark_RuntimeType runtimeType(const Opt_HorizontalAlignParam& value) { return (value.tag != INTEROP_TAG_UNDEFINED) ? (INTEROP_RUNTIME_OBJECT) : (INTEROP_RUNTIME_UNDEFINED); } template <> -inline Ark_RuntimeType runtimeType(const Ark_VerticalAlignOptions& value) +inline Ark_RuntimeType runtimeType(const Ark_VerticalAlignParam& value) { return INTEROP_RUNTIME_OBJECT; } template <> -inline void WriteToString(std::string* result, const Ark_VerticalAlignOptions* value) { +inline void WriteToString(std::string* result, const Ark_VerticalAlignParam* value) { result->append("{"); // Ark_String anchor result->append(".anchor="); @@ -36058,7 +36058,7 @@ inline void WriteToString(std::string* result, const Ark_VerticalAlignOptions* v result->append("}"); } template <> -inline void WriteToString(std::string* result, const Opt_VerticalAlignOptions* value) { +inline void WriteToString(std::string* result, const Opt_VerticalAlignParam* value) { result->append("{.tag="); result->append(tagNameExact((Ark_Tag)(value->tag))); result->append(", .value="); @@ -36071,7 +36071,7 @@ inline void WriteToString(std::string* result, const Opt_VerticalAlignOptions* v result->append("}"); } template <> -inline Ark_RuntimeType runtimeType(const Opt_VerticalAlignOptions& value) +inline Ark_RuntimeType runtimeType(const Opt_VerticalAlignParam& value) { return (value.tag != INTEROP_TAG_UNDEFINED) ? (INTEROP_RUNTIME_OBJECT) : (INTEROP_RUNTIME_UNDEFINED); } @@ -47939,26 +47939,26 @@ inline Ark_RuntimeType runtimeType(const Ark_AlignRuleOption& value) template <> inline void WriteToString(std::string* result, const Ark_AlignRuleOption* value) { result->append("{"); - // Ark_HorizontalAlignOptions left + // Ark_HorizontalAlignParam left result->append(".left="); WriteToString(result, &value->left); - // Ark_HorizontalAlignOptions right + // Ark_HorizontalAlignParam right result->append(", "); result->append(".right="); WriteToString(result, &value->right); - // Ark_HorizontalAlignOptions middle + // Ark_HorizontalAlignParam middle result->append(", "); result->append(".middle="); WriteToString(result, &value->middle); - // Ark_VerticalAlignOptions top + // Ark_VerticalAlignParam top result->append(", "); result->append(".top="); WriteToString(result, &value->top); - // Ark_VerticalAlignOptions bottom + // Ark_VerticalAlignParam bottom result->append(", "); result->append(".bottom="); WriteToString(result, &value->bottom); - // Ark_VerticalAlignOptions center + // Ark_VerticalAlignParam center result->append(", "); result->append(".center="); WriteToString(result, &value->center); @@ -96658,66 +96658,66 @@ class Deserializer : public DeserializerBase { Ark_AlignRuleOption value = {}; Deserializer& valueDeserializer = *this; const auto left_buf_runtimeType = static_cast(valueDeserializer.readInt8()); - Opt_HorizontalAlignOptions left_buf = {}; + Opt_HorizontalAlignParam left_buf = {}; left_buf.tag = left_buf_runtimeType == INTEROP_RUNTIME_UNDEFINED ? INTEROP_TAG_UNDEFINED : INTEROP_TAG_OBJECT; if ((INTEROP_RUNTIME_UNDEFINED) != (left_buf_runtimeType)) { - Ark_HorizontalAlignOptions left_buf_ = {}; + Ark_HorizontalAlignParam left_buf_ = {}; left_buf_.anchor = static_cast(valueDeserializer.readString()); left_buf_.align = static_cast(valueDeserializer.readInt32()); left_buf.value = left_buf_; } value.left = left_buf; const auto right_buf_runtimeType = static_cast(valueDeserializer.readInt8()); - Opt_HorizontalAlignOptions right_buf = {}; + Opt_HorizontalAlignParam right_buf = {}; right_buf.tag = right_buf_runtimeType == INTEROP_RUNTIME_UNDEFINED ? INTEROP_TAG_UNDEFINED : INTEROP_TAG_OBJECT; if ((INTEROP_RUNTIME_UNDEFINED) != (right_buf_runtimeType)) { - Ark_HorizontalAlignOptions right_buf_ = {}; + Ark_HorizontalAlignParam right_buf_ = {}; right_buf_.anchor = static_cast(valueDeserializer.readString()); right_buf_.align = static_cast(valueDeserializer.readInt32()); right_buf.value = right_buf_; } value.right = right_buf; const auto middle_buf_runtimeType = static_cast(valueDeserializer.readInt8()); - Opt_HorizontalAlignOptions middle_buf = {}; + Opt_HorizontalAlignParam middle_buf = {}; middle_buf.tag = middle_buf_runtimeType == INTEROP_RUNTIME_UNDEFINED ? INTEROP_TAG_UNDEFINED : INTEROP_TAG_OBJECT; if ((INTEROP_RUNTIME_UNDEFINED) != (middle_buf_runtimeType)) { - Ark_HorizontalAlignOptions middle_buf_ = {}; + Ark_HorizontalAlignParam middle_buf_ = {}; middle_buf_.anchor = static_cast(valueDeserializer.readString()); middle_buf_.align = static_cast(valueDeserializer.readInt32()); middle_buf.value = middle_buf_; } value.middle = middle_buf; const auto top_buf_runtimeType = static_cast(valueDeserializer.readInt8()); - Opt_VerticalAlignOptions top_buf = {}; + Opt_VerticalAlignParam top_buf = {}; top_buf.tag = top_buf_runtimeType == INTEROP_RUNTIME_UNDEFINED ? INTEROP_TAG_UNDEFINED : INTEROP_TAG_OBJECT; if ((INTEROP_RUNTIME_UNDEFINED) != (top_buf_runtimeType)) { - Ark_VerticalAlignOptions top_buf_ = {}; + Ark_VerticalAlignParam top_buf_ = {}; top_buf_.anchor = static_cast(valueDeserializer.readString()); top_buf_.align = static_cast(valueDeserializer.readInt32()); top_buf.value = top_buf_; } value.top = top_buf; const auto bottom_buf_runtimeType = static_cast(valueDeserializer.readInt8()); - Opt_VerticalAlignOptions bottom_buf = {}; + Opt_VerticalAlignParam bottom_buf = {}; bottom_buf.tag = bottom_buf_runtimeType == INTEROP_RUNTIME_UNDEFINED ? INTEROP_TAG_UNDEFINED : INTEROP_TAG_OBJECT; if ((INTEROP_RUNTIME_UNDEFINED) != (bottom_buf_runtimeType)) { - Ark_VerticalAlignOptions bottom_buf_ = {}; + Ark_VerticalAlignParam bottom_buf_ = {}; bottom_buf_.anchor = static_cast(valueDeserializer.readString()); bottom_buf_.align = static_cast(valueDeserializer.readInt32()); bottom_buf.value = bottom_buf_; } value.bottom = bottom_buf; const auto center_buf_runtimeType = static_cast(valueDeserializer.readInt8()); - Opt_VerticalAlignOptions center_buf = {}; + Opt_VerticalAlignParam center_buf = {}; center_buf.tag = center_buf_runtimeType == INTEROP_RUNTIME_UNDEFINED ? INTEROP_TAG_UNDEFINED : INTEROP_TAG_OBJECT; if ((INTEROP_RUNTIME_UNDEFINED) != (center_buf_runtimeType)) { - Ark_VerticalAlignOptions center_buf_ = {}; + Ark_VerticalAlignParam center_buf_ = {}; center_buf_.anchor = static_cast(valueDeserializer.readString()); center_buf_.align = static_cast(valueDeserializer.readInt32()); center_buf.value = center_buf_; diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala/framework/native/src/generated/arkoala_api_generated.h b/frameworks/bridge/arkts_frontend/koala_projects/arkoala/framework/native/src/generated/arkoala_api_generated.h index 9364902e5b6..18be6b4e37f 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala/framework/native/src/generated/arkoala_api_generated.h +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala/framework/native/src/generated/arkoala_api_generated.h @@ -1975,10 +1975,10 @@ typedef struct Ark_Literal_Number_surfaceHeight_surfaceWidth Ark_Literal_Number_ typedef struct Opt_Literal_Number_surfaceHeight_surfaceWidth Opt_Literal_Number_surfaceHeight_surfaceWidth; typedef struct Ark_Literal_Object_object__String_name_Array_String_methodList Ark_Literal_Object_object__String_name_Array_String_methodList; typedef struct Opt_Literal_Object_object__String_name_Array_String_methodList Opt_Literal_Object_object__String_name_Array_String_methodList; -typedef struct Ark_HorizontalAlignOptions Ark_HorizontalAlignOptions; -typedef struct Opt_HorizontalAlignOptions Opt_HorizontalAlignOptions; -typedef struct Ark_VerticalAlignOptions Ark_VerticalAlignOptions; -typedef struct Opt_VerticalAlignOptions Opt_VerticalAlignOptions; +typedef struct Ark_HorizontalAlignParam Ark_HorizontalAlignParam; +typedef struct Opt_HorizontalAlignParam Opt_HorizontalAlignParam; +typedef struct Ark_VerticalAlignParam Ark_VerticalAlignParam; +typedef struct Opt_VerticalAlignParam Opt_VerticalAlignParam; typedef struct Ark_Literal_String_baseUrl_data_encoding_historyUrl_mimeType Ark_Literal_String_baseUrl_data_encoding_historyUrl_mimeType; typedef struct Opt_Literal_String_baseUrl_data_encoding_historyUrl_mimeType Opt_Literal_String_baseUrl_data_encoding_historyUrl_mimeType; typedef struct Ark_Literal_String_plainText Ark_Literal_String_plainText; @@ -13026,22 +13026,22 @@ typedef struct Opt_Literal_Object_object__String_name_Array_String_methodList { Ark_Tag tag; Ark_Literal_Object_object__String_name_Array_String_methodList value; } Opt_Literal_Object_object__String_name_Array_String_methodList; -typedef struct Ark_HorizontalAlignOptions { +typedef struct Ark_HorizontalAlignParam { Ark_String anchor; Ark_HorizontalAlign align; -} Ark_HorizontalAlignOptions; -typedef struct Opt_HorizontalAlignOptions { +} Ark_HorizontalAlignParam; +typedef struct Opt_HorizontalAlignParam { Ark_Tag tag; - Ark_HorizontalAlignOptions value; -} Opt_HorizontalAlignOptions; -typedef struct Ark_VerticalAlignOptions { + Ark_HorizontalAlignParam value; +} Opt_HorizontalAlignParam; +typedef struct Ark_VerticalAlignParam { Ark_String anchor; Ark_VerticalAlign align; -} Ark_VerticalAlignOptions; -typedef struct Opt_VerticalAlignOptions { +} Ark_VerticalAlignParam; +typedef struct Opt_VerticalAlignParam { Ark_Tag tag; - Ark_VerticalAlignOptions value; -} Opt_VerticalAlignOptions; + Ark_VerticalAlignParam value; +} Opt_VerticalAlignParam; typedef struct Ark_Literal_String_baseUrl_data_encoding_historyUrl_mimeType { Ark_String data; Ark_String mimeType; @@ -15870,12 +15870,12 @@ typedef struct Opt_AlertDialogButtonOptions { Ark_AlertDialogButtonOptions value; } Opt_AlertDialogButtonOptions; typedef struct Ark_AlignRuleOption { - Opt_HorizontalAlignOptions left; - Opt_HorizontalAlignOptions right; - Opt_HorizontalAlignOptions middle; - Opt_VerticalAlignOptions top; - Opt_VerticalAlignOptions bottom; - Opt_VerticalAlignOptions center; + Opt_HorizontalAlignParam left; + Opt_HorizontalAlignParam right; + Opt_HorizontalAlignParam middle; + Opt_VerticalAlignParam top; + Opt_VerticalAlignParam bottom; + Opt_VerticalAlignParam center; Opt_Bias bias; } Ark_AlignRuleOption; typedef struct Opt_AlignRuleOption { @@ -26917,7 +26917,9 @@ typedef struct GENERATED_ArkUINodeModifiers { const GENERATED_ArkUIEmbeddedComponentModifier* (*getEmbeddedComponentModifier)(); const GENERATED_ArkUIFlexModifier* (*getFlexModifier)(); const GENERATED_ArkUIFlowItemModifier* (*getFlowItemModifier)(); +#ifndef ARKUI_WEARABLE const GENERATED_ArkUIFolderStackModifier* (*getFolderStackModifier)(); +#endif const GENERATED_ArkUIFormComponentModifier* (*getFormComponentModifier)(); const GENERATED_ArkUIFormLinkModifier* (*getFormLinkModifier)(); const GENERATED_ArkUIGaugeModifier* (*getGaugeModifier)(); diff --git a/frameworks/core/components_ng/base/view_abstract_model_static.cpp b/frameworks/core/components_ng/base/view_abstract_model_static.cpp index 5873a816382..88e73fcd8f6 100644 --- a/frameworks/core/components_ng/base/view_abstract_model_static.cpp +++ b/frameworks/core/components_ng/base/view_abstract_model_static.cpp @@ -41,6 +41,7 @@ namespace { const std::string BLOOM_RADIUS_SYS_RES_NAME = "sys.float.ohos_id_point_light_bloom_radius"; const std::string BLOOM_COLOR_SYS_RES_NAME = "sys.color.ohos_id_point_light_bloom_color"; const std::string ILLUMINATED_BORDER_WIDTH_SYS_RES_NAME = "sys.float.ohos_id_point_light_illuminated_border_width"; +constexpr float DEFAULT_BIAS = 0.5f; // constexpr int32_t HOVER_IMAGE_INTERRUPT_DURATION = 500; // constexpr char KEY_CONTEXT_MENU_HOVER[] = "ContextMenuHover"; // constexpr char KEY_CONTEXT_MENU[] = "ContextMenu"; @@ -1115,14 +1116,14 @@ void ViewAbstractModelStatic::SetBias(FrameNode* frameNode, const std::optional< void ViewAbstractModelStatic::SetBias(FrameNode* frameNode, const std::optional& horisontal, const std::optional& vertical) { - // auto biasPair = BiasPair(DEFAULT_BIAS, DEFAULT_BIAS); - // if (horisontal.has_value()) { - // biasPair.first = horisontal.value(); - // } - // if (vertical.has_value()) { - // biasPair.second = vertical.value(); - // } - // ViewAbstract::SetBias(frameNode, biasPair); + auto biasPair = BiasPair(DEFAULT_BIAS, DEFAULT_BIAS); + if (horisontal.has_value()) { + biasPair.first = horisontal.value(); + } + if (vertical.has_value()) { + biasPair.second = vertical.value(); + } + ViewAbstract::SetBias(frameNode, biasPair); } void ViewAbstractModelStatic::SetKeyboardShortcut(FrameNode* frameNode, const std::string& value, diff --git a/frameworks/core/interfaces/native/common/BUILD.gn b/frameworks/core/interfaces/native/common/BUILD.gn index 481a55ece0a..7f8ec8631a6 100644 --- a/frameworks/core/interfaces/native/common/BUILD.gn +++ b/frameworks/core/interfaces/native/common/BUILD.gn @@ -29,6 +29,10 @@ rebased_generated_sources = [] foreach(src, generated_sources) { rebased_generated_sources += [ native_root + "/" + src ] } +rebased_wearable_sources = [] +foreach(src, wearable_sources) { + rebased_wearable_sources += [ native_root + "/" + src ] +} rebased_common_sources = [] foreach(src, common_sources) { rebased_common_sources += [ native_root + "/" + src ] @@ -67,6 +71,9 @@ template("ace_core_interfaces_native") { sources += rebased_generated_sources defines += [ "INCLUDE_GENERATED_SOURCES" ] } + if (!ace_engine_feature_wearable) { + sources += rebased_wearable_sources + } deps = [ "$ace_root/frameworks/core/components/theme:build_theme_code" ] if (defined(config.model_component_support) && 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 2b84db857d2..5e719c8d2e9 100644 --- a/frameworks/core/interfaces/native/generated/interface/arkoala_api_generated.h +++ b/frameworks/core/interfaces/native/generated/interface/arkoala_api_generated.h @@ -1977,10 +1977,10 @@ typedef struct Ark_Literal_Number_surfaceHeight_surfaceWidth Ark_Literal_Number_ typedef struct Opt_Literal_Number_surfaceHeight_surfaceWidth Opt_Literal_Number_surfaceHeight_surfaceWidth; typedef struct Ark_Literal_Object_object__String_name_Array_String_methodList Ark_Literal_Object_object__String_name_Array_String_methodList; typedef struct Opt_Literal_Object_object__String_name_Array_String_methodList Opt_Literal_Object_object__String_name_Array_String_methodList; -typedef struct Ark_HorizontalAlignOptions Ark_HorizontalAlignOptions; -typedef struct Opt_HorizontalAlignOptions Opt_HorizontalAlignOptions; -typedef struct Ark_VerticalAlignOptions Ark_VerticalAlignOptions; -typedef struct Opt_VerticalAlignOptions Opt_VerticalAlignOptions; +typedef struct Ark_HorizontalAlignParam Ark_HorizontalAlignParam; +typedef struct Opt_HorizontalAlignParam Opt_HorizontalAlignParam; +typedef struct Ark_VerticalAlignParam Ark_VerticalAlignParam; +typedef struct Opt_VerticalAlignParam Opt_VerticalAlignParam; typedef struct Ark_Literal_String_baseUrl_data_encoding_historyUrl_mimeType Ark_Literal_String_baseUrl_data_encoding_historyUrl_mimeType; typedef struct Opt_Literal_String_baseUrl_data_encoding_historyUrl_mimeType Opt_Literal_String_baseUrl_data_encoding_historyUrl_mimeType; typedef struct Ark_Literal_String_plainText Ark_Literal_String_plainText; @@ -13028,22 +13028,22 @@ typedef struct Opt_Literal_Object_object__String_name_Array_String_methodList { Ark_Tag tag; Ark_Literal_Object_object__String_name_Array_String_methodList value; } Opt_Literal_Object_object__String_name_Array_String_methodList; -typedef struct Ark_HorizontalAlignOptions { +typedef struct Ark_HorizontalAlignParam { Ark_String anchor; Ark_HorizontalAlign align; -} Ark_HorizontalAlignOptions; -typedef struct Opt_HorizontalAlignOptions { +} Ark_HorizontalAlignParam; +typedef struct Opt_HorizontalAlignParam { Ark_Tag tag; - Ark_HorizontalAlignOptions value; -} Opt_HorizontalAlignOptions; -typedef struct Ark_VerticalAlignOptions { + Ark_HorizontalAlignParam value; +} Opt_HorizontalAlignParam; +typedef struct Ark_VerticalAlignParam { Ark_String anchor; Ark_VerticalAlign align; -} Ark_VerticalAlignOptions; -typedef struct Opt_VerticalAlignOptions { +} Ark_VerticalAlignParam; +typedef struct Opt_VerticalAlignParam { Ark_Tag tag; - Ark_VerticalAlignOptions value; -} Opt_VerticalAlignOptions; + Ark_VerticalAlignParam value; +} Opt_VerticalAlignParam; typedef struct Ark_Literal_String_baseUrl_data_encoding_historyUrl_mimeType { Ark_String data; Ark_String mimeType; @@ -15873,12 +15873,12 @@ typedef struct Opt_AlertDialogButtonOptions { Ark_AlertDialogButtonOptions value; } Opt_AlertDialogButtonOptions; typedef struct Ark_AlignRuleOption { - Opt_HorizontalAlignOptions left; - Opt_HorizontalAlignOptions right; - Opt_HorizontalAlignOptions middle; - Opt_VerticalAlignOptions top; - Opt_VerticalAlignOptions bottom; - Opt_VerticalAlignOptions center; + Opt_HorizontalAlignParam left; + Opt_HorizontalAlignParam right; + Opt_HorizontalAlignParam middle; + Opt_VerticalAlignParam top; + Opt_VerticalAlignParam bottom; + Opt_VerticalAlignParam center; Opt_Bias bias; } Ark_AlignRuleOption; typedef struct Opt_AlignRuleOption { @@ -26919,7 +26919,9 @@ typedef struct GENERATED_ArkUINodeModifiers { const GENERATED_ArkUIEmbeddedComponentModifier* (*getEmbeddedComponentModifier)(); const GENERATED_ArkUIFlexModifier* (*getFlexModifier)(); const GENERATED_ArkUIFlowItemModifier* (*getFlowItemModifier)(); +#ifndef ARKUI_WEARABLE const GENERATED_ArkUIFolderStackModifier* (*getFolderStackModifier)(); +#endif const GENERATED_ArkUIFormComponentModifier* (*getFormComponentModifier)(); const GENERATED_ArkUIFormLinkModifier* (*getFormLinkModifier)(); const GENERATED_ArkUIGaugeModifier* (*getGaugeModifier)(); diff --git a/frameworks/core/interfaces/native/generated/interface/node_interface.gni b/frameworks/core/interfaces/native/generated/interface/node_interface.gni index 23c2a20bcd8..c6754c1ad90 100644 --- a/frameworks/core/interfaces/native/generated/interface/node_interface.gni +++ b/frameworks/core/interfaces/native/generated/interface/node_interface.gni @@ -108,7 +108,6 @@ generated_sources = [ "implementation/flow_item_modifier.cpp", "implementation/focus_axis_event_accessor.cpp", "implementation/focus_controller_accessor.cpp", - "implementation/folder_stack_modifier.cpp", "implementation/form_component_modifier.cpp", "implementation/form_link_modifier.cpp", "implementation/frame_node_accessor.cpp", @@ -350,3 +349,8 @@ generated_sources = [ "utility/converter.cpp", ] + +wearable_sources = +[ + "implementation/folder_stack_modifier.cpp", +] \ No newline at end of file diff --git a/frameworks/core/interfaces/native/implementation/all_modifiers.cpp b/frameworks/core/interfaces/native/implementation/all_modifiers.cpp index aebb8aad156..55f572308ed 100644 --- a/frameworks/core/interfaces/native/implementation/all_modifiers.cpp +++ b/frameworks/core/interfaces/native/implementation/all_modifiers.cpp @@ -118,7 +118,9 @@ const GENERATED_ArkUIEllipseModifier* GetEllipseModifier(); const GENERATED_ArkUIEmbeddedComponentModifier* GetEmbeddedComponentModifier(); const GENERATED_ArkUIFlexModifier* GetFlexModifier(); const GENERATED_ArkUIFlowItemModifier* GetFlowItemModifier(); +#ifndef ARKUI_WEARABLE const GENERATED_ArkUIFolderStackModifier* GetFolderStackModifier(); +#endif const GENERATED_ArkUIFormComponentModifier* GetFormComponentModifier(); const GENERATED_ArkUIFormLinkModifier* GetFormLinkModifier(); const GENERATED_ArkUIGaugeModifier* GetGaugeModifier(); @@ -449,7 +451,9 @@ const GENERATED_ArkUINodeModifiers* GENERATED_GetArkUINodeModifiers() GetEmbeddedComponentModifier, GetFlexModifier, GetFlowItemModifier, + #ifndef ARKUI_WEARABLE GetFolderStackModifier, + #endif GetFormComponentModifier, GetFormLinkModifier, GetGaugeModifier, diff --git a/frameworks/core/interfaces/native/implementation/common_method_modifier.cpp b/frameworks/core/interfaces/native/implementation/common_method_modifier.cpp index aeb23a68719..28394f28cb0 100644 --- a/frameworks/core/interfaces/native/implementation/common_method_modifier.cpp +++ b/frameworks/core/interfaces/native/implementation/common_method_modifier.cpp @@ -1059,7 +1059,7 @@ void AssignCast(std::optional& dst, const Ark_VerticalAlign& src) } template<> -AlignRule Convert(const Ark_HorizontalAlignOptions& src) +AlignRule Convert(const Ark_HorizontalAlignParam& src) { AlignRule rule; rule.anchor = Convert(src.anchor); @@ -1083,7 +1083,7 @@ AlignRule Convert(const Ark_LocalizedHorizontalAlignParam& src) } template<> -AlignRule Convert(const Ark_VerticalAlignOptions& src) +AlignRule Convert(const Ark_VerticalAlignParam& src) { AlignRule rule; rule.anchor = Convert(src.anchor); diff --git a/frameworks/core/interfaces/native/utility/generated/converter_generated.h b/frameworks/core/interfaces/native/utility/generated/converter_generated.h index 48b18839031..8e80cb5828f 100644 --- a/frameworks/core/interfaces/native/utility/generated/converter_generated.h +++ b/frameworks/core/interfaces/native/utility/generated/converter_generated.h @@ -3066,14 +3066,14 @@ void AssignLiteralTo(std::optional& dst, template void AssignLiteralTo(std::optional& dst, - const Ark_HorizontalAlignOptions& src) + const Ark_HorizontalAlignParam& src) { AssignTo(dst, src.anchor); } template void AssignLiteralTo(std::optional& dst, - const Ark_VerticalAlignOptions& src) + const Ark_VerticalAlignParam& src) { AssignTo(dst, src.anchor); } @@ -4318,8 +4318,8 @@ ASSIGN_OPT(Opt_Literal_Number_offset_span) ASSIGN_OPT(Opt_Literal_Number_offsetRemain) ASSIGN_OPT(Opt_Literal_Number_surfaceHeight_surfaceWidth) ASSIGN_OPT(Opt_Literal_Object_object__String_name_Array_String_methodList) -ASSIGN_OPT(Opt_HorizontalAlignOptions) -ASSIGN_OPT(Opt_VerticalAlignOptions) +ASSIGN_OPT(Opt_HorizontalAlignParam) +ASSIGN_OPT(Opt_VerticalAlignParam) ASSIGN_OPT(Opt_Literal_String_baseUrl_data_encoding_historyUrl_mimeType) ASSIGN_OPT(Opt_Literal_String_plainText) ASSIGN_OPT(Opt_Literal_String_script_Callback_String_Void_callback_) diff --git a/test/unittest/core/pattern/flex/flex_new_test_ng.cpp b/test/unittest/core/pattern/flex/flex_new_test_ng.cpp index d53617303ee..6af1d4d8bb8 100644 --- a/test/unittest/core/pattern/flex/flex_new_test_ng.cpp +++ b/test/unittest/core/pattern/flex/flex_new_test_ng.cpp @@ -24,6 +24,7 @@ using namespace testing; using namespace testing::ext; namespace { +const int32_t FIRST_CHILD = 0; const int32_t SECOND_CHILD = 1; const float RK356_WIDTH = 720.0f; const float RK356_HEIGHT = 1136.0f; @@ -98,6 +99,7 @@ HWTEST_F(FlexNewTestNG, Example, TestSize.Level1) CreateLayoutTask(frameNode); // expect: second text offset x = 100.0f + EXPECT_EQ(frameNode->GetChildByIndex(FIRST_CHILD)->GetGeometryNode()->GetFrameOffset().GetX(), 0.0f); EXPECT_EQ(frameNode->GetChildByIndex(SECOND_CHILD)->GetGeometryNode()->GetFrameOffset().GetX(), 100.0f); } -- Gitee