From b99ac643de8ac74b45df331dc335e81d281df6e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9E=97=E5=98=89=E8=AF=9A?= <425765923@qq.com> Date: Sun, 3 Mar 2024 18:59:43 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=82=E9=85=8DRNOH=200.72.16(RNComponentFac?= =?UTF-8?q?tory)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- harmony/safe_area.har | Bin 16282 -> 16625 bytes harmony/safe_area/oh-package.json5 | 3 ++- .../src/main/ets/SafeAreaProvider.ets | 10 ++++++---- .../safe_area/src/main/ets/SafeAreaView.ets | 10 ++++++---- package.json | 2 +- 5 files changed, 15 insertions(+), 10 deletions(-) diff --git a/harmony/safe_area.har b/harmony/safe_area.har index 2cb2447bb7d48ad178ca4070aed2eb44ca78e802..a18c9309b9893fdea61565e9fe7cd03e97028a49 100644 GIT binary patch literal 16625 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 Vgd`*(2}y_w{~t}75kvqG0stc|9m@a! literal 16282 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 Xd9jBa#x+Pn`{6G};;IG$0|xRx1TK`? diff --git a/harmony/safe_area/oh-package.json5 b/harmony/safe_area/oh-package.json5 index edf6d8e..48547c5 100644 --- 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 index b2a1d26..5deb844 100644 --- 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 index 65b621f..1853aca 100644 --- 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 index a297a89..928060b 100644 --- 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",