From 3982ee001faefe1c22ab01169f5529c33ff317b2 Mon Sep 17 00:00:00 2001 From: zhanghaibo0 Date: Tue, 8 Jul 2025 22:24:48 +0800 Subject: [PATCH] =?UTF-8?q?levelorder=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: firminly Change-Id: Idcdccff617b29a1916e2e97ad60a15a4c99220f4 --- .../arkui-ohos/@ohos.promptAction.ts | 49 ++++- .../arkui-ohos/src/component/actionSheet.ts | 9 +- .../arkui-ohos/src/component/alertDialog.ts | 6 +- .../arkts/ArkUIGeneratedNativeModule.ts | 18 ++ .../src/component/arkts/type_check.ts | 23 +- .../arkui-ohos/src/component/common.ts | 48 ++++- .../src/component/peers/Deserializer.ts | 82 ++++--- .../src/component/peers/Serializer.ts | 88 ++++---- .../arkui-ohos/src/component/ts/type_check.ts | 40 ++-- .../component/customDialogController.ts | 5 +- .../native/src/generated/Serializers.h | 163 +++++--------- .../src/generated/arkoala_api_generated.h | 46 ++-- .../native/src/generated/bridge_generated.cc | 40 ++++ .../native/src/generated/dummy_impl.cc | 201 ++++++++++++++++++ .../native/src/generated/real_impl.cc | 87 ++++++++ .../interface/arkoala_api_generated.h | 46 ++-- .../generated/interface/node_interface.gni | 2 + .../native/implementation/all_modifiers.cpp | 4 + .../implementation/common_method_modifier.cpp | 16 +- .../custom_dialog_controller_accessor.cpp | 12 ++ .../custom_dialog_controller_peer_impl.cpp | 135 ++++++++++-- .../custom_dialog_controller_peer_impl.h | 14 ++ .../dismiss_popup_action_accessor.cpp | 61 ++++++ .../implementation/level_order_accessor.cpp | 70 ++++++ .../native/implementation/level_order_peer.h | 32 +++ .../interfaces/native/utility/converter.cpp | 13 ++ .../interfaces/native/utility/converter.h | 2 + .../utility/generated/converter_generated.h | 1 - .../common_method_modifier_test13.cpp | 8 +- .../common_method_modifier_test17.cpp | 8 +- 30 files changed, 1027 insertions(+), 302 deletions(-) create mode 100644 frameworks/core/interfaces/native/implementation/dismiss_popup_action_accessor.cpp create mode 100644 frameworks/core/interfaces/native/implementation/level_order_accessor.cpp create mode 100644 frameworks/core/interfaces/native/implementation/level_order_peer.h diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/@ohos.promptAction.ts b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/@ohos.promptAction.ts index 5ac98748082..d39142b4d7d 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/@ohos.promptAction.ts +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/@ohos.promptAction.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import { KPointer } from "@koalaui/interop" +import { Finalizable, SerializerBase, toPeerPtr, KPointer, MaterializedBase, DeserializerBase } from "@koalaui/interop" import { ResourceColor, Offset, Dimension, EdgeStyles, EdgeColors, EdgeWidths, BorderRadiuses } from 'arkui/component/units'; import { Callback } from '@ohos.base'; @@ -21,9 +21,11 @@ import { BlurStyle, ShadowOptions, ShadowStyle, HoverModeAreaType, Rectangle, Tr DismissReason, BackgroundBlurStyleOptions, BackgroundEffectOptions } from 'arkui/component/common'; import { AsyncCallback, CustomBuilder } from 'arkui/component'; import { DialogAlignment } from 'arkui/component/alertDialog'; +import { DismissDialogAction } from 'arkui/component/actionSheet'; import { BorderStyle, Alignment } from 'arkui/component/enums'; import { Resource } from 'global.resource'; import { LengthMetrics } from 'arkui/Graphics'; +import { ArkUIGeneratedNativeModule } from "#components" export enum LevelMode { OVERLAY = 0, @@ -35,14 +37,45 @@ export enum ImmersiveMode { EXTEND = 1, } -export interface DismissDialogAction { - dismiss: (() => void); - reason: DismissReason; +export class LevelOrderInternal { + public static fromPtr(ptr: KPointer): LevelOrder { + return new LevelOrder(ptr) + } } - -export declare class LevelOrder { - static clamp(order: number): LevelOrder; - getOrder(): number; +export class LevelOrder implements MaterializedBase { + peer?: Finalizable | undefined = undefined + public getPeer(): Finalizable | undefined { + return this.peer + } + constructor(peerPtr?: KPointer) { + if(!peerPtr) { + peerPtr = LevelOrder.construct() + } + this.peer = new Finalizable(peerPtr!, LevelOrder.getFinalizer()) + } + static construct(): KPointer { + const retval = ArkUIGeneratedNativeModule._LevelOrder_construct() + return retval + } + static getFinalizer(): KPointer { + return ArkUIGeneratedNativeModule._LevelOrder_getFinalizer() + } + public static clamp(order: number): LevelOrder { + const order_casted = order as (number) + return LevelOrder.clamp_serialize(order_casted) + } + public getOrder(): number { + return this.getOrder_serialize() + } + private static clamp_serialize(order: number): LevelOrder { + const retval = ArkUIGeneratedNativeModule._LevelOrder_clamp(order) + const obj : LevelOrder = LevelOrderInternal.fromPtr(retval) + return obj + } + private getOrder_serialize(): number { + const retval = ArkUIGeneratedNativeModule._LevelOrder_getOrder(this.peer!.ptr) + return retval + } } declare namespace promptAction { diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/actionSheet.ts b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/actionSheet.ts index d5c6b1c6254..889f26ae943 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/actionSheet.ts +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/actionSheet.ts @@ -28,7 +28,8 @@ import { Resource } from "global.resource" import { VoidCallback, ResourceStr, ResourceColor, Dimension, BorderRadiuses, LocalizedBorderRadiuses, EdgeWidths, LocalizedEdgeWidths, EdgeColors, LocalizedEdgeColors, EdgeStyles } from "./units" import { DismissReason, Rectangle, BlurStyle, BackgroundBlurStyleOptions, BackgroundEffectOptions, TransitionEffect, ShadowOptions, ShadowStyle, HoverModeAreaType } from "./common" import { DialogButtonStyle, BorderStyle } from "./enums" -import { DialogAlignment, LevelOrder } from "./alertDialog" +import { DialogAlignment } from "./alertDialog" +import { LevelMode, ImmersiveMode, LevelOrder } from "@ohos/promptAction" export class ActionSheet { public static show(value: ActionSheetOptions): undefined { const value_casted = value as (ActionSheetOptions) @@ -62,12 +63,6 @@ export interface ActionSheetOffset { dx: number | string | Resource; dy: number | string | Resource; } -export interface LevelMode { - _LevelModeStub: string; -} -export interface ImmersiveMode { - _ImmersiveModeStub: string; -} export type Callback_DismissDialogAction_Void = (parameter: DismissDialogAction) => void; export interface ActionSheetOptions { title: string | Resource; diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/alertDialog.ts b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/alertDialog.ts index 2fe0f7389d4..d43cd7546b6 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/alertDialog.ts +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/alertDialog.ts @@ -27,7 +27,8 @@ import { NodeAttach, remember } from "@koalaui/runtime" import { DialogButtonStyle, WordBreak, BorderStyle } from "./enums" import { ResourceStr, ResourceColor, VoidCallback, Offset, Dimension, BorderRadiuses, LocalizedBorderRadiuses, EdgeWidths, LocalizedEdgeWidths, EdgeColors, LocalizedEdgeColors, EdgeStyles } from "./units" import { Rectangle, BlurStyle, BackgroundBlurStyleOptions, BackgroundEffectOptions, TransitionEffect, ShadowOptions, ShadowStyle, HoverModeAreaType } from "./common" -import { Callback_DismissDialogAction_Void, DismissDialogAction, LevelMode, ImmersiveMode } from "./actionSheet" +import { Callback_DismissDialogAction_Void, DismissDialogAction } from "./actionSheet" +import { ImmersiveMode, LevelMode, LevelOrder } from "@ohos/promptAction" export class AlertDialog { public static show(value: AlertDialogParamWithConfirm | AlertDialogParamWithButtons | AlertDialogParamWithOptions): undefined { const value_casted = value as (AlertDialogParamWithConfirm | AlertDialogParamWithButtons | AlertDialogParamWithOptions) @@ -99,9 +100,6 @@ export interface AlertDialogButtonOptions extends AlertDialogButtonBaseOptions { export interface TextStyle_alert_dialog { wordBreak?: WordBreak; } -export interface LevelOrder { - _LevelOrderStub: string; -} export interface AlertDialogParam { title?: ResourceStr; subtitle?: ResourceStr; diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/arkts/ArkUIGeneratedNativeModule.ts b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/arkts/ArkUIGeneratedNativeModule.ts index bcd4e376e15..a52fd3eb3f6 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/arkts/ArkUIGeneratedNativeModule.ts +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/arkts/ArkUIGeneratedNativeModule.ts @@ -6954,6 +6954,24 @@ export class ArkUIGeneratedNativeModule { @ani.unsafe.Direct native static _LetterSpacingStyle_getLetterSpacing(ptr: KPointer): number @ani.unsafe.Direct + native static _LevelOrder_construct(): KPointer + @ani.unsafe.Direct + native static _LevelOrder_getFinalizer(): KPointer + @ani.unsafe.Direct + native static _LevelOrder_clamp(order: number): KPointer + @ani.unsafe.Direct + native static _LevelOrder_getOrder(ptr: KPointer): number + @ani.unsafe.Direct + native static _DismissPopupAction_construct(): KPointer + @ani.unsafe.Direct + native static _DismissPopupAction_getFinalizer(): KPointer + @ani.unsafe.Direct + native static _DismissPopupAction_dismiss(ptr: KPointer): void + @ani.unsafe.Direct + native static _DismissPopupAction_getReason(ptr: KPointer): int32 + @ani.unsafe.Direct + native static _DismissPopupAction_setReason(ptr: KPointer, reason: KInt): void + @ani.unsafe.Direct native static _TextShadowStyle_ctor(thisArray: KSerializerBuffer, thisLength: int32): KPointer @ani.unsafe.Direct native static _TextShadowStyle_getFinalizer(): KPointer 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 e835c1906f7..628c9eaa9be 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 @@ -59,7 +59,7 @@ import { DrawContext, Rect, LengthUnit, ShapeClip, ColorMetrics, RoundRect, Circ import { DataOperationType } from "./../lazyForEach" import { DataPanelType, ColorStop, LinearGradient, DataPanelOptions, DataPanelShadowOptions } from "./../dataPanel" import { DatePickerMode, DatePickerOptions, DatePickerResult, LunarSwitchStyle, DatePickerDialogOptions, Callback_DatePickerResult_Void } from "./../datePicker" -import { DialogAlignment, DialogButtonDirection, LevelOrder, TextStyle_alert_dialog, AlertDialogButtonBaseOptions, AlertDialogButtonOptions, AlertDialogParamWithButtons, AlertDialogParam, AlertDialogParamWithConfirm, AlertDialogParamWithOptions } from "./../alertDialog" +import { DialogAlignment, DialogButtonDirection, TextStyle_alert_dialog, AlertDialogButtonBaseOptions, AlertDialogButtonOptions, AlertDialogParamWithButtons, AlertDialogParam, AlertDialogParamWithConfirm, AlertDialogParamWithOptions } from "./../alertDialog" import { DistributionType, DisturbanceFieldShape, ParticleEmitterShape, ParticleType, ParticleUpdater } from "./../particle" import { DpiFollowStrategy, UIExtensionProxy, Callback_UIExtensionProxy_Void, WindowModeFollowStrategy, UIExtensionOptions, Literal_Number_code__want } from "./../uiExtensionComponent" import { EditMode, ListItemStyle, Sticky, SwipeActionState, SwipeEdgeEffect, ListItemOptions, SwipeActionItem, Callback_SwipeActionState_Void, SwipeActionOptions } from "./../listItem" @@ -132,7 +132,7 @@ import { CircleOptions } from "./../circle" import { ColumnOptions, ColumnOptionsV2 } from "./../column" import { ColumnSplitDividerStyle } from "./../columnSplit" import { DateTimeOptions } from "./../arkui-intl" -import { DismissDialogAction, ImmersiveMode, LevelMode, ActionSheetButtonOptions, ActionSheetOffset, SheetInfo, ActionSheetOptions, Callback_DismissDialogAction_Void } from "./../actionSheet" +import { DismissDialogAction, ActionSheetButtonOptions, ActionSheetOffset, SheetInfo, ActionSheetOptions, Callback_DismissDialogAction_Void } from "./../actionSheet" import { DoubleAnimationParam, Callback_Extender_OnProgress, Callback_Extender_OnFinish } from "./../animationExtender" import { EllipseOptions } from "./../ellipse" import { FormLinkOptions } from "./../formLink" @@ -161,6 +161,7 @@ import { OnHoverCallback } from "./../sdk-stubs" import { TerminationInfo } from "./../embeddedComponent" import { TextBackgroundStyle } from "./../span" import promptAction from '@ohos/promptAction' +import { LevelMode, ImmersiveMode, LevelOrder } from "@ohos/promptAction" import { PointerStyle, UniformDataType} from '#external' export class TypeChecker { static typeInstanceOf(value: Object, prop: string): boolean { @@ -1297,7 +1298,7 @@ export class TypeChecker { static isImageSpanAlignment(value: Object | string | number | undefined): boolean { return value instanceof ImageSpanAlignment } - static isImmersiveMode(value: Object | string | number | undefined, arg0: boolean): boolean { + static isImmersiveMode(value: Object | string | number | undefined): boolean { return value instanceof ImmersiveMode } static isIndexerAlign(value: Object | string | number | undefined): boolean { @@ -1426,10 +1427,10 @@ export class TypeChecker { static isLetterSpacingStyle(value: Object | string | number | undefined, arg0: boolean): boolean { return value instanceof LetterSpacingStyle } - static isLevelMode(value: Object | string | number | undefined, arg0: boolean): boolean { + static isLevelMode(value: Object | string | number | undefined): boolean { return value instanceof LevelMode } - static isLevelOrder(value: Object | string | number | undefined, arg0: boolean): boolean { + static isLevelOrder(value: Object | string | number | undefined): boolean { return value instanceof LevelOrder } static isLightSource(value: Object | string | number | undefined, arg0: boolean, arg1: boolean, arg2: boolean, arg3: boolean, arg4: boolean): boolean { @@ -4213,6 +4214,18 @@ export class TypeChecker { static HoverModeAreaType_FromNumeric(ordinal: int32): HoverModeAreaType { return HoverModeAreaType.fromValue(ordinal) } + static LevelMode_ToNumeric(value: LevelMode): int32 { + return value.valueOf() + } + static LevelMode_FromNumeric(ordinal: int32): LevelMode { + return LevelMode.fromValue(ordinal) + } + static ImmersiveMode_ToNumeric(value: ImmersiveMode): int32 { + return value.valueOf() + } + static ImmersiveMode_FromNumeric(ordinal: int32): ImmersiveMode { + return ImmersiveMode.fromValue(ordinal) + } static IlluminatedType_ToNumeric(value: IlluminatedType): int32 { return value.valueOf() } 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 f926183d8a0..4d78657edfd 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 @@ -7648,9 +7648,55 @@ export enum DismissReason { SLIDE_DOWN = 3 } export interface DismissPopupAction { - dismiss: (() => void); + dismiss(): void; reason: DismissReason; } + +export class DismissPopupActionInternal implements MaterializedBase, DismissPopupAction { + peer?: Finalizable | undefined = undefined + public getPeer(): Finalizable | undefined { + return this.peer + } + get reason(): DismissReason { + return this.getReason() + } + set reason(reason: DismissReason) { + this.setReason(reason) + } + constructor(peerPtr?: KPointer) { + if (!peerPtr) { + peerPtr = ArkUIGeneratedNativeModule._DismissPopupAction_construct() + } + this.peer = new Finalizable(peerPtr!, DismissPopupActionInternal.getFinalizer()) + } + static getFinalizer(): KPointer { + return ArkUIGeneratedNativeModule._DismissPopupAction_getFinalizer() + } + public static fromPtr(ptr: KPointer): DismissPopupActionInternal { + return new DismissPopupActionInternal(ptr) + } + public dismiss(): void { + this.dismiss_serialize() + return + } + private getReason(): DismissReason { + return this.getReason_serialize() + } + private setReason(reason: DismissReason): void { + const reason_casted = reason as DismissReason + this.setReason_serialize(reason_casted) + } + private dismiss_serialize(): void { + ArkUIGeneratedNativeModule._DismissPopupAction_dismiss(this.peer!.ptr) + } + private getReason_serialize(): DismissReason { + const retval = ArkUIGeneratedNativeModule._DismissPopupAction_getReason(this.peer!.ptr) + return DismissReason.fromValue(retval) + } + private setReason_serialize(reason: DismissReason): void { + ArkUIGeneratedNativeModule._DismissPopupAction_setReason(this.peer!.ptr, reason.valueOf()) + } +} export interface PopupStateChangeParam { isVisible: boolean; } 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 f4bcaa39df1..5698e20a1af 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, DraggingSizeChangeEffect, DragPreviewMode, DrawModifier, 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, SelectedCallback, IndexCallback, IndexerSelectedCallback, RefreshingCallback, DividerStyle, BlendMode, PopupCommonOptions } 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, DraggingSizeChangeEffect, DragPreviewMode, DrawModifier, 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, SelectedCallback, IndexCallback, IndexerSelectedCallback, RefreshingCallback, DividerStyle, BlendMode, PopupCommonOptions, DismissPopupActionInternal } 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, BuilderNodeOps, BuilderNodeOpsInternal, BuilderNodeOptions, ComponentContent, ComponentContentInternal, UnifiedData, UnifiedDataInternal, SystemBarStyle, Scene, SceneInternal, Context, ContextInternal, WorkerEventListener, WorkerEventListenerInternal, Event, ErrorEvent, MessageEvents, BaseContext, BaseContextInternal, PostMessageOptions, WorkerOptions, CustomColors, RestrictedWorker, RestrictedWorkerInternal, CustomTheme, Callback_CreateItem, LengthMetricsCustom } from "./../arkui-custom" @@ -104,7 +104,7 @@ import { DrawContext, Rect, LengthMetricsUnit, LengthUnit, ColorMetrics, ColorMe import { DataOperationType } from "./../lazyForEach" import { DataPanelType, LinearGradient, LinearGradientInternal, ColorStop, DataPanelOptions, DataPanelShadowOptions } from "./../dataPanel" import { DatePickerMode, Callback_DatePickerResult_Void, DatePickerResult, DatePickerOptions, LunarSwitchStyle, DatePickerDialogOptions } from "./../datePicker" -import { DialogAlignment, DialogButtonDirection, LevelOrder, TextStyle_alert_dialog, AlertDialogButtonBaseOptions, AlertDialogButtonOptions, AlertDialogParamWithButtons, AlertDialogParam, AlertDialogParamWithConfirm, AlertDialogParamWithOptions } from "./../alertDialog" +import { DialogAlignment, DialogButtonDirection, TextStyle_alert_dialog, AlertDialogButtonBaseOptions, AlertDialogButtonOptions, AlertDialogParamWithButtons, AlertDialogParam, AlertDialogParamWithConfirm, AlertDialogParamWithOptions } from "./../alertDialog" import { DistributionType, DisturbanceFieldShape, ParticleEmitterShape, ParticleType, ParticleUpdater } from "./../particle" import { DpiFollowStrategy, UIExtensionProxy, UIExtensionProxyInternal, Callback_UIExtensionProxy_Void, WindowModeFollowStrategy, Callback_Literal_Number_code__want_Void, Literal_Number_code__want, Callback_Map_String_Object_Void, UIExtensionOptions } from "./../uiExtensionComponent" import { EditMode, ListItemStyle, Sticky, SwipeActionState, SwipeEdgeEffect, Callback_SwipeActionState_Void, ListItemOptions, SwipeActionItem, SwipeActionOptions } from "./../listItem" @@ -151,7 +151,7 @@ import { ToggleType, ToggleOptions, SwitchStyle } from "./../toggle" import { UniformDataType } from "./../arkui-uniformtypedescriptor" import { WindowSceneAttribute } from "./../windowScene" import { Callback_Array_String_Void, Callback_Array_TextMenuItem_Void, Callback_Buffer_Void, Callback_ComputedBarAttribute_Void, Callback_CustomBuilder_Void, Callback_GestureJudgeResult_Void, Callback_GestureRecognizer_Void, Callback_HitTestMode_Void, Callback_Literal_Number_offsetRemain_Void, Callback_OffsetResult_Void, Callback_OnScrollFrameBeginHandlerResult_Void, Callback_Opt_Array_NavDestinationTransition_Void, Callback_Opt_Array_String_Void, Callback_Opt_NavigationAnimatedTransition_Void, Callback_Opt_StyledString_Opt_Array_String_Void, Callback_Opt_TabContentAnimatedTransition_Void, Callback_Pointer_Void, Callback_StyledStringMarshallingValue_Void, Callback_TouchResult_Void, Callback_Tuple_Number_Number_Number_Number_Void, Callback_Tuple_Number_Number_Void, Callback_Union_CustomBuilder_DragItemInfo_Void, Callback_WebKeyboardOptions_Void, Callback_WebResourceResponse_Void, Callback_WithThemeAttribute_Void } from "./../generatorSynthetic" -import { Callback_DismissDialogAction_Void, DismissDialogAction, ImmersiveMode, LevelMode, ActionSheetButtonOptions, ActionSheetOffset, SheetInfo, ActionSheetOptions } from "./../actionSheet" +import { Callback_DismissDialogAction_Void, DismissDialogAction, ActionSheetButtonOptions, ActionSheetOffset, SheetInfo, ActionSheetOptions } from "./../actionSheet" import { Want } from "./../ohos.app.ability" import { Callback_TerminationInfo_Void, TerminationInfo } from "./../embeddedComponent" import { BusinessError } from "#external" @@ -184,6 +184,7 @@ import { DividerStyle as DividerStyle_sidebar } from "./../sidebar" import { NodeContainer_AboutToResizeCallback } from "./../nodeContainer" import { drawing } from "@ohos/graphics/drawing" import promptAction from '@ohos/promptAction' +import { LevelOrderInternal, LevelMode, ImmersiveMode, LevelOrder } from "@ohos/promptAction" import { PointerStyle, DataSyncOptions } from '#external' import { UIContextUtil } from "arkui/handwritten/UIContextUtil" export class Deserializer extends DeserializerBase { @@ -7652,10 +7653,12 @@ export class Deserializer extends DeserializerBase { } readDismissPopupAction(): DismissPopupAction { let valueDeserializer : Deserializer = this - const dismiss_result : (() => void) = valueDeserializer.readCallback_Void() - const reason_result : DismissReason = TypeChecker.DismissReason_FromNumeric(valueDeserializer.readInt32()) - let value : DismissPopupAction = ({dismiss: dismiss_result, reason: reason_result} as DismissPopupAction) - return value + let ptr: KPointer = valueDeserializer.readPointer() + return DismissPopupActionInternal.fromPtr(ptr) + // const dismiss_result : (() => void) = valueDeserializer.readCallback_Void() + // const reason_result : DismissReason = TypeChecker.DismissReason_FromNumeric(valueDeserializer.readInt32()) + // let value : DismissPopupAction = ({dismiss: dismiss_result, reason: reason_result} as DismissPopupAction) + // return value } readDismissSheetAction(): DismissSheetAction { let valueDeserializer : Deserializer = this @@ -8757,12 +8760,6 @@ export class Deserializer extends DeserializerBase { let value : ImageSourceSize = ({width: width_result, height: height_result} as ImageSourceSize) return value } - readImmersiveMode(): ImmersiveMode { - let valueDeserializer : Deserializer = this - const _ImmersiveModeStub_result : string = (valueDeserializer.readString() as string) - let value : ImmersiveMode = ({_ImmersiveModeStub: _ImmersiveModeStub_result} as ImmersiveMode) - return value - } readInputCounterOptions(): InputCounterOptions { let valueDeserializer : Deserializer = this const thresholdPercentage_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -8919,17 +8916,10 @@ export class Deserializer extends DeserializerBase { let ptr : KPointer = valueDeserializer.readPointer() return LetterSpacingStyleInternal.fromPtr(ptr) } - readLevelMode(): LevelMode { - let valueDeserializer : Deserializer = this - const _LevelModeStub_result : string = (valueDeserializer.readString() as string) - let value : LevelMode = ({_LevelModeStub: _LevelModeStub_result} as LevelMode) - return value - } readLevelOrder(): LevelOrder { let valueDeserializer : Deserializer = this - const _LevelOrderStub_result : string = (valueDeserializer.readString() as string) - let value : LevelOrder = ({_LevelOrderStub: _LevelOrderStub_result} as LevelOrder) - return value + let ptr : KPointer = valueDeserializer.readPointer() + return LevelOrderInternal.fromPtr(ptr) } readLinearGradient_common(): LinearGradient_common { let valueDeserializer : Deserializer = this @@ -21831,7 +21821,7 @@ export class Deserializer extends DeserializerBase { let levelMode_buf : LevelMode | undefined if ((RuntimeType.UNDEFINED) != (levelMode_buf_runtimeType)) { - levelMode_buf = valueDeserializer.readLevelMode() + levelMode_buf = TypeChecker.LevelMode_FromNumeric(valueDeserializer.readInt32()) } const levelMode_result : LevelMode | undefined = levelMode_buf const levelUniqueId_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -21845,14 +21835,14 @@ export class Deserializer extends DeserializerBase { let immersiveMode_buf : ImmersiveMode | undefined if ((RuntimeType.UNDEFINED) != (immersiveMode_buf_runtimeType)) { - immersiveMode_buf = valueDeserializer.readImmersiveMode() + immersiveMode_buf = TypeChecker.ImmersiveMode_FromNumeric(valueDeserializer.readInt32()) } const immersiveMode_result : ImmersiveMode | undefined = immersiveMode_buf const levelOrder_buf_runtimeType = (valueDeserializer.readInt8() as int32) let levelOrder_buf : LevelOrder | undefined if ((RuntimeType.UNDEFINED) != (levelOrder_buf_runtimeType)) { - levelOrder_buf = valueDeserializer.readLevelOrder() + levelOrder_buf = (valueDeserializer.readLevelOrder() as LevelOrder) } const levelOrder_result : LevelOrder | undefined = levelOrder_buf let value : ActionSheetOptions = ({title: title_result, subtitle: subtitle_result, message: message_result, confirm: confirm_result, cancel: cancel_result, sheets: sheets_result, autoCancel: autoCancel_result, alignment: alignment_result, offset: offset_result, maskRect: maskRect_result, showInSubWindow: showInSubWindow_result, isModal: isModal_result, backgroundColor: backgroundColor_result, backgroundBlurStyle: backgroundBlurStyle_result, backgroundBlurStyleOptions: backgroundBlurStyleOptions_result, backgroundEffect: backgroundEffect_result, onWillDismiss: onWillDismiss_result, transition: transition_result, cornerRadius: cornerRadius_result, width: width_result, height: height_result, borderWidth: borderWidth_result, borderColor: borderColor_result, borderStyle: borderStyle_result, shadow: shadow_result, enableHoverMode: enableHoverMode_result, hoverModeArea: hoverModeArea_result, onDidAppear: onDidAppear_result, onDidDisappear: onDidDisappear_result, onWillAppear: onWillAppear_result, onWillDisappear: onWillDisappear_result, levelMode: levelMode_result, levelUniqueId: levelUniqueId_result, immersiveMode: immersiveMode_result, levelOrder: levelOrder_result} as ActionSheetOptions) @@ -22356,7 +22346,7 @@ export class Deserializer extends DeserializerBase { let levelMode_buf : LevelMode | undefined if ((RuntimeType.UNDEFINED) != (levelMode_buf_runtimeType)) { - levelMode_buf = valueDeserializer.readLevelMode() + levelMode_buf = TypeChecker.LevelMode_FromNumeric(valueDeserializer.readInt32()) } const levelMode_result : LevelMode | undefined = levelMode_buf const levelUniqueId_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -22370,14 +22360,14 @@ export class Deserializer extends DeserializerBase { let immersiveMode_buf : ImmersiveMode | undefined if ((RuntimeType.UNDEFINED) != (immersiveMode_buf_runtimeType)) { - immersiveMode_buf = valueDeserializer.readImmersiveMode() + immersiveMode_buf = TypeChecker.ImmersiveMode_FromNumeric(valueDeserializer.readInt32()) } const immersiveMode_result : ImmersiveMode | undefined = immersiveMode_buf const levelOrder_buf_runtimeType = (valueDeserializer.readInt8() as int32) let levelOrder_buf : LevelOrder | undefined if ((RuntimeType.UNDEFINED) != (levelOrder_buf_runtimeType)) { - levelOrder_buf = valueDeserializer.readLevelOrder() + levelOrder_buf = (valueDeserializer.readLevelOrder() as LevelOrder) } const levelOrder_result : LevelOrder | undefined = levelOrder_buf const primaryButton_result : AlertDialogButtonBaseOptions = valueDeserializer.readAlertDialogButtonBaseOptions() @@ -22733,7 +22723,7 @@ export class Deserializer extends DeserializerBase { let levelMode_buf : LevelMode | undefined if ((RuntimeType.UNDEFINED) != (levelMode_buf_runtimeType)) { - levelMode_buf = valueDeserializer.readLevelMode() + levelMode_buf = TypeChecker.LevelMode_FromNumeric(valueDeserializer.readInt32()) } const levelMode_result : LevelMode | undefined = levelMode_buf const levelUniqueId_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -22747,14 +22737,14 @@ export class Deserializer extends DeserializerBase { let immersiveMode_buf : ImmersiveMode | undefined if ((RuntimeType.UNDEFINED) != (immersiveMode_buf_runtimeType)) { - immersiveMode_buf = valueDeserializer.readImmersiveMode() + immersiveMode_buf = TypeChecker.ImmersiveMode_FromNumeric(valueDeserializer.readInt32()) } const immersiveMode_result : ImmersiveMode | undefined = immersiveMode_buf const levelOrder_buf_runtimeType = (valueDeserializer.readInt8() as int32) let levelOrder_buf : LevelOrder | undefined if ((RuntimeType.UNDEFINED) != (levelOrder_buf_runtimeType)) { - levelOrder_buf = valueDeserializer.readLevelOrder() + levelOrder_buf = (valueDeserializer.readLevelOrder() as LevelOrder) } const levelOrder_result : LevelOrder | undefined = levelOrder_buf const confirm_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -23115,7 +23105,7 @@ export class Deserializer extends DeserializerBase { let levelMode_buf : LevelMode | undefined if ((RuntimeType.UNDEFINED) != (levelMode_buf_runtimeType)) { - levelMode_buf = valueDeserializer.readLevelMode() + levelMode_buf = TypeChecker.LevelMode_FromNumeric(valueDeserializer.readInt32()) } const levelMode_result : LevelMode | undefined = levelMode_buf const levelUniqueId_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -23129,14 +23119,14 @@ export class Deserializer extends DeserializerBase { let immersiveMode_buf : ImmersiveMode | undefined if ((RuntimeType.UNDEFINED) != (immersiveMode_buf_runtimeType)) { - immersiveMode_buf = valueDeserializer.readImmersiveMode() + immersiveMode_buf = TypeChecker.ImmersiveMode_FromNumeric(valueDeserializer.readInt32()) } const immersiveMode_result : ImmersiveMode | undefined = immersiveMode_buf const levelOrder_buf_runtimeType = (valueDeserializer.readInt8() as int32) let levelOrder_buf : LevelOrder | undefined if ((RuntimeType.UNDEFINED) != (levelOrder_buf_runtimeType)) { - levelOrder_buf = valueDeserializer.readLevelOrder() + levelOrder_buf = (valueDeserializer.readLevelOrder() as LevelOrder) } const levelOrder_result : LevelOrder | undefined = levelOrder_buf const buttons_buf_length : int32 = valueDeserializer.readInt32() @@ -24179,7 +24169,7 @@ export class Deserializer extends DeserializerBase { let levelMode_buf : LevelMode | undefined if ((RuntimeType.UNDEFINED) != (levelMode_buf_runtimeType)) { - levelMode_buf = valueDeserializer.readLevelMode() + levelMode_buf = TypeChecker.LevelMode_FromNumeric(valueDeserializer.readInt32()) } const levelMode_result : LevelMode | undefined = levelMode_buf const levelUniqueId_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -24193,14 +24183,14 @@ export class Deserializer extends DeserializerBase { let immersiveMode_buf : ImmersiveMode | undefined if ((RuntimeType.UNDEFINED) != (immersiveMode_buf_runtimeType)) { - immersiveMode_buf = valueDeserializer.readImmersiveMode() + immersiveMode_buf = TypeChecker.ImmersiveMode_FromNumeric(valueDeserializer.readInt32()) } const immersiveMode_result : ImmersiveMode | undefined = immersiveMode_buf const levelOrder_buf_runtimeType = (valueDeserializer.readInt8() as int32) let levelOrder_buf : LevelOrder | undefined if ((RuntimeType.UNDEFINED) != (levelOrder_buf_runtimeType)) { - levelOrder_buf = valueDeserializer.readLevelOrder() + levelOrder_buf = (valueDeserializer.readLevelOrder() as LevelOrder) } const levelOrder_result : LevelOrder | undefined = levelOrder_buf const focusable_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -27422,6 +27412,16 @@ export class Deserializer extends DeserializerBase { let value : NavigationToolbarOptions = ({backgroundColor: backgroundColor_result, backgroundBlurStyle: backgroundBlurStyle_result, backgroundBlurStyleOptions: backgroundBlurStyleOptions_result, backgroundEffect: backgroundEffect_result, moreButtonOptions: moreButtonOptions_result, barStyle: barStyle_result, hideItemValue: hideItemValue_result} as NavigationToolbarOptions) return value } + public readPopupButton(): PopupButton { + let valueDeserializer : Deserializer = this + const value_result : string = (valueDeserializer.readString() as string) + const action_result : (() => void) = valueDeserializer.readCallback_Void() + let value : PopupButton = ({ + value: value_result, + action: action_result + } as PopupButton) + return value + } readPopupOptions(): PopupOptions { let valueDeserializer : Deserializer = this const message_result : string = (valueDeserializer.readString() as string) @@ -27436,18 +27436,14 @@ export class Deserializer extends DeserializerBase { let primaryButton_buf : PopupButton | undefined if ((RuntimeType.UNDEFINED) != (primaryButton_buf_runtimeType)) { - const primaryButton_buf__value : string = (valueDeserializer.readString() as string) - const primaryButton_buf__action : (() => void) = valueDeserializer.readCallback_Void() - primaryButton_buf = ({value: primaryButton_buf__value, action: primaryButton_buf__action} as PopupButton) + primaryButton_buf = valueDeserializer.readPopupButton() } const primaryButton_result : PopupButton | undefined = primaryButton_buf const secondaryButton_buf_runtimeType = (valueDeserializer.readInt8() as int32) let secondaryButton_buf : PopupButton | undefined if ((RuntimeType.UNDEFINED) != (secondaryButton_buf_runtimeType)) { - const secondaryButton_buf__value : string = (valueDeserializer.readString() as string) - const secondaryButton_buf__action : (() => void) = valueDeserializer.readCallback_Void() - secondaryButton_buf = ({value: secondaryButton_buf__value, action: secondaryButton_buf__action} as PopupButton) + secondaryButton_buf = valueDeserializer.readPopupButton() } const secondaryButton_result : PopupButton | undefined = secondaryButton_buf const onStateChange_buf_runtimeType = (valueDeserializer.readInt8() as int32) 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 542c3ca886f..0981f013ed2 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, float64, unsafeCast } from "@koalaui/common" import { CallbackKind } from "./CallbackKind" import { TypeChecker } from "#components" import { CallbackTransformer } from "./CallbackTransformer" -import { 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, DraggingSizeChangeEffect, DragPreviewMode, DrawModifier, 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, PopupCommonOptions } from "./../common" +import { 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, DraggingSizeChangeEffect, DragPreviewMode, DrawModifier, 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, PopupCommonOptions, 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, BuilderNodeOps, BuilderNodeOpsInternal, BuilderNodeOptions, ComponentContent, ComponentContentInternal, UnifiedData, UnifiedDataInternal, SystemBarStyle, Scene, SceneInternal, Context, ContextInternal, WorkerEventListener, WorkerEventListenerInternal, Event, ErrorEvent, MessageEvents, BaseContext, BaseContextInternal, PostMessageOptions, WorkerOptions, CustomColors, RestrictedWorker, RestrictedWorkerInternal, CustomTheme } from "./../arkui-custom" @@ -92,7 +92,7 @@ import { DrawContext, Rect, LengthMetricsUnit, LengthUnit, ShapeClip, RoundRect, import { DataOperationType } from "./../lazyForEach" import { DataPanelType, LinearGradient, LinearGradientInternal, ColorStop, DataPanelOptions, DataPanelShadowOptions } from "./../dataPanel" import { DatePickerMode, Callback_DatePickerResult_Void, DatePickerResult, DatePickerOptions, LunarSwitchStyle, DatePickerDialogOptions } from "./../datePicker" -import { DialogAlignment, DialogButtonDirection, LevelOrder, TextStyle_alert_dialog, AlertDialogButtonBaseOptions, AlertDialogButtonOptions, AlertDialogParamWithButtons, AlertDialogParam, AlertDialogParamWithConfirm, AlertDialogParamWithOptions } from "./../alertDialog" +import { DialogAlignment, DialogButtonDirection, TextStyle_alert_dialog, AlertDialogButtonBaseOptions, AlertDialogButtonOptions, AlertDialogParamWithButtons, AlertDialogParam, AlertDialogParamWithConfirm, AlertDialogParamWithOptions } from "./../alertDialog" import { DistributionType, DisturbanceFieldShape, ParticleEmitterShape, ParticleType, ParticleUpdater } from "./../particle" import { DpiFollowStrategy, UIExtensionProxy, UIExtensionProxyInternal, Callback_UIExtensionProxy_Void, WindowModeFollowStrategy, Callback_Literal_Number_code__want_Void, Literal_Number_code__want, Callback_Map_String_Object_Void, UIExtensionOptions } from "./../uiExtensionComponent" import { EditMode, ListItemStyle, Sticky, SwipeActionState, SwipeEdgeEffect, Callback_SwipeActionState_Void, ListItemOptions, SwipeActionItem, SwipeActionOptions } from "./../listItem" @@ -140,7 +140,7 @@ import { ToggleType, ToggleOptions, SwitchStyle } from "./../toggle" import { UniformDataType } from "./../arkui-uniformtypedescriptor" import { WindowSceneAttribute } from "./../windowScene" import { Callback_Array_String_Void, Callback_Array_TextMenuItem_Void, Callback_Buffer_Void, Callback_ComputedBarAttribute_Void, Callback_CustomBuilder_Void, Callback_GestureJudgeResult_Void, Callback_GestureRecognizer_Void, Callback_HitTestMode_Void, Callback_Literal_Number_offsetRemain_Void, Callback_OffsetResult_Void, Callback_OnScrollFrameBeginHandlerResult_Void, Callback_Opt_Array_NavDestinationTransition_Void, Callback_Opt_Array_String_Void, Callback_Opt_NavigationAnimatedTransition_Void, Callback_Opt_StyledString_Opt_Array_String_Void, Callback_Opt_TabContentAnimatedTransition_Void, Callback_Pointer_Void, Callback_StyledStringMarshallingValue_Void, Callback_TouchResult_Void, Callback_Tuple_Number_Number_Number_Number_Void, Callback_Tuple_Number_Number_Void, Callback_Union_CustomBuilder_DragItemInfo_Void, Callback_WebKeyboardOptions_Void, Callback_WebResourceResponse_Void, Callback_WithThemeAttribute_Void } from "./../generatorSynthetic" -import { Callback_DismissDialogAction_Void, DismissDialogAction, ImmersiveMode, LevelMode, ActionSheetButtonOptions, ActionSheetOffset, SheetInfo, ActionSheetOptions } from "./../actionSheet" +import { Callback_DismissDialogAction_Void, DismissDialogAction, ActionSheetButtonOptions, ActionSheetOffset, SheetInfo, ActionSheetOptions } from "./../actionSheet" import { Want } from "./../ohos.app.ability" import { Callback_TerminationInfo_Void, TerminationInfo } from "./../embeddedComponent" import { BusinessError } from "#external" @@ -171,6 +171,7 @@ import { MenuItemOptions } from "./../menuItem" import { TextBackgroundStyle } from "./../span" import { DividerStyle as DividerStyle_sidebar } from "./../sidebar" import promptAction from '@ohos/promptAction' +import { LevelMode, ImmersiveMode, LevelOrder } from "@ohos/promptAction" import { PointerStyle, DataSyncOptions } from '#external' export class Serializer extends SerializerBase { private static pool?: Array | undefined = undefined @@ -2573,10 +2574,11 @@ export class Serializer extends SerializerBase { } writeDismissPopupAction(value: DismissPopupAction): void { let valueSerializer : Serializer = this - const value_dismiss = value.dismiss - valueSerializer.holdAndWriteCallback(value_dismiss) - const value_reason = value.reason - valueSerializer.writeInt32(TypeChecker.DismissReason_ToNumeric(value_reason)) + valueSerializer.writePointer(toPeerPtr(value)) + // const value_dismiss = value.dismiss + // valueSerializer.holdAndWriteCallback(value_dismiss) + // const value_reason = value.reason + // valueSerializer.writeInt32(TypeChecker.DismissReason_ToNumeric(value_reason)) } writeDismissSheetAction(value: DismissSheetAction): void { let valueSerializer : Serializer = this @@ -3778,11 +3780,6 @@ export class Serializer extends SerializerBase { const value_height = value.height valueSerializer.writeNumber(value_height) } - writeImmersiveMode(value: ImmersiveMode): void { - let valueSerializer : Serializer = this - const value__ImmersiveModeStub = value._ImmersiveModeStub - valueSerializer.writeString(value__ImmersiveModeStub) - } writeInputCounterOptions(value: InputCounterOptions): void { let valueSerializer : Serializer = this const value_thresholdPercentage = value.thresholdPercentage @@ -3927,15 +3924,9 @@ export class Serializer extends SerializerBase { let valueSerializer : Serializer = this valueSerializer.writePointer(toPeerPtr(value)) } - writeLevelMode(value: LevelMode): void { - let valueSerializer : Serializer = this - const value__LevelModeStub = value._LevelModeStub - valueSerializer.writeString(value__LevelModeStub) - } writeLevelOrder(value: LevelOrder): void { let valueSerializer : Serializer = this - const value__LevelOrderStub = value._LevelOrderStub - valueSerializer.writeString(value__LevelOrderStub) + valueSerializer.writePointer(toPeerPtr(value)) } writeLinearGradient_common(value: LinearGradient_common): void { let valueSerializer : Serializer = this @@ -18172,8 +18163,8 @@ export class Serializer extends SerializerBase { value_levelMode_type = runtimeType(value_levelMode) valueSerializer.writeInt8(value_levelMode_type as int32) if ((RuntimeType.UNDEFINED) != (value_levelMode_type)) { - const value_levelMode_value = value_levelMode! - valueSerializer.writeLevelMode(value_levelMode_value) + const value_levelMode_value = (value_levelMode as LevelMode) + valueSerializer.writeInt32(TypeChecker.LevelMode_ToNumeric(value_levelMode_value)) } const value_levelUniqueId = value.levelUniqueId let value_levelUniqueId_type : int32 = RuntimeType.UNDEFINED @@ -18189,7 +18180,7 @@ export class Serializer extends SerializerBase { valueSerializer.writeInt8(value_immersiveMode_type as int32) if ((RuntimeType.UNDEFINED) != (value_immersiveMode_type)) { const value_immersiveMode_value = value_immersiveMode! - valueSerializer.writeImmersiveMode(value_immersiveMode_value) + valueSerializer.writeInt32(TypeChecker.ImmersiveMode_ToNumeric(value_immersiveMode_value)) } const value_levelOrder = value.levelOrder let value_levelOrder_type : int32 = RuntimeType.UNDEFINED @@ -18594,8 +18585,8 @@ export class Serializer extends SerializerBase { value_levelMode_type = runtimeType(value_levelMode) valueSerializer.writeInt8(value_levelMode_type as int32) if ((RuntimeType.UNDEFINED) != (value_levelMode_type)) { - const value_levelMode_value = value_levelMode! - valueSerializer.writeLevelMode(value_levelMode_value) + const value_levelMode_value = (value_levelMode as LevelMode) + valueSerializer.writeInt32(TypeChecker.LevelMode_ToNumeric(value_levelMode_value)) } const value_levelUniqueId = value.levelUniqueId let value_levelUniqueId_type : int32 = RuntimeType.UNDEFINED @@ -18610,8 +18601,8 @@ export class Serializer extends SerializerBase { value_immersiveMode_type = runtimeType(value_immersiveMode) valueSerializer.writeInt8(value_immersiveMode_type as int32) if ((RuntimeType.UNDEFINED) != (value_immersiveMode_type)) { - const value_immersiveMode_value = value_immersiveMode! - valueSerializer.writeImmersiveMode(value_immersiveMode_value) + const value_immersiveMode_value = (value_immersiveMode as ImmersiveMode) + valueSerializer.writeInt32(TypeChecker.ImmersiveMode_ToNumeric(value_immersiveMode_value)) } const value_levelOrder = value.levelOrder let value_levelOrder_type : int32 = RuntimeType.UNDEFINED @@ -19020,8 +19011,8 @@ export class Serializer extends SerializerBase { value_levelMode_type = runtimeType(value_levelMode) valueSerializer.writeInt8(value_levelMode_type as int32) if ((RuntimeType.UNDEFINED) != (value_levelMode_type)) { - const value_levelMode_value = value_levelMode! - valueSerializer.writeLevelMode(value_levelMode_value) + const value_levelMode_value = (value_levelMode as LevelMode) + valueSerializer.writeInt32(TypeChecker.LevelMode_ToNumeric(value_levelMode_value)) } const value_levelUniqueId = value.levelUniqueId let value_levelUniqueId_type : int32 = RuntimeType.UNDEFINED @@ -19036,8 +19027,8 @@ export class Serializer extends SerializerBase { value_immersiveMode_type = runtimeType(value_immersiveMode) valueSerializer.writeInt8(value_immersiveMode_type as int32) if ((RuntimeType.UNDEFINED) != (value_immersiveMode_type)) { - const value_immersiveMode_value = value_immersiveMode! - valueSerializer.writeImmersiveMode(value_immersiveMode_value) + const value_immersiveMode_value = (value_immersiveMode as ImmersiveMode) + valueSerializer.writeInt32(TypeChecker.ImmersiveMode_ToNumeric(value_immersiveMode_value)) } const value_levelOrder = value.levelOrder let value_levelOrder_type : int32 = RuntimeType.UNDEFINED @@ -19450,8 +19441,8 @@ export class Serializer extends SerializerBase { value_levelMode_type = runtimeType(value_levelMode) valueSerializer.writeInt8(value_levelMode_type as int32) if ((RuntimeType.UNDEFINED) != (value_levelMode_type)) { - const value_levelMode_value = value_levelMode! - valueSerializer.writeLevelMode(value_levelMode_value) + const value_levelMode_value = (value_levelMode as LevelMode) + valueSerializer.writeInt32(TypeChecker.LevelMode_ToNumeric(value_levelMode_value)) } const value_levelUniqueId = value.levelUniqueId let value_levelUniqueId_type : int32 = RuntimeType.UNDEFINED @@ -19466,8 +19457,8 @@ export class Serializer extends SerializerBase { value_immersiveMode_type = runtimeType(value_immersiveMode) valueSerializer.writeInt8(value_immersiveMode_type as int32) if ((RuntimeType.UNDEFINED) != (value_immersiveMode_type)) { - const value_immersiveMode_value = value_immersiveMode! - valueSerializer.writeImmersiveMode(value_immersiveMode_value) + const value_immersiveMode_value = (value_immersiveMode as ImmersiveMode) + valueSerializer.writeInt32(TypeChecker.ImmersiveMode_ToNumeric(value_immersiveMode_value)) } const value_levelOrder = value.levelOrder let value_levelOrder_type : int32 = RuntimeType.UNDEFINED @@ -20630,8 +20621,8 @@ export class Serializer extends SerializerBase { value_levelMode_type = runtimeType(value_levelMode) valueSerializer.writeInt8(value_levelMode_type as int32) if ((RuntimeType.UNDEFINED) != (value_levelMode_type)) { - const value_levelMode_value = value_levelMode! - valueSerializer.writeLevelMode(value_levelMode_value) + const value_levelMode_value = (value_levelMode as LevelMode) + valueSerializer.writeInt32(TypeChecker.LevelMode_ToNumeric(value_levelMode_value)) } const value_levelUniqueId = value.levelUniqueId let value_levelUniqueId_type : int32 = RuntimeType.UNDEFINED @@ -20646,8 +20637,8 @@ export class Serializer extends SerializerBase { value_immersiveMode_type = runtimeType(value_immersiveMode) valueSerializer.writeInt8(value_immersiveMode_type as int32) if ((RuntimeType.UNDEFINED) != (value_immersiveMode_type)) { - const value_immersiveMode_value = value_immersiveMode! - valueSerializer.writeImmersiveMode(value_immersiveMode_value) + const value_immersiveMode_value = (value_immersiveMode as ImmersiveMode) + valueSerializer.writeInt32(TypeChecker.ImmersiveMode_ToNumeric(value_immersiveMode_value)) } const value_levelOrder = value.levelOrder let value_levelOrder_type : int32 = RuntimeType.UNDEFINED @@ -24507,6 +24498,13 @@ export class Serializer extends SerializerBase { valueSerializer.writeBoolean(value_hideItemValue_value) } } + public writePopupButton(value: PopupButton): void { + let valueSerializer : Serializer = this + const value_value = value.value + valueSerializer.writeString(value_value) + const value_action = value.action + valueSerializer.holdAndWriteCallback(value_action) + } writePopupOptions(value: PopupOptions): void { let valueSerializer : Serializer = this const value_message = value.message @@ -24523,24 +24521,18 @@ export class Serializer extends SerializerBase { const value_primaryButton = value.primaryButton let value_primaryButton_type : int32 = RuntimeType.UNDEFINED value_primaryButton_type = runtimeType(value_primaryButton) - valueSerializer.writeInt8(value_primaryButton_type as int32) + valueSerializer.writeInt8(value_primaryButton_type) if ((RuntimeType.UNDEFINED) != (value_primaryButton_type)) { const value_primaryButton_value = value_primaryButton! - const value_primaryButton_value_value = value_primaryButton_value.value - valueSerializer.writeString(value_primaryButton_value_value) - const value_primaryButton_value_action = value_primaryButton_value.action - valueSerializer.holdAndWriteCallback(value_primaryButton_value_action) + valueSerializer.writePopupButton(value_primaryButton_value) } const value_secondaryButton = value.secondaryButton let value_secondaryButton_type : int32 = RuntimeType.UNDEFINED value_secondaryButton_type = runtimeType(value_secondaryButton) - valueSerializer.writeInt8(value_secondaryButton_type as int32) + valueSerializer.writeInt8(value_secondaryButton_type) if ((RuntimeType.UNDEFINED) != (value_secondaryButton_type)) { const value_secondaryButton_value = value_secondaryButton! - const value_secondaryButton_value_value = value_secondaryButton_value.value - valueSerializer.writeString(value_secondaryButton_value_value) - const value_secondaryButton_value_action = value_secondaryButton_value.action - valueSerializer.holdAndWriteCallback(value_secondaryButton_value_action) + valueSerializer.writePopupButton(value_secondaryButton_value) } const value_onStateChange = value.onStateChange let value_onStateChange_type : int32 = RuntimeType.UNDEFINED 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 9ec5f8eab4b..95d6fe59ef0 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 @@ -58,7 +58,7 @@ import { DrawContext, Rect, LengthUnit, ShapeClip, RoundRect, Circle, CommandPat import { DataOperationType } from "./../lazyForEach" import { DataPanelType, ColorStop, LinearGradient, DataPanelOptions, DataPanelShadowOptions } from "./../dataPanel" import { DatePickerMode, DatePickerOptions, DatePickerResult, LunarSwitchStyle, DatePickerDialogOptions, Callback_DatePickerResult_Void } from "./../datePicker" -import { DialogAlignment, DialogButtonDirection, LevelOrder, TextStyle_alert_dialog, AlertDialogButtonBaseOptions, AlertDialogButtonOptions, AlertDialogParamWithButtons, AlertDialogParam, AlertDialogParamWithConfirm, AlertDialogParamWithOptions } from "./../alertDialog" +import { DialogAlignment, DialogButtonDirection, TextStyle_alert_dialog, AlertDialogButtonBaseOptions, AlertDialogButtonOptions, AlertDialogParamWithButtons, AlertDialogParam, AlertDialogParamWithConfirm, AlertDialogParamWithOptions } from "./../alertDialog" import { DistributionType, DisturbanceFieldShape, ParticleEmitterShape, ParticleType, ParticleUpdater } from "./../particle" import { DpiFollowStrategy, UIExtensionProxy, Callback_UIExtensionProxy_Void, WindowModeFollowStrategy, UIExtensionOptions, Literal_Number_code__want } from "./../uiExtensionComponent" import { EditMode, ListItemStyle, Sticky, SwipeActionState, SwipeEdgeEffect, ListItemOptions, SwipeActionItem, Callback_SwipeActionState_Void, SwipeActionOptions } from "./../listItem" @@ -130,7 +130,7 @@ import { CircleOptions } from "./../circle" import { ColumnOptions, ColumnOptionsV2 } from "./../column" import { ColumnSplitDividerStyle } from "./../columnSplit" import { DateTimeOptions } from "./../arkui-intl" -import { DismissDialogAction, ImmersiveMode, LevelMode, ActionSheetButtonOptions, ActionSheetOffset, SheetInfo, ActionSheetOptions, Callback_DismissDialogAction_Void } from "./../actionSheet" +import { DismissDialogAction, ActionSheetButtonOptions, ActionSheetOffset, SheetInfo, ActionSheetOptions, Callback_DismissDialogAction_Void } from "./../actionSheet" import { DoubleAnimationParam, Callback_Extender_OnProgress, Callback_Extender_OnFinish } from "./../animationExtender" import { EllipseOptions } from "./../ellipse" import { FormLinkOptions } from "./../formLink" @@ -160,6 +160,7 @@ import { TerminationInfo } from "./../embeddedComponent" import { TextBackgroundStyle } from "./../span" import { PointerStyle, UniformDataType, DataSyncOptions} from '#external' import promptAction from "@ohos/promptAction" +import { LevelMode, ImmersiveMode, LevelOrder } from "@ohos/promptAction" export class TypeChecker { static typeInstanceOf(value: Object, prop: string): boolean { @@ -6961,8 +6962,11 @@ export class TypeChecker { throw new Error("Can not discriminate value typeof ImageSpanAlignment") } } - static isImmersiveMode(value: Object | string | number | undefined | boolean, duplicated__ImmersiveModeStub: boolean): boolean { - if ((!duplicated__ImmersiveModeStub) && (value?.hasOwnProperty("_ImmersiveModeStub"))) { + static isImmersiveMode(value: Object | string | number | undefined | boolean): boolean { + if ((value) === (ImmersiveMode.DEFAULT)) { + return true + } + else if ((value) === (ImmersiveMode.EXTEND)) { return true } else { @@ -7626,22 +7630,20 @@ export class TypeChecker { throw new Error("Can not discriminate value typeof LetterSpacingStyle") } } - static isLevelMode(value: Object | string | number | undefined | boolean, duplicated__LevelModeStub: boolean): boolean { - if ((!duplicated__LevelModeStub) && (value?.hasOwnProperty("_LevelModeStub"))) { + static isLevelMode(value: Object | string | number | undefined | boolean): boolean { + if ((value) === (LevelMode.OVERLAY)) { return true } - else { - throw new Error("Can not discriminate value typeof LevelMode") - } - } - static isLevelOrder(value: Object | string | number | undefined | boolean, duplicated__LevelOrderStub: boolean): boolean { - if ((!duplicated__LevelOrderStub) && (value?.hasOwnProperty("_LevelOrderStub"))) { + else if ((value) === (LevelMode.EMBEDDED)) { return true } else { - throw new Error("Can not discriminate value typeof LevelOrder") + throw new Error("Can not discriminate value typeof LevelMode") } } + static isLevelOrder(value: Object | string | number | undefined | boolean): boolean { + throw new Error("Can not discriminate value typeof LevelOrder") + } static isLightSource(value: Object | string | number | undefined | boolean, duplicated_positionX: boolean, duplicated_positionY: boolean, duplicated_positionZ: boolean, duplicated_intensity: boolean, duplicated_color: boolean): boolean { if ((!duplicated_positionX) && (value?.hasOwnProperty("positionX"))) { return true @@ -20213,6 +20215,18 @@ export class TypeChecker { static HoverModeAreaType_FromNumeric(ordinal: int32): HoverModeAreaType { return ordinal as HoverModeAreaType } + static LevelMode_ToNumeric(value: LevelMode): int32 { + return value as int32 + } + static LevelMode_FromNumeric(ordinal: int32): LevelMode { + return ordinal as LevelMode + } + static ImmersiveMode_ToNumeric(value: ImmersiveMode): int32 { + return value as int32 + } + static ImmersiveMode_FromNumeric(ordinal: int32): ImmersiveMode { + return ordinal as ImmersiveMode + } static IlluminatedType_ToNumeric(value: IlluminatedType): int32 { return value as int32 } diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/handwritten/component/customDialogController.ts b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/handwritten/component/customDialogController.ts index a462d37ed8e..ca50777833c 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/handwritten/component/customDialogController.ts +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/handwritten/component/customDialogController.ts @@ -25,12 +25,13 @@ import { Deserializer } from "./peers/Deserializer" import { CallbackTransformer } from "./peers/CallbackTransformer" import { NodeAttach, remember } from "@koalaui/runtime" import { CustomBuilder, Rectangle, AnimateParam, ShadowOptions, ShadowStyle, BlurStyle, BackgroundBlurStyleOptions, BackgroundEffectOptions, KeyboardAvoidMode, HoverModeAreaType } from "./common" -import { DialogAlignment, LevelOrder } from "./alertDialog" +import { DialogAlignment } from "./alertDialog" import { Offset, ResourceColor, Dimension, BorderRadiuses, EdgeWidths, EdgeColors, EdgeStyles } from "./units" -import { Callback_DismissDialogAction_Void, DismissDialogAction, LevelMode, ImmersiveMode } from "./actionSheet" +import { Callback_DismissDialogAction_Void, DismissDialogAction} from "./actionSheet" import { BorderStyle } from "./enums" import { LengthMetrics } from "../Graphics" import { ExtendableComponent } from "./extendableComponent"; +import { ImmersiveMode, LevelMode, LevelOrder } from "@ohos/promptAction" export class CustomDialogControllerInternal { public static fromPtr(ptr: KPointer): CustomDialogController { const obj : CustomDialogController = new CustomDialogController(undefined) 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 7af3894aeaa..72b95381fc4 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 @@ -33253,16 +33253,8 @@ inline Ark_RuntimeType runtimeType(const Ark_DismissPopupAction& value) return INTEROP_RUNTIME_OBJECT; } template <> -inline void WriteToString(std::string* result, const Ark_DismissPopupAction* value) { - result->append("{"); - // Callback_Void dismiss - result->append(".dismiss="); - WriteToString(result, &value->dismiss); - // Ark_DismissReason reason - result->append(", "); - result->append(".reason="); - WriteToString(result, value->reason); - result->append("}"); +inline void WriteToString(std::string* result, const Ark_DismissPopupAction value) { + WriteToString(result, static_cast(value)); } template <> inline void WriteToString(std::string* result, const Opt_DismissPopupAction* value) { @@ -33270,7 +33262,7 @@ inline void WriteToString(std::string* result, const Opt_DismissPopupAction* val result->append(tagNameExact((Ark_Tag)(value->tag))); result->append(", .value="); if (value->tag != INTEROP_TAG_UNDEFINED) { - WriteToString(result, &value->value); + WriteToString(result, value->value); } else { Ark_Undefined undefined = { 0 }; WriteToString(result, undefined); @@ -35524,15 +35516,13 @@ inline Ark_RuntimeType runtimeType(const Opt_ImageSourceSize& value) template <> inline Ark_RuntimeType runtimeType(const Ark_ImmersiveMode& value) { - return INTEROP_RUNTIME_OBJECT; + return INTEROP_RUNTIME_NUMBER; } template <> -inline void WriteToString(std::string* result, const Ark_ImmersiveMode* value) { - result->append("{"); - // Ark_String _ImmersiveModeStub - result->append("._ImmersiveModeStub="); - WriteToString(result, &value->_ImmersiveModeStub); - result->append("}"); +inline void WriteToString(std::string* result, const Ark_ImmersiveMode value) { + result->append("Ark_ImmersiveMode("); + WriteToString(result, (Ark_Int32) value); + result->append(")"); } template <> inline void WriteToString(std::string* result, const Opt_ImmersiveMode* value) { @@ -35540,7 +35530,7 @@ inline void WriteToString(std::string* result, const Opt_ImmersiveMode* value) { result->append(tagNameExact((Ark_Tag)(value->tag))); result->append(", .value="); if (value->tag != INTEROP_TAG_UNDEFINED) { - WriteToString(result, &value->value); + WriteToString(result, value->value); } else { Ark_Undefined undefined = { 0 }; WriteToString(result, undefined); @@ -35936,15 +35926,13 @@ inline Ark_RuntimeType runtimeType(const Opt_LetterSpacingStyle& value) template <> inline Ark_RuntimeType runtimeType(const Ark_LevelMode& value) { - return INTEROP_RUNTIME_OBJECT; + return INTEROP_RUNTIME_NUMBER; } template <> -inline void WriteToString(std::string* result, const Ark_LevelMode* value) { - result->append("{"); - // Ark_String _LevelModeStub - result->append("._LevelModeStub="); - WriteToString(result, &value->_LevelModeStub); - result->append("}"); +inline void WriteToString(std::string* result, const Ark_LevelMode value) { + result->append("(Ark_LevelMode("); + WriteToString(result, (Ark_Int32) value); + result->append(")"); } template <> inline void WriteToString(std::string* result, const Opt_LevelMode* value) { @@ -35952,7 +35940,7 @@ inline void WriteToString(std::string* result, const Opt_LevelMode* value) { result->append(tagNameExact((Ark_Tag)(value->tag))); result->append(", .value="); if (value->tag != INTEROP_TAG_UNDEFINED) { - WriteToString(result, &value->value); + WriteToString(result, value->value); } else { Ark_Undefined undefined = { 0 }; WriteToString(result, undefined); @@ -35970,12 +35958,8 @@ inline Ark_RuntimeType runtimeType(const Ark_LevelOrder& value) return INTEROP_RUNTIME_OBJECT; } template <> -inline void WriteToString(std::string* result, const Ark_LevelOrder* value) { - result->append("{"); - // Ark_String _LevelOrderStub - result->append("._LevelOrderStub="); - WriteToString(result, &value->_LevelOrderStub); - result->append("}"); +inline void WriteToString(std::string* result, const Ark_LevelOrder value) { + WriteToString(result, static_cast(value)); } template <> inline void WriteToString(std::string* result, const Opt_LevelOrder* value) { @@ -35983,7 +35967,7 @@ inline void WriteToString(std::string* result, const Opt_LevelOrder* value) { result->append(tagNameExact((Ark_Tag)(value->tag))); result->append(", .value="); if (value->tag != INTEROP_TAG_UNDEFINED) { - WriteToString(result, &value->value); + WriteToString(result, value->value); } else { Ark_Undefined undefined = { 0 }; WriteToString(result, undefined); @@ -65546,12 +65530,7 @@ class Serializer : public SerializerBase { void writeDismissPopupAction(Ark_DismissPopupAction value) { Serializer& valueSerializer = *this; - const auto value_dismiss = value.dismiss; - valueSerializer.writeCallbackResource(value_dismiss.resource); - valueSerializer.writePointer(reinterpret_cast(value_dismiss.call)); - valueSerializer.writePointer(reinterpret_cast(value_dismiss.callSync)); - const auto value_reason = value.reason; - valueSerializer.writeInt32(static_cast(value_reason)); + valueSerializer.writePointer(value); } void writeDismissSheetAction(Ark_DismissSheetAction value) { @@ -66907,12 +66886,6 @@ class Serializer : public SerializerBase { const auto value_height = value.height; valueSerializer.writeNumber(value_height); } - void writeImmersiveMode(Ark_ImmersiveMode value) - { - Serializer& valueSerializer = *this; - const auto value__ImmersiveModeStub = value._ImmersiveModeStub; - valueSerializer.writeString(value__ImmersiveModeStub); - } void writeInputCounterOptions(Ark_InputCounterOptions value) { Serializer& valueSerializer = *this; @@ -67067,17 +67040,10 @@ class Serializer : public SerializerBase { Serializer& valueSerializer = *this; valueSerializer.writePointer(value); } - void writeLevelMode(Ark_LevelMode value) - { - Serializer& valueSerializer = *this; - const auto value__LevelModeStub = value._LevelModeStub; - valueSerializer.writeString(value__LevelModeStub); - } void writeLevelOrder(Ark_LevelOrder value) { Serializer& valueSerializer = *this; - const auto value__LevelOrderStub = value._LevelOrderStub; - valueSerializer.writeString(value__LevelOrderStub); + valueSerializer.writePointer(value); } void writeLinearGradient_common(Ark_LinearGradient_common value) { @@ -81669,7 +81635,7 @@ class Serializer : public SerializerBase { valueSerializer.writeInt8(value_levelMode_type); if ((INTEROP_RUNTIME_UNDEFINED) != (value_levelMode_type)) { const auto value_levelMode_value = value_levelMode.value; - valueSerializer.writeLevelMode(value_levelMode_value); + valueSerializer.writeInt32(static_cast(value_levelMode_value)); } const auto value_levelUniqueId = value.levelUniqueId; Ark_Int32 value_levelUniqueId_type = INTEROP_RUNTIME_UNDEFINED; @@ -81685,7 +81651,7 @@ class Serializer : public SerializerBase { valueSerializer.writeInt8(value_immersiveMode_type); if ((INTEROP_RUNTIME_UNDEFINED) != (value_immersiveMode_type)) { const auto value_immersiveMode_value = value_immersiveMode.value; - valueSerializer.writeImmersiveMode(value_immersiveMode_value); + valueSerializer.writeInt32(static_cast(value_immersiveMode_value)); } const auto value_levelOrder = value.levelOrder; Ark_Int32 value_levelOrder_type = INTEROP_RUNTIME_UNDEFINED; @@ -82104,7 +82070,7 @@ class Serializer : public SerializerBase { valueSerializer.writeInt8(value_levelMode_type); if ((INTEROP_RUNTIME_UNDEFINED) != (value_levelMode_type)) { const auto value_levelMode_value = value_levelMode.value; - valueSerializer.writeLevelMode(value_levelMode_value); + valueSerializer.writeInt32(static_cast(value_levelMode_value)); } const auto value_levelUniqueId = value.levelUniqueId; Ark_Int32 value_levelUniqueId_type = INTEROP_RUNTIME_UNDEFINED; @@ -82120,7 +82086,7 @@ class Serializer : public SerializerBase { valueSerializer.writeInt8(value_immersiveMode_type); if ((INTEROP_RUNTIME_UNDEFINED) != (value_immersiveMode_type)) { const auto value_immersiveMode_value = value_immersiveMode.value; - valueSerializer.writeImmersiveMode(value_immersiveMode_value); + valueSerializer.writeInt32(static_cast(value_immersiveMode_value)); } const auto value_levelOrder = value.levelOrder; Ark_Int32 value_levelOrder_type = INTEROP_RUNTIME_UNDEFINED; @@ -82543,7 +82509,7 @@ class Serializer : public SerializerBase { valueSerializer.writeInt8(value_levelMode_type); if ((INTEROP_RUNTIME_UNDEFINED) != (value_levelMode_type)) { const auto value_levelMode_value = value_levelMode.value; - valueSerializer.writeLevelMode(value_levelMode_value); + valueSerializer.writeInt32(static_cast(value_levelMode_value)); } const auto value_levelUniqueId = value.levelUniqueId; Ark_Int32 value_levelUniqueId_type = INTEROP_RUNTIME_UNDEFINED; @@ -82559,7 +82525,7 @@ class Serializer : public SerializerBase { valueSerializer.writeInt8(value_immersiveMode_type); if ((INTEROP_RUNTIME_UNDEFINED) != (value_immersiveMode_type)) { const auto value_immersiveMode_value = value_immersiveMode.value; - valueSerializer.writeImmersiveMode(value_immersiveMode_value); + valueSerializer.writeInt32(static_cast(value_immersiveMode_value)); } const auto value_levelOrder = value.levelOrder; Ark_Int32 value_levelOrder_type = INTEROP_RUNTIME_UNDEFINED; @@ -82986,7 +82952,7 @@ class Serializer : public SerializerBase { valueSerializer.writeInt8(value_levelMode_type); if ((INTEROP_RUNTIME_UNDEFINED) != (value_levelMode_type)) { const auto value_levelMode_value = value_levelMode.value; - valueSerializer.writeLevelMode(value_levelMode_value); + valueSerializer.writeInt32(static_cast(value_levelMode_value)); } const auto value_levelUniqueId = value.levelUniqueId; Ark_Int32 value_levelUniqueId_type = INTEROP_RUNTIME_UNDEFINED; @@ -83002,7 +82968,7 @@ class Serializer : public SerializerBase { valueSerializer.writeInt8(value_immersiveMode_type); if ((INTEROP_RUNTIME_UNDEFINED) != (value_immersiveMode_type)) { const auto value_immersiveMode_value = value_immersiveMode.value; - valueSerializer.writeImmersiveMode(value_immersiveMode_value); + valueSerializer.writeInt32(static_cast(value_immersiveMode_value)); } const auto value_levelOrder = value.levelOrder; Ark_Int32 value_levelOrder_type = INTEROP_RUNTIME_UNDEFINED; @@ -84208,7 +84174,7 @@ class Serializer : public SerializerBase { valueSerializer.writeInt8(value_levelMode_type); if ((INTEROP_RUNTIME_UNDEFINED) != (value_levelMode_type)) { const auto value_levelMode_value = value_levelMode.value; - valueSerializer.writeLevelMode(value_levelMode_value); + valueSerializer.writeInt32(static_cast(value_levelMode_value)); } const auto value_levelUniqueId = value.levelUniqueId; Ark_Int32 value_levelUniqueId_type = INTEROP_RUNTIME_UNDEFINED; @@ -84224,7 +84190,7 @@ class Serializer : public SerializerBase { valueSerializer.writeInt8(value_immersiveMode_type); if ((INTEROP_RUNTIME_UNDEFINED) != (value_immersiveMode_type)) { const auto value_immersiveMode_value = value_immersiveMode.value; - valueSerializer.writeImmersiveMode(value_immersiveMode_value); + valueSerializer.writeInt32(static_cast(value_immersiveMode_value)); } const auto value_levelOrder = value.levelOrder; Ark_Int32 value_levelOrder_type = INTEROP_RUNTIME_UNDEFINED; @@ -88477,6 +88443,16 @@ class Serializer : public SerializerBase { valueSerializer.writeBoolean(value_hideItemValue_value); } } + void writePopupButton(Ark_PopupButton value) + { + Serializer& valueSerializer = *this; + const auto value_value = value.value; + valueSerializer.writeString(value_value); + const auto value_action = value.action; + valueSerializer.writeCallbackResource(value_action.resource); + valueSerializer.writePointer(reinterpret_cast(value_action.call)); + valueSerializer.writePointer(reinterpret_cast(value_action.callSync)); + } void writePopupOptions(Ark_PopupOptions value) { Serializer& valueSerializer = *this; @@ -88496,12 +88472,7 @@ class Serializer : public SerializerBase { valueSerializer.writeInt8(value_primaryButton_type); if ((INTEROP_RUNTIME_UNDEFINED) != (value_primaryButton_type)) { const auto value_primaryButton_value = value_primaryButton.value; - const auto value_primaryButton_value_value = value_primaryButton_value.value; - valueSerializer.writeString(value_primaryButton_value_value); - const auto value_primaryButton_value_action = value_primaryButton_value.action; - valueSerializer.writeCallbackResource(value_primaryButton_value_action.resource); - valueSerializer.writePointer(reinterpret_cast(value_primaryButton_value_action.call)); - valueSerializer.writePointer(reinterpret_cast(value_primaryButton_value_action.callSync)); + valueSerializer.writePopupButton(value_primaryButton_value); } const auto value_secondaryButton = value.secondaryButton; Ark_Int32 value_secondaryButton_type = INTEROP_RUNTIME_UNDEFINED; @@ -88509,12 +88480,7 @@ class Serializer : public SerializerBase { valueSerializer.writeInt8(value_secondaryButton_type); if ((INTEROP_RUNTIME_UNDEFINED) != (value_secondaryButton_type)) { const auto value_secondaryButton_value = value_secondaryButton.value; - const auto value_secondaryButton_value_value = value_secondaryButton_value.value; - valueSerializer.writeString(value_secondaryButton_value_value); - const auto value_secondaryButton_value_action = value_secondaryButton_value.action; - valueSerializer.writeCallbackResource(value_secondaryButton_value_action.resource); - valueSerializer.writePointer(reinterpret_cast(value_secondaryButton_value_action.call)); - valueSerializer.writePointer(reinterpret_cast(value_secondaryButton_value_action.callSync)); + valueSerializer.writePopupButton(value_secondaryButton_value); } const auto value_onStateChange = value.onStateChange; Ark_Int32 value_onStateChange_type = INTEROP_RUNTIME_UNDEFINED; @@ -92498,11 +92464,9 @@ class Deserializer : public DeserializerBase { } Ark_DismissPopupAction readDismissPopupAction() { - Ark_DismissPopupAction value = {}; Deserializer& valueDeserializer = *this; - value.dismiss = {valueDeserializer.readCallbackResource(), reinterpret_cast(valueDeserializer.readPointerOrDefault(reinterpret_cast(getManagedCallbackCaller(Kind_Callback_Void)))), reinterpret_cast(valueDeserializer.readPointerOrDefault(reinterpret_cast(getManagedCallbackCallerSync(Kind_Callback_Void))))}; - value.reason = static_cast(valueDeserializer.readInt32()); - return value; + Ark_NativePointer ptr = valueDeserializer.readPointer(); + return static_cast(ptr); } Ark_DismissSheetAction readDismissSheetAction() { @@ -93773,13 +93737,6 @@ class Deserializer : public DeserializerBase { value.height = static_cast(valueDeserializer.readNumber()); return value; } - Ark_ImmersiveMode readImmersiveMode() - { - Ark_ImmersiveMode value = {}; - Deserializer& valueDeserializer = *this; - value._ImmersiveModeStub = static_cast(valueDeserializer.readString()); - return value; - } Ark_InputCounterOptions readInputCounterOptions() { Ark_InputCounterOptions value = {}; @@ -93942,19 +93899,11 @@ class Deserializer : public DeserializerBase { Ark_NativePointer ptr = valueDeserializer.readPointer(); return static_cast(ptr); } - Ark_LevelMode readLevelMode() - { - Ark_LevelMode value = {}; - Deserializer& valueDeserializer = *this; - value._LevelModeStub = static_cast(valueDeserializer.readString()); - return value; - } Ark_LevelOrder readLevelOrder() { - Ark_LevelOrder value = {}; Deserializer& valueDeserializer = *this; - value._LevelOrderStub = static_cast(valueDeserializer.readString()); - return value; + Ark_NativePointer ptr = valueDeserializer.readPointer(); + return static_cast(ptr); } Ark_LinearGradient_common readLinearGradient_common() { @@ -109739,7 +109688,7 @@ class Deserializer : public DeserializerBase { levelMode_buf.tag = levelMode_buf_runtimeType == INTEROP_RUNTIME_UNDEFINED ? INTEROP_TAG_UNDEFINED : INTEROP_TAG_OBJECT; if ((INTEROP_RUNTIME_UNDEFINED) != (levelMode_buf_runtimeType)) { - levelMode_buf.value = valueDeserializer.readLevelMode(); + levelMode_buf.value = static_cast(valueDeserializer.readInt32()); } value.levelMode = levelMode_buf; const auto levelUniqueId_buf_runtimeType = static_cast(valueDeserializer.readInt8()); @@ -109755,7 +109704,7 @@ class Deserializer : public DeserializerBase { immersiveMode_buf.tag = immersiveMode_buf_runtimeType == INTEROP_RUNTIME_UNDEFINED ? INTEROP_TAG_UNDEFINED : INTEROP_TAG_OBJECT; if ((INTEROP_RUNTIME_UNDEFINED) != (immersiveMode_buf_runtimeType)) { - immersiveMode_buf.value = valueDeserializer.readImmersiveMode(); + immersiveMode_buf.value = static_cast(valueDeserializer.readInt32()); } value.immersiveMode = immersiveMode_buf; const auto levelOrder_buf_runtimeType = static_cast(valueDeserializer.readInt8()); @@ -110186,7 +110135,7 @@ class Deserializer : public DeserializerBase { levelMode_buf.tag = levelMode_buf_runtimeType == INTEROP_RUNTIME_UNDEFINED ? INTEROP_TAG_UNDEFINED : INTEROP_TAG_OBJECT; if ((INTEROP_RUNTIME_UNDEFINED) != (levelMode_buf_runtimeType)) { - levelMode_buf.value = valueDeserializer.readLevelMode(); + levelMode_buf.value = static_cast(valueDeserializer.readInt32()); } value.levelMode = levelMode_buf; const auto levelUniqueId_buf_runtimeType = static_cast(valueDeserializer.readInt8()); @@ -110202,7 +110151,7 @@ class Deserializer : public DeserializerBase { immersiveMode_buf.tag = immersiveMode_buf_runtimeType == INTEROP_RUNTIME_UNDEFINED ? INTEROP_TAG_UNDEFINED : INTEROP_TAG_OBJECT; if ((INTEROP_RUNTIME_UNDEFINED) != (immersiveMode_buf_runtimeType)) { - immersiveMode_buf.value = valueDeserializer.readImmersiveMode(); + immersiveMode_buf.value = static_cast(valueDeserializer.readInt32()); } value.immersiveMode = immersiveMode_buf; const auto levelOrder_buf_runtimeType = static_cast(valueDeserializer.readInt8()); @@ -110635,7 +110584,7 @@ class Deserializer : public DeserializerBase { levelMode_buf.tag = levelMode_buf_runtimeType == INTEROP_RUNTIME_UNDEFINED ? INTEROP_TAG_UNDEFINED : INTEROP_TAG_OBJECT; if ((INTEROP_RUNTIME_UNDEFINED) != (levelMode_buf_runtimeType)) { - levelMode_buf.value = valueDeserializer.readLevelMode(); + levelMode_buf.value = static_cast(valueDeserializer.readInt32()); } value.levelMode = levelMode_buf; const auto levelUniqueId_buf_runtimeType = static_cast(valueDeserializer.readInt8()); @@ -110651,7 +110600,7 @@ class Deserializer : public DeserializerBase { immersiveMode_buf.tag = immersiveMode_buf_runtimeType == INTEROP_RUNTIME_UNDEFINED ? INTEROP_TAG_UNDEFINED : INTEROP_TAG_OBJECT; if ((INTEROP_RUNTIME_UNDEFINED) != (immersiveMode_buf_runtimeType)) { - immersiveMode_buf.value = valueDeserializer.readImmersiveMode(); + immersiveMode_buf.value = static_cast(valueDeserializer.readInt32()); } value.immersiveMode = immersiveMode_buf; const auto levelOrder_buf_runtimeType = static_cast(valueDeserializer.readInt8()); @@ -111090,7 +111039,7 @@ class Deserializer : public DeserializerBase { levelMode_buf.tag = levelMode_buf_runtimeType == INTEROP_RUNTIME_UNDEFINED ? INTEROP_TAG_UNDEFINED : INTEROP_TAG_OBJECT; if ((INTEROP_RUNTIME_UNDEFINED) != (levelMode_buf_runtimeType)) { - levelMode_buf.value = valueDeserializer.readLevelMode(); + levelMode_buf.value = static_cast(valueDeserializer.readInt32()); } value.levelMode = levelMode_buf; const auto levelUniqueId_buf_runtimeType = static_cast(valueDeserializer.readInt8()); @@ -111106,7 +111055,7 @@ class Deserializer : public DeserializerBase { immersiveMode_buf.tag = immersiveMode_buf_runtimeType == INTEROP_RUNTIME_UNDEFINED ? INTEROP_TAG_UNDEFINED : INTEROP_TAG_OBJECT; if ((INTEROP_RUNTIME_UNDEFINED) != (immersiveMode_buf_runtimeType)) { - immersiveMode_buf.value = valueDeserializer.readImmersiveMode(); + immersiveMode_buf.value = static_cast(valueDeserializer.readInt32()); } value.immersiveMode = immersiveMode_buf; const auto levelOrder_buf_runtimeType = static_cast(valueDeserializer.readInt8()); @@ -112362,7 +112311,7 @@ class Deserializer : public DeserializerBase { levelMode_buf.tag = levelMode_buf_runtimeType == INTEROP_RUNTIME_UNDEFINED ? INTEROP_TAG_UNDEFINED : INTEROP_TAG_OBJECT; if ((INTEROP_RUNTIME_UNDEFINED) != (levelMode_buf_runtimeType)) { - levelMode_buf.value = valueDeserializer.readLevelMode(); + levelMode_buf.value = static_cast(valueDeserializer.readInt32()); } value.levelMode = levelMode_buf; const auto levelUniqueId_buf_runtimeType = static_cast(valueDeserializer.readInt8()); @@ -112378,7 +112327,7 @@ class Deserializer : public DeserializerBase { immersiveMode_buf.tag = immersiveMode_buf_runtimeType == INTEROP_RUNTIME_UNDEFINED ? INTEROP_TAG_UNDEFINED : INTEROP_TAG_OBJECT; if ((INTEROP_RUNTIME_UNDEFINED) != (immersiveMode_buf_runtimeType)) { - immersiveMode_buf.value = valueDeserializer.readImmersiveMode(); + immersiveMode_buf.value = static_cast(valueDeserializer.readInt32()); } value.immersiveMode = immersiveMode_buf; const auto levelOrder_buf_runtimeType = static_cast(valueDeserializer.readInt8()); 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 0b8796f228a..dc827fd6b38 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 @@ -1842,7 +1842,8 @@ typedef struct Ark_DismissContentCoverAction Ark_DismissContentCoverAction; typedef struct Opt_DismissContentCoverAction Opt_DismissContentCoverAction; typedef struct Ark_DismissDialogAction Ark_DismissDialogAction; typedef struct Opt_DismissDialogAction Opt_DismissDialogAction; -typedef struct Ark_DismissPopupAction Ark_DismissPopupAction; +typedef struct DismissPopupActionPeer DismissPopupActionPeer; +typedef struct DismissPopupActionPeer* Ark_DismissPopupAction; typedef struct Opt_DismissPopupAction Opt_DismissPopupAction; typedef struct Ark_DismissSheetAction Ark_DismissSheetAction; typedef struct Opt_DismissSheetAction Opt_DismissSheetAction; @@ -1964,8 +1965,6 @@ typedef struct Ark_ShapePoint Ark_ShapePoint; typedef struct Opt_ShapePoint Opt_ShapePoint; typedef struct Ark_ImageSourceSize Ark_ImageSourceSize; typedef struct Opt_ImageSourceSize Opt_ImageSourceSize; -typedef struct Ark_ImmersiveMode Ark_ImmersiveMode; -typedef struct Opt_ImmersiveMode Opt_ImmersiveMode; typedef struct Ark_InputCounterOptions Ark_InputCounterOptions; typedef struct Opt_InputCounterOptions Opt_InputCounterOptions; typedef struct Ark_InsertValue Ark_InsertValue; @@ -1995,9 +1994,8 @@ typedef struct Opt_LengthMetricsCustom Opt_LengthMetricsCustom; typedef struct LetterSpacingStylePeer LetterSpacingStylePeer; typedef struct LetterSpacingStylePeer* Ark_LetterSpacingStyle; typedef struct Opt_LetterSpacingStyle Opt_LetterSpacingStyle; -typedef struct Ark_LevelMode Ark_LevelMode; -typedef struct Opt_LevelMode Opt_LevelMode; -typedef struct Ark_LevelOrder Ark_LevelOrder; +typedef struct LevelOrderPeer LevelOrderPeer; +typedef struct LevelOrderPeer* Ark_LevelOrder; typedef struct Opt_LevelOrder Opt_LevelOrder; typedef struct Ark_LinearGradient_common Ark_LinearGradient_common; typedef struct Opt_LinearGradient_common Opt_LinearGradient_common; @@ -12519,10 +12517,6 @@ typedef struct Opt_DismissDialogAction { Ark_Tag tag; Ark_DismissDialogAction value; } Opt_DismissDialogAction; -typedef struct Ark_DismissPopupAction { - Callback_Void dismiss; - Ark_DismissReason reason; -} Ark_DismissPopupAction; typedef struct Opt_DismissPopupAction { Ark_Tag tag; Ark_DismissPopupAction value; @@ -13067,8 +13061,9 @@ typedef struct Opt_ImageSourceSize { Ark_Tag tag; Ark_ImageSourceSize value; } Opt_ImageSourceSize; -typedef struct Ark_ImmersiveMode { - Ark_String _ImmersiveModeStub; +typedef enum Ark_ImmersiveMode { + ARK_IMMERSIVE_MODE_DEFAULT = 0, + ARK_IMMERSIVE_MODE_EXTEND = 1, } Ark_ImmersiveMode; typedef struct Opt_ImmersiveMode { Ark_Tag tag; @@ -13172,16 +13167,14 @@ typedef struct Opt_LetterSpacingStyle { Ark_Tag tag; Ark_LetterSpacingStyle value; } Opt_LetterSpacingStyle; -typedef struct Ark_LevelMode { - Ark_String _LevelModeStub; +typedef enum Ark_LevelMode { + ARK_LEVEL_MODE_OVERLAY = 0, + ARK_LEVEL_MODE_EMBEDDED = 1, } Ark_LevelMode; typedef struct Opt_LevelMode { Ark_Tag tag; Ark_LevelMode value; } Opt_LevelMode; -typedef struct Ark_LevelOrder { - Ark_String _LevelOrderStub; -} Ark_LevelOrder; typedef struct Opt_LevelOrder { Ark_Tag tag; Ark_LevelOrder value; @@ -27282,6 +27275,23 @@ typedef struct GENERATED_ArkUILetterSpacingStyleAccessor { Ark_Number (*getLetterSpacing)(Ark_LetterSpacingStyle peer); } GENERATED_ArkUILetterSpacingStyleAccessor; +typedef struct GENERATED_ArkUILevelOrderAccessor { + void (*destroyPeer)(Ark_LevelOrder peer); + Ark_LevelOrder (*construct)(); + Ark_NativePointer (*getFinalizer)(); + Ark_LevelOrder (*clamp)(const Ark_Number* order); + Ark_Number (*getOrder)(Ark_LevelOrder peer); +} GENERATED_ArkUILevelOrderAccessor; + +typedef struct GENERATED_ArkUIDismissPopupActionAccessor { + void (*destroyPeer)(Ark_DismissPopupAction peer); + Ark_DismissPopupAction (*construct)(); + Ark_NativePointer (*getFinalizer)(); + void (*dismiss)(Ark_DismissPopupAction peer); + Ark_DismissReason (*getReason)(Ark_DismissPopupAction peer); + void (*setReason)(Ark_DismissPopupAction peer, Ark_DismissReason reason); +} GENERATED_ArkUIDismissPopupActionAccessor; + typedef struct GENERATED_ArkUITextShadowStyleAccessor { void (*destroyPeer)(Ark_TextShadowStyle peer); Ark_TextShadowStyle (*ctor)(const Ark_Union_ShadowOptions_Array_ShadowOptions* value); @@ -27820,6 +27830,8 @@ typedef struct GENERATED_ArkUIAccessors { const GENERATED_ArkUIDecorationStyleAccessor* (*getDecorationStyleAccessor)(); const GENERATED_ArkUIBaselineOffsetStyleAccessor* (*getBaselineOffsetStyleAccessor)(); const GENERATED_ArkUILetterSpacingStyleAccessor* (*getLetterSpacingStyleAccessor)(); + const GENERATED_ArkUILevelOrderAccessor* (*getLevelOrderAccessor)(); + const GENERATED_ArkUIDismissPopupActionAccessor* (*getDismissPopupActionAccessor)(); const GENERATED_ArkUITextShadowStyleAccessor* (*getTextShadowStyleAccessor)(); const GENERATED_ArkUIBackgroundColorStyleAccessor* (*getBackgroundColorStyleAccessor)(); const GENERATED_ArkUIGestureStyleAccessor* (*getGestureStyleAccessor)(); diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala/framework/native/src/generated/bridge_generated.cc b/frameworks/bridge/arkts_frontend/koala_projects/arkoala/framework/native/src/generated/bridge_generated.cc index 15f407ace86..6be73b9a5ef 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala/framework/native/src/generated/bridge_generated.cc +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala/framework/native/src/generated/bridge_generated.cc @@ -44577,6 +44577,46 @@ Ark_Number impl_LetterSpacingStyle_getLetterSpacing(Ark_NativePointer thisPtr) { return GetAccessors()->getLetterSpacingStyleAccessor()->getLetterSpacing(self); } KOALA_INTEROP_DIRECT_1(LetterSpacingStyle_getLetterSpacing, KInteropNumber, Ark_NativePointer) +Ark_NativePointer impl_LevelOrder_construct() { + return GetAccessors()->getLevelOrderAccessor()->construct(); +} +KOALA_INTEROP_DIRECT_0(LevelOrder_construct, Ark_NativePointer) +Ark_NativePointer impl_LevelOrder_getFinalizer() { + return GetAccessors()->getLevelOrderAccessor()->getFinalizer(); +} +KOALA_INTEROP_DIRECT_0(LevelOrder_getFinalizer, Ark_NativePointer) +Ark_NativePointer impl_LevelOrder_clamp(KInteropNumber order) { + return GetAccessors()->getLevelOrderAccessor()->clamp((const Ark_Number*) (&order)); +} +KOALA_INTEROP_DIRECT_1(LevelOrder_clamp, Ark_NativePointer, KInteropNumber) +Ark_Number impl_LevelOrder_getOrder(Ark_NativePointer thisPtr) { + Ark_LevelOrder self = reinterpret_cast(thisPtr); + return GetAccessors()->getLevelOrderAccessor()->getOrder(self); +} +KOALA_INTEROP_DIRECT_1(LevelOrder_getOrder, KInteropNumber, Ark_NativePointer) +Ark_NativePointer impl_DismissPopupAction_construct() { + return GetAccessors()->getDismissPopupActionAccessor()->construct(); +} +KOALA_INTEROP_DIRECT_0(DismissPopupAction_construct, Ark_NativePointer) +Ark_NativePointer impl_DismissPopupAction_getFinalizer() { + return GetAccessors()->getDismissPopupActionAccessor()->getFinalizer(); +} +KOALA_INTEROP_DIRECT_0(DismissPopupAction_getFinalizer, Ark_NativePointer) +void impl_DismissPopupAction_dismiss(Ark_NativePointer thisPtr) { + Ark_DismissPopupAction self = reinterpret_cast(thisPtr); + GetAccessors()->getDismissPopupActionAccessor()->dismiss(self); +} +KOALA_INTEROP_DIRECT_V1(DismissPopupAction_dismiss, Ark_NativePointer) +Ark_Int32 impl_DismissPopupAction_getReason(Ark_NativePointer thisPtr) { + Ark_DismissPopupAction self = reinterpret_cast(thisPtr); + return GetAccessors()->getDismissPopupActionAccessor()->getReason(self); +} +KOALA_INTEROP_DIRECT_1(DismissPopupAction_getReason, Ark_Int32, Ark_NativePointer) +void impl_DismissPopupAction_setReason(Ark_NativePointer thisPtr, Ark_Int32 reason) { + Ark_DismissPopupAction self = reinterpret_cast(thisPtr); + GetAccessors()->getDismissPopupActionAccessor()->setReason(self, static_cast(reason)); +} +KOALA_INTEROP_DIRECT_V2(DismissPopupAction_setReason, Ark_NativePointer, Ark_Int32) Ark_NativePointer impl_TextShadowStyle_ctor(KSerializerBuffer thisArray, int32_t thisLength) { Deserializer thisDeserializer(thisArray, thisLength); const Ark_Int8 value_value_buf_selector = thisDeserializer.readInt8(); diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala/framework/native/src/generated/dummy_impl.cc b/frameworks/bridge/arkts_frontend/koala_projects/arkoala/framework/native/src/generated/dummy_impl.cc index f2863d72f95..461137d76d3 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala/framework/native/src/generated/dummy_impl.cc +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala/framework/native/src/generated/dummy_impl.cc @@ -42689,6 +42689,173 @@ namespace OHOS::Ace::NG::GeneratedModifier { return {42}; } } // LetterSpacingStyleAccessor + namespace LevelOrderAccessor { + void DestroyPeerImpl(Ark_LevelOrder peer) + { + if (!needGroupedLog(1)) + return; + string out("destroyPeer("); + out.append(") \n"); + appendGroupedLog(1, out); + } + Ark_LevelOrder ConstructImpl() + { + if (!needGroupedLog(1)) + return (Ark_LevelOrder) 100; + string out("new LevelOrder("); + out.append(") \n"); + out.append("[return (Ark_LevelOrder) 100] \n"); + appendGroupedLog(1, out); + return (Ark_LevelOrder) 100; + } + Ark_NativePointer GetFinalizerImpl() + { + if (!needGroupedLog(1)) + return fnPtr(dummyClassFinalizer); + string out("getFinalizer("); + out.append(") \n"); + out.append("[return fnPtr(dummyClassFinalizer)] \n"); + appendGroupedLog(1, out); + return fnPtr(dummyClassFinalizer); + } + Ark_LevelOrder ClampImpl(const Ark_Number* order) + { + if (!needGroupedLog(1)) + return (Ark_LevelOrder) 300; + string out("clamp("); + WriteToString(&out, order); + out.append(") \n"); + out.append("[return (Ark_LevelOrder) 300] \n"); + appendGroupedLog(1, out); + return (Ark_LevelOrder) 300; + } + Ark_Number GetOrderImpl(Ark_LevelOrder peer) + { + if (!needGroupedLog(1)) + return {42}; + string out("getOrder("); + out.append(") \n"); + out.append("[return {42}] \n"); + appendGroupedLog(1, out); + return {42}; + } + } // LevelOrderAccessor + namespace DismissPopupActionAccessor { + void DestroyPeerImpl(Ark_DismissPopupAction peer) + { + if (!needGroupedLog(1)) + return; + string out("destroyPeer("); + out.append(") \n"); + appendGroupedLog(1, out); + } + Ark_DismissPopupAction ConstructImpl() + { + if (!needGroupedLog(1)) + return (Ark_DismissPopupAction) 100; + string out("new DismissPopupAction("); + out.append(") \n"); + out.append("[return (Ark_DismissPopupAction) 100] \n"); + appendGroupedLog(1, out); + return (Ark_DismissPopupAction) 100; + } + Ark_NativePointer GetFinalizerImpl() + { + if (!needGroupedLog(1)) + return fnPtr(dummyClassFinalizer); + string out("getFinalizer("); + out.append(") \n"); + out.append("[return fnPtr(dummyClassFinalizer)] \n"); + appendGroupedLog(1, out); + return fnPtr(dummyClassFinalizer); + } + void DismissImpl(Ark_DismissPopupAction peer) + { + if (!needGroupedLog(1)) + return; + string out("dismiss("); + out.append(") \n"); + appendGroupedLog(1, out); + } + Ark_DismissReason GetReasonImpl(Ark_DismissPopupAction peer) + { + if (!needGroupedLog(1)) + return {}; + string out("getReason("); + out.append(") \n"); + out.append("[return {}] \n"); + appendGroupedLog(1, out); + return {}; + } + void SetReasonImpl(Ark_DismissPopupAction peer, + Ark_DismissReason reason) + { + if (!needGroupedLog(1)) + return; + string out("setReason("); + WriteToString(&out, reason); + out.append(") \n"); + appendGroupedLog(1, out); + } + } // DismissPopupActionAccessor + namespace DissmissDialogActionNewAccessor { + void DestroyPeerImpl(Ark_DissmissDialogActionNew peer) + { + if (!needGroupedLog(1)) + return; + string out("destroyPeer("); + out.append(") \n"); + appendGroupedLog(1, out); + } + Ark_DissmissDialogActionNew ConstructImpl() + { + if (!needGroupedLog(1)) + return (Ark_DissmissDialogActionNew) 100; + string out("new DissmissDialogActionNew("); + out.append(") \n"); + out.append("[return (Ark_DissmissDialogActionNew) 100] \n"); + appendGroupedLog(1, out); + return (Ark_DissmissDialogActionNew) 100; + } + Ark_NativePointer GetFinalizerImpl() + { + if (!needGroupedLog(1)) + return fnPtr(dummyClassFinalizer); + string out("getFinalizer("); + out.append(") \n"); + out.append("[return fnPtr(dummyClassFinalizer)] \n"); + appendGroupedLog(1, out); + return fnPtr(dummyClassFinalizer); + } + void DismissImpl(Ark_DissmissDialogActionNew peer) + { + if (!needGroupedLog(1)) + return; + string out("dismiss("); + out.append(") \n"); + appendGroupedLog(1, out); + } + Ark_DismissReasonNew GetReasonImpl(Ark_DissmissDialogActionNew peer) + { + if (!needGroupedLog(1)) + return {}; + string out("getReason("); + out.append(") \n"); + out.append("[return {}] \n"); + appendGroupedLog(1, out); + return {}; + } + void SetReasonImpl(Ark_DissmissDialogActionNew peer, + Ark_DismissReasonNew reason) + { + if (!needGroupedLog(1)) + return; + string out("setReason("); + WriteToString(&out, reason); + out.append(") \n"); + appendGroupedLog(1, out); + } + } // DissmissDialogActionNewAccessor namespace TextShadowStyleAccessor { void DestroyPeerImpl(Ark_TextShadowStyle peer) { @@ -47384,6 +47551,38 @@ namespace OHOS::Ace::NG::GeneratedModifier { struct LetterSpacingStylePeer { virtual ~LetterSpacingStylePeer() = default; }; + + const GENERATED_ArkUILevelOrderAccessor* GetLevelOrderAccessor() + { + static const GENERATED_ArkUILevelOrderAccessor LevelOrderAccessorImpl { + LevelOrderAccessor::DestroyPeerImpl, + LevelOrderAccessor::ConstructImpl, + LevelOrderAccessor::GetFinalizerImpl, + LevelOrderAccessor::ClampImpl, + LevelOrderAccessor::GetOrderImpl, + }; + return &LevelOrderAccessorImpl; + } + + struct LevelOrderPeer { + virtual ~LevelOrderPeer() = default; + }; + const GENERATED_ArkUIDismissPopupActionAccessor* GetDismissPopupActionAccessor() + { + static const GENERATED_ArkUIDismissPopupActionAccessor DismissPopupActionAccessorImpl { + DismissPopupActionAccessor::DestroyPeerImpl, + DismissPopupActionAccessor::ConstructImpl, + DismissPopupActionAccessor::GetFinalizerImpl, + DismissPopupActionAccessor::DismissImpl, + DismissPopupActionAccessor::GetReasonImpl, + DismissPopupActionAccessor::SetReasonImpl, + }; + return &DismissPopupActionAccessorImpl; + } + + struct DismissPopupActionPeer { + virtual ~DismissPopupActionPeer() = default; + }; const GENERATED_ArkUITextShadowStyleAccessor* GetTextShadowStyleAccessor() { static const GENERATED_ArkUITextShadowStyleAccessor TextShadowStyleAccessorImpl { @@ -47801,6 +48000,8 @@ namespace OHOS::Ace::NG::GeneratedModifier { GetDecorationStyleAccessor, GetBaselineOffsetStyleAccessor, GetLetterSpacingStyleAccessor, + GetLevelOrderAccessor, + GetDismissPopupActionAccessor, GetTextShadowStyleAccessor, GetBackgroundColorStyleAccessor, GetGestureStyleAccessor, diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala/framework/native/src/generated/real_impl.cc b/frameworks/bridge/arkts_frontend/koala_projects/arkoala/framework/native/src/generated/real_impl.cc index da7b57f7ff8..9343ee8acaf 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala/framework/native/src/generated/real_impl.cc +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala/framework/native/src/generated/real_impl.cc @@ -20745,6 +20745,59 @@ namespace OHOS::Ace::NG::GeneratedModifier { return {}; } } // LetterSpacingStyleAccessor + namespace LevelOrderAccessor { + void DestroyPeerImpl(Ark_LevelOrder peer) + { + auto peerImpl = reinterpret_cast(peer); + if (peerImpl) { + delete peerImpl; + } + } + Ark_LevelOrder ConstructImpl() + { + return {}; + } + Ark_NativePointer GetFinalizerImpl() + { + return reinterpret_cast(&DestroyPeerImpl); + } + Ark_LevelOrder ClampImpl(const Ark_Number* order) + { + return {}; + } + Ark_Number GetOrderImpl(Ark_LevelOrder peer) + { + return {}; + } + } // LevelOrderAccessor + namespace DismissPopupActionAccessor { + void DestroyPeerImpl(Ark_DismissPopupAction peer) + { + auto peerImpl = reinterpret_cast(peer); + if (peerImpl) { + delete peerImpl; + } + } + Ark_DismissPopupAction ConstructImpl() + { + return {}; + } + Ark_NativePointer GetFinalizerImpl() + { + return reinterpret_cast(&DestroyPeerImpl); + } + void DismissImpl(Ark_DismissPopupAction peer) + { + } + Ark_DismissReason GetReasonImpl(Ark_DismissPopupAction peer) + { + return {}; + } + void SetReasonImpl(Ark_DismissPopupAction peer, + Ark_DismissReason reason) + { + } + } // DismissPopupActionAccessor namespace TextShadowStyleAccessor { void DestroyPeerImpl(Ark_TextShadowStyle peer) { @@ -24957,6 +25010,38 @@ namespace OHOS::Ace::NG::GeneratedModifier { struct LetterSpacingStylePeer { virtual ~LetterSpacingStylePeer() = default; }; + + const GENERATED_ArkUILevelOrderAccessor* GetLevelOrderAccessor() + { + static const GENERATED_ArkUILevelOrderAccessor LevelOrderAccessorImpl { + LevelOrderAccessor::DestroyPeerImpl, + LevelOrderAccessor::ConstructImpl, + LevelOrderAccessor::GetFinalizerImpl, + LevelOrderAccessor::ClampImpl, + LevelOrderAccessor::GetOrderImpl, + }; + return &LevelOrderAccessorImpl; + } + + struct LevelOrderPeer { + virtual ~LevelOrderPeer() = default; + }; + const GENERATED_ArkUIDismissPopupActionAccessor* GetDismissPopupActionAccessor() + { + static const GENERATED_ArkUIDismissPopupActionAccessor DismissPopupActionAccessorImpl { + DismissPopupActionAccessor::DestroyPeerImpl, + DismissPopupActionAccessor::ConstructImpl, + DismissPopupActionAccessor::GetFinalizerImpl, + DismissPopupActionAccessor::DismissImpl, + DismissPopupActionAccessor::GetReasonImpl, + DismissPopupActionAccessor::SetReasonImpl, + }; + return &DismissPopupActionAccessorImpl; + } + + struct DismissPopupActionPeer { + virtual ~DismissPopupActionPeer() = default; + }; const GENERATED_ArkUITextShadowStyleAccessor* GetTextShadowStyleAccessor() { static const GENERATED_ArkUITextShadowStyleAccessor TextShadowStyleAccessorImpl { @@ -25385,6 +25470,8 @@ namespace OHOS::Ace::NG::GeneratedModifier { GetDecorationStyleAccessor, GetBaselineOffsetStyleAccessor, GetLetterSpacingStyleAccessor, + GetLevelOrderAccessor, + GetDismissPopupActionAccessor, GetTextShadowStyleAccessor, GetBackgroundColorStyleAccessor, GetGestureStyleAccessor, 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 2852a32b1c0..b4ebb45522a 100644 --- a/frameworks/core/interfaces/native/generated/interface/arkoala_api_generated.h +++ b/frameworks/core/interfaces/native/generated/interface/arkoala_api_generated.h @@ -1840,7 +1840,8 @@ typedef struct Ark_DismissContentCoverAction Ark_DismissContentCoverAction; typedef struct Opt_DismissContentCoverAction Opt_DismissContentCoverAction; typedef struct Ark_DismissDialogAction Ark_DismissDialogAction; typedef struct Opt_DismissDialogAction Opt_DismissDialogAction; -typedef struct Ark_DismissPopupAction Ark_DismissPopupAction; +typedef struct DismissPopupActionPeer DismissPopupActionPeer; +typedef struct DismissPopupActionPeer* Ark_DismissPopupAction; typedef struct Opt_DismissPopupAction Opt_DismissPopupAction; typedef struct Ark_DismissSheetAction Ark_DismissSheetAction; typedef struct Opt_DismissSheetAction Opt_DismissSheetAction; @@ -1962,8 +1963,6 @@ typedef struct Ark_ShapePoint Ark_ShapePoint; typedef struct Opt_ShapePoint Opt_ShapePoint; typedef struct Ark_ImageSourceSize Ark_ImageSourceSize; typedef struct Opt_ImageSourceSize Opt_ImageSourceSize; -typedef struct Ark_ImmersiveMode Ark_ImmersiveMode; -typedef struct Opt_ImmersiveMode Opt_ImmersiveMode; typedef struct Ark_InputCounterOptions Ark_InputCounterOptions; typedef struct Opt_InputCounterOptions Opt_InputCounterOptions; typedef struct Ark_InsertValue Ark_InsertValue; @@ -1993,9 +1992,8 @@ typedef struct Opt_LengthMetricsCustom Opt_LengthMetricsCustom; typedef struct LetterSpacingStylePeer LetterSpacingStylePeer; typedef struct LetterSpacingStylePeer* Ark_LetterSpacingStyle; typedef struct Opt_LetterSpacingStyle Opt_LetterSpacingStyle; -typedef struct Ark_LevelMode Ark_LevelMode; -typedef struct Opt_LevelMode Opt_LevelMode; -typedef struct Ark_LevelOrder Ark_LevelOrder; +typedef struct LevelOrderPeer LevelOrderPeer; +typedef struct LevelOrderPeer* Ark_LevelOrder; typedef struct Opt_LevelOrder Opt_LevelOrder; typedef struct Ark_LinearGradient_common Ark_LinearGradient_common; typedef struct Opt_LinearGradient_common Opt_LinearGradient_common; @@ -12517,10 +12515,6 @@ typedef struct Opt_DismissDialogAction { Ark_Tag tag; Ark_DismissDialogAction value; } Opt_DismissDialogAction; -typedef struct Ark_DismissPopupAction { - Callback_Void dismiss; - Ark_DismissReason reason; -} Ark_DismissPopupAction; typedef struct Opt_DismissPopupAction { Ark_Tag tag; Ark_DismissPopupAction value; @@ -13065,8 +13059,9 @@ typedef struct Opt_ImageSourceSize { Ark_Tag tag; Ark_ImageSourceSize value; } Opt_ImageSourceSize; -typedef struct Ark_ImmersiveMode { - Ark_String _ImmersiveModeStub; +typedef enum Ark_ImmersiveMode { + ARK_IMMERSIVE_MODE_DEFAULT = 0, + ARK_IMMERSIVE_MODE_EXTEND = 1, } Ark_ImmersiveMode; typedef struct Opt_ImmersiveMode { Ark_Tag tag; @@ -13170,16 +13165,14 @@ typedef struct Opt_LetterSpacingStyle { Ark_Tag tag; Ark_LetterSpacingStyle value; } Opt_LetterSpacingStyle; -typedef struct Ark_LevelMode { - Ark_String _LevelModeStub; +typedef enum Ark_LevelMode { + ARK_LEVEL_MODE_OVERLAY = 0, + ARK_LEVEL_MODE_EMBEDDED = 1, } Ark_LevelMode; typedef struct Opt_LevelMode { Ark_Tag tag; Ark_LevelMode value; } Opt_LevelMode; -typedef struct Ark_LevelOrder { - Ark_String _LevelOrderStub; -} Ark_LevelOrder; typedef struct Opt_LevelOrder { Ark_Tag tag; Ark_LevelOrder value; @@ -27281,6 +27274,23 @@ typedef struct GENERATED_ArkUILetterSpacingStyleAccessor { Ark_Number (*getLetterSpacing)(Ark_LetterSpacingStyle peer); } GENERATED_ArkUILetterSpacingStyleAccessor; +typedef struct GENERATED_ArkUILevelOrderAccessor { + void (*destroyPeer)(Ark_LevelOrder peer); + Ark_LevelOrder (*construct)(); + Ark_NativePointer (*getFinalizer)(); + Ark_LevelOrder (*clamp)(const Ark_Number* order); + Ark_Number (*getOrder)(Ark_LevelOrder peer); +} GENERATED_ArkUILevelOrderAccessor; + +typedef struct GENERATED_ArkUIDismissPopupActionAccessor { + void (*destroyPeer)(Ark_DismissPopupAction peer); + Ark_DismissPopupAction (*construct)(); + Ark_NativePointer (*getFinalizer)(); + void (*dismiss)(Ark_DismissPopupAction peer); + Ark_DismissReason (*getReason)(Ark_DismissPopupAction peer); + void (*setReason)(Ark_DismissPopupAction peer, Ark_DismissReason reason); +} GENERATED_ArkUIDismissPopupActionAccessor; + typedef struct GENERATED_ArkUITextShadowStyleAccessor { void (*destroyPeer)(Ark_TextShadowStyle peer); Ark_TextShadowStyle (*ctor)(const Ark_Union_ShadowOptions_Array_ShadowOptions* value); @@ -27820,6 +27830,8 @@ typedef struct GENERATED_ArkUIAccessors { const GENERATED_ArkUIDecorationStyleAccessor* (*getDecorationStyleAccessor)(); const GENERATED_ArkUIBaselineOffsetStyleAccessor* (*getBaselineOffsetStyleAccessor)(); const GENERATED_ArkUILetterSpacingStyleAccessor* (*getLetterSpacingStyleAccessor)(); + const GENERATED_ArkUILevelOrderAccessor* (*getLevelOrderAccessor)(); + const GENERATED_ArkUIDismissPopupActionAccessor* (*getDismissPopupActionAccessor)(); const GENERATED_ArkUITextShadowStyleAccessor* (*getTextShadowStyleAccessor)(); const GENERATED_ArkUIBackgroundColorStyleAccessor* (*getBackgroundColorStyleAccessor)(); const GENERATED_ArkUIGestureStyleAccessor* (*getGestureStyleAccessor)(); diff --git a/frameworks/core/interfaces/native/generated/interface/node_interface.gni b/frameworks/core/interfaces/native/generated/interface/node_interface.gni index aa4313eedaf..628c359596c 100644 --- a/frameworks/core/interfaces/native/generated/interface/node_interface.gni +++ b/frameworks/core/interfaces/native/generated/interface/node_interface.gni @@ -161,6 +161,8 @@ generated_sources = [ "implementation/lazyv_grid_layout_modifier.cpp", "implementation/length_metrics_accessor.cpp", "implementation/letter_spacing_style_accessor.cpp", + "implementation/level_order_accessor.cpp", + "implementation/dismiss_popup_action_accessor.cpp", "implementation/line_height_style_accessor.cpp", "implementation/line_modifier.cpp", "implementation/linear_gradient_accessor.cpp", diff --git a/frameworks/core/interfaces/native/implementation/all_modifiers.cpp b/frameworks/core/interfaces/native/implementation/all_modifiers.cpp index e211e39e099..7d175300e32 100644 --- a/frameworks/core/interfaces/native/implementation/all_modifiers.cpp +++ b/frameworks/core/interfaces/native/implementation/all_modifiers.cpp @@ -420,6 +420,8 @@ const GENERATED_ArkUITextStyle_styled_stringAccessor* GetTextStyle_styled_string const GENERATED_ArkUIDecorationStyleAccessor* GetDecorationStyleAccessor(); const GENERATED_ArkUIBaselineOffsetStyleAccessor* GetBaselineOffsetStyleAccessor(); const GENERATED_ArkUILetterSpacingStyleAccessor* GetLetterSpacingStyleAccessor(); +const GENERATED_ArkUILevelOrderAccessor* GetLevelOrderAccessor(); +const GENERATED_ArkUIDismissPopupActionAccessor* GetDismissPopupActionAccessor(); const GENERATED_ArkUITextShadowStyleAccessor* GetTextShadowStyleAccessor(); const GENERATED_ArkUIBackgroundColorStyleAccessor* GetBackgroundColorStyleAccessor(); const GENERATED_ArkUIGestureStyleAccessor* GetGestureStyleAccessor(); @@ -778,6 +780,8 @@ const GENERATED_ArkUIAccessors* GENERATED_GetArkUIAccessors() GetDecorationStyleAccessor, GetBaselineOffsetStyleAccessor, GetLetterSpacingStyleAccessor, + GetLevelOrderAccessor, + GetDismissPopupActionAccessor, GetTextShadowStyleAccessor, GetBackgroundColorStyleAccessor, GetGestureStyleAccessor, diff --git a/frameworks/core/interfaces/native/implementation/common_method_modifier.cpp b/frameworks/core/interfaces/native/implementation/common_method_modifier.cpp index 5f3aa4be708..2618debb843 100644 --- a/frameworks/core/interfaces/native/implementation/common_method_modifier.cpp +++ b/frameworks/core/interfaces/native/implementation/common_method_modifier.cpp @@ -205,14 +205,14 @@ auto g_onWillDismissPopup = []( }, [&popupParam](const Callback_DismissPopupAction_Void& value) { auto callback = [arkCallback = CallbackHelper(value)](int32_t reason) { - Ark_DismissPopupAction parameter; - auto reasonOpt = Converter::ArkValue( - static_cast(reason)); - parameter.reason = Converter::OptConvert(reasonOpt) - .value_or(ARK_DISMISS_REASON_CLOSE_BUTTON); - const auto keeper = CallbackKeeper::Claim(std::move(ViewAbstract::DismissPopup)); - parameter.dismiss = keeper.ArkValue(); - arkCallback.InvokeSync(parameter); + // Ark_DismissPopupAction parameter; + // auto reasonOpt = Converter::ArkValue( + // static_cast(reason)); + // parameter.reason = Converter::OptConvert(reasonOpt) + // .value_or(ARK_DISMISS_REASON_CLOSE_BUTTON); + // const auto keeper = CallbackKeeper::Claim(std::move(ViewAbstract::DismissPopup)); + // parameter.dismiss = keeper.ArkValue(); + // arkCallback.InvokeSync(parameter); }; popupParam->SetOnWillDismiss(std::move(callback)); popupParam->SetInteractiveDismiss(true); diff --git a/frameworks/core/interfaces/native/implementation/custom_dialog_controller_accessor.cpp b/frameworks/core/interfaces/native/implementation/custom_dialog_controller_accessor.cpp index 55b7443607c..18e311fc8dc 100644 --- a/frameworks/core/interfaces/native/implementation/custom_dialog_controller_accessor.cpp +++ b/frameworks/core/interfaces/native/implementation/custom_dialog_controller_accessor.cpp @@ -57,6 +57,18 @@ Ark_CustomDialogController CtorImpl(const Ark_CustomDialogControllerOptions* val peer->SetKeyboardAvoidMode(value->keyboardAvoidMode); peer->SetEnableHoverMode(value->enableHoverMode); peer->SetHoverModeArea(value->hoverModeArea); + peer->SetBackgroundBlurStyleOptions(value->backgroundBlurStyleOptions); + peer->SetBackgroundEffect(value->backgroundEffect); + peer->SetOnDidAppear(value->onDidAppear, peer); + peer->SetOnDidDisappear(value->onDidDisappear, peer); + peer->SetOnWillAppear(value->onWillAppear, peer); + peer->SetOnWillDisappear(value->onWillDisappear, peer); + peer->SetKeyboardAvoidDistance(value->keyboardAvoidDistance); + peer->SetLevelMode(value->levelMode); + peer->SetLevelUniqueId(value->levelUniqueId); + peer->SetImersiveMode(value->immersiveMode); + peer->SetLevelOrder(value->levelOrder); + peer->SetFocusable(value->focusable); return AceType::RawPtr(peer); } diff --git a/frameworks/core/interfaces/native/implementation/custom_dialog_controller_peer_impl.cpp b/frameworks/core/interfaces/native/implementation/custom_dialog_controller_peer_impl.cpp index 32ce23d1e43..883e25e7061 100644 --- a/frameworks/core/interfaces/native/implementation/custom_dialog_controller_peer_impl.cpp +++ b/frameworks/core/interfaces/native/implementation/custom_dialog_controller_peer_impl.cpp @@ -35,6 +35,24 @@ inline void AssignCast(std::optional& dst, const Ark_Keyboard default: LOGE("Unexpected enum value in Ark_KeyboardAvoidMode: %{public}d", src); } } +template<> +inline void AssignCast(std::optional& dst, const Ark_LevelMode& src) +{ + switch (src) { + case ARK_LEVEL_MODE_OVERLAY: dst = LevelMode::OVERLAY; break; + case ARK_LEVEL_MODE_EMBEDDED: dst = LevelMode::EMBEDDED; break; + default: LOGE("Unexpected enum value in Ark_LevelMode: %{public}d", src); + } +} +template<> +inline void AssignCast(std::optional& dst, const Ark_ImmersiveMode& src) +{ + switch (src) { + case ARK_IMMERSIVE_MODE_DEFAULT: dst = ImmersiveMode::DEFAULT; break; + case ARK_IMMERSIVE_MODE_EXTEND: dst = ImmersiveMode::EXTEND; break; + default: LOGE("Unexpected enum value in Ark_ImmersiveMode: %{public}d", src); + } +} } // namespace OHOS::Ace::NG::Converter namespace OHOS::Ace::NG::GeneratedModifier { @@ -81,20 +99,9 @@ void CustomDialogControllerPeerImpl::SetBuilder( void CustomDialogControllerPeerImpl::SetOnCancel( Opt_Callback_Void cancel, const RefPtr& peer) { - auto cancelOpt = Converter::OptConvert(cancel); + auto cancelOpt = TransformCallbackToFunctionVoid(cancel, peer); CHECK_NULL_VOID(cancelOpt); - dialogProperties_.onCancel = - [callback = CallbackHelper(cancelOpt.value()), weakPeer = AceType::WeakClaim(AceType::RawPtr(peer))]() { - auto controllerPeer = weakPeer.Upgrade(); - CHECK_NULL_VOID(controllerPeer); - auto weakNode = controllerPeer->GetOwnerViewNode(); - auto frameNode = weakNode.Upgrade(); - CHECK_NULL_VOID(frameNode); - auto pipelineContext = frameNode->GetContext(); - CHECK_NULL_VOID(pipelineContext); - pipelineContext->UpdateCurrentActiveNode(frameNode); - callback.InvokeSync(); - }; + dialogProperties_.onCancel = cancelOpt; } void CustomDialogControllerPeerImpl::SetAutoCancel(Opt_Boolean autoCancel) @@ -292,6 +299,91 @@ void CustomDialogControllerPeerImpl::SetHoverModeArea(Opt_HoverModeAreaType hove dialogProperties_.hoverModeArea = Converter::OptConvert(hoverModeArea); } +void CustomDialogControllerPeerImpl::SetBackgroundBlurStyleOptions( + Opt_BackgroundBlurStyleOptions backgroundBlurStyleOptions) +{ + dialogProperties_.blurStyleOption = Converter::OptConvert(backgroundBlurStyleOptions); +} + +void CustomDialogControllerPeerImpl::SetBackgroundEffect(Opt_BackgroundEffectOptions backgroundEffect) +{ + dialogProperties_.effectOption = Converter::OptConvert(backgroundEffect); +} + +void CustomDialogControllerPeerImpl::SetOnDidAppear( + Opt_Callback_Void onDidAppear, const RefPtr& peer) +{ + auto callback = TransformCallbackToFunctionVoid(onDidAppear, peer); + CHECK_NULL_VOID(callback); + dialogProperties_.onDidAppear = callback; +} + +void CustomDialogControllerPeerImpl::SetOnDidDisappear( + Opt_Callback_Void onDidDisappear, const RefPtr& peer) +{ + auto callback = TransformCallbackToFunctionVoid(onDidDisappear, peer); + CHECK_NULL_VOID(callback); + dialogProperties_.onDidDisappear = callback; +} + +void CustomDialogControllerPeerImpl::SetOnWillAppear( + Opt_Callback_Void onWillAppear, const RefPtr& peer) +{ + auto callback = TransformCallbackToFunctionVoid(onWillAppear, peer); + CHECK_NULL_VOID(callback); + dialogProperties_.onWillAppear = callback; +} + +void CustomDialogControllerPeerImpl::SetOnWillDisappear( + Opt_Callback_Void onWillDisappear, const RefPtr& peer) +{ + auto callback = TransformCallbackToFunctionVoid(onWillDisappear, peer); + CHECK_NULL_VOID(callback); + dialogProperties_.onWillDisappear = callback; +} + +void CustomDialogControllerPeerImpl::SetKeyboardAvoidDistance(Opt_LengthMetrics keyboardAvoidDistance) +{ + dialogProperties_.keyboardAvoidDistance = Converter::OptConvert(keyboardAvoidDistance); +} + +void CustomDialogControllerPeerImpl::SetLevelMode(Opt_LevelMode levelMode) +{ + auto result = Converter::OptConvert(levelMode); + if (result.has_value()) { + dialogProperties_.dialogLevelMode = result.value(); + } +} + +void CustomDialogControllerPeerImpl::SetLevelUniqueId(Opt_Number levelUniqueId) +{ + auto result = Converter::OptConvert(levelUniqueId); + if (result.has_value()) { + dialogProperties_.dialogLevelUniqueId = result.value(); + } +} + +void CustomDialogControllerPeerImpl::SetImersiveMode(Opt_ImmersiveMode immersiveMode) +{ + auto result = Converter::OptConvert(immersiveMode); + if (result.has_value()) { + dialogProperties_.dialogImmersiveMode = result.value(); + } +} + +void CustomDialogControllerPeerImpl::SetLevelOrder(Opt_LevelOrder levelOrder) +{ + dialogProperties_.levelOrder = Converter::OptConvert(levelOrder); +} + +void CustomDialogControllerPeerImpl::SetFocusable(Opt_Boolean focusable) +{ + auto result = Converter::OptConvert(focusable); + if (result.has_value()) { + dialogProperties_.focusable = result.value(); + } +} + DialogProperties CustomDialogControllerPeerImpl::GetDialogProperties() const { return dialogProperties_; @@ -332,4 +424,21 @@ RefPtr CustomDialogControllerPeerImpl::GetWindowScene() const return parent; } +std::function CustomDialogControllerPeerImpl::TransformCallbackToFunctionVoid( + Opt_Callback_Void callback, const RefPtr& peer) +{ + auto callbackOpt = Converter::OptConvert(callback); + CHECK_NULL_RETURN(callbackOpt, nullptr); + return [callbackFunc = CallbackHelper(callbackOpt.value()), weak = AceType::WeakClaim(AceType::RawPtr(peer))]() { + auto controllerPeer = weak.Upgrade(); + CHECK_NULL_VOID(controllerPeer); + auto weakNode = controllerPeer->GetOwnerViewNode(); + auto frameNode = weakNode.Upgrade(); + CHECK_NULL_VOID(frameNode); + auto pipelineContext = frameNode->GetContext(); + CHECK_NULL_VOID(pipelineContext); + pipelineContext->UpdateCurrentActiveNode(frameNode); + callbackFunc.InvokeSync(); + }; +} } // namespace OHOS::Ace::NG::GeneratedModifier diff --git a/frameworks/core/interfaces/native/implementation/custom_dialog_controller_peer_impl.h b/frameworks/core/interfaces/native/implementation/custom_dialog_controller_peer_impl.h index d0aa541d507..039e9287f75 100644 --- a/frameworks/core/interfaces/native/implementation/custom_dialog_controller_peer_impl.h +++ b/frameworks/core/interfaces/native/implementation/custom_dialog_controller_peer_impl.h @@ -55,6 +55,18 @@ public: void SetKeyboardAvoidMode(Opt_KeyboardAvoidMode keyboardAvoidMode); void SetEnableHoverMode(Opt_Boolean enableHoverMode); void SetHoverModeArea(Opt_HoverModeAreaType hoverModeArea); + void SetBackgroundBlurStyleOptions(Opt_BackgroundBlurStyleOptions backgroundBlurStyleOptions); + void SetBackgroundEffect(Opt_BackgroundEffectOptions backgroundEffect); + void SetOnDidAppear(Opt_Callback_Void onDidAppear, const RefPtr& peer); + void SetOnDidDisappear(Opt_Callback_Void onDidDisappear, const RefPtr& peer); + void SetOnWillAppear(Opt_Callback_Void onWillAppear, const RefPtr& peer); + void SetOnWillDisappear(Opt_Callback_Void onWillDisappear, const RefPtr& peer); + void SetKeyboardAvoidDistance(Opt_LengthMetrics keyboardAvoidDistance); + void SetLevelMode(Opt_LevelMode levelMode); + void SetLevelUniqueId(Opt_Number levelUniqueId); + void SetImersiveMode(Opt_ImmersiveMode immersiveMode); + void SetLevelOrder(Opt_LevelOrder levelOrder); + void SetFocusable(Opt_Boolean focusable); DialogProperties GetDialogProperties() const; @@ -72,6 +84,8 @@ public: } private: RefPtr GetWindowScene() const; + std::function TransformCallbackToFunctionVoid( + Opt_Callback_Void callback, const RefPtr& peer); WeakPtr ownerView_; DialogProperties dialogProperties_; diff --git a/frameworks/core/interfaces/native/implementation/dismiss_popup_action_accessor.cpp b/frameworks/core/interfaces/native/implementation/dismiss_popup_action_accessor.cpp new file mode 100644 index 00000000000..b997d214b83 --- /dev/null +++ b/frameworks/core/interfaces/native/implementation/dismiss_popup_action_accessor.cpp @@ -0,0 +1,61 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "core/components_ng/base/frame_node.h" +#include "core/interfaces/native/utility/converter.h" +#include "arkoala_api_generated.h" + +namespace OHOS::Ace::NG::GeneratedModifier { +namespace DismissPopupActionAccessor { +void DestroyPeerImpl(Ark_DismissPopupAction peer) +{ +} +Ark_DismissPopupAction ConstructImpl() +{ + return {}; +} +Ark_NativePointer GetFinalizerImpl() +{ + return reinterpret_cast(&DestroyPeerImpl); +} +void DismissImpl(Ark_DismissPopupAction peer) +{ +} +Ark_DismissReason GetReasonImpl(Ark_DismissPopupAction peer) +{ + return {}; +} +void SetReasonImpl(Ark_DismissPopupAction peer, + Ark_DismissReason reason) +{ +} +} // DismissPopupActionAccessor +const GENERATED_ArkUIDismissPopupActionAccessor* GetDismissPopupActionAccessor() +{ + static const GENERATED_ArkUIDismissPopupActionAccessor DismissPopupActionAccessorImpl { + DismissPopupActionAccessor::DestroyPeerImpl, + DismissPopupActionAccessor::ConstructImpl, + DismissPopupActionAccessor::GetFinalizerImpl, + DismissPopupActionAccessor::DismissImpl, + DismissPopupActionAccessor::GetReasonImpl, + DismissPopupActionAccessor::SetReasonImpl, + }; + return &DismissPopupActionAccessorImpl; +} + +struct DismissPopupActionPeer { + virtual ~DismissPopupActionPeer() = default; +}; +} diff --git a/frameworks/core/interfaces/native/implementation/level_order_accessor.cpp b/frameworks/core/interfaces/native/implementation/level_order_accessor.cpp new file mode 100644 index 00000000000..64498bc5eda --- /dev/null +++ b/frameworks/core/interfaces/native/implementation/level_order_accessor.cpp @@ -0,0 +1,70 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "core/components_ng/base/frame_node.h" +#include "core/interfaces/native/utility/converter.h" +#include "core/interfaces/native/utility/reverse_converter.h" +#include "core/interfaces/native/utility/callback_helper.h" +#include "core/interfaces/native/implementation/level_order_peer.h" + +namespace OHOS::Ace::NG::GeneratedModifier { +namespace LevelOrderAccessor { +void DestroyPeerImpl(Ark_LevelOrder peer) +{ + CHECK_NULL_VOID(peer); + CHECK_NULL_VOID(peer->levelOrder); + delete peer->levelOrder; + peer->levelOrder = nullptr; + PeerUtils::DestroyPeer(peer); +} +Ark_LevelOrder ConstructImpl() +{ + auto peer = PeerUtils::CreatePeer(); + peer->levelOrder = new (std::nothrow) NG::LevelOrder(); + return peer; +} +Ark_NativePointer GetFinalizerImpl() +{ + return reinterpret_cast(&DestroyPeerImpl); +} +Ark_LevelOrder ClampImpl(const Ark_Number* order) +{ + auto peer = PeerUtils::CreatePeer(); + CHECK_NULL_RETURN(peer, nullptr); + peer->levelOrder = new (std::nothrow) NG::LevelOrder(); + CHECK_NULL_RETURN(peer->levelOrder, nullptr); + peer->levelOrder->SetOrder(Converter::Convert(*order)); + return peer; +} +Ark_Number GetOrderImpl(Ark_LevelOrder peer) +{ + CHECK_NULL_RETURN(peer, {}); + CHECK_NULL_RETURN(peer->levelOrder, {}); + auto value = Converter::ArkValue(peer->levelOrder->GetOrder()); + return value; +} +} // LevelOrderAccessor +const GENERATED_ArkUILevelOrderAccessor* GetLevelOrderAccessor() +{ + static const GENERATED_ArkUILevelOrderAccessor LevelOrderAccessorImpl { + LevelOrderAccessor::DestroyPeerImpl, + LevelOrderAccessor::ConstructImpl, + LevelOrderAccessor::GetFinalizerImpl, + LevelOrderAccessor::ClampImpl, + LevelOrderAccessor::GetOrderImpl, + }; + return &LevelOrderAccessorImpl; +} +} diff --git a/frameworks/core/interfaces/native/implementation/level_order_peer.h b/frameworks/core/interfaces/native/implementation/level_order_peer.h new file mode 100644 index 00000000000..e8ccde226e4 --- /dev/null +++ b/frameworks/core/interfaces/native/implementation/level_order_peer.h @@ -0,0 +1,32 @@ +/* +* Copyright (c) 2025 Huawei Device Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +#ifndef FOUNDATION_ARKUI_ACE_ENGINE_FRAMEWORKS_CORE_INTERFACES_NATIVE_IMPL_LEVEL_ORDER_PEER_IMPL_H +#define FOUNDATION_ARKUI_ACE_ENGINE_FRAMEWORKS_CORE_INTERFACES_NATIVE_IMPL_LEVEL_ORDER_PEER_IMPL_H + +#include "base/memory/ace_type.h" +#include "core/interfaces/native/utility/peer_utils.h" +#include "core/components_ng/pattern/overlay/level_order.h" + +struct LevelOrderPeer final { + OHOS::Ace::NG::LevelOrder* levelOrder; + +protected: + LevelOrderPeer() = default; + ~LevelOrderPeer() = default; + friend OHOS::Ace::NG::PeerUtils; +}; + +#endif // FOUNDATION_ARKUI_ACE_ENGINE_FRAMEWORKS_CORE_INTERFACES_NATIVE_IMPL_LEVEL_ORDER_PEER_IMPL_H \ No newline at end of file diff --git a/frameworks/core/interfaces/native/utility/converter.cpp b/frameworks/core/interfaces/native/utility/converter.cpp index 81e3cc1d52c..9248e0efc97 100644 --- a/frameworks/core/interfaces/native/utility/converter.cpp +++ b/frameworks/core/interfaces/native/utility/converter.cpp @@ -32,6 +32,7 @@ #include "core/interfaces/native/implementation/linear_gradient_peer.h" #include "core/interfaces/native/implementation/pixel_map_peer.h" #include "core/interfaces/native/implementation/text_menu_item_id_peer.h" +#include "core/interfaces/native/implementation/level_order_peer.h" #include "core/interfaces/native/utility/callback_helper.h" #include "core/interfaces/native/utility/reverse_converter.h" #include "core/interfaces/native/utility/validators.h" @@ -3128,4 +3129,16 @@ void AssignCast(std::optional& dst, const Opt_ShapePoint& src) dst = Converter::Convert(src.value); } } + +template<> +void AssignCast(std::optional& dst, const Opt_LevelOrder& src) +{ + dst = std::make_optional(NG::LevelOrder::ORDER_DEFAULT); + if (src.tag != InteropTag::INTEROP_TAG_UNDEFINED) { + auto peer = reinterpret_cast(src.value); + if (peer && peer->levelOrder) { + dst = std::make_optional(peer->levelOrder->GetOrder()); + } + } +} } // namespace OHOS::Ace::NG::Converter diff --git a/frameworks/core/interfaces/native/utility/converter.h b/frameworks/core/interfaces/native/utility/converter.h index 0523fcddf66..d39d5ed7f96 100644 --- a/frameworks/core/interfaces/native/utility/converter.h +++ b/frameworks/core/interfaces/native/utility/converter.h @@ -45,6 +45,7 @@ #include "core/components_ng/pattern/navigation/navigation_declaration.h" #include "core/components_ng/pattern/navigation/navigation_options.h" #include "core/components_ng/pattern/navigation/navigation_transition_proxy.h" +#include "core/components_ng/pattern/overlay/level_order.h" #include "core/components_ng/pattern/overlay/sheet_presentation_pattern.h" #include "core/components_ng/pattern/scrollable/scrollable_paint_property.h" #include "core/components_ng/pattern/scrollable/scrollable_properties.h" @@ -834,6 +835,7 @@ namespace Converter { template<> void AssignCast(std::optional& dst, const Ark_SharedTransitionEffectType& src); template<> void AssignCast(std::optional& dst, const Opt_ShapePoint& src); + template<> void AssignCast(std::optional& dst, const Opt_LevelOrder& src); template std::optional GetOpt(const From& src) diff --git a/frameworks/core/interfaces/native/utility/generated/converter_generated.h b/frameworks/core/interfaces/native/utility/generated/converter_generated.h index 34bb7243d62..6ad739b9b78 100644 --- a/frameworks/core/interfaces/native/utility/generated/converter_generated.h +++ b/frameworks/core/interfaces/native/utility/generated/converter_generated.h @@ -4305,7 +4305,6 @@ ASSIGN_OPT(Opt_LeadingMarginPlaceholder) ASSIGN_OPT(Opt_LengthMetrics) ASSIGN_OPT(Opt_LetterSpacingStyle) ASSIGN_OPT(Opt_LevelMode) -ASSIGN_OPT(Opt_LevelOrder) ASSIGN_OPT(Opt_LinearGradient_common) ASSIGN_OPT(Opt_LinearGradientBlurOptions) ASSIGN_OPT(Opt_LinearGradientOptions) diff --git a/test/unittest/capi/modifiers/common_method_modifier_test13.cpp b/test/unittest/capi/modifiers/common_method_modifier_test13.cpp index 5b979af4a70..c5c088ef1b1 100755 --- a/test/unittest/capi/modifiers/common_method_modifier_test13.cpp +++ b/test/unittest/capi/modifiers/common_method_modifier_test13.cpp @@ -1702,13 +1702,13 @@ HWTEST_F(CommonMethodModifierTest13, DISABLED_bindPopupPopupOptionsOnWillDismiss { MockPipelineContext::GetCurrent()->SetTaskExecutor(AceType::MakeRefPtr(false)); auto arkShow = Converter::ArkValue(true); - struct CheckEvent { int32_t resourceId; std::optional reason; }; + struct CheckEvent { int32_t resourceId; std::optional action; }; static std::optional checkEvent = std::nullopt; void (*checkCallback)(const Ark_Int32, const Ark_DismissPopupAction) = [](const Ark_Int32 resourceId, const Ark_DismissPopupAction action) { checkEvent = { .resourceId = resourceId, - .reason = static_cast(action.reason) + .action = action }; }; @@ -1742,9 +1742,9 @@ HWTEST_F(CommonMethodModifierTest13, DISABLED_bindPopupPopupOptionsOnWillDismiss pattern->CallOnWillDismiss(static_cast(DismissReason::TOUCH_OUTSIDE)); ASSERT_TRUE(checkEvent.has_value()); - ASSERT_TRUE(checkEvent.value().reason.has_value()); + ASSERT_TRUE(checkEvent.value().action.has_value()); EXPECT_EQ(checkEvent.value().resourceId, TEST_RESOURCE_ID_1); - EXPECT_EQ(checkEvent.value().reason.value(), DismissReason::TOUCH_OUTSIDE); + EXPECT_NE(checkEvent.value().action.value(), nullptr); } /* diff --git a/test/unittest/capi/modifiers/common_method_modifier_test17.cpp b/test/unittest/capi/modifiers/common_method_modifier_test17.cpp index 0d77fa1fd59..6a791c73014 100755 --- a/test/unittest/capi/modifiers/common_method_modifier_test17.cpp +++ b/test/unittest/capi/modifiers/common_method_modifier_test17.cpp @@ -1822,13 +1822,13 @@ HWTEST_F(CommonMethodModifierTest17, DISABLED_bindPopupCustomPopupOptionsOnWillD { MockPipelineContext::GetCurrent()->SetTaskExecutor(AceType::MakeRefPtr(false)); auto arkShow = Converter::ArkValue(true); - struct CheckEvent { int32_t resourceId; std::optional reason; }; + struct CheckEvent { int32_t resourceId; std::optional action; }; static std::optional checkEvent = std::nullopt; void (*checkCallback)(const Ark_Int32, const Ark_DismissPopupAction) = [](const Ark_Int32 resourceId, const Ark_DismissPopupAction action) { checkEvent = { .resourceId = resourceId, - .reason = static_cast(action.reason) + .action = action }; }; @@ -1865,9 +1865,9 @@ HWTEST_F(CommonMethodModifierTest17, DISABLED_bindPopupCustomPopupOptionsOnWillD pattern->CallOnWillDismiss(static_cast(DismissReason::TOUCH_OUTSIDE)); ASSERT_TRUE(checkEvent.has_value()); - ASSERT_TRUE(checkEvent.value().reason.has_value()); + ASSERT_TRUE(checkEvent.value().action.has_value()); EXPECT_EQ(checkEvent.value().resourceId, TEST_RESOURCE_ID_1); - EXPECT_EQ(checkEvent.value().reason.value(), DismissReason::TOUCH_OUTSIDE); + EXPECT_NE(checkEvent.value().action.value(), nullptr); } } -- Gitee