@react-native-ohos/slider 5.1.2-rc.1 → 5.1.2-rc.2

package/example/harmony/entry/src/main/cpp/PackageProvider.cpp

@@ -1,17 +1,17 @@
-// Copyright (c) 2025 Huawei Device Co., Ltd. All rights reserved
-// Use of this source code is governed by a MIT license that can be
-// found in the LICENSE file.
-
-#include "RNOH/PackageProvider.h"
-#include "generated/RNOHGeneratedPackage.h"
-#include "SliderPackage.h"
-
-using namespace rnoh;
-
-std::vector<std::shared_ptr<Package>> PackageProvider::getPackages(Package::Context ctx)
-{
-    return {
-        std::make_shared<RNOHGeneratedPackage>(ctx), // generated by codegen v1
-         std::make_shared<SliderPackage>(ctx)
-    };
+// Copyright (c) 2025 Huawei Device Co., Ltd. All rights reserved
+// Use of this source code is governed by a MIT license that can be
+// found in the LICENSE file.
+
+#include "RNOH/PackageProvider.h"
+#include "generated/RNOHGeneratedPackage.h"
+#include "SliderPackage.h"
+
+using namespace rnoh;
+
+std::vector<std::shared_ptr<Package>> PackageProvider::getPackages(Package::Context ctx)
+{
+    return {
+        std::make_shared<RNOHGeneratedPackage>(ctx), // generated by codegen v1
+         std::make_shared<SliderPackage>(ctx)
+    };
 }

package/example/harmony/entry/src/main/ets/RNPackagesFactory.ets

@@ -1,13 +1,13 @@
-/*
- * Copyright (c) 2025 Huawei Device Co., Ltd. All rights reserved
- * Use of this source code is governed by a MIT license that can be
- * found in the LICENSE file.
- */
-
-
-import type {RNPackageContext, RNPackage} from '@rnoh/react-native-openharmony/ts';
-
-export function createRNPackages(ctx: RNPackageContext): RNPackage[] {
-  return [
-  ];
-}
+/*
+ * Copyright (c) 2025 Huawei Device Co., Ltd. All rights reserved
+ * Use of this source code is governed by a MIT license that can be
+ * found in the LICENSE file.
+ */
+
+
+import type {RNPackageContext, RNPackage} from '@rnoh/react-native-openharmony/ts';
+
+export function createRNPackages(ctx: RNPackageContext): RNPackage[] {
+  return [
+  ];
+}

package/example/harmony/entry/src/main/ets/entryability/EntryAbility.ets

@@ -1,27 +1,27 @@
-/*
- * Copyright (c) 2025 Huawei Device Co., Ltd. All rights reserved
- * Use of this source code is governed by a MIT license that can be
- * found in the LICENSE file.
- */
-
-import {RNAbility} from '@rnoh/react-native-openharmony';
-import { AbilityConstant, Want } from '@kit.AbilityKit';
-
-export default class EntryAbility extends RNAbility {
-
-  onCreate(want: Want) {
-    super.onCreate(want)
-    this.handleWeChatCallIfNeed(want)
-  }
-
-  getPagePath() {
-    return 'pages/Index';
-  }
-
-  onNewWant(want: Want, _launchParam: AbilityConstant.LaunchParam): void {
-    this.handleWeChatCallIfNeed(want)
-  }
-
-  private handleWeChatCallIfNeed(want: Want) {
-  }
-}
+/*
+ * Copyright (c) 2025 Huawei Device Co., Ltd. All rights reserved
+ * Use of this source code is governed by a MIT license that can be
+ * found in the LICENSE file.
+ */
+
+import {RNAbility} from '@rnoh/react-native-openharmony';
+import { AbilityConstant, Want } from '@kit.AbilityKit';
+
+export default class EntryAbility extends RNAbility {
+
+  onCreate(want: Want) {
+    super.onCreate(want)
+    this.handleWeChatCallIfNeed(want)
+  }
+
+  getPagePath() {
+    return 'pages/Index';
+  }
+
+  onNewWant(want: Want, _launchParam: AbilityConstant.LaunchParam): void {
+    this.handleWeChatCallIfNeed(want)
+  }
+
+  private handleWeChatCallIfNeed(want: Want) {
+  }
+}

package/example/harmony/entry/src/main/ets/pages/Index.ets

@@ -1,125 +1,125 @@
-/*
- * Copyright (c) 2025 Huawei Device Co., Ltd. All rights reserved
- * Use of this source code is governed by a MIT license that can be
- * found in the LICENSE file.
- */
-
-import {
-  AnyJSBundleProvider,
-  ComponentBuilderContext,
-  FileJSBundleProvider,
-  MetroJSBundleProvider,
-  ResourceJSBundleProvider,
-  RNApp,
-  RNOHErrorDialog,
-  RNOHLogger,
-  TraceJSBundleProviderDecorator,
-  RNOHCoreContext
-} from '@rnoh/react-native-openharmony';
-import font from '@ohos.font';
-import { createRNPackages } from '../RNPackagesFactory';
-import { RNCSlider, SLIDER_TYPE } from "@react-native-ohos/slider"
-const arkTsComponentNames: Array<string> = [
-  SLIDER_TYPE
-];
-
-@Builder
-export function buildCustomRNComponent(ctx: ComponentBuilderContext) {
-  // There seems to be a problem with the placement of ArkTS components in mixed mode. Nested Stack temporarily avoided.
-  Stack() {
-    if (ctx.componentName === SLIDER_TYPE) {
-      RNCSlider({
-        ctx: ctx.rnComponentContext,
-        tag: ctx.tag,
-      })
-    }
-  }
-  .position({ x: 0, y: 0 })
-
-}
-
-const wrappedCustomRNComponentBuilder = wrapBuilder(buildCustomRNComponent)
-
-/**
- * If you want to use custom fonts, you need to register them here.
- * We should support react-native-asset to handle registering fonts automatically.
- */
-const fonts: font.FontOptions[] = [
-  {
-    familyName: 'Pacifico-Regular',
-    familySrc: '/assets/fonts/Pacifico-Regular.ttf'
-  },
-  {
-    familyName: 'StintUltraCondensed-Regular',
-    familySrc: '/assets/fonts/StintUltraCondensed-Regular.ttf'
-  }
-]
-
-@Entry
-@Component
-struct Index {
-  @StorageLink('RNOHCoreContext') private rnohCoreContext: RNOHCoreContext | undefined = undefined
-  @State shouldShow: boolean = false
-  private logger!: RNOHLogger
-  bundlePath: string = 'bunlde.harmony.js'
-  @State hasBundle: boolean = false
-
-  aboutToAppear() {
-    this.logger = this.rnohCoreContext!.logger.clone("Index")
-    const stopTracing = this.logger.clone("aboutToAppear").startTracing()
-    for (const customFont of fonts) {
-      font.registerFont(customFont)
-    }
-
-    this.shouldShow = true
-    stopTracing()
-  }
-
-  onBackPress(): boolean | undefined {
-    // NOTE: this is required since `Ability`'s `onBackPressed` function always
-    // terminates or puts the app in the background, but we want Ark to ignore it completely
-    // when handled by RN
-    this.rnohCoreContext!.dispatchBackPress()
-    return true
-  }
-
-  build() {
-    Column() {
-      if (this.rnohCoreContext && this.shouldShow) {
-        if (this.rnohCoreContext?.isDebugModeEnabled) {
-          RNOHErrorDialog({ ctx: this.rnohCoreContext })
-        }
-        RNApp({
-          rnInstanceConfig: {
-            createRNPackages,
-            enableNDKTextMeasuring: true,
-            enableBackgroundExecutor: false,
-            enableCAPIArchitecture: true,
-            arkTsComponentNames: arkTsComponentNames,
-          },
-          initialProps: { "foo": "bar" } as Record<string, string>,
-          appKey: "app_name",
-          wrappedCustomRNComponentBuilder: wrappedCustomRNComponentBuilder,
-          onSetUp: (rnInstance) => {
-            rnInstance.enableFeatureFlag("ENABLE_RN_INSTANCE_CLEAN_UP")
-          },
-          jsBundleProvider: new TraceJSBundleProviderDecorator(
-            new AnyJSBundleProvider([
-              new MetroJSBundleProvider(),
-              // NOTE: to load the bundle from file, place it in
-              // `/data/app/el2/100/base/com.rnoh.tester/files/bundle.harmony.js`
-              // on your device. The path mismatch is due to app sandboxing on HarmonyOS
-              new FileJSBundleProvider('/data/storage/el2/base/files/bundle.harmony.js'),
-              // new FileJSBundleProvider(context.filesDir + '/' + this.bundlePath),
-              new ResourceJSBundleProvider(this.rnohCoreContext.uiAbilityContext.resourceManager, 'hermes_bundle.hbc'),
-              new ResourceJSBundleProvider(this.rnohCoreContext.uiAbilityContext.resourceManager, 'bundle.harmony.js')
-            ]),
-            this.rnohCoreContext.logger),
-        })
-      }
-      Text("1233333333122 1212323")
-    }
-    .height('100%')
-    .width('100%')
-  }
-}
+/*
+ * Copyright (c) 2025 Huawei Device Co., Ltd. All rights reserved
+ * Use of this source code is governed by a MIT license that can be
+ * found in the LICENSE file.
+ */
+
+import {
+  AnyJSBundleProvider,
+  ComponentBuilderContext,
+  FileJSBundleProvider,
+  MetroJSBundleProvider,
+  ResourceJSBundleProvider,
+  RNApp,
+  RNOHErrorDialog,
+  RNOHLogger,
+  TraceJSBundleProviderDecorator,
+  RNOHCoreContext
+} from '@rnoh/react-native-openharmony';
+import font from '@ohos.font';
+import { createRNPackages } from '../RNPackagesFactory';
+import { RNCSlider, SLIDER_TYPE } from "@react-native-ohos/slider"
+const arkTsComponentNames: Array<string> = [
+  SLIDER_TYPE
+];
+
+@Builder
+export function buildCustomRNComponent(ctx: ComponentBuilderContext) {
+  // There seems to be a problem with the placement of ArkTS components in mixed mode. Nested Stack temporarily avoided.
+  Stack() {
+    if (ctx.componentName === SLIDER_TYPE) {
+      RNCSlider({
+        ctx: ctx.rnComponentContext,
+        tag: ctx.tag,
+      })
+    }
+  }
+  .position({ x: 0, y: 0 })
+
+}
+
+const wrappedCustomRNComponentBuilder = wrapBuilder(buildCustomRNComponent)
+
+/**
+ * If you want to use custom fonts, you need to register them here.
+ * We should support react-native-asset to handle registering fonts automatically.
+ */
+const fonts: font.FontOptions[] = [
+  {
+    familyName: 'Pacifico-Regular',
+    familySrc: '/assets/fonts/Pacifico-Regular.ttf'
+  },
+  {
+    familyName: 'StintUltraCondensed-Regular',
+    familySrc: '/assets/fonts/StintUltraCondensed-Regular.ttf'
+  }
+]
+
+@Entry
+@Component
+struct Index {
+  @StorageLink('RNOHCoreContext') private rnohCoreContext: RNOHCoreContext | undefined = undefined
+  @State shouldShow: boolean = false
+  private logger!: RNOHLogger
+  bundlePath: string = 'bunlde.harmony.js'
+  @State hasBundle: boolean = false
+
+  aboutToAppear() {
+    this.logger = this.rnohCoreContext!.logger.clone("Index")
+    const stopTracing = this.logger.clone("aboutToAppear").startTracing()
+    for (const customFont of fonts) {
+      font.registerFont(customFont)
+    }
+
+    this.shouldShow = true
+    stopTracing()
+  }
+
+  onBackPress(): boolean | undefined {
+    // NOTE: this is required since `Ability`'s `onBackPressed` function always
+    // terminates or puts the app in the background, but we want Ark to ignore it completely
+    // when handled by RN
+    this.rnohCoreContext!.dispatchBackPress()
+    return true
+  }
+
+  build() {
+    Column() {
+      if (this.rnohCoreContext && this.shouldShow) {
+        if (this.rnohCoreContext?.isDebugModeEnabled) {
+          RNOHErrorDialog({ ctx: this.rnohCoreContext })
+        }
+        RNApp({
+          rnInstanceConfig: {
+            createRNPackages,
+            enableNDKTextMeasuring: true,
+            enableBackgroundExecutor: false,
+            enableCAPIArchitecture: true,
+            arkTsComponentNames: arkTsComponentNames,
+          },
+          initialProps: { "foo": "bar" } as Record<string, string>,
+          appKey: "app_name",
+          wrappedCustomRNComponentBuilder: wrappedCustomRNComponentBuilder,
+          onSetUp: (rnInstance) => {
+            rnInstance.enableFeatureFlag("ENABLE_RN_INSTANCE_CLEAN_UP")
+          },
+          jsBundleProvider: new TraceJSBundleProviderDecorator(
+            new AnyJSBundleProvider([
+              new MetroJSBundleProvider(),
+              // NOTE: to load the bundle from file, place it in
+              // `/data/app/el2/100/base/com.rnoh.tester/files/bundle.harmony.js`
+              // on your device. The path mismatch is due to app sandboxing on HarmonyOS
+              new FileJSBundleProvider('/data/storage/el2/base/files/bundle.harmony.js'),
+              // new FileJSBundleProvider(context.filesDir + '/' + this.bundlePath),
+              new ResourceJSBundleProvider(this.rnohCoreContext.uiAbilityContext.resourceManager, 'hermes_bundle.hbc'),
+              new ResourceJSBundleProvider(this.rnohCoreContext.uiAbilityContext.resourceManager, 'bundle.harmony.js')
+            ]),
+            this.rnohCoreContext.logger),
+        })
+      }
+      Text("1233333333122 1212323")
+    }
+    .height('100%')
+    .width('100%')
+  }
+}

package/example/harmony/entry/src/main/ets/pages/SurfaceDeadlockTest.ets

@@ -1,135 +1,135 @@
-/*
- * Copyright (c) 2025 Huawei Device Co., Ltd. All rights reserved
- * Use of this source code is governed by a MIT license that can be
- * found in the LICENSE file.
- */
-import { RNInstance, JSBundleProvider, RNAbility, RNSurface } from '@rnoh/react-native-openharmony'
-import { CustomComponentBuilder } from "@rnoh/react-native-openharmony/src/main/ets/RNOHCorePackage"
-import { SurfaceConfig2 } from '@rnoh/react-native-openharmony/src/main/ets/RNSurface'
-
-
-@Component
-export struct SurfaceDeadlockTest {
-  public jsBundleProvider: JSBundleProvider | undefined = undefined
-  public appKeys: string[] = []
-  public numberOfIterations: number = 1
-  @BuilderParam public buildCustomComponent!: CustomComponentBuilder
-  // -------------------------------------------------------------------------------------------------------------------
-  @StorageLink('RNAbility') private rnAbility: RNAbility = {} as RNAbility
-  private rnInstance!: RNInstance
-  @State private shouldShow: boolean = false
-  private shouldDestroyRNInstance: boolean = false
-  private cleanUpCallbacks: (() => void)[] = []
-
-  aboutToAppear() {
-    this.getOrCreateRNInstance().then(rnInstance => {
-      this.rnInstance = rnInstance
-      const jsBundleExecutionStatus = this.rnInstance.getBundleExecutionStatus(this.jsBundleProvider?.getURL())
-      if (this.jsBundleProvider && jsBundleExecutionStatus === undefined) {
-        this.rnInstance.runJSBundle(this.jsBundleProvider).then(() => {
-          this.shouldShow = true
-        })
-        return;
-      }
-    }).catch((reason: string | Error) => {
-      if (typeof reason === "string")
-        this.rnAbility.getLogger().error(reason)
-      else if (reason instanceof Error) {
-        this.rnAbility.getLogger().error(reason.message)
-      } else {
-        this.rnAbility.getLogger().error("Fatal exception")
-      }
-    })
-  }
-
-  aboutToDisappear() {
-    if (this.shouldDestroyRNInstance)
-      this.rnAbility.destroyAndUnregisterRNInstance(this.rnInstance)
-    this.cleanUpCallbacks.forEach(cleanUp => cleanUp())
-  }
-
-  private getOrCreateRNInstance(): Promise<RNInstance> {
-    return this.rnAbility.createAndRegisterRNInstance({ createRNPackages: () => [] })
-  }
-
-  build() {
-    Stack() {
-      if (this.shouldShow) {
-        ForEach(this.appKeys, (appKey: string, idx) => {
-          Stack() {
-            Blinker({
-              minDelayInMs: 1000,
-              maxDelayInMs: 2000,
-              blinksCount: this.numberOfIterations,
-              randomnessPrecisionInMs: 500
-            }) {
-              RNSurface({
-                ctx: this.rnAbility.createRNOHContext({ rnInstance: this.rnInstance }),
-                surfaceConfig: {
-                  initialProps: {},
-                  appKey: appKey,
-                } as SurfaceConfig2,
-                buildCustomComponent: this.buildCustomComponent,
-              })
-            }
-          }.height(`${100 / this.appKeys.length}%`)
-          .position({ x: 0, y: `${(idx / this.appKeys.length) * 100}%` })
-        })
-      }
-    }.width("100%")
-    .height("100%")
-  }
-}
-
-
-@Component
-struct Blinker {
-  public minDelayInMs: number = 0
-  public maxDelayInMs: number = 1000
-  public blinksCount: number = 0
-  public randomnessPrecisionInMs: number = 250
-  @BuilderParam public renderChildren: () => void
-  private currentBlinksCount = 0
-  @State private isVisible: boolean = false
-  private timeout: number = 0
-
-  aboutToAppear() {
-    this.blink(this.minDelayInMs)
-  }
-
-  aboutToDisappear() {
-    clearTimeout(this.timeout)
-  }
-
-  private blink(ms: number) {
-    this.isVisible = !this.isVisible
-    this.currentBlinksCount += 1
-    if (this.currentBlinksCount >= this.blinksCount) {
-      if (this.timeout) {
-        clearTimeout(this.timeout)
-      }
-      this.isVisible = true
-      return;
-    }
-    this.timeout = setTimeout(() => {
-      this.blink(this.getNextDelay())
-    }, ms)
-  }
-
-  private getNextDelay(): number {
-    return ((Math.floor(Math.random() * (Number.MAX_VALUE / this.randomnessPrecisionInMs)) * this.randomnessPrecisionInMs) % this.maxDelayInMs) + this.minDelayInMs
-  }
-
-  build() {
-    Stack() {
-      if (this.isVisible) {
-        this.renderChildren()
-      }
-    }
-  }
-}
-
-
-
-
-
+/*
+ * Copyright (c) 2025 Huawei Device Co., Ltd. All rights reserved
+ * Use of this source code is governed by a MIT license that can be
+ * found in the LICENSE file.
+ */
+import { RNInstance, JSBundleProvider, RNAbility, RNSurface } from '@rnoh/react-native-openharmony'
+import { CustomComponentBuilder } from "@rnoh/react-native-openharmony/src/main/ets/RNOHCorePackage"
+import { SurfaceConfig2 } from '@rnoh/react-native-openharmony/src/main/ets/RNSurface'
+
+
+@Component
+export struct SurfaceDeadlockTest {
+  public jsBundleProvider: JSBundleProvider | undefined = undefined
+  public appKeys: string[] = []
+  public numberOfIterations: number = 1
+  @BuilderParam public buildCustomComponent!: CustomComponentBuilder
+  // -------------------------------------------------------------------------------------------------------------------
+  @StorageLink('RNAbility') private rnAbility: RNAbility = {} as RNAbility
+  private rnInstance!: RNInstance
+  @State private shouldShow: boolean = false
+  private shouldDestroyRNInstance: boolean = false
+  private cleanUpCallbacks: (() => void)[] = []
+
+  aboutToAppear() {
+    this.getOrCreateRNInstance().then(rnInstance => {
+      this.rnInstance = rnInstance
+      const jsBundleExecutionStatus = this.rnInstance.getBundleExecutionStatus(this.jsBundleProvider?.getURL())
+      if (this.jsBundleProvider && jsBundleExecutionStatus === undefined) {
+        this.rnInstance.runJSBundle(this.jsBundleProvider).then(() => {
+          this.shouldShow = true
+        })
+        return;
+      }
+    }).catch((reason: string | Error) => {
+      if (typeof reason === "string")
+        this.rnAbility.getLogger().error(reason)
+      else if (reason instanceof Error) {
+        this.rnAbility.getLogger().error(reason.message)
+      } else {
+        this.rnAbility.getLogger().error("Fatal exception")
+      }
+    })
+  }
+
+  aboutToDisappear() {
+    if (this.shouldDestroyRNInstance)
+      this.rnAbility.destroyAndUnregisterRNInstance(this.rnInstance)
+    this.cleanUpCallbacks.forEach(cleanUp => cleanUp())
+  }
+
+  private getOrCreateRNInstance(): Promise<RNInstance> {
+    return this.rnAbility.createAndRegisterRNInstance({ createRNPackages: () => [] })
+  }
+
+  build() {
+    Stack() {
+      if (this.shouldShow) {
+        ForEach(this.appKeys, (appKey: string, idx) => {
+          Stack() {
+            Blinker({
+              minDelayInMs: 1000,
+              maxDelayInMs: 2000,
+              blinksCount: this.numberOfIterations,
+              randomnessPrecisionInMs: 500
+            }) {
+              RNSurface({
+                ctx: this.rnAbility.createRNOHContext({ rnInstance: this.rnInstance }),
+                surfaceConfig: {
+                  initialProps: {},
+                  appKey: appKey,
+                } as SurfaceConfig2,
+                buildCustomComponent: this.buildCustomComponent,
+              })
+            }
+          }.height(`${100 / this.appKeys.length}%`)
+          .position({ x: 0, y: `${(idx / this.appKeys.length) * 100}%` })
+        })
+      }
+    }.width("100%")
+    .height("100%")
+  }
+}
+
+
+@Component
+struct Blinker {
+  public minDelayInMs: number = 0
+  public maxDelayInMs: number = 1000
+  public blinksCount: number = 0
+  public randomnessPrecisionInMs: number = 250
+  @BuilderParam public renderChildren: () => void
+  private currentBlinksCount = 0
+  @State private isVisible: boolean = false
+  private timeout: number = 0
+
+  aboutToAppear() {
+    this.blink(this.minDelayInMs)
+  }
+
+  aboutToDisappear() {
+    clearTimeout(this.timeout)
+  }
+
+  private blink(ms: number) {
+    this.isVisible = !this.isVisible
+    this.currentBlinksCount += 1
+    if (this.currentBlinksCount >= this.blinksCount) {
+      if (this.timeout) {
+        clearTimeout(this.timeout)
+      }
+      this.isVisible = true
+      return;
+    }
+    this.timeout = setTimeout(() => {
+      this.blink(this.getNextDelay())
+    }, ms)
+  }
+
+  private getNextDelay(): number {
+    return ((Math.floor(Math.random() * (Number.MAX_VALUE / this.randomnessPrecisionInMs)) * this.randomnessPrecisionInMs) % this.maxDelayInMs) + this.minDelayInMs
+  }
+
+  build() {
+    Stack() {
+      if (this.isVisible) {
+        this.renderChildren()
+      }
+    }
+  }
+}
+
+
+
+
+