From cfc84e0651df7fa5e9c2b91444b0d44efc59df3e Mon Sep 17 00:00:00 2001 From: Aleksandr Veselov Date: Thu, 24 Jul 2025 16:31:46 +0000 Subject: [PATCH 1/2] !1514 Fix return type in Wrapped{Map,Set}::Size() --- .../arkui/src/stateManagement/base/observeWrappedMap.ts | 2 +- .../arkui/src/stateManagement/base/observeWrappedSet.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arkoala-arkts/arkui/src/stateManagement/base/observeWrappedMap.ts b/arkoala-arkts/arkui/src/stateManagement/base/observeWrappedMap.ts index e2662b5fa1..11358a1dda 100644 --- a/arkoala-arkts/arkui/src/stateManagement/base/observeWrappedMap.ts +++ b/arkoala-arkts/arkui/src/stateManagement/base/observeWrappedMap.ts @@ -118,7 +118,7 @@ export class WrappedMap extends Map implements IObservedObject, Obse * Returns number of Entries with unique keys in the Map * @returns number of Entries with unique keys in the Map */ - public override get size(): number { + public override get size(): int { if (this.shouldAddRef()) { this.meta_.addRef(CONSTANT.OB_LENGTH); } diff --git a/arkoala-arkts/arkui/src/stateManagement/base/observeWrappedSet.ts b/arkoala-arkts/arkui/src/stateManagement/base/observeWrappedSet.ts index 34b640739f..1966db4d35 100644 --- a/arkoala-arkts/arkui/src/stateManagement/base/observeWrappedSet.ts +++ b/arkoala-arkts/arkui/src/stateManagement/base/observeWrappedSet.ts @@ -118,7 +118,7 @@ export class WrappedSet extends Set implements IObservedObject, ObserveWra * * @returns number of unique elements in the Set */ - public get size(): number { + public get size(): int { if (this.shouldAddRef()) { this.meta_.addRef(CONSTANT.OB_LENGTH); } -- Gitee From 9f37cde09551e1c846323765714c7696e7c70203 Mon Sep 17 00:00:00 2001 From: Peter Z Date: Thu, 24 Jul 2025 15:30:43 +0300 Subject: [PATCH 2/2] FQN serializers --- subset/arkoala/arkui/src/main.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/subset/arkoala/arkui/src/main.ts b/subset/arkoala/arkui/src/main.ts index 068bafca8a..44b376dd05 100644 --- a/subset/arkoala/arkui/src/main.ts +++ b/subset/arkoala/arkui/src/main.ts @@ -26,7 +26,11 @@ import { ArkButtonPeer, ArkCommonMethodPeer, } from "@arkoala/arkui/generated" // Improve: It needs to be possible to use CanvasRenderingContext2D without import -import { CanvasRenderingContext2D, CanvasRenderingContext2D_serializer, CanvasRenderingContext2DInternal } from "@arkoala/arkui/generated" +import { + CanvasRenderingContext2D, + CanvasRenderingContext2DInternal, + arkui_component_canvas_CanvasRenderingContext2D_serializer as CanvasRenderingContext2D_serializer +} from "@arkoala/arkui/generated" import { startPerformanceTest } from "@arkoala/arkui/test_performance" import { testLength_10_lpx } from "@arkoala/arkui/test_data" // imports required interfaces (now generation is disabled) -- Gitee