适配RNOH 0.72.16(RNComponentFactory)

react-native-oh-library · Mar 3, 2024 · b99ac64 · b99ac64
1 parent 5b96d44
commit b99ac64
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 10 deletions.
diff --git a/harmony/safe_area.har b/harmony/safe_area.har
diff --git a/harmony/safe_area/oh-package.json5 b/harmony/safe_area/oh-package.json5
@@ -2,12 +2,13 @@
   "license": "ISC",
   "types": "",
   "devDependencies": {
+
   },
   "author": "",
   "name": "safe_area",
   "description": "Please describe the basic information.",
   "main": "./index.ets",
-  "version": "1.0.0",
+  "version": "4.7.4-0.0.8",
   "dependencies": {
     "rnoh": "file:../rnoh"
   }

diff --git a/harmony/safe_area/src/main/ets/SafeAreaProvider.ets b/harmony/safe_area/src/main/ets/SafeAreaProvider.ets
@@ -25,7 +25,7 @@
 import {
   Descriptor,
   ComponentBuilderContext,
-  rnComponentFactoryBuilder,
+  RNComponentFactory,
   RNOHContext,
   ViewRawProps,
   ViewBaseProps,
@@ -116,9 +116,11 @@ export struct SafeAreaProvider {
   build() {
     Stack() {
       ForEach(this.descriptorWrapper?.childrenTags, (childrenTag: Tag) => {
-        rnComponentFactoryBuilder(this.ctx,
-          childrenTag,
-          this.ctx.rnInstance.getComponentNameFromDescriptorType(this.ctx.descriptorRegistry.getDescriptor(childrenTag)?.type))
+        RNComponentFactory({
+          ctx: this.ctx,
+          tag: childrenTag,
+          buildCustomComponent: this.buildCustomComponent
+        })
       }, (tag: Tag) => tag.toString())
     }
     .attributeModifier(SafeAreaProviderModifier.getInstance().setDescriptor(this.descriptorWrapper))

diff --git a/harmony/safe_area/src/main/ets/SafeAreaView.ets b/harmony/safe_area/src/main/ets/SafeAreaView.ets
@@ -30,7 +30,7 @@ import {
   RNOHContext,
   ViewBaseProps,
   Tag,
-  rnComponentFactoryBuilder,
+  RNComponentFactory,
   ViewRawProps,
   RNViewManager,
   ViewDescriptorWrapperBase,
@@ -230,9 +230,11 @@ export struct SafeAreaView {
   build() {
     Stack() {
       ForEach(this.descriptorWrapper?.childrenTags, (childrenTag: Tag) => {
-        rnComponentFactoryBuilder(this.ctx,
-          childrenTag,
-          this.ctx.rnInstance.getComponentNameFromDescriptorType(this.ctx.descriptorRegistry.getDescriptor(childrenTag)?.type))
+        RNComponentFactory({
+          ctx: this.ctx,
+          tag: childrenTag,
+          buildCustomComponent: this.buildCustomComponent
+        })
       }, (tag: Tag) => tag.toString())
     }
     .attributeModifier(SafeAreaViewModifier.getInstance().setDescriptor(this.descriptorWrapper))

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@react-native-oh-tpl/react-native-safe-area-context",
-  "version": "4.7.4-0.0.7",
+  "version": "4.7.4-0.0.8",
   "description": "A flexible way to handle safe area, also works on Android and web.",
   "main": "lib/commonjs/index.js",
   "module": "lib/module/index.js",