From 3757ec5cd4b70ddfd673507aeade355ee17d7acc Mon Sep 17 00:00:00 2001 From: evstigneevroman_9cd1 Date: Wed, 10 Sep 2025 17:14:43 +0300 Subject: [PATCH] regenerate lazyBuild code with custom builder Signed-off-by: evstigneevroman_9cd1 --- .../arkui/generated/component/idlize.ets | 16 +++++++++++- .../arkui/generated/component/tabContent.ets | 5 +++- .../arkts/ArkUIGeneratedNativeModule.ets | 2 ++ arkoala-arkts/arkui/sdk/component/idlize.ets | 5 +++- arkoala-arkts/arkui_components.gni | 4 ++- .../src/generated/arkoala_api_generated.h | 6 +++++ .../native/src/generated/bridge_generated.cc | 6 +++++ .../native/src/generated/dummy_impl.cc | 25 +++++++++++++++++++ .../native/src/generated/real_impl.cc | 17 +++++++++++++ 9 files changed, 82 insertions(+), 4 deletions(-) diff --git a/arkoala-arkts/arkui/generated/component/idlize.ets b/arkoala-arkts/arkui/generated/component/idlize.ets index 39e9cea5c..fbc52bbd0 100644 --- a/arkoala-arkts/arkui/generated/component/idlize.ets +++ b/arkoala-arkts/arkui/generated/component/idlize.ets @@ -43,6 +43,7 @@ import { image } from "@ohos.multimedia.image" import { FontOptions_serializer, FontInfo_serializer } from "./../framework/ohos.font" import { FontOptions, FontInfo } from "@ohos.font" import { MeasureOptions_serializer, MeasureOptions } from "./../framework/ohos.measure" +import { CustomBuilder } from "./builder" import { NavigationOptions_serializer, NavPathStack, NavPathStackInternal, NavPathInfo, NavPathInfoInternal, NavigationOptions } from "./navigation" import { Frame_serializer, Frame, Size, Size_serializer } from "./../Graphics" import { ComponentBase } from "./../ComponentBase" @@ -52,7 +53,6 @@ import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder, Builder } from "@koalaui/builderLambda" import { curves, curves_ICurve_serializer } from "./../framework/ohos.curves" import { CustomDialogController } from "./customDialogController" -import { CustomBuilder } from "./builder" import { NodeAttach, remember } from "@koalaui/runtime" import { GlobalScope } from "./../framework/GlobalScope" export class AnimationExtender { @@ -813,6 +813,20 @@ export class IUIContext { return } } +export class LazyBuild { + private static SetTabContentLazyBuilder_serialize(node: KPointer, builder: CustomBuilder): void { + const thisSerializer : SerializerBase = SerializerBase.hold() + thisSerializer.holdAndWriteCallback(CallbackTransformer.transformFromCustomBuilder(builder)) + ArkUIGeneratedNativeModule._LazyBuild_SetTabContentLazyBuilder(node, thisSerializer.asBuffer(), thisSerializer.length()) + thisSerializer.release() + } + public static SetTabContentLazyBuilder(node: KPointer, builder: CustomBuilder): void { + const node_casted = node as (KPointer) + const builder_casted = builder as (CustomBuilder) + LazyBuild.SetTabContentLazyBuilder_serialize(node_casted, builder_casted) + return + } +} export class LazyForEachOps { private static Sync_serialize(node: KPointer, totalCount: int32, creator: Callback_CreateItem, updater: Callback_RangeUpdate): void { const thisSerializer : SerializerBase = SerializerBase.hold() diff --git a/arkoala-arkts/arkui/generated/component/tabContent.ets b/arkoala-arkts/arkui/generated/component/tabContent.ets index de88d72f8..d83a01102 100644 --- a/arkoala-arkts/arkui/generated/component/tabContent.ets +++ b/arkoala-arkts/arkui/generated/component/tabContent.ets @@ -28,6 +28,7 @@ import { PeerNode } from "./../PeerNode" import { ArkCommonMethodPeer, CommonMethod, ArkCommonMethodComponent, ArkCommonMethodStyle } from "./common" import { Resource } from "global.resource" import { CustomBuilder } from "./builder" +import { LazyBuild } from "#generated" import { VoidCallback, ResourceColor, Length, ResourceStr, Font, Padding, Dimension, LocalizedPadding, Font_serializer, Padding_serializer, LocalizedPadding_serializer } from "./units" import { AttributeModifier, AttributeUpdater } from "#handwritten" import { CallbackKind } from "./../framework/peers/CallbackKind" @@ -330,7 +331,9 @@ export function TabContent( NodeAttach((): ArkTabContentPeer => ArkTabContentPeer.create(receiver), (_: ArkTabContentPeer): void => { receiver.setTabContentOptions() style?.(receiver) - content_?.() + if (content_) { + LazyBuild.SetTabContentLazyBuilder(receiver.getPeer().getPeerPtr(), content_!) + } receiver.applyAttributesFinish() }) } diff --git a/arkoala-arkts/arkui/generated/framework/arkts/ArkUIGeneratedNativeModule.ets b/arkoala-arkts/arkui/generated/framework/arkts/ArkUIGeneratedNativeModule.ets index f2fb0311f..8c34d7d29 100644 --- a/arkoala-arkts/arkui/generated/framework/arkts/ArkUIGeneratedNativeModule.ets +++ b/arkoala-arkts/arkui/generated/framework/arkts/ArkUIGeneratedNativeModule.ets @@ -4911,6 +4911,8 @@ export class ArkUIGeneratedNativeModule { @ani.unsafe.Direct native static _LayoutPolicy_getMatchParent(): KPointer @ani.unsafe.Direct + native static _LazyBuild_SetTabContentLazyBuilder(node: KPointer, thisArray: KSerializerBuffer, thisLength: int32): void + @ani.unsafe.Direct native static _LazyForEachOps_Sync(node: KPointer, totalCount: KInt, thisArray: KSerializerBuffer, thisLength: int32): void @ani.unsafe.Direct native static _LengthMetrics_construct(value: number, unit: KInt): KPointer diff --git a/arkoala-arkts/arkui/sdk/component/idlize.ets b/arkoala-arkts/arkui/sdk/component/idlize.ets index 6b8118903..68e4bd4aa 100644 --- a/arkoala-arkts/arkui/sdk/component/idlize.ets +++ b/arkoala-arkts/arkui/sdk/component/idlize.ets @@ -22,6 +22,7 @@ import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder, Builder } from "@koalaui/builderLambda" import { curves } from "./../framework/ohos.curves" import { AnimateParam, TranslateOptions, TouchEvent, GeometryInfo, Measurable, SizeResult, Layoutable, ClickEvent } from "./common" +import { CustomBuilder } from "./builder" import { Size, Frame } from "./../Graphics" import { ButtonConfiguration } from "./button" import { CheckBoxConfiguration } from "./checkbox" @@ -38,7 +39,6 @@ import { TextTimerConfiguration } from "./textTimer" import { ToggleConfiguration } from "./toggle" import { ContentModifier, extractors, AttributeModifier, AttributeUpdater } from "./../handwritten" import { CustomDialogController } from "./customDialogController" -import { CustomBuilder } from "./builder" import { Resource } from "global.resource" import { ResourceStr, ResourceColor, Position, Length, SizeOptions, ConstraintSizeOptions } from "./units" import { Color } from "./enums" @@ -65,6 +65,9 @@ export declare class AnimationExtender { static StartDoubleAnimation(node: KPointer, param: DoubleAnimationParam): void static AnimationTranslate(node: KPointer, options: TranslateOptions): void } +export declare class LazyBuild { + static SetTabContentLazyBuilder(node: KPointer, builder: CustomBuilder): void +} export declare interface ComponentInfo { size: Size; localOffset: Offset_componentutils; diff --git a/arkoala-arkts/arkui_components.gni b/arkoala-arkts/arkui_components.gni index 247f67e57..105210041 100644 --- a/arkoala-arkts/arkui_components.gni +++ b/arkoala-arkts/arkui_components.gni @@ -42,6 +42,7 @@ arkui_files = [ "arkui/generated/CommonShapeMethodModifier.ets", "arkui/generated/ComponentContent.ets", "arkui/generated/ComponentRootModifier.ets", + "arkui/generated/ConditionScopeModifier.ets", "arkui/generated/ContainerSpanModifier.ets", "arkui/generated/Content.ets", "arkui/generated/CounterModifier.ets", @@ -167,6 +168,7 @@ arkui_files = [ "arkui/generated/component/ellipse.ets", "arkui/generated/component/embeddedComponent.ets", "arkui/generated/component/enums.ets", + "arkui/generated/component/extendableComponent.ets", "arkui/generated/component/flex.ets", "arkui/generated/component/flowItem.ets", "arkui/generated/component/focus.ets", @@ -328,7 +330,6 @@ arkui_files = [ "arkui/src/ContentModifierHooks.ets", "arkui/src/DataChangeListener.ets", "arkui/src/ForeignFunctions.ets", - "arkui/src/LazyForEach.ets", "arkui/src/NativeLog.ets", "arkui/src/NativePeerNode.ets", "arkui/src/PeerNode.ets", @@ -350,6 +351,7 @@ arkui_files = [ "arkui/src/component/extendableComponent.ets", "arkui/src/component/forEach.ets", "arkui/src/component/interop.ets", + "arkui/src/component/lazyForEach.ets", "arkui/src/component/stateManagement.ets", "arkui/src/componentAnnotations/index.ets", "arkui/src/extractors.ets", diff --git a/arkoala-arkts/framework/native/src/generated/arkoala_api_generated.h b/arkoala-arkts/framework/native/src/generated/arkoala_api_generated.h index 10e44c34b..e257b2d1b 100644 --- a/arkoala-arkts/framework/native/src/generated/arkoala_api_generated.h +++ b/arkoala-arkts/framework/native/src/generated/arkoala_api_generated.h @@ -26165,6 +26165,11 @@ typedef struct GENERATED_ArkUILayoutPolicyAccessor { Ark_LayoutPolicy (*getMatchParent)(); } GENERATED_ArkUILayoutPolicyAccessor; +typedef struct GENERATED_ArkUILazyBuildAccessor { + void (*SetTabContentLazyBuilder)(Ark_NativePointer node, + const CustomNodeBuilder* builder); +} GENERATED_ArkUILazyBuildAccessor; + typedef struct GENERATED_ArkUILazyForEachOpsAccessor { void (*Sync)(Ark_NativePointer node, Ark_Int32 totalCount, @@ -28672,6 +28677,7 @@ typedef struct GENERATED_ArkUIAccessors { const GENERATED_ArkUILayoutChildAccessor* (*getLayoutChildAccessor)(); const GENERATED_ArkUILayoutManagerAccessor* (*getLayoutManagerAccessor)(); const GENERATED_ArkUILayoutPolicyAccessor* (*getLayoutPolicyAccessor)(); + const GENERATED_ArkUILazyBuildAccessor* (*getLazyBuildAccessor)(); const GENERATED_ArkUILazyForEachOpsAccessor* (*getLazyForEachOpsAccessor)(); const GENERATED_ArkUILengthMetricsAccessor* (*getLengthMetricsAccessor)(); const GENERATED_ArkUILetterSpacingStyleAccessor* (*getLetterSpacingStyleAccessor)(); diff --git a/arkoala-arkts/framework/native/src/generated/bridge_generated.cc b/arkoala-arkts/framework/native/src/generated/bridge_generated.cc index bb2ba14d4..c6fd1eb18 100644 --- a/arkoala-arkts/framework/native/src/generated/bridge_generated.cc +++ b/arkoala-arkts/framework/native/src/generated/bridge_generated.cc @@ -31351,6 +31351,12 @@ Ark_NativePointer impl_LayoutPolicy_getMatchParent() { return GetAccessors()->getLayoutPolicyAccessor()->getMatchParent(); } KOALA_INTEROP_DIRECT_0(LayoutPolicy_getMatchParent, Ark_NativePointer) +void impl_LazyBuild_SetTabContentLazyBuilder(Ark_NativePointer node, KSerializerBuffer thisArray, int32_t thisLength) { + DeserializerBase thisDeserializer(thisArray, thisLength); + CustomNodeBuilder builderValueTemp = {thisDeserializer.readCallbackResource(), reinterpret_cast(thisDeserializer.readPointerOrDefault(reinterpret_cast(getManagedCallbackCaller(Kind_CustomNodeBuilder)))), reinterpret_cast(thisDeserializer.readPointerOrDefault(reinterpret_cast(getManagedCallbackCallerSync(Kind_CustomNodeBuilder))))};; + GetAccessors()->getLazyBuildAccessor()->SetTabContentLazyBuilder(node, static_cast(&builderValueTemp)); +} +KOALA_INTEROP_DIRECT_V3(LazyBuild_SetTabContentLazyBuilder, Ark_NativePointer, KSerializerBuffer, int32_t) void impl_LazyForEachOps_Sync(Ark_NativePointer node, Ark_Int32 totalCount, KSerializerBuffer thisArray, int32_t thisLength) { DeserializerBase thisDeserializer(thisArray, thisLength); Callback_CreateItem creatorValueTemp = {thisDeserializer.readCallbackResource(), reinterpret_cast(thisDeserializer.readPointerOrDefault(reinterpret_cast(getManagedCallbackCaller(Kind_Callback_CreateItem)))), reinterpret_cast(thisDeserializer.readPointerOrDefault(reinterpret_cast(getManagedCallbackCallerSync(Kind_Callback_CreateItem))))};; diff --git a/arkoala-arkts/framework/native/src/generated/dummy_impl.cc b/arkoala-arkts/framework/native/src/generated/dummy_impl.cc index d244d91bb..fc62f78f9 100644 --- a/arkoala-arkts/framework/native/src/generated/dummy_impl.cc +++ b/arkoala-arkts/framework/native/src/generated/dummy_impl.cc @@ -36415,6 +36415,22 @@ namespace OHOS::Ace::NG::GeneratedModifier { return reinterpret_cast(300); } } // LayoutPolicyAccessor + namespace LazyBuildAccessor { + void SetTabContentLazyBuilderImpl(Ark_NativePointer node, + const CustomNodeBuilder* builder) + { + if (!needGroupedLog(1)) + { + return; + } + string out("SetTabContentLazyBuilder("); + WriteToString(&out, node); + out.append(", "); + WriteToString(&out, builder); + out.append(") \n"); + appendGroupedLog(1, out); + } + } // LazyBuildAccessor namespace LazyForEachOpsAccessor { void SyncImpl(Ark_NativePointer node, Ark_Int32 totalCount, @@ -53702,6 +53718,14 @@ namespace OHOS::Ace::NG::GeneratedModifier { struct LayoutPolicyPeer { virtual ~LayoutPolicyPeer() = default; }; + const GENERATED_ArkUILazyBuildAccessor* GetLazyBuildAccessor() + { + static const GENERATED_ArkUILazyBuildAccessor LazyBuildAccessorImpl { + LazyBuildAccessor::SetTabContentLazyBuilderImpl, + }; + return &LazyBuildAccessorImpl; + } + const GENERATED_ArkUILazyForEachOpsAccessor* GetLazyForEachOpsAccessor() { static const GENERATED_ArkUILazyForEachOpsAccessor LazyForEachOpsAccessorImpl { @@ -56286,6 +56310,7 @@ namespace OHOS::Ace::NG::GeneratedModifier { GetLayoutChildAccessor, GetLayoutManagerAccessor, GetLayoutPolicyAccessor, + GetLazyBuildAccessor, GetLazyForEachOpsAccessor, GetLengthMetricsAccessor, GetLetterSpacingStyleAccessor, diff --git a/arkoala-arkts/framework/native/src/generated/real_impl.cc b/arkoala-arkts/framework/native/src/generated/real_impl.cc index 58248b133..9004de6be 100644 --- a/arkoala-arkts/framework/native/src/generated/real_impl.cc +++ b/arkoala-arkts/framework/native/src/generated/real_impl.cc @@ -15309,6 +15309,14 @@ namespace OHOS::Ace::NG::GeneratedModifier { return {}; } } // LayoutPolicyAccessor + namespace LazyBuildAccessor { + void SetTabContentLazyBuilderImpl(Ark_NativePointer node, + const CustomNodeBuilder* builder) + { + auto frameNode = reinterpret_cast(node); + CHECK_NULL_VOID(frameNode); + } + } // LazyBuildAccessor namespace LazyForEachOpsAccessor { void SyncImpl(Ark_NativePointer node, Ark_Int32 totalCount, @@ -23104,6 +23112,14 @@ namespace OHOS::Ace::NG::GeneratedModifier { struct LayoutPolicyPeer { virtual ~LayoutPolicyPeer() = default; }; + const GENERATED_ArkUILazyBuildAccessor* GetLazyBuildAccessor() + { + static const GENERATED_ArkUILazyBuildAccessor LazyBuildAccessorImpl { + LazyBuildAccessor::SetTabContentLazyBuilderImpl, + }; + return &LazyBuildAccessorImpl; + } + const GENERATED_ArkUILazyForEachOpsAccessor* GetLazyForEachOpsAccessor() { static const GENERATED_ArkUILazyForEachOpsAccessor LazyForEachOpsAccessorImpl { @@ -25688,6 +25704,7 @@ namespace OHOS::Ace::NG::GeneratedModifier { GetLayoutChildAccessor, GetLayoutManagerAccessor, GetLayoutPolicyAccessor, + GetLazyBuildAccessor, GetLazyForEachOpsAccessor, GetLengthMetricsAccessor, GetLetterSpacingStyleAccessor, -- Gitee