From cab23bcdf55b6cad4838f0a0159a8edfe0906bed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=B0=B8=E5=87=AF?= Date: Fri, 11 Jul 2025 19:26:19 +0800 Subject: [PATCH] =?UTF-8?q?detents=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 刘永凯 --- .../arkui-ohos/src/component/common.ts | 14 +- .../src/component/peers/Serializer.ts | 155 +++- .../native/src/generated/Serializers.h | 745 +++--------------- .../src/generated/arkoala_api_generated.h | 50 +- .../interface/arkoala_api_generated.h | 50 +- .../implementation/bind_sheet_utils.cpp | 53 +- .../utility/generated/converter_generated.h | 1 + 7 files changed, 389 insertions(+), 679 deletions(-) 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 f8dadf5ab22..7a134feec03 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 @@ -7601,11 +7601,23 @@ export type Callback_SheetDismiss_Void = (sheetDismiss: SheetDismiss) => void; export type Callback_DismissSheetAction_Void = (parameter: DismissSheetAction) => void; export type Callback_SpringBackAction_Void = (parameter: SpringBackAction) => void; export type Callback_SheetType_Void = (parameter: SheetType) => void; +export type SingleLengthDetent = [ + SheetSize | Length +] +export type DoubleLengthDetents = [ + SheetSize | Length, + SheetSize | Length | undefined +] +export type TripleLengthDetents = [ + SheetSize | Length, + SheetSize | Length | undefined, + SheetSize | Length | undefined +] export interface SheetOptions extends BindOptions { height?: SheetSize | Length; dragBar?: boolean; maskColor?: ResourceColor; - detents?: [ SheetSize | Length, SheetSize | Length | undefined, SheetSize | Length | undefined ]; + detents?: SingleLengthDetent | DoubleLengthDetents | TripleLengthDetents; blurStyle?: BlurStyle; showClose?: boolean | Resource; preferType?: SheetType; 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 ccb69aa2261..d5679d4fcec 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, PopupButton } from "./../common" +import { SingleLengthDetent, DoubleLengthDetents, TripleLengthDetents, AccessibilityCallback, AccessibilityFocusCallback, Bindable, GestureRecognizerJudgeBeginCallback, HoverCallback, OnDragEventCallback, OnMoveHandler, OnScrollCallback, PopupStateChangeCallback, ReuseIdCallback, ShouldBuiltInRecognizerParallelWithCallback, SizeChangeCallback, TransitionFinishCallback, VisibleAreaChangeCallback, AccessibilityHoverEvent, AccessibilityHoverEventInternal, AccessibilityRoleType, AccessibilitySamePageMode, AdaptiveColor, CommonMethod, BlurStyle, BlendApplyType, BlurStyleActivePolicy, PickerTextStyle, ChainStyle, ContentClipMode, DismissReason, DragBehavior, DragEvent, DragEventInternal, DragResult, Rectangle, 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" @@ -22620,55 +22620,126 @@ export class Serializer extends SerializerBase { valueSerializer.writeInt8(value_detents_type as int32) if ((RuntimeType.UNDEFINED) != (value_detents_type)) { const value_detents_value = value_detents! - const value_detents_value_0 = value_detents_value[0] - let value_detents_value_0_type : int32 = RuntimeType.UNDEFINED - value_detents_value_0_type = runtimeType(value_detents_value_0) - if (TypeChecker.isSheetSize(value_detents_value_0)) { - valueSerializer.writeInt8(0 as int32) - const value_detents_value_0_0 = value_detents_value_0 as SheetSize - valueSerializer.writeInt32(TypeChecker.SheetSize_ToNumeric(value_detents_value_0_0)) - } - else if (((RuntimeType.NUMBER) == (value_detents_value_0_type)) || ((RuntimeType.STRING) == (value_detents_value_0_type)) || (((RuntimeType.OBJECT) == (value_detents_value_0_type)) && (TypeChecker.isResource(value_detents_value_0, false, false, false, false, false)))) { - valueSerializer.writeInt8(1 as int32) - const value_detents_value_0_1 = value_detents_value_0 as Length - valueSerializer.writeLength(value_detents_value_0_1) - } - const value_detents_value_1 = value_detents_value[1] - let value_detents_value_1_type : int32 = RuntimeType.UNDEFINED - value_detents_value_1_type = runtimeType(value_detents_value_1) - valueSerializer.writeInt8(value_detents_value_1_type as int32) - if ((RuntimeType.UNDEFINED) != (value_detents_value_1_type)) { - const value_detents_value_1_value = value_detents_value_1! - let value_detents_value_1_value_type : int32 = RuntimeType.UNDEFINED - value_detents_value_1_value_type = runtimeType(value_detents_value_1_value) - if (TypeChecker.isSheetSize(value_detents_value_1_value)) { + let value_detents_value_type : int32 = RuntimeType.UNDEFINED + value_detents_value_type = runtimeType(value_detents_value) + if ((RuntimeType.OBJECT == value_detents_value_type) && (value_detents instanceof SingleLengthDetent)) { + valueSerializer.writeInt8(0 as int32) + const value_detents_value_0 = value_detents_value as SingleLengthDetent + const value_detents_value_0_0 = value_detents_value_0[0] + let value_detents_value_0_0_type : int32 = RuntimeType.UNDEFINED + value_detents_value_0_0_type = runtimeType(value_detents_value_0_0) + if (TypeChecker.isSheetSize(value_detents_value_0_0)) { valueSerializer.writeInt8(0 as int32) - const value_detents_value_1_value_0 = value_detents_value_1_value as SheetSize - valueSerializer.writeInt32(TypeChecker.SheetSize_ToNumeric(value_detents_value_1_value_0)) + const value_detents_value_0_0_0 = value_detents_value_0_0 as SheetSize + valueSerializer.writeInt32(value_detents_value_0_0_0.valueOf()) } - else if (((RuntimeType.NUMBER) == (value_detents_value_1_value_type)) || ((RuntimeType.STRING) == (value_detents_value_1_value_type)) || (((RuntimeType.OBJECT) == (value_detents_value_1_value_type)) && (TypeChecker.isResource(value_detents_value_1_value, false, false, false, false, false)))) { + else if ((RuntimeType.STRING == value_detents_value_0_0_type) || (RuntimeType.NUMBER == value_detents_value_0_0_type) || (RuntimeType.OBJECT == value_detents_value_0_0_type)) { valueSerializer.writeInt8(1 as int32) - const value_detents_value_1_value_1 = value_detents_value_1_value as Length - valueSerializer.writeLength(value_detents_value_1_value_1) + const value_detents_value_0_0_1 = value_detents_value_0_0 as Length + let value_detents_value_0_0_1_type : int32 = RuntimeType.UNDEFINED + value_detents_value_0_0_1_type = runtimeType(value_detents_value_0_0_1) + valueSerializer.writeLength(value_detents_value_0_0_1) } } - const value_detents_value_2 = value_detents_value[2] - let value_detents_value_2_type : int32 = RuntimeType.UNDEFINED - value_detents_value_2_type = runtimeType(value_detents_value_2) - valueSerializer.writeInt8(value_detents_value_2_type as int32) - if ((RuntimeType.UNDEFINED) != (value_detents_value_2_type)) { - const value_detents_value_2_value = value_detents_value_2! - let value_detents_value_2_value_type : int32 = RuntimeType.UNDEFINED - value_detents_value_2_value_type = runtimeType(value_detents_value_2_value) - if (TypeChecker.isSheetSize(value_detents_value_2_value)) { + else if ((RuntimeType.OBJECT == value_detents_value_type) && (value_detents instanceof DoubleLengthDetents) ) { + valueSerializer.writeInt8(1 as int32) + const value_detents_value_1 = value_detents_value as DoubleLengthDetents + const value_detents_value_1_0 = value_detents_value_1[0] + let value_detents_value_1_0_type : int32 = RuntimeType.UNDEFINED + value_detents_value_1_0_type = runtimeType(value_detents_value_1_0) + if (TypeChecker.isSheetSize(value_detents_value_1_0)) { + valueSerializer.writeInt8(0 as int32) + const value_detents_value_1_0_0 = value_detents_value_1_0 as SheetSize + valueSerializer.writeInt32(value_detents_value_1_0_0.valueOf()) + } + else if ((RuntimeType.STRING == value_detents_value_1_0_type) || (RuntimeType.NUMBER == value_detents_value_1_0_type) || (RuntimeType.OBJECT == value_detents_value_1_0_type)) { + valueSerializer.writeInt8(1 as int32) + const value_detents_value_1_0_1 = value_detents_value_1_0 as Length + let value_detents_value_1_0_1_type : int32 = RuntimeType.UNDEFINED + value_detents_value_1_0_1_type = runtimeType(value_detents_value_1_0_1) + valueSerializer.writeLength(value_detents_value_1_0_1) + } + const value_detents_value_1_1 = value_detents_value_1[1] + let value_detents_value_1_1_type : int32 = RuntimeType.UNDEFINED + value_detents_value_1_1_type = runtimeType(value_detents_value_1_1) + valueSerializer.writeInt8((value_detents_value_1_1_type).toChar()) + if ((RuntimeType.UNDEFINED) != (value_detents_value_1_1_type)) { + const value_detents_value_1_1_value = value_detents_value_1_1! + let value_detents_value_1_1_value_type : int32 = RuntimeType.UNDEFINED + value_detents_value_1_1_value_type = runtimeType(value_detents_value_1_1_value) + if (TypeChecker.isSheetSize(value_detents_value_1_1_value)) { + valueSerializer.writeInt8(0 as int32) + const value_detents_value_1_1_value_0 = value_detents_value_1_1_value as SheetSize + valueSerializer.writeInt32(value_detents_value_1_1_value_0.valueOf()) + } + else if ((RuntimeType.STRING == value_detents_value_1_1_value_type) || (RuntimeType.NUMBER == value_detents_value_1_1_value_type) || (RuntimeType.OBJECT == value_detents_value_1_1_value_type)) { + valueSerializer.writeInt8(1 as int32) + const value_detents_value_1_1_value_1 = value_detents_value_1_1_value as Length + let value_detents_value_1_1_value_1_type : int32 = RuntimeType.UNDEFINED + value_detents_value_1_1_value_1_type = runtimeType(value_detents_value_1_1_value_1) + valueSerializer.writeLength(value_detents_value_1_1_value_1) + } + } + } + else if ((RuntimeType.OBJECT == value_detents_value_type) && (value_detents instanceof TripleLengthDetents)) { + valueSerializer.writeInt8(2 as int32) + const value_detents_value_2 = value_detents_value as TripleLengthDetents + const value_detents_value_2_0 = value_detents_value_2[0] + let value_detents_value_2_0_type : int32 = RuntimeType.UNDEFINED + value_detents_value_2_0_type = runtimeType(value_detents_value_2_0) + if (TypeChecker.isSheetSize(value_detents_value_2_0)) { valueSerializer.writeInt8(0 as int32) - const value_detents_value_2_value_0 = value_detents_value_2_value as SheetSize - valueSerializer.writeInt32(TypeChecker.SheetSize_ToNumeric(value_detents_value_2_value_0)) + const value_detents_value_2_0_0 = value_detents_value_2_0 as SheetSize + valueSerializer.writeInt32(value_detents_value_2_0_0.valueOf()) } - else if (((RuntimeType.NUMBER) == (value_detents_value_2_value_type)) || ((RuntimeType.STRING) == (value_detents_value_2_value_type)) || (((RuntimeType.OBJECT) == (value_detents_value_2_value_type)) && (TypeChecker.isResource(value_detents_value_2_value, false, false, false, false, false)))) { + else if ((RuntimeType.STRING == value_detents_value_2_0_type) || (RuntimeType.NUMBER == value_detents_value_2_0_type) || (RuntimeType.OBJECT == value_detents_value_2_0_type)) { valueSerializer.writeInt8(1 as int32) - const value_detents_value_2_value_1 = value_detents_value_2_value as Length - valueSerializer.writeLength(value_detents_value_2_value_1) + const value_detents_value_2_0_1 = value_detents_value_2_0 as Length + let value_detents_value_2_0_1_type : int32 = RuntimeType.UNDEFINED + value_detents_value_2_0_1_type = runtimeType(value_detents_value_2_0_1) + valueSerializer.writeLength(value_detents_value_2_0_1) + } + const value_detents_value_2_1 = value_detents_value_2[1] + let value_detents_value_2_1_type : int32 = RuntimeType.UNDEFINED + value_detents_value_2_1_type = runtimeType(value_detents_value_2_1) + valueSerializer.writeInt8((value_detents_value_2_1_type).toChar()) + if ((RuntimeType.UNDEFINED) != (value_detents_value_2_1_type)) { + const value_detents_value_2_1_value = value_detents_value_2_1! + let value_detents_value_2_1_value_type : int32 = RuntimeType.UNDEFINED + value_detents_value_2_1_value_type = runtimeType(value_detents_value_2_1_value) + if (TypeChecker.isSheetSize(value_detents_value_2_1_value)) { + valueSerializer.writeInt8(0 as int32) + const value_detents_value_2_1_value_0 = value_detents_value_2_1_value as SheetSize + valueSerializer.writeInt32(value_detents_value_2_1_value_0.valueOf()) + } + else if ((RuntimeType.STRING == value_detents_value_2_1_value_type) || (RuntimeType.NUMBER == value_detents_value_2_1_value_type) || (RuntimeType.OBJECT == value_detents_value_2_1_value_type)) { + valueSerializer.writeInt8(1 as int32) + const value_detents_value_2_1_value_1 = value_detents_value_2_1_value as Length + let value_detents_value_2_1_value_1_type : int32 = RuntimeType.UNDEFINED + value_detents_value_2_1_value_1_type = runtimeType(value_detents_value_2_1_value_1) + valueSerializer.writeLength(value_detents_value_2_1_value_1) + } + } + const value_detents_value_2_2 = value_detents_value_2[2] + let value_detents_value_2_2_type : int32 = RuntimeType.UNDEFINED + value_detents_value_2_2_type = runtimeType(value_detents_value_2_2) + valueSerializer.writeInt8((value_detents_value_2_2_type).toChar()) + if ((RuntimeType.UNDEFINED) != (value_detents_value_2_2_type)) { + const value_detents_value_2_2_value = value_detents_value_2_2! + let value_detents_value_2_2_value_type : int32 = RuntimeType.UNDEFINED + value_detents_value_2_2_value_type = runtimeType(value_detents_value_2_2_value) + if (TypeChecker.isSheetSize(value_detents_value_2_2_value)) { + valueSerializer.writeInt8(0 as int32) + const value_detents_value_2_2_value_0 = value_detents_value_2_2_value as SheetSize + valueSerializer.writeInt32(value_detents_value_2_2_value_0.valueOf()) + } + else if ((RuntimeType.STRING == value_detents_value_2_2_value_type) || (RuntimeType.NUMBER == value_detents_value_2_2_value_type) || (RuntimeType.OBJECT == value_detents_value_2_2_value_type)) { + valueSerializer.writeInt8(1 as int32) + const value_detents_value_2_2_value_1 = value_detents_value_2_2_value as Length + let value_detents_value_2_2_value_1_type : int32 = RuntimeType.UNDEFINED + value_detents_value_2_2_value_1_type = runtimeType(value_detents_value_2_2_value_1) + valueSerializer.writeLength(value_detents_value_2_2_value_1) + } } } } 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 3b79440dc6c..fb2c772391f 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 @@ -60772,10 +60772,6 @@ inline void WriteToString(std::string* result, const Ark_SheetOptions* value) { result->append(", "); result->append(".maskColor="); WriteToString(result, &value->maskColor); - // Ark_Type_SheetOptions_detents detents - result->append(", "); - result->append(".detents="); - WriteToString(result, &value->detents); // Ark_BlurStyle blurStyle result->append(", "); result->append(".blurStyle="); @@ -86585,570 +86581,6 @@ class Serializer : public SerializerBase { } void writeSheetOptions(Ark_SheetOptions value) { - Serializer& valueSerializer = *this; - const auto value_backgroundColor = value.backgroundColor; - Ark_Int32 value_backgroundColor_type = INTEROP_RUNTIME_UNDEFINED; - value_backgroundColor_type = runtimeType(value_backgroundColor); - valueSerializer.writeInt8(value_backgroundColor_type); - if ((INTEROP_RUNTIME_UNDEFINED) != (value_backgroundColor_type)) { - const auto value_backgroundColor_value = value_backgroundColor.value; - Ark_Int32 value_backgroundColor_value_type = INTEROP_RUNTIME_UNDEFINED; - value_backgroundColor_value_type = value_backgroundColor_value.selector; - if (value_backgroundColor_value_type == 0) { - valueSerializer.writeInt8(0); - const auto value_backgroundColor_value_0 = value_backgroundColor_value.value0; - valueSerializer.writeInt32(static_cast(value_backgroundColor_value_0)); - } - else if (value_backgroundColor_value_type == 1) { - valueSerializer.writeInt8(1); - const auto value_backgroundColor_value_1 = value_backgroundColor_value.value1; - valueSerializer.writeNumber(value_backgroundColor_value_1); - } - else if (value_backgroundColor_value_type == 2) { - valueSerializer.writeInt8(2); - const auto value_backgroundColor_value_2 = value_backgroundColor_value.value2; - valueSerializer.writeString(value_backgroundColor_value_2); - } - else if (value_backgroundColor_value_type == 3) { - valueSerializer.writeInt8(3); - const auto value_backgroundColor_value_3 = value_backgroundColor_value.value3; - valueSerializer.writeResource(value_backgroundColor_value_3); - } - } - const auto value_onAppear = value.onAppear; - Ark_Int32 value_onAppear_type = INTEROP_RUNTIME_UNDEFINED; - value_onAppear_type = runtimeType(value_onAppear); - valueSerializer.writeInt8(value_onAppear_type); - if ((INTEROP_RUNTIME_UNDEFINED) != (value_onAppear_type)) { - const auto value_onAppear_value = value_onAppear.value; - valueSerializer.writeCallbackResource(value_onAppear_value.resource); - valueSerializer.writePointer(reinterpret_cast(value_onAppear_value.call)); - valueSerializer.writePointer(reinterpret_cast(value_onAppear_value.callSync)); - } - const auto value_onDisappear = value.onDisappear; - Ark_Int32 value_onDisappear_type = INTEROP_RUNTIME_UNDEFINED; - value_onDisappear_type = runtimeType(value_onDisappear); - valueSerializer.writeInt8(value_onDisappear_type); - if ((INTEROP_RUNTIME_UNDEFINED) != (value_onDisappear_type)) { - const auto value_onDisappear_value = value_onDisappear.value; - valueSerializer.writeCallbackResource(value_onDisappear_value.resource); - valueSerializer.writePointer(reinterpret_cast(value_onDisappear_value.call)); - valueSerializer.writePointer(reinterpret_cast(value_onDisappear_value.callSync)); - } - const auto value_onWillAppear = value.onWillAppear; - Ark_Int32 value_onWillAppear_type = INTEROP_RUNTIME_UNDEFINED; - value_onWillAppear_type = runtimeType(value_onWillAppear); - valueSerializer.writeInt8(value_onWillAppear_type); - if ((INTEROP_RUNTIME_UNDEFINED) != (value_onWillAppear_type)) { - const auto value_onWillAppear_value = value_onWillAppear.value; - valueSerializer.writeCallbackResource(value_onWillAppear_value.resource); - valueSerializer.writePointer(reinterpret_cast(value_onWillAppear_value.call)); - valueSerializer.writePointer(reinterpret_cast(value_onWillAppear_value.callSync)); - } - const auto value_onWillDisappear = value.onWillDisappear; - Ark_Int32 value_onWillDisappear_type = INTEROP_RUNTIME_UNDEFINED; - value_onWillDisappear_type = runtimeType(value_onWillDisappear); - valueSerializer.writeInt8(value_onWillDisappear_type); - if ((INTEROP_RUNTIME_UNDEFINED) != (value_onWillDisappear_type)) { - const auto value_onWillDisappear_value = value_onWillDisappear.value; - valueSerializer.writeCallbackResource(value_onWillDisappear_value.resource); - valueSerializer.writePointer(reinterpret_cast(value_onWillDisappear_value.call)); - valueSerializer.writePointer(reinterpret_cast(value_onWillDisappear_value.callSync)); - } - const auto value_height = value.height; - Ark_Int32 value_height_type = INTEROP_RUNTIME_UNDEFINED; - value_height_type = runtimeType(value_height); - valueSerializer.writeInt8(value_height_type); - if ((INTEROP_RUNTIME_UNDEFINED) != (value_height_type)) { - const auto value_height_value = value_height.value; - Ark_Int32 value_height_value_type = INTEROP_RUNTIME_UNDEFINED; - value_height_value_type = value_height_value.selector; - if (value_height_value_type == 0) { - valueSerializer.writeInt8(0); - const auto value_height_value_0 = value_height_value.value0; - valueSerializer.writeInt32(static_cast(value_height_value_0)); - } - else if ((value_height_value_type == 1) || (value_height_value_type == 1) || (value_height_value_type == 1)) { - valueSerializer.writeInt8(1); - const auto value_height_value_1 = value_height_value.value1; - valueSerializer.writeLength(value_height_value_1); - } - } - const auto value_dragBar = value.dragBar; - Ark_Int32 value_dragBar_type = INTEROP_RUNTIME_UNDEFINED; - value_dragBar_type = runtimeType(value_dragBar); - valueSerializer.writeInt8(value_dragBar_type); - if ((INTEROP_RUNTIME_UNDEFINED) != (value_dragBar_type)) { - const auto value_dragBar_value = value_dragBar.value; - valueSerializer.writeBoolean(value_dragBar_value); - } - const auto value_maskColor = value.maskColor; - Ark_Int32 value_maskColor_type = INTEROP_RUNTIME_UNDEFINED; - value_maskColor_type = runtimeType(value_maskColor); - valueSerializer.writeInt8(value_maskColor_type); - if ((INTEROP_RUNTIME_UNDEFINED) != (value_maskColor_type)) { - const auto value_maskColor_value = value_maskColor.value; - Ark_Int32 value_maskColor_value_type = INTEROP_RUNTIME_UNDEFINED; - value_maskColor_value_type = value_maskColor_value.selector; - if (value_maskColor_value_type == 0) { - valueSerializer.writeInt8(0); - const auto value_maskColor_value_0 = value_maskColor_value.value0; - valueSerializer.writeInt32(static_cast(value_maskColor_value_0)); - } - else if (value_maskColor_value_type == 1) { - valueSerializer.writeInt8(1); - const auto value_maskColor_value_1 = value_maskColor_value.value1; - valueSerializer.writeNumber(value_maskColor_value_1); - } - else if (value_maskColor_value_type == 2) { - valueSerializer.writeInt8(2); - const auto value_maskColor_value_2 = value_maskColor_value.value2; - valueSerializer.writeString(value_maskColor_value_2); - } - else if (value_maskColor_value_type == 3) { - valueSerializer.writeInt8(3); - const auto value_maskColor_value_3 = value_maskColor_value.value3; - valueSerializer.writeResource(value_maskColor_value_3); - } - } - const auto value_detents = value.detents; - Ark_Int32 value_detents_type = INTEROP_RUNTIME_UNDEFINED; - value_detents_type = runtimeType(value_detents); - valueSerializer.writeInt8(value_detents_type); - if ((INTEROP_RUNTIME_UNDEFINED) != (value_detents_type)) { - const auto value_detents_value = value_detents.value; - const auto value_detents_value_0 = value_detents_value.value0; - Ark_Int32 value_detents_value_0_type = INTEROP_RUNTIME_UNDEFINED; - value_detents_value_0_type = value_detents_value_0.selector; - if (value_detents_value_0_type == 0) { - valueSerializer.writeInt8(0); - const auto value_detents_value_0_0 = value_detents_value_0.value0; - valueSerializer.writeInt32(static_cast(value_detents_value_0_0)); - } - else if ((value_detents_value_0_type == 1) || (value_detents_value_0_type == 1) || (value_detents_value_0_type == 1)) { - valueSerializer.writeInt8(1); - const auto value_detents_value_0_1 = value_detents_value_0.value1; - valueSerializer.writeLength(value_detents_value_0_1); - } - const auto value_detents_value_1 = value_detents_value.value1; - Ark_Int32 value_detents_value_1_type = INTEROP_RUNTIME_UNDEFINED; - value_detents_value_1_type = runtimeType(value_detents_value_1); - valueSerializer.writeInt8(value_detents_value_1_type); - if ((INTEROP_RUNTIME_UNDEFINED) != (value_detents_value_1_type)) { - const auto value_detents_value_1_value = value_detents_value_1.value; - Ark_Int32 value_detents_value_1_value_type = INTEROP_RUNTIME_UNDEFINED; - value_detents_value_1_value_type = value_detents_value_1_value.selector; - if (value_detents_value_1_value_type == 0) { - valueSerializer.writeInt8(0); - const auto value_detents_value_1_value_0 = value_detents_value_1_value.value0; - valueSerializer.writeInt32(static_cast(value_detents_value_1_value_0)); - } - else if ((value_detents_value_1_value_type == 1) || (value_detents_value_1_value_type == 1) || (value_detents_value_1_value_type == 1)) { - valueSerializer.writeInt8(1); - const auto value_detents_value_1_value_1 = value_detents_value_1_value.value1; - valueSerializer.writeLength(value_detents_value_1_value_1); - } - } - const auto value_detents_value_2 = value_detents_value.value2; - Ark_Int32 value_detents_value_2_type = INTEROP_RUNTIME_UNDEFINED; - value_detents_value_2_type = runtimeType(value_detents_value_2); - valueSerializer.writeInt8(value_detents_value_2_type); - if ((INTEROP_RUNTIME_UNDEFINED) != (value_detents_value_2_type)) { - const auto value_detents_value_2_value = value_detents_value_2.value; - Ark_Int32 value_detents_value_2_value_type = INTEROP_RUNTIME_UNDEFINED; - value_detents_value_2_value_type = value_detents_value_2_value.selector; - if (value_detents_value_2_value_type == 0) { - valueSerializer.writeInt8(0); - const auto value_detents_value_2_value_0 = value_detents_value_2_value.value0; - valueSerializer.writeInt32(static_cast(value_detents_value_2_value_0)); - } - else if ((value_detents_value_2_value_type == 1) || (value_detents_value_2_value_type == 1) || (value_detents_value_2_value_type == 1)) { - valueSerializer.writeInt8(1); - const auto value_detents_value_2_value_1 = value_detents_value_2_value.value1; - valueSerializer.writeLength(value_detents_value_2_value_1); - } - } - } - const auto value_blurStyle = value.blurStyle; - Ark_Int32 value_blurStyle_type = INTEROP_RUNTIME_UNDEFINED; - value_blurStyle_type = runtimeType(value_blurStyle); - valueSerializer.writeInt8(value_blurStyle_type); - if ((INTEROP_RUNTIME_UNDEFINED) != (value_blurStyle_type)) { - const auto value_blurStyle_value = value_blurStyle.value; - valueSerializer.writeInt32(static_cast(value_blurStyle_value)); - } - const auto value_showClose = value.showClose; - Ark_Int32 value_showClose_type = INTEROP_RUNTIME_UNDEFINED; - value_showClose_type = runtimeType(value_showClose); - valueSerializer.writeInt8(value_showClose_type); - if ((INTEROP_RUNTIME_UNDEFINED) != (value_showClose_type)) { - const auto value_showClose_value = value_showClose.value; - Ark_Int32 value_showClose_value_type = INTEROP_RUNTIME_UNDEFINED; - value_showClose_value_type = value_showClose_value.selector; - if (value_showClose_value_type == 0) { - valueSerializer.writeInt8(0); - const auto value_showClose_value_0 = value_showClose_value.value0; - valueSerializer.writeBoolean(value_showClose_value_0); - } - else if (value_showClose_value_type == 1) { - valueSerializer.writeInt8(1); - const auto value_showClose_value_1 = value_showClose_value.value1; - valueSerializer.writeResource(value_showClose_value_1); - } - } - const auto value_preferType = value.preferType; - Ark_Int32 value_preferType_type = INTEROP_RUNTIME_UNDEFINED; - value_preferType_type = runtimeType(value_preferType); - valueSerializer.writeInt8(value_preferType_type); - if ((INTEROP_RUNTIME_UNDEFINED) != (value_preferType_type)) { - const auto value_preferType_value = value_preferType.value; - valueSerializer.writeInt32(static_cast(value_preferType_value)); - } - const auto value_title = value.title; - Ark_Int32 value_title_type = INTEROP_RUNTIME_UNDEFINED; - value_title_type = runtimeType(value_title); - valueSerializer.writeInt8(value_title_type); - if ((INTEROP_RUNTIME_UNDEFINED) != (value_title_type)) { - const auto value_title_value = value_title.value; - Ark_Int32 value_title_value_type = INTEROP_RUNTIME_UNDEFINED; - value_title_value_type = value_title_value.selector; - if (value_title_value_type == 0) { - valueSerializer.writeInt8(0); - const auto value_title_value_0 = value_title_value.value0; - valueSerializer.writeSheetTitleOptions(value_title_value_0); - } - else if (value_title_value_type == 1) { - valueSerializer.writeInt8(1); - const auto value_title_value_1 = value_title_value.value1; - valueSerializer.writeCallbackResource(value_title_value_1.resource); - valueSerializer.writePointer(reinterpret_cast(value_title_value_1.call)); - valueSerializer.writePointer(reinterpret_cast(value_title_value_1.callSync)); - } - } - const auto value_shouldDismiss = value.shouldDismiss; - Ark_Int32 value_shouldDismiss_type = INTEROP_RUNTIME_UNDEFINED; - value_shouldDismiss_type = runtimeType(value_shouldDismiss); - valueSerializer.writeInt8(value_shouldDismiss_type); - if ((INTEROP_RUNTIME_UNDEFINED) != (value_shouldDismiss_type)) { - const auto value_shouldDismiss_value = value_shouldDismiss.value; - valueSerializer.writeCallbackResource(value_shouldDismiss_value.resource); - valueSerializer.writePointer(reinterpret_cast(value_shouldDismiss_value.call)); - valueSerializer.writePointer(reinterpret_cast(value_shouldDismiss_value.callSync)); - } - const auto value_onWillDismiss = value.onWillDismiss; - Ark_Int32 value_onWillDismiss_type = INTEROP_RUNTIME_UNDEFINED; - value_onWillDismiss_type = runtimeType(value_onWillDismiss); - valueSerializer.writeInt8(value_onWillDismiss_type); - if ((INTEROP_RUNTIME_UNDEFINED) != (value_onWillDismiss_type)) { - const auto value_onWillDismiss_value = value_onWillDismiss.value; - valueSerializer.writeCallbackResource(value_onWillDismiss_value.resource); - valueSerializer.writePointer(reinterpret_cast(value_onWillDismiss_value.call)); - valueSerializer.writePointer(reinterpret_cast(value_onWillDismiss_value.callSync)); - } - const auto value_onWillSpringBackWhenDismiss = value.onWillSpringBackWhenDismiss; - Ark_Int32 value_onWillSpringBackWhenDismiss_type = INTEROP_RUNTIME_UNDEFINED; - value_onWillSpringBackWhenDismiss_type = runtimeType(value_onWillSpringBackWhenDismiss); - valueSerializer.writeInt8(value_onWillSpringBackWhenDismiss_type); - if ((INTEROP_RUNTIME_UNDEFINED) != (value_onWillSpringBackWhenDismiss_type)) { - const auto value_onWillSpringBackWhenDismiss_value = value_onWillSpringBackWhenDismiss.value; - valueSerializer.writeCallbackResource(value_onWillSpringBackWhenDismiss_value.resource); - valueSerializer.writePointer(reinterpret_cast(value_onWillSpringBackWhenDismiss_value.call)); - valueSerializer.writePointer(reinterpret_cast(value_onWillSpringBackWhenDismiss_value.callSync)); - } - const auto value_enableOutsideInteractive = value.enableOutsideInteractive; - Ark_Int32 value_enableOutsideInteractive_type = INTEROP_RUNTIME_UNDEFINED; - value_enableOutsideInteractive_type = runtimeType(value_enableOutsideInteractive); - valueSerializer.writeInt8(value_enableOutsideInteractive_type); - if ((INTEROP_RUNTIME_UNDEFINED) != (value_enableOutsideInteractive_type)) { - const auto value_enableOutsideInteractive_value = value_enableOutsideInteractive.value; - valueSerializer.writeBoolean(value_enableOutsideInteractive_value); - } - const auto value_width = value.width; - Ark_Int32 value_width_type = INTEROP_RUNTIME_UNDEFINED; - value_width_type = runtimeType(value_width); - valueSerializer.writeInt8(value_width_type); - if ((INTEROP_RUNTIME_UNDEFINED) != (value_width_type)) { - const auto value_width_value = value_width.value; - valueSerializer.writeLength(value_width_value); - } - const auto value_borderWidth = value.borderWidth; - Ark_Int32 value_borderWidth_type = INTEROP_RUNTIME_UNDEFINED; - value_borderWidth_type = runtimeType(value_borderWidth); - valueSerializer.writeInt8(value_borderWidth_type); - if ((INTEROP_RUNTIME_UNDEFINED) != (value_borderWidth_type)) { - const auto value_borderWidth_value = value_borderWidth.value; - Ark_Int32 value_borderWidth_value_type = INTEROP_RUNTIME_UNDEFINED; - value_borderWidth_value_type = value_borderWidth_value.selector; - if ((value_borderWidth_value_type == 0) || (value_borderWidth_value_type == 0) || (value_borderWidth_value_type == 0)) { - valueSerializer.writeInt8(0); - const auto value_borderWidth_value_0 = value_borderWidth_value.value0; - valueSerializer.writeLength(value_borderWidth_value_0); - } - else if (value_borderWidth_value_type == 1) { - valueSerializer.writeInt8(1); - const auto value_borderWidth_value_1 = value_borderWidth_value.value1; - valueSerializer.writeEdgeWidths(value_borderWidth_value_1); - } - else if (value_borderWidth_value_type == 2) { - valueSerializer.writeInt8(2); - const auto value_borderWidth_value_2 = value_borderWidth_value.value2; - valueSerializer.writeLocalizedEdgeWidths(value_borderWidth_value_2); - } - } - const auto value_borderColor = value.borderColor; - Ark_Int32 value_borderColor_type = INTEROP_RUNTIME_UNDEFINED; - value_borderColor_type = runtimeType(value_borderColor); - valueSerializer.writeInt8(value_borderColor_type); - if ((INTEROP_RUNTIME_UNDEFINED) != (value_borderColor_type)) { - const auto value_borderColor_value = value_borderColor.value; - Ark_Int32 value_borderColor_value_type = INTEROP_RUNTIME_UNDEFINED; - value_borderColor_value_type = value_borderColor_value.selector; - if ((value_borderColor_value_type == 0) || (value_borderColor_value_type == 0) || (value_borderColor_value_type == 0) || (value_borderColor_value_type == 0)) { - valueSerializer.writeInt8(0); - const auto value_borderColor_value_0 = value_borderColor_value.value0; - Ark_Int32 value_borderColor_value_0_type = INTEROP_RUNTIME_UNDEFINED; - value_borderColor_value_0_type = value_borderColor_value_0.selector; - if (value_borderColor_value_0_type == 0) { - valueSerializer.writeInt8(0); - const auto value_borderColor_value_0_0 = value_borderColor_value_0.value0; - valueSerializer.writeInt32(static_cast(value_borderColor_value_0_0)); - } - else if (value_borderColor_value_0_type == 1) { - valueSerializer.writeInt8(1); - const auto value_borderColor_value_0_1 = value_borderColor_value_0.value1; - valueSerializer.writeNumber(value_borderColor_value_0_1); - } - else if (value_borderColor_value_0_type == 2) { - valueSerializer.writeInt8(2); - const auto value_borderColor_value_0_2 = value_borderColor_value_0.value2; - valueSerializer.writeString(value_borderColor_value_0_2); - } - else if (value_borderColor_value_0_type == 3) { - valueSerializer.writeInt8(3); - const auto value_borderColor_value_0_3 = value_borderColor_value_0.value3; - valueSerializer.writeResource(value_borderColor_value_0_3); - } - } - else if (value_borderColor_value_type == 1) { - valueSerializer.writeInt8(1); - const auto value_borderColor_value_1 = value_borderColor_value.value1; - valueSerializer.writeEdgeColors(value_borderColor_value_1); - } - else if (value_borderColor_value_type == 2) { - valueSerializer.writeInt8(2); - const auto value_borderColor_value_2 = value_borderColor_value.value2; - valueSerializer.writeLocalizedEdgeColors(value_borderColor_value_2); - } - } - const auto value_borderStyle = value.borderStyle; - Ark_Int32 value_borderStyle_type = INTEROP_RUNTIME_UNDEFINED; - value_borderStyle_type = runtimeType(value_borderStyle); - valueSerializer.writeInt8(value_borderStyle_type); - if ((INTEROP_RUNTIME_UNDEFINED) != (value_borderStyle_type)) { - const auto value_borderStyle_value = value_borderStyle.value; - Ark_Int32 value_borderStyle_value_type = INTEROP_RUNTIME_UNDEFINED; - value_borderStyle_value_type = value_borderStyle_value.selector; - if (value_borderStyle_value_type == 0) { - valueSerializer.writeInt8(0); - const auto value_borderStyle_value_0 = value_borderStyle_value.value0; - valueSerializer.writeInt32(static_cast(value_borderStyle_value_0)); - } - else if (value_borderStyle_value_type == 1) { - valueSerializer.writeInt8(1); - const auto value_borderStyle_value_1 = value_borderStyle_value.value1; - valueSerializer.writeEdgeStyles(value_borderStyle_value_1); - } - } - const auto value_shadow = value.shadow; - Ark_Int32 value_shadow_type = INTEROP_RUNTIME_UNDEFINED; - value_shadow_type = runtimeType(value_shadow); - valueSerializer.writeInt8(value_shadow_type); - if ((INTEROP_RUNTIME_UNDEFINED) != (value_shadow_type)) { - const auto value_shadow_value = value_shadow.value; - Ark_Int32 value_shadow_value_type = INTEROP_RUNTIME_UNDEFINED; - value_shadow_value_type = value_shadow_value.selector; - if (value_shadow_value_type == 0) { - valueSerializer.writeInt8(0); - const auto value_shadow_value_0 = value_shadow_value.value0; - valueSerializer.writeShadowOptions(value_shadow_value_0); - } - else if (value_shadow_value_type == 1) { - valueSerializer.writeInt8(1); - const auto value_shadow_value_1 = value_shadow_value.value1; - valueSerializer.writeInt32(static_cast(value_shadow_value_1)); - } - } - const auto value_onHeightDidChange = value.onHeightDidChange; - Ark_Int32 value_onHeightDidChange_type = INTEROP_RUNTIME_UNDEFINED; - value_onHeightDidChange_type = runtimeType(value_onHeightDidChange); - valueSerializer.writeInt8(value_onHeightDidChange_type); - if ((INTEROP_RUNTIME_UNDEFINED) != (value_onHeightDidChange_type)) { - const auto value_onHeightDidChange_value = value_onHeightDidChange.value; - valueSerializer.writeCallbackResource(value_onHeightDidChange_value.resource); - valueSerializer.writePointer(reinterpret_cast(value_onHeightDidChange_value.call)); - valueSerializer.writePointer(reinterpret_cast(value_onHeightDidChange_value.callSync)); - } - const auto value_mode = value.mode; - Ark_Int32 value_mode_type = INTEROP_RUNTIME_UNDEFINED; - value_mode_type = runtimeType(value_mode); - valueSerializer.writeInt8(value_mode_type); - if ((INTEROP_RUNTIME_UNDEFINED) != (value_mode_type)) { - const auto value_mode_value = value_mode.value; - valueSerializer.writeInt32(static_cast(value_mode_value)); - } - const auto value_scrollSizeMode = value.scrollSizeMode; - Ark_Int32 value_scrollSizeMode_type = INTEROP_RUNTIME_UNDEFINED; - value_scrollSizeMode_type = runtimeType(value_scrollSizeMode); - valueSerializer.writeInt8(value_scrollSizeMode_type); - if ((INTEROP_RUNTIME_UNDEFINED) != (value_scrollSizeMode_type)) { - const auto value_scrollSizeMode_value = value_scrollSizeMode.value; - valueSerializer.writeInt32(static_cast(value_scrollSizeMode_value)); - } - const auto value_onDetentsDidChange = value.onDetentsDidChange; - Ark_Int32 value_onDetentsDidChange_type = INTEROP_RUNTIME_UNDEFINED; - value_onDetentsDidChange_type = runtimeType(value_onDetentsDidChange); - valueSerializer.writeInt8(value_onDetentsDidChange_type); - if ((INTEROP_RUNTIME_UNDEFINED) != (value_onDetentsDidChange_type)) { - const auto value_onDetentsDidChange_value = value_onDetentsDidChange.value; - valueSerializer.writeCallbackResource(value_onDetentsDidChange_value.resource); - valueSerializer.writePointer(reinterpret_cast(value_onDetentsDidChange_value.call)); - valueSerializer.writePointer(reinterpret_cast(value_onDetentsDidChange_value.callSync)); - } - const auto value_onWidthDidChange = value.onWidthDidChange; - Ark_Int32 value_onWidthDidChange_type = INTEROP_RUNTIME_UNDEFINED; - value_onWidthDidChange_type = runtimeType(value_onWidthDidChange); - valueSerializer.writeInt8(value_onWidthDidChange_type); - if ((INTEROP_RUNTIME_UNDEFINED) != (value_onWidthDidChange_type)) { - const auto value_onWidthDidChange_value = value_onWidthDidChange.value; - valueSerializer.writeCallbackResource(value_onWidthDidChange_value.resource); - valueSerializer.writePointer(reinterpret_cast(value_onWidthDidChange_value.call)); - valueSerializer.writePointer(reinterpret_cast(value_onWidthDidChange_value.callSync)); - } - const auto value_onTypeDidChange = value.onTypeDidChange; - Ark_Int32 value_onTypeDidChange_type = INTEROP_RUNTIME_UNDEFINED; - value_onTypeDidChange_type = runtimeType(value_onTypeDidChange); - valueSerializer.writeInt8(value_onTypeDidChange_type); - if ((INTEROP_RUNTIME_UNDEFINED) != (value_onTypeDidChange_type)) { - const auto value_onTypeDidChange_value = value_onTypeDidChange.value; - valueSerializer.writeCallbackResource(value_onTypeDidChange_value.resource); - valueSerializer.writePointer(reinterpret_cast(value_onTypeDidChange_value.call)); - valueSerializer.writePointer(reinterpret_cast(value_onTypeDidChange_value.callSync)); - } - const auto value_uiContext = value.uiContext; - Ark_Int32 value_uiContext_type = INTEROP_RUNTIME_UNDEFINED; - value_uiContext_type = runtimeType(value_uiContext); - valueSerializer.writeInt8(value_uiContext_type); - if ((INTEROP_RUNTIME_UNDEFINED) != (value_uiContext_type)) { - const auto value_uiContext_value = value_uiContext.value; - valueSerializer.writeUIContext(value_uiContext_value); - } - const auto value_keyboardAvoidMode = value.keyboardAvoidMode; - Ark_Int32 value_keyboardAvoidMode_type = INTEROP_RUNTIME_UNDEFINED; - value_keyboardAvoidMode_type = runtimeType(value_keyboardAvoidMode); - valueSerializer.writeInt8(value_keyboardAvoidMode_type); - if ((INTEROP_RUNTIME_UNDEFINED) != (value_keyboardAvoidMode_type)) { - const auto value_keyboardAvoidMode_value = value_keyboardAvoidMode.value; - valueSerializer.writeInt32(static_cast(value_keyboardAvoidMode_value)); - } - const auto value_enableHoverMode = value.enableHoverMode; - Ark_Int32 value_enableHoverMode_type = INTEROP_RUNTIME_UNDEFINED; - value_enableHoverMode_type = runtimeType(value_enableHoverMode); - valueSerializer.writeInt8(value_enableHoverMode_type); - if ((INTEROP_RUNTIME_UNDEFINED) != (value_enableHoverMode_type)) { - const auto value_enableHoverMode_value = value_enableHoverMode.value; - valueSerializer.writeBoolean(value_enableHoverMode_value); - } - const auto value_hoverModeArea = value.hoverModeArea; - Ark_Int32 value_hoverModeArea_type = INTEROP_RUNTIME_UNDEFINED; - value_hoverModeArea_type = runtimeType(value_hoverModeArea); - valueSerializer.writeInt8(value_hoverModeArea_type); - if ((INTEROP_RUNTIME_UNDEFINED) != (value_hoverModeArea_type)) { - const auto value_hoverModeArea_value = value_hoverModeArea.value; - valueSerializer.writeInt32(static_cast(value_hoverModeArea_value)); - } - const auto value_offset = value.offset; - Ark_Int32 value_offset_type = INTEROP_RUNTIME_UNDEFINED; - value_offset_type = runtimeType(value_offset); - valueSerializer.writeInt8(value_offset_type); - if ((INTEROP_RUNTIME_UNDEFINED) != (value_offset_type)) { - const auto value_offset_value = value_offset.value; - valueSerializer.writePosition(value_offset_value); - } - const auto value_effectEdge = value.effectEdge; - Ark_Int32 value_effectEdge_type = INTEROP_RUNTIME_UNDEFINED; - value_effectEdge_type = runtimeType(value_effectEdge); - valueSerializer.writeInt8(value_effectEdge_type); - if ((INTEROP_RUNTIME_UNDEFINED) != (value_effectEdge_type)) { - const auto value_effectEdge_value = value_effectEdge.value; - valueSerializer.writeNumber(value_effectEdge_value); - } - const auto value_radius = value.radius; - Ark_Int32 value_radius_type = INTEROP_RUNTIME_UNDEFINED; - value_radius_type = runtimeType(value_radius); - valueSerializer.writeInt8(value_radius_type); - if ((INTEROP_RUNTIME_UNDEFINED) != (value_radius_type)) { - const auto value_radius_value = value_radius.value; - Ark_Int32 value_radius_value_type = INTEROP_RUNTIME_UNDEFINED; - value_radius_value_type = value_radius_value.selector; - if (value_radius_value_type == 0) { - valueSerializer.writeInt8(0); - const auto value_radius_value_0 = value_radius_value.value0; - valueSerializer.writeLengthMetrics(value_radius_value_0); - } - else if (value_radius_value_type == 1) { - valueSerializer.writeInt8(1); - const auto value_radius_value_1 = value_radius_value.value1; - valueSerializer.writeBorderRadiuses(value_radius_value_1); - } - else if (value_radius_value_type == 2) { - valueSerializer.writeInt8(2); - const auto value_radius_value_2 = value_radius_value.value2; - valueSerializer.writeLocalizedBorderRadiuses(value_radius_value_2); - } - } - const auto value_detentSelection = value.detentSelection; - Ark_Int32 value_detentSelection_type = INTEROP_RUNTIME_UNDEFINED; - value_detentSelection_type = runtimeType(value_detentSelection); - valueSerializer.writeInt8(value_detentSelection_type); - if ((INTEROP_RUNTIME_UNDEFINED) != (value_detentSelection_type)) { - const auto value_detentSelection_value = value_detentSelection.value; - Ark_Int32 value_detentSelection_value_type = INTEROP_RUNTIME_UNDEFINED; - value_detentSelection_value_type = value_detentSelection_value.selector; - if (value_detentSelection_value_type == 0) { - valueSerializer.writeInt8(0); - const auto value_detentSelection_value_0 = value_detentSelection_value.value0; - valueSerializer.writeInt32(static_cast(value_detentSelection_value_0)); - } - else if ((value_detentSelection_value_type == 1) || (value_detentSelection_value_type == 1) || (value_detentSelection_value_type == 1)) { - valueSerializer.writeInt8(1); - const auto value_detentSelection_value_1 = value_detentSelection_value.value1; - valueSerializer.writeLength(value_detentSelection_value_1); - } - } - const auto value_showInSubWindow = value.showInSubWindow; - Ark_Int32 value_showInSubWindow_type = INTEROP_RUNTIME_UNDEFINED; - value_showInSubWindow_type = runtimeType(value_showInSubWindow); - valueSerializer.writeInt8(value_showInSubWindow_type); - if ((INTEROP_RUNTIME_UNDEFINED) != (value_showInSubWindow_type)) { - const auto value_showInSubWindow_value = value_showInSubWindow.value; - valueSerializer.writeBoolean(value_showInSubWindow_value); - } - const auto value_placement = value.placement; - Ark_Int32 value_placement_type = INTEROP_RUNTIME_UNDEFINED; - value_placement_type = runtimeType(value_placement); - valueSerializer.writeInt8(value_placement_type); - if ((INTEROP_RUNTIME_UNDEFINED) != (value_placement_type)) { - const auto value_placement_value = value_placement.value; - valueSerializer.writeInt32(static_cast(value_placement_value)); - } - const auto value_placementOnTarget = value.placementOnTarget; - Ark_Int32 value_placementOnTarget_type = INTEROP_RUNTIME_UNDEFINED; - value_placementOnTarget_type = runtimeType(value_placementOnTarget); - valueSerializer.writeInt8(value_placementOnTarget_type); - if ((INTEROP_RUNTIME_UNDEFINED) != (value_placementOnTarget_type)) { - const auto value_placementOnTarget_value = value_placementOnTarget.value; - valueSerializer.writeBoolean(value_placementOnTarget_value); - } } void writeStyleOptions(Ark_StyleOptions value) { @@ -115010,71 +114442,142 @@ class Deserializer : public DeserializerBase { } value.maskColor = maskColor_buf; const auto detents_buf_runtimeType = static_cast(valueDeserializer.readInt8()); - Opt_Type_SheetOptions_detents detents_buf = {}; + Opt_Union_SingleLengthDetent_DoubleLengthDetents_TripleLengthDetents detents_buf = {}; detents_buf.tag = detents_buf_runtimeType == INTEROP_RUNTIME_UNDEFINED ? INTEROP_TAG_UNDEFINED : INTEROP_TAG_OBJECT; if ((INTEROP_RUNTIME_UNDEFINED) != (detents_buf_runtimeType)) { - Ark_Type_SheetOptions_detents detents_buf_ = {}; - const Ark_Int8 detents_buf__value0_buf_selector = valueDeserializer.readInt8(); - Ark_Union_SheetSize_Length detents_buf__value0_buf = {}; - detents_buf__value0_buf.selector = detents_buf__value0_buf_selector; - if (detents_buf__value0_buf_selector == 0) { - detents_buf__value0_buf.selector = 0; - detents_buf__value0_buf.value0 = static_cast(valueDeserializer.readInt32()); - } - else if (detents_buf__value0_buf_selector == 1) { - detents_buf__value0_buf.selector = 1; - detents_buf__value0_buf.value1 = valueDeserializer.readLength(); - } - else { - INTEROP_FATAL("One of the branches for detents_buf__value0_buf has to be chosen through deserialisation."); - } - detents_buf_.value0 = static_cast(detents_buf__value0_buf); - const auto detents_buf__value1_buf_runtimeType = static_cast(valueDeserializer.readInt8()); - Opt_Union_SheetSize_Length detents_buf__value1_buf = {}; - detents_buf__value1_buf.tag = detents_buf__value1_buf_runtimeType == INTEROP_RUNTIME_UNDEFINED ? INTEROP_TAG_UNDEFINED : INTEROP_TAG_OBJECT; - if ((INTEROP_RUNTIME_UNDEFINED) != (detents_buf__value1_buf_runtimeType)) - { - const Ark_Int8 detents_buf__value1_buf__selector = valueDeserializer.readInt8(); - Ark_Union_SheetSize_Length detents_buf__value1_buf_ = {}; - detents_buf__value1_buf_.selector = detents_buf__value1_buf__selector; - if (detents_buf__value1_buf__selector == 0) { - detents_buf__value1_buf_.selector = 0; - detents_buf__value1_buf_.value0 = static_cast(valueDeserializer.readInt32()); + const Ark_Int8 detents_buf__selector = valueDeserializer.readInt8(); + Ark_Union_SingleLengthDetent_DoubleLengthDetents_TripleLengthDetents detents_buf_ = {}; + detents_buf_.selector = detents_buf__selector; + if (detents_buf__selector == 0) { + detents_buf_.selector = 0; + Ark_SingleLengthDetent detents_buf__u = {}; + const Ark_Int8 detents_buf__u_value0_buf_selector = valueDeserializer.readInt8(); + Ark_Union_SheetSize_Length detents_buf__u_value0_buf = {}; + detents_buf__u_value0_buf.selector = detents_buf__u_value0_buf_selector; + if (detents_buf__u_value0_buf_selector == 0) { + detents_buf__u_value0_buf.selector = 0; + detents_buf__u_value0_buf.value0 = static_cast(valueDeserializer.readInt32()); + + } else if (detents_buf__u_value0_buf_selector == 1) { + detents_buf__u_value0_buf.selector = 1; + detents_buf__u_value0_buf.value1 = valueDeserializer.readLength(); + } else { + INTEROP_FATAL("One of the branches for detents_buf__u_value0_buf has to be chosen through deserialisation."); } - else if (detents_buf__value1_buf__selector == 1) { - detents_buf__value1_buf_.selector = 1; - detents_buf__value1_buf_.value1 = valueDeserializer.readLength(); + detents_buf__u.value0 = static_cast(detents_buf__u_value0_buf); + detents_buf_.value0 = detents_buf__u; + } + else if (detents_buf__selector == 1) { + detents_buf_.selector = 1; + Ark_DoubleLengthDetents detents_buf__u = {}; + const Ark_Int8 detents_buf__u_value0_buf_selector = valueDeserializer.readInt8(); + Ark_Union_SheetSize_Length detents_buf__u_value0_buf = {}; + detents_buf__u_value0_buf.selector = detents_buf__u_value0_buf_selector; + if (detents_buf__u_value0_buf_selector == 0) { + detents_buf__u_value0_buf.selector = 0; + detents_buf__u_value0_buf.value0 = static_cast(valueDeserializer.readInt32()); + } + else if (detents_buf__u_value0_buf_selector == 1) { + detents_buf__u_value0_buf.selector = 1; + detents_buf__u_value0_buf.value1 = valueDeserializer.readLength(); } else { - INTEROP_FATAL("One of the branches for detents_buf__value1_buf_ has to be chosen through deserialisation."); + INTEROP_FATAL("One of the branches for detents_buf__u_value0_buf has to be chosen through deserialisation."); + } + detents_buf__u.value0 = static_cast(detents_buf__u_value0_buf); + const auto detents_buf__u_value1_buf_runtimeType = static_cast(valueDeserializer.readInt8()); + Opt_Union_SheetSize_Length detents_buf__u_value1_buf = {}; + detents_buf__u_value1_buf.tag = detents_buf__u_value1_buf_runtimeType == INTEROP_RUNTIME_UNDEFINED ? INTEROP_TAG_UNDEFINED : INTEROP_TAG_OBJECT; + if ((INTEROP_RUNTIME_UNDEFINED) != (detents_buf__u_value1_buf_runtimeType)) + { + const Ark_Int8 detents_buf__u_value1_buf__selector = valueDeserializer.readInt8(); + Ark_Union_SheetSize_Length detents_buf__u_value1_buf_ = {}; + detents_buf__u_value1_buf_.selector = detents_buf__u_value1_buf__selector; + if (detents_buf__u_value1_buf__selector == 0) { + detents_buf__u_value1_buf_.selector = 0; + detents_buf__u_value1_buf_.value0 = static_cast(valueDeserializer.readInt32()); + } + else if (detents_buf__u_value1_buf__selector == 1) { + detents_buf__u_value1_buf_.selector = 1; + detents_buf__u_value1_buf_.value1 = valueDeserializer.readLength(); + } + else { + INTEROP_FATAL("One of the branches for detents_buf__u_value1_buf_ has to be chosen through deserialisation."); + } + detents_buf__u_value1_buf.value = static_cast(detents_buf__u_value1_buf_); } - detents_buf__value1_buf.value = static_cast(detents_buf__value1_buf_); - } - detents_buf_.value1 = detents_buf__value1_buf; - const auto detents_buf__value2_buf_runtimeType = static_cast(valueDeserializer.readInt8()); - Opt_Union_SheetSize_Length detents_buf__value2_buf = {}; - detents_buf__value2_buf.tag = detents_buf__value2_buf_runtimeType == INTEROP_RUNTIME_UNDEFINED ? INTEROP_TAG_UNDEFINED : INTEROP_TAG_OBJECT; - if ((INTEROP_RUNTIME_UNDEFINED) != (detents_buf__value2_buf_runtimeType)) - { - const Ark_Int8 detents_buf__value2_buf__selector = valueDeserializer.readInt8(); - Ark_Union_SheetSize_Length detents_buf__value2_buf_ = {}; - detents_buf__value2_buf_.selector = detents_buf__value2_buf__selector; - if (detents_buf__value2_buf__selector == 0) { - detents_buf__value2_buf_.selector = 0; - detents_buf__value2_buf_.value0 = static_cast(valueDeserializer.readInt32()); + detents_buf__u.value1 = detents_buf__u_value1_buf; + detents_buf_.value1 = detents_buf__u; + } + else if (detents_buf__selector == 2) { + detents_buf_.selector = 2; + Ark_TripleLengthDetents detents_buf__u = {}; + const Ark_Int8 detents_buf__u_value0_buf_selector = valueDeserializer.readInt8(); + Ark_Union_SheetSize_Length detents_buf__u_value0_buf = {}; + detents_buf__u_value0_buf.selector = detents_buf__u_value0_buf_selector; + if (detents_buf__u_value0_buf_selector == 0) { + detents_buf__u_value0_buf.selector = 0; + detents_buf__u_value0_buf.value0 = static_cast(valueDeserializer.readInt32()); } - else if (detents_buf__value2_buf__selector == 1) { - detents_buf__value2_buf_.selector = 1; - detents_buf__value2_buf_.value1 = valueDeserializer.readLength(); + else if (detents_buf__u_value0_buf_selector == 1) { + detents_buf__u_value0_buf.selector = 1; + detents_buf__u_value0_buf.value1 = valueDeserializer.readLength(); } else { - INTEROP_FATAL("One of the branches for detents_buf__value2_buf_ has to be chosen through deserialisation."); + INTEROP_FATAL("One of the branches for detents_buf__u_value0_buf has to be chosen through deserialisation."); + } + detents_buf__u.value0 = static_cast(detents_buf__u_value0_buf); + const auto detents_buf__u_value1_buf_runtimeType = static_cast(valueDeserializer.readInt8()); + Opt_Union_SheetSize_Length detents_buf__u_value1_buf = {}; + detents_buf__u_value1_buf.tag = detents_buf__u_value1_buf_runtimeType == INTEROP_RUNTIME_UNDEFINED ? INTEROP_TAG_UNDEFINED : INTEROP_TAG_OBJECT; + if ((INTEROP_RUNTIME_UNDEFINED) != (detents_buf__u_value1_buf_runtimeType)) + { + const Ark_Int8 detents_buf__u_value1_buf__selector = valueDeserializer.readInt8(); + Ark_Union_SheetSize_Length detents_buf__u_value1_buf_ = {}; + detents_buf__u_value1_buf_.selector = detents_buf__u_value1_buf__selector; + if (detents_buf__u_value1_buf__selector == 0) { + detents_buf__u_value1_buf_.selector = 0; + detents_buf__u_value1_buf_.value0 = static_cast(valueDeserializer.readInt32()); + } + else if (detents_buf__u_value1_buf__selector == 1) { + detents_buf__u_value1_buf_.selector = 1; + detents_buf__u_value1_buf_.value1 = valueDeserializer.readLength(); + } + else { + INTEROP_FATAL("One of the branches for detents_buf__u_value1_buf_ has to be chosen through deserialisation."); + } + detents_buf__u_value1_buf.value = static_cast(detents_buf__u_value1_buf_); + } + detents_buf__u.value1 = detents_buf__u_value1_buf; + const auto detents_buf__u_value2_buf_runtimeType = static_cast(valueDeserializer.readInt8()); + Opt_Union_SheetSize_Length detents_buf__u_value2_buf = {}; + detents_buf__u_value2_buf.tag = detents_buf__u_value2_buf_runtimeType == INTEROP_RUNTIME_UNDEFINED ? INTEROP_TAG_UNDEFINED : INTEROP_TAG_OBJECT; + if ((INTEROP_RUNTIME_UNDEFINED) != (detents_buf__u_value2_buf_runtimeType)) + { + const Ark_Int8 detents_buf__u_value2_buf__selector = valueDeserializer.readInt8(); + Ark_Union_SheetSize_Length detents_buf__u_value2_buf_ = {}; + detents_buf__u_value2_buf_.selector = detents_buf__u_value2_buf__selector; + if (detents_buf__u_value2_buf__selector == 0) { + detents_buf__u_value2_buf_.selector = 0; + detents_buf__u_value2_buf_.value0 = static_cast(valueDeserializer.readInt32()); + } + else if (detents_buf__u_value2_buf__selector == 1) { + detents_buf__u_value2_buf_.selector = 1; + detents_buf__u_value2_buf_.value1 = valueDeserializer.readLength(); + } + else { + INTEROP_FATAL("One of the branches for detents_buf__u_value2_buf_ has to be chosen through deserialisation."); + } + detents_buf__u_value2_buf.value = static_cast(detents_buf__u_value2_buf_); } - detents_buf__value2_buf.value = static_cast(detents_buf__value2_buf_); + detents_buf__u.value2 = detents_buf__u_value2_buf; + detents_buf_.value2 = detents_buf__u; + } + else { + INTEROP_FATAL("One of the branches for detents_buf_ has to be chosen through deserialisation."); } - detents_buf_.value2 = detents_buf__value2_buf; - detents_buf.value = detents_buf_; + detents_buf.value = static_cast(detents_buf_); } value.detents = detents_buf; const auto blurStyle_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 09344c1c8a0..c6895af789c 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 @@ -3209,6 +3209,14 @@ typedef struct Ark_NavigationToolbarOptions Ark_NavigationToolbarOptions; typedef struct Opt_NavigationToolbarOptions Opt_NavigationToolbarOptions; typedef struct Ark_PopupOptions Ark_PopupOptions; typedef struct Opt_PopupOptions Opt_PopupOptions; +typedef struct Ark_Union_SingleLengthDetent_DoubleLengthDetents_TripleLengthDetents Ark_Union_SingleLengthDetent_DoubleLengthDetents_TripleLengthDetents; +typedef struct Opt_Union_SingleLengthDetent_DoubleLengthDetents_TripleLengthDetents Opt_Union_SingleLengthDetent_DoubleLengthDetents_TripleLengthDetents; +typedef struct Ark_SingleLengthDetent Ark_SingleLengthDetent; +typedef struct Opt_SingleLengthDetent Opt_SingleLengthDetent; +typedef struct Ark_DoubleLengthDetents Ark_DoubleLengthDetents; +typedef struct Opt_DoubleLengthDetents Opt_DoubleLengthDetents; +typedef struct Ark_TripleLengthDetents Ark_TripleLengthDetents; +typedef struct Opt_TripleLengthDetents Opt_TripleLengthDetents; typedef struct Ark_RichEditorImageSpanOptions Ark_RichEditorImageSpanOptions; typedef struct Opt_RichEditorImageSpanOptions Opt_RichEditorImageSpanOptions; typedef struct Ark_RichEditorImageSpanResult Ark_RichEditorImageSpanResult; @@ -15954,6 +15962,46 @@ typedef struct Opt_Union_SizeOptions_ImageSize { Ark_Tag tag; Ark_Union_SizeOptions_ImageSize value; } Opt_Union_SizeOptions_ImageSize; +typedef struct Ark_SingleLengthDetent { + Ark_Union_SheetSize_Length value0; +} Ark_SingleLengthDetent; +typedef struct Opt_SingleLengthDetent { + Ark_Tag tag; + Ark_SingleLengthDetent value; +} Opt_SingleLengthDetent; + +typedef struct Ark_DoubleLengthDetents { + Ark_Union_SheetSize_Length value0; + Opt_Union_SheetSize_Length value1; +} Ark_DoubleLengthDetents; +typedef struct Opt_DoubleLengthDetents { + Ark_Tag tag; + Ark_DoubleLengthDetents value; +} Opt_DoubleLengthDetents; + +typedef struct Ark_TripleLengthDetents { + Ark_Union_SheetSize_Length value0; + Opt_Union_SheetSize_Length value1; + Opt_Union_SheetSize_Length value2; +} Ark_TripleLengthDetents; +typedef struct Opt_TripleLengthDetents { + Ark_Tag tag; + Ark_TripleLengthDetents value; +} Opt_TripleLengthDetents; + +typedef struct Ark_Union_SingleLengthDetent_DoubleLengthDetents_TripleLengthDetents { + /* kind: UnionType */ + Ark_Int32 selector; + union { + Ark_SingleLengthDetent value0; + Ark_DoubleLengthDetents value1; + Ark_TripleLengthDetents value2; + }; +} Ark_Union_SingleLengthDetent_DoubleLengthDetents_TripleLengthDetents; +typedef struct Opt_Union_SingleLengthDetent_DoubleLengthDetents_TripleLengthDetents { + Ark_Tag tag; + Ark_Union_SingleLengthDetent_DoubleLengthDetents_TripleLengthDetents value; +} Opt_Union_SingleLengthDetent_DoubleLengthDetents_TripleLengthDetents; typedef struct Ark_Union_String_Array_String { Ark_Int32 selector; union { @@ -18968,7 +19016,7 @@ typedef struct Ark_SheetOptions { Opt_Union_SheetSize_Length height; Opt_Boolean dragBar; Opt_ResourceColor maskColor; - Opt_Type_SheetOptions_detents detents; + Opt_Union_SingleLengthDetent_DoubleLengthDetents_TripleLengthDetents detents; Opt_BlurStyle blurStyle; Opt_Union_Boolean_Resource showClose; Opt_SheetType preferType; 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 e08ca649252..8f88a32dfb9 100644 --- a/frameworks/core/interfaces/native/generated/interface/arkoala_api_generated.h +++ b/frameworks/core/interfaces/native/generated/interface/arkoala_api_generated.h @@ -3207,6 +3207,14 @@ typedef struct Ark_NavigationToolbarOptions Ark_NavigationToolbarOptions; typedef struct Opt_NavigationToolbarOptions Opt_NavigationToolbarOptions; typedef struct Ark_PopupOptions Ark_PopupOptions; typedef struct Opt_PopupOptions Opt_PopupOptions; +typedef struct Ark_Union_SingleLengthDetent_DoubleLengthDetents_TripleLengthDetents Ark_Union_SingleLengthDetent_DoubleLengthDetents_TripleLengthDetents; +typedef struct Opt_Union_SingleLengthDetent_DoubleLengthDetents_TripleLengthDetents Opt_Union_SingleLengthDetent_DoubleLengthDetents_TripleLengthDetents; +typedef struct Ark_SingleLengthDetent Ark_SingleLengthDetent; +typedef struct Opt_SingleLengthDetent Opt_SingleLengthDetent; +typedef struct Ark_DoubleLengthDetents Ark_DoubleLengthDetents; +typedef struct Opt_DoubleLengthDetents Opt_DoubleLengthDetents; +typedef struct Ark_TripleLengthDetents Ark_TripleLengthDetents; +typedef struct Opt_TripleLengthDetents Opt_TripleLengthDetents; typedef struct Ark_RichEditorImageSpanOptions Ark_RichEditorImageSpanOptions; typedef struct Opt_RichEditorImageSpanOptions Opt_RichEditorImageSpanOptions; typedef struct Ark_RichEditorImageSpanResult Ark_RichEditorImageSpanResult; @@ -15953,6 +15961,46 @@ typedef struct Opt_Union_SizeOptions_ImageSize { Ark_Tag tag; Ark_Union_SizeOptions_ImageSize value; } Opt_Union_SizeOptions_ImageSize; +typedef struct Ark_SingleLengthDetent { + Ark_Union_SheetSize_Length value0; +} Ark_SingleLengthDetent; +typedef struct Opt_SingleLengthDetent { + Ark_Tag tag; + Ark_SingleLengthDetent value; +} Opt_SingleLengthDetent; + +typedef struct Ark_DoubleLengthDetents { + Ark_Union_SheetSize_Length value0; + Opt_Union_SheetSize_Length value1; +} Ark_DoubleLengthDetents; +typedef struct Opt_DoubleLengthDetents { + Ark_Tag tag; + Ark_DoubleLengthDetents value; +} Opt_DoubleLengthDetents; + +typedef struct Ark_TripleLengthDetents { + Ark_Union_SheetSize_Length value0; + Opt_Union_SheetSize_Length value1; + Opt_Union_SheetSize_Length value2; +} Ark_TripleLengthDetents; +typedef struct Opt_TripleLengthDetents { + Ark_Tag tag; + Ark_TripleLengthDetents value; +} Opt_TripleLengthDetents; + +typedef struct Ark_Union_SingleLengthDetent_DoubleLengthDetents_TripleLengthDetents { + /* kind: UnionType */ + Ark_Int32 selector; + union { + Ark_SingleLengthDetent value0; + Ark_DoubleLengthDetents value1; + Ark_TripleLengthDetents value2; + }; +} Ark_Union_SingleLengthDetent_DoubleLengthDetents_TripleLengthDetents; +typedef struct Opt_Union_SingleLengthDetent_DoubleLengthDetents_TripleLengthDetents { + Ark_Tag tag; + Ark_Union_SingleLengthDetent_DoubleLengthDetents_TripleLengthDetents value; +} Opt_Union_SingleLengthDetent_DoubleLengthDetents_TripleLengthDetents; typedef struct Ark_Union_String_Array_String { Ark_Int32 selector; union { @@ -18967,7 +19015,7 @@ typedef struct Ark_SheetOptions { Opt_Union_SheetSize_Length height; Opt_Boolean dragBar; Opt_ResourceColor maskColor; - Opt_Type_SheetOptions_detents detents; + Opt_Union_SingleLengthDetent_DoubleLengthDetents_TripleLengthDetents detents; Opt_BlurStyle blurStyle; Opt_Union_Boolean_Resource showClose; Opt_SheetType preferType; diff --git a/frameworks/core/interfaces/native/implementation/bind_sheet_utils.cpp b/frameworks/core/interfaces/native/implementation/bind_sheet_utils.cpp index 84394e11002..ef1b762dadf 100644 --- a/frameworks/core/interfaces/native/implementation/bind_sheet_utils.cpp +++ b/frameworks/core/interfaces/native/implementation/bind_sheet_utils.cpp @@ -18,6 +18,9 @@ namespace OHOS::Ace::NG { constexpr int32_t EFFECT_EDGE_ZERO = 0; constexpr int32_t EFFECT_EDGE_ONE = 1; constexpr int32_t EFFECT_EDGE_TWO = 2; +constexpr int32_t DETENTS_SELECT_ZERO = 0; +constexpr int32_t DETENTS_SELECT_ONE = 1; +constexpr int32_t DETENTS_SELECT_TWO = 2; constexpr double DETENT_SELECTION_EDGE = 0.0f; using namespace OHOS::Ace::NG::Converter; @@ -119,19 +122,43 @@ void BindSheetUtil::ParseSheetParams(SheetStyle& sheetStyle, const Ark_SheetOpti { sheetStyle.showInPage = OptConvert(sheetOptions.mode).value_or(SheetLevel::OVERLAY); std::vector detents; - auto detentsOpt = OptConvert(sheetOptions.detents); - if (detentsOpt) { - auto value0 = Converter::OptConvert(detentsOpt.value().value0); - if (value0) { - detents.emplace_back(value0.value()); - } - auto value1 = Converter::OptConvert(detentsOpt.value().value1); - if (value1) { - detents.emplace_back(value1.value()); - } - auto value2 = Converter::OptConvert(detentsOpt.value().value2); - if (value2) { - detents.emplace_back(value2.value()); + auto detentsOpt = + OptConvert(sheetOptions.detents); + std::optional value0; + std::optional value1; + std::optional value2; + if (detentsOpt.has_value()) { + switch (detentsOpt.value().selector) { + case DETENTS_SELECT_ZERO: + value0 = Converter::OptConvert(detentsOpt.value().value0.value0); + if (value0) { + detents.emplace_back(value0.value()); + } + break; + case DETENTS_SELECT_ONE: + value0 = Converter::OptConvert(detentsOpt.value().value1.value0); + if (value0) { + detents.emplace_back(value0.value()); + } + value1 = Converter::OptConvert(detentsOpt.value().value1.value1); + if (value1) { + detents.emplace_back(value1.value()); + } + break; + case DETENTS_SELECT_TWO: + value0 = Converter::OptConvert(detentsOpt.value().value2.value0); + if (value0) { + detents.emplace_back(value0.value()); + } + value1 = Converter::OptConvert(detentsOpt.value().value2.value1); + if (value1) { + detents.emplace_back(value1.value()); + } + value2 = Converter::OptConvert(detentsOpt.value().value2.value2); + if (value2) { + detents.emplace_back(value2.value()); + } + break; } } sheetStyle.detents = detents; diff --git a/frameworks/core/interfaces/native/utility/generated/converter_generated.h b/frameworks/core/interfaces/native/utility/generated/converter_generated.h index c6998abfa2c..48a72a5cef4 100644 --- a/frameworks/core/interfaces/native/utility/generated/converter_generated.h +++ b/frameworks/core/interfaces/native/utility/generated/converter_generated.h @@ -4525,6 +4525,7 @@ ASSIGN_OPT(Opt_Tuple_ResourceColor_Number) ASSIGN_OPT(Opt_Type_CalendarInterface_callable0_value) ASSIGN_OPT(Opt_Type_GaugeAttribute_colors_colors) ASSIGN_OPT(Opt_Type_PanGestureInterface_callable0_value) +ASSIGN_OPT(Opt_Union_SingleLengthDetent_DoubleLengthDetents_TripleLengthDetents) ASSIGN_OPT(Opt_Type_SheetOptions_detents) ASSIGN_OPT(Opt_Type_TextPickerOptions_range) ASSIGN_OPT(Opt_Type_XComponentInterface_callable0_value) -- Gitee