From d8ac38a035888a873a545d0a7b1f57f9b0ce90db Mon Sep 17 00:00:00 2001 From: huangyouhua Date: Thu, 23 Jan 2025 12:40:40 +0800 Subject: [PATCH 1/8] docs: Added the open source rectification notes for the 0.72.5-ohos-5.0-release branch Signed-off-by: huangyouhua <1356795413@qq.com> --- README_zh.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README_zh.md b/README_zh.md index 21aaa6d9..94645250 100644 --- a/README_zh.md +++ b/README_zh.md @@ -48,3 +48,5 @@ - master分支:主分支,请勿从此分支拉取源码用于商用版本,不保证质量。 - dev分支/partner-dev分支:开发分支,请勿从此分支拉取源码,不保证质量。 - 其余分支(若存在):项目内部运行过程分支,请勿从相关分支拉取源码,不保证质量。 + +**说明:** 0.72.5-ohos-5.0-release分支在2025/01/23进行了开源整改,整改后的CommitID与整改前不一致,请开发者重新拉取仓库最新代码。 \ No newline at end of file -- Gitee From cbd6bf44bf2e449a3a88454a7fd9236ebb7369bf Mon Sep 17 00:00:00 2001 From: xujerwu Date: Thu, 23 Jan 2025 20:57:49 +0800 Subject: [PATCH 2/8] fix:crash when updateConstraints called on a destroyed surface Signed-off-by: xujerwu --- .../src/main/ets/RNOH/RNInstancesCoordinator.ets | 5 ++++- .../react_native_openharmony/src/main/ets/RNSurface.ets | 8 +++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/tester/harmony/react_native_openharmony/src/main/ets/RNOH/RNInstancesCoordinator.ets b/tester/harmony/react_native_openharmony/src/main/ets/RNOH/RNInstancesCoordinator.ets index b63dc4ea..460b7e4a 100644 --- a/tester/harmony/react_native_openharmony/src/main/ets/RNOH/RNInstancesCoordinator.ets +++ b/tester/harmony/react_native_openharmony/src/main/ets/RNOH/RNInstancesCoordinator.ets @@ -282,6 +282,9 @@ export class RNInstancesCoordinator { public onDestroy() { const stopTracing = this.logger.clone("onDestroy").startTracing() + if (this.timerId) { + clearTimeout(this.timerId) + } this.jsPackagerClient.onDestroy() this.rnInstanceRegistry.forEach(instance => { instance.onDestroy() @@ -334,7 +337,7 @@ export class RNInstancesCoordinator { }) this.lastChangeTime = currentTime; } else { - if(this.timerId){ + if (this.timerId) { clearTimeout(this.timerId) } this.timerId = setTimeout(() =>{ diff --git a/tester/harmony/react_native_openharmony/src/main/ets/RNSurface.ets b/tester/harmony/react_native_openharmony/src/main/ets/RNSurface.ets index 48e15092..8fa36bdf 100644 --- a/tester/harmony/react_native_openharmony/src/main/ets/RNSurface.ets +++ b/tester/harmony/react_native_openharmony/src/main/ets/RNSurface.ets @@ -158,6 +158,9 @@ export struct RNSurface { aboutToDisappear() { const surfaceHandle = this.surfaceHandle; + if (this.timerId) { + clearTimeout(this.timerId); + } (async () => { const stopTracing = this.logger.clone("aboutToDisappear").startTracing() this.cleanUpCallbacks.forEach(cb => cb()) @@ -202,6 +205,9 @@ export struct RNSurface { override onMeasureSize(selfLayoutInfo: GeometryInfo, children: Array, constraint: ConstraintSizeOptions): SizeResult { + if (this.surfaceHandle.isDestroyed()) { + return {width: 0, height: 0}; + } const currentTime = Date.now(); if (currentTime - this.lastChangeTime > this.delayTime) { this.currentMeasuredSize = @@ -213,7 +219,7 @@ export struct RNSurface { }) this.lastChangeTime = currentTime; } else { - if(this.timerId){ + if (this.timerId) { clearTimeout(this.timerId) } this.timerId = setTimeout(() =>{ -- Gitee From 4256e190a7691e454a6e2ee72d5aed93af3451d1 Mon Sep 17 00:00:00 2001 From: Dark <3166955090@qq.com> Date: Fri, 24 Jan 2025 11:11:54 +0800 Subject: [PATCH 3/8] config: RN Tester add fontSizeScale config Signed-off-by: Dark <3166955090@qq.com> --- tester/harmony/AppScope/app.json5 | 1 + .../AppScope/resources/base/profile/configuration.json | 6 ++++++ 2 files changed, 7 insertions(+) create mode 100644 tester/harmony/AppScope/resources/base/profile/configuration.json diff --git a/tester/harmony/AppScope/app.json5 b/tester/harmony/AppScope/app.json5 index d6694f26..b9bc6557 100644 --- a/tester/harmony/AppScope/app.json5 +++ b/tester/harmony/AppScope/app.json5 @@ -6,5 +6,6 @@ "versionName": "1.0.0", "icon": "$media:app_icon", "label": "$string:app_name", + "configuration": "$profile:configuration" } } diff --git a/tester/harmony/AppScope/resources/base/profile/configuration.json b/tester/harmony/AppScope/resources/base/profile/configuration.json new file mode 100644 index 00000000..5bdd4f03 --- /dev/null +++ b/tester/harmony/AppScope/resources/base/profile/configuration.json @@ -0,0 +1,6 @@ +{ + "configuration": { + "fontSizeMaxScale": "3.2", + "fontSizeScale": "followSystem" + } +} \ No newline at end of file -- Gitee From 39a36feb0a8343a296245fe50bf32aaba4ace91e Mon Sep 17 00:00:00 2001 From: Dark <3166955090@qq.com> Date: Fri, 24 Jan 2025 11:12:05 +0800 Subject: [PATCH 4/8] fix: MaxFontSizeMultiplier property adds a judgment greater than or equal to 1 Signed-off-by: Dark <3166955090@qq.com> --- .../react_native_openharmony/src/main/cpp/RNOH/TextMeasurer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tester/harmony/react_native_openharmony/src/main/cpp/RNOH/TextMeasurer.cpp b/tester/harmony/react_native_openharmony/src/main/cpp/RNOH/TextMeasurer.cpp index a63356b4..b2cbed77 100644 --- a/tester/harmony/react_native_openharmony/src/main/cpp/RNOH/TextMeasurer.cpp +++ b/tester/harmony/react_native_openharmony/src/main/cpp/RNOH/TextMeasurer.cpp @@ -41,7 +41,7 @@ TextMeasurement TextMeasurer::measure( float fontMultiplier = 1.0; if (paragraphAttributes.allowFontScaling) { fontMultiplier = m_fontScale; - if (!isnan(paragraphAttributes.maxFontSizeMultiplier)) { + if (!isnan(paragraphAttributes.maxFontSizeMultiplier) && paragraphAttributes.maxFontSizeMultiplier >= 1) { fontMultiplier = std::min(m_fontScale, (float)paragraphAttributes.maxFontSizeMultiplier); } } -- Gitee From 8973483e36fbbfe445944ab5ed572576c23514cf Mon Sep 17 00:00:00 2001 From: x30015140 Date: Fri, 24 Jan 2025 10:31:01 +0800 Subject: [PATCH 5/8] fix: Modify the type of onFinished Signed-off-by: x30015140 (cherry picked from commit ce7111ff70209e635327a4fea0191f040999ab82) --- react-native-harmony-cli/src/commands/bundle-harmony.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/react-native-harmony-cli/src/commands/bundle-harmony.ts b/react-native-harmony-cli/src/commands/bundle-harmony.ts index a9aafdc9..2b0a838d 100644 --- a/react-native-harmony-cli/src/commands/bundle-harmony.ts +++ b/react-native-harmony-cli/src/commands/bundle-harmony.ts @@ -195,7 +195,7 @@ function copyFiles(fileDestBySrc: Record) { function copyFile( src: string, dest: string, - onFinished: (error: Error) => void + onFinished: (error?: Error) => void ): void { const destDir = pathUtils.dirname(dest); fs.mkdir(destDir, { recursive: true }, (err?) => { -- Gitee From f084903c58d2dcc321e5f225a824ffe981d0f686 Mon Sep 17 00:00:00 2001 From: xujerwu Date: Sat, 25 Jan 2025 20:54:09 +0800 Subject: [PATCH 6/8] fix:surface change delay in non-windowed change scenes Signed-off-by: xujerwu --- .../src/main/ets/RNOH/RNAbility.ets | 4 +++ .../src/main/ets/RNOH/RNInstance.ts | 6 +++- .../main/ets/RNOH/RNInstancesCoordinator.ets | 12 +++++++ .../src/main/ets/RNSurface.ets | 36 +++++++++++++------ 4 files changed, 47 insertions(+), 11 deletions(-) diff --git a/tester/harmony/react_native_openharmony/src/main/ets/RNOH/RNAbility.ets b/tester/harmony/react_native_openharmony/src/main/ets/RNOH/RNAbility.ets index e0f7a443..4f59f1e8 100644 --- a/tester/harmony/react_native_openharmony/src/main/ets/RNOH/RNAbility.ets +++ b/tester/harmony/react_native_openharmony/src/main/ets/RNOH/RNAbility.ets @@ -140,10 +140,14 @@ export abstract class RNAbility extends UIAbility { const onWindowSizeChange = (windowSize: window.Size) => { this.rnInstancesCoordinator?.onWindowSizeChange(windowSize) } + const onWindowReactChange = (data: window.RectChangeOptions) => { + this.rnInstancesCoordinator?.onWindowRectChange(data) + } const onWindowStageChange = (windowStageEvent: window.WindowStageEventType) => { this.rnInstancesCoordinator?.onWindowStageChange(windowStageEvent) } mainWindow.on('windowSizeChange', onWindowSizeChange) + mainWindow.on('windowRectChange', onWindowReactChange) windowStage.on('windowStageEvent', onWindowStageChange) this.unregisterWindowListenerCallback() this.unregisterWindowListenerCallback = () => { diff --git a/tester/harmony/react_native_openharmony/src/main/ets/RNOH/RNInstance.ts b/tester/harmony/react_native_openharmony/src/main/ets/RNOH/RNInstance.ts index 63d4d7eb..0af2d152 100644 --- a/tester/harmony/react_native_openharmony/src/main/ets/RNOH/RNInstance.ts +++ b/tester/harmony/react_native_openharmony/src/main/ets/RNOH/RNInstance.ts @@ -71,6 +71,7 @@ export type LifecycleEventArgsByEventName = { ]; RELOAD: [{ reason: string | undefined }]; WINDOW_SIZE_CHANGE: [windowSize: window.Size]; + WINDOW_REACT_DRAG: [isWindowRectDrag: boolean]; } export type StageChangeEventArgsByEventName = { @@ -877,6 +878,10 @@ export class RNInstanceImpl implements RNInstance { this.lifecycleEventEmitter.emit("CONFIGURATION_UPDATE", ...args) } + public onWindowReactChange(isWindowRectDrag: boolean) { + this.lifecycleEventEmitter.emit("WINDOW_REACT_DRAG", isWindowRectDrag); + } + public onWindowSizeChange(windowSize: window.Size) { this.lifecycleEventEmitter.emit("WINDOW_SIZE_CHANGE", windowSize); this.postMessageToCpp("WINDOW_SIZE_CHANGE", windowSize); @@ -970,7 +975,6 @@ export class RNInstanceImpl implements RNInstance { return this.uiCtx; } - public registerFont(fontFamily: string, fontResource: Resource | string): void { const fontPath = (() => { if (typeof fontResource === 'string') { diff --git a/tester/harmony/react_native_openharmony/src/main/ets/RNOH/RNInstancesCoordinator.ets b/tester/harmony/react_native_openharmony/src/main/ets/RNOH/RNInstancesCoordinator.ets index 460b7e4a..dd0850c5 100644 --- a/tester/harmony/react_native_openharmony/src/main/ets/RNOH/RNInstancesCoordinator.ets +++ b/tester/harmony/react_native_openharmony/src/main/ets/RNOH/RNInstancesCoordinator.ets @@ -328,6 +328,18 @@ export class RNInstancesCoordinator { }) } + public onWindowRectChange(data: window.RectChangeOptions) { + if (data.reason === window.RectChangeReason.DRAG_START) { + this.rnInstanceRegistry.forEach((rnInstance) => { + rnInstance.onWindowReactChange(true) + }) + } else if(data.reason === window.RectChangeReason.DRAG_END) { + this.rnInstanceRegistry.forEach((rnInstance) => { + rnInstance.onWindowReactChange(false) + }) + } + } + public onWindowSizeChange(windowSize: window.Size) { const currentTime = Date.now(); if (currentTime - this.lastChangeTime > this.delayTime) { diff --git a/tester/harmony/react_native_openharmony/src/main/ets/RNSurface.ets b/tester/harmony/react_native_openharmony/src/main/ets/RNSurface.ets index 8fa36bdf..269bbf75 100644 --- a/tester/harmony/react_native_openharmony/src/main/ets/RNSurface.ets +++ b/tester/harmony/react_native_openharmony/src/main/ets/RNSurface.ets @@ -110,9 +110,11 @@ export struct RNSurface { private initialProps!: SurfaceProps; private logger!: RNOHLogger private rootViewNodeContent: NodeContent = new NodeContent(); - private timerId: number = 0; + private timerId: undefined | number = undefined; private lastChangeTime: number = 0; + private isWindowRectDrag: boolean = false; private currentMeasuredSize: Size | undefined = undefined; + private lastChangeFlag: boolean = false; /** * Note: You may need to change this delay along with RNInstancesCoordinator's * onWindowSizeChange delay, as both have an effect on window changes. @@ -151,6 +153,12 @@ export struct RNSurface { this.rootComponentSize = { width: payload.width, height: payload.height } } })) + this.cleanUpCallbacks.push( + this.ctx.rnInstance.subscribeToLifecycleEvents("WINDOW_REACT_DRAG", + (isWindowRectDrag: boolean) => { + this.isWindowRectDrag = isWindowRectDrag; + }) + ) this.surfaceHandle.attachRootView(this.ctx.rnInstance.getId(), this.surfaceHandle.getTag(), this.rootViewNodeContent); stopTracing() @@ -160,6 +168,7 @@ export struct RNSurface { const surfaceHandle = this.surfaceHandle; if (this.timerId) { clearTimeout(this.timerId); + this.timerId = undefined; } (async () => { const stopTracing = this.logger.clone("aboutToDisappear").startTracing() @@ -209,18 +218,24 @@ export struct RNSurface { return {width: 0, height: 0}; } const currentTime = Date.now(); - if (currentTime - this.lastChangeTime > this.delayTime) { + if (!this.isWindowRectDrag || (currentTime - this.lastChangeTime > this.delayTime) || this.lastChangeFlag) { + if (this.timerId) { + clearTimeout(this.timerId); + this.timerId = undefined; + } this.currentMeasuredSize = - this.updateSurfaceConstraints({ - minWidth: constraint.maxWidth as number, // NOTE: width: 100% doesn't work on the root component hence maxWidth is used here - minHeight: constraint.minHeight as number, - maxWidth: constraint.maxWidth as number, - maxHeight: constraint.maxHeight as number, - }) + this.updateSurfaceConstraints({ + minWidth: constraint.maxWidth as number, // NOTE: width: 100% doesn't work on the root component hence maxWidth is used here + minHeight: constraint.minHeight as number, + maxWidth: constraint.maxWidth as number, + maxHeight: constraint.maxHeight as number, + }) + this.lastChangeFlag = false; this.lastChangeTime = currentTime; } else { if (this.timerId) { clearTimeout(this.timerId) + this.timerId = undefined; } this.timerId = setTimeout(() =>{ this.currentMeasuredSize = @@ -230,9 +245,10 @@ export struct RNSurface { maxWidth: constraint.maxWidth as number, maxHeight: constraint.maxHeight as number, }) + this.timerId = undefined; + this.lastChangeFlag = true; this.lastChangeTime = Date.now(); }, this.delayTime) - this.lastChangeTime = currentTime; } const measuredSize = this.currentMeasuredSize; const newSize: Size = @@ -245,7 +261,7 @@ export struct RNSurface { maxHeight: newSize.height }) }) - return newSize + return newSize; } override onPlaceChildren(selfLayoutInfo: GeometryInfo, children: Array, -- Gitee From f19bda388633c9e3290737c1500df1b2387b8cdc Mon Sep 17 00:00:00 2001 From: xujerwu Date: Sat, 25 Jan 2025 21:21:14 +0800 Subject: [PATCH 7/8] fix:change delay time Signed-off-by: xujerwu --- .../harmony/react_native_openharmony/src/main/ets/RNSurface.ets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tester/harmony/react_native_openharmony/src/main/ets/RNSurface.ets b/tester/harmony/react_native_openharmony/src/main/ets/RNSurface.ets index 269bbf75..80a1bfa2 100644 --- a/tester/harmony/react_native_openharmony/src/main/ets/RNSurface.ets +++ b/tester/harmony/react_native_openharmony/src/main/ets/RNSurface.ets @@ -119,7 +119,7 @@ export struct RNSurface { * Note: You may need to change this delay along with RNInstancesCoordinator's * onWindowSizeChange delay, as both have an effect on window changes. */ - private readonly delayTime: number = 500; + private readonly delayTime: number = 100; aboutToAppear() { this.logger = this.ctx.logger.clone("RNSurface") -- Gitee From 5cba5fbed30b66f8974a77269fb29f22abdf14d8 Mon Sep 17 00:00:00 2001 From: huangyouhua Date: Sat, 25 Jan 2025 22:11:28 +0800 Subject: [PATCH 8/8] chore: update to version 5.1.0.111(0.72.53) Signed-off-by: huangyouhua <1356795413@qq.com> --- CHANGELOG.md | 8 +++++++- .../FabricComponentSample/ReactProject/package.json | 2 +- docs/Samples/Sample/SampleApp/oh-package.json5 | 2 +- ...y-v5.1.0.110.md => react-native-harmony-v5.1.0.111.md} | 8 ++++---- .../\347\211\210\346\234\254\350\257\264\346\230\216.md" | 2 +- react-native-harmony-sample-package/package.json | 2 +- react-native-harmony/package.json | 2 +- tester/harmony/react_native_openharmony/CHANGELOG.md | 8 +++++++- tester/harmony/react_native_openharmony/oh-package.json5 | 2 +- tester/package.json | 4 ++-- 10 files changed, 26 insertions(+), 14 deletions(-) rename docs/zh-cn/release-notes/{react-native-harmony-v5.1.0.110.md => react-native-harmony-v5.1.0.111.md} (73%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 736f4030..83b54c23 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,12 @@ # Changelog -## 5.1.0.110 +## 5.1.0.111 +- fix:change delay time,([f19bda388](https://gitee.com/openharmony-sig/ohos_react_native/commit/f19bda388633c9e3290737c1500df1b2387b8cdc)) +- fix:surface change delay in non-windowed change scenes,([f084903c5](https://gitee.com/openharmony-sig/ohos_react_native/commit/f084903c58d2dcc321e5f225a824ffe981d0f686)) +- ix: Modify the type of onFinished,([8973483e3](https://gitee.com/openharmony-sig/ohos_react_native/commit/8973483e36fbbfe445944ab5ed572576c23514cf)) +- fix: MaxFontSizeMultiplier property adds a judgment greater than or equal to 1,([39a36feb0](https://gitee.com/openharmony-sig/ohos_react_native/commit/39a36feb0a8343a296245fe50bf32aaba4ace91e)) +- config: RN Tester add fontSizeScale config,([4256e190a](https://gitee.com/openharmony-sig/ohos_react_native/commit/4256e190a7691e454a6e2ee72d5aed93af3451d1)) +- fix:crash when updateConstraints called on a destroyed surface,([cbd6bf44b](https://gitee.com/openharmony-sig/ohos_react_native/commit/cbd6bf44bf2e449a3a88454a7fd9236ebb7369bf)) - add enum UI_INPUT_EVENT_SOURCE_TYPE_KEY,([c5625dbe0](https://gitee.com/openharmony-sig/ohos_react_native/commit/c5625dbe04cbca9ab3dda1ac1e7ceeae1a3d1d15)) - fix: Fix the mouse click onPress responding twice on PC.,([6b628dfb4](https://gitee.com/openharmony-sig/ohos_react_native/commit/6b628dfb4c0966c0bcac4774ef453f091a7578d8)) - fix large scrollEventThrottle ScrollView missing items on ends,([16c6ef3aa](https://gitee.com/openharmony-sig/ohos_react_native/commit/16c6ef3aab69502a506e4fd089a6e2491bcbebbc)) diff --git a/docs/Samples/FabricComponentSample/ReactProject/package.json b/docs/Samples/FabricComponentSample/ReactProject/package.json index 3e35e2cf..c4a6adcd 100644 --- a/docs/Samples/FabricComponentSample/ReactProject/package.json +++ b/docs/Samples/FabricComponentSample/ReactProject/package.json @@ -11,7 +11,7 @@ "dependencies": { "react": "18.2.0", "react-native": "0.72.5", - "react-native-harmony": "file:../react-native-harmony/rnoh-react-native-harmony-0.72.52.tgz", + "react-native-harmony": "file:../react-native-harmony/rnoh-react-native-harmony-0.72.53.tgz", "react-native-performance": "^5.1.2", "fabric-component-sample-package": "file:../fabric-component-sample-package/fabric-component-sample-package-1.0.0.tgz" }, diff --git a/docs/Samples/Sample/SampleApp/oh-package.json5 b/docs/Samples/Sample/SampleApp/oh-package.json5 index 11efeefe..c17463e0 100644 --- a/docs/Samples/Sample/SampleApp/oh-package.json5 +++ b/docs/Samples/Sample/SampleApp/oh-package.json5 @@ -13,6 +13,6 @@ "@ohos/axios": "^2.1.1" }, "overrides": { - "@rnoh/react-native-openharmony": "0.72.52" + "@rnoh/react-native-openharmony": "0.72.53" } } \ No newline at end of file diff --git a/docs/zh-cn/release-notes/react-native-harmony-v5.1.0.110.md b/docs/zh-cn/release-notes/react-native-harmony-v5.1.0.111.md similarity index 73% rename from docs/zh-cn/release-notes/react-native-harmony-v5.1.0.110.md rename to docs/zh-cn/release-notes/react-native-harmony-v5.1.0.111.md index 2f287725..eae5ae90 100644 --- a/docs/zh-cn/release-notes/react-native-harmony-v5.1.0.110.md +++ b/docs/zh-cn/release-notes/react-native-harmony-v5.1.0.111.md @@ -2,10 +2,10 @@ 当前React Native鸿蒙版本基于社区RN 0.72.5进行适配,发布版本信息如下: | 名称 | 版本号 | | ----------------------------- | -------------------------------| -| react-native-harmony.tgz | 0.72.52 | -| react-native-harmony-cli.tgz | 0.0.27 | -| react_native_openharmony-5.1.0.110.har | 0.72.52 | -| react_native_openharmony_release-5.1.0.110.har | 5.1.0.110 | +| react-native-harmony.tgz | 0.72.53 | +| react-native-harmony-cli.tgz | 0.0.28 | +| react_native_openharmony-5.1.0.111.har | 0.72.53 | +| react_native_openharmony_release-5.1.0.111.har | 5.1.0.111 | 配套IDE、SDK版本和手机ROM: | 名称 | 版本号 | diff --git "a/docs/zh-cn/\347\211\210\346\234\254\350\257\264\346\230\216.md" "b/docs/zh-cn/\347\211\210\346\234\254\350\257\264\346\230\216.md" index 3073bc5b..4eee765f 100644 --- "a/docs/zh-cn/\347\211\210\346\234\254\350\257\264\346\230\216.md" +++ "b/docs/zh-cn/\347\211\210\346\234\254\350\257\264\346\230\216.md" @@ -7,4 +7,4 @@ - [RNOH v5.0.0.715(2024-10-25)](./release-notes/react-native-harmony-v5.0.0.715.md) - [RNOH v5.0.0.812(2024-12-14)](./release-notes/react-native-harmony-v5.0.0.812.md) - [RNOH v5.0.0.813(2024-12-26)](./release-notes/react-native-harmony-v5.0.0.813.md) -- [RNOH v5.1.0.110(2025-01-16)](./release-notes/react-native-harmony-v5.1.0.110.md)(非正式发布) \ No newline at end of file +- [RNOH v5.1.0.111(2025-01-25)](./release-notes/react-native-harmony-v5.1.0.111.md)(非正式发布) \ No newline at end of file diff --git a/react-native-harmony-sample-package/package.json b/react-native-harmony-sample-package/package.json index 9f0e2035..aa213e22 100644 --- a/react-native-harmony-sample-package/package.json +++ b/react-native-harmony-sample-package/package.json @@ -8,7 +8,7 @@ "pack:harmony": "react-native pack-harmony --oh-module-path ../tester/harmony/sample_package --harmony-dir-path ./harmony --package-json-path ./package.json", "codegen-lib": "react-native codegen-lib-harmony --no-safety-check --npm-package-name react-native-harmony-sample-package-2 --cpp-output-path ../tester/harmony/sample_package/src/main/cpp/generated --ets-output-path ../tester/harmony/sample_package/src/main/ets/generated --cpp-components-spec-paths ./src/specs/codegen-lib/CodegenLibCppSampleNativeComponent.ts --turbo-modules-spec-paths ./src/specs/codegen-lib/NativeCodegenLibSampleModule.ts --arkts-components-spec-paths ./src/specs/codegen-lib/CodegenLibArkTSSampleNativeComponent.ts", "install:local-cli": "cd ../react-native-harmony-cli && npm pack && cd ../react-native-harmony-sample-package && npm i ../react-native-harmony-cli/rnoh-react-native-harmony-cli-0.0.26.tgz", - "install:rn_harmony": "cd ../react-native-harmony && npm pack && cd ../react-native-harmony-sample-package && npm uninstall react-native-harmony && npm i react-native-harmony@file:../react-native-harmony/rnoh-react-native-harmony-0.72.52.tgz" + "install:rn_harmony": "cd ../react-native-harmony && npm pack && cd ../react-native-harmony-sample-package && npm uninstall react-native-harmony && npm i react-native-harmony@file:../react-native-harmony/rnoh-react-native-harmony-0.72.53.tgz" }, "keywords": [], "author": "", diff --git a/react-native-harmony/package.json b/react-native-harmony/package.json index c2633fec..811b5405 100644 --- a/react-native-harmony/package.json +++ b/react-native-harmony/package.json @@ -1,6 +1,6 @@ { "name": "@rnoh/react-native-harmony", - "version": "0.72.52", + "version": "0.72.53", "description": "", "scripts": { "install:local-cli": "cd ../react-native-harmony-cli && npm pack && cd ../react-native-harmony && npm i ../react-native-harmony-cli/rnoh-react-native-harmony-cli-0.0.25.tgz && cd ../react-native-harmony", diff --git a/tester/harmony/react_native_openharmony/CHANGELOG.md b/tester/harmony/react_native_openharmony/CHANGELOG.md index 6b5a1a9f..91beef7d 100644 --- a/tester/harmony/react_native_openharmony/CHANGELOG.md +++ b/tester/harmony/react_native_openharmony/CHANGELOG.md @@ -1,6 +1,12 @@ # Changelog -## v0.72.52 +## v0.72.53 +- fix:change delay time,([f19bda388](https://gitee.com/openharmony-sig/ohos_react_native/commit/f19bda388633c9e3290737c1500df1b2387b8cdc)) +- fix:surface change delay in non-windowed change scenes,([f084903c5](https://gitee.com/openharmony-sig/ohos_react_native/commit/f084903c58d2dcc321e5f225a824ffe981d0f686)) +- ix: Modify the type of onFinished,([8973483e3](https://gitee.com/openharmony-sig/ohos_react_native/commit/8973483e36fbbfe445944ab5ed572576c23514cf)) +- fix: MaxFontSizeMultiplier property adds a judgment greater than or equal to 1,([39a36feb0](https://gitee.com/openharmony-sig/ohos_react_native/commit/39a36feb0a8343a296245fe50bf32aaba4ace91e)) +- config: RN Tester add fontSizeScale config,([4256e190a](https://gitee.com/openharmony-sig/ohos_react_native/commit/4256e190a7691e454a6e2ee72d5aed93af3451d1)) +- fix:crash when updateConstraints called on a destroyed surface,([cbd6bf44b](https://gitee.com/openharmony-sig/ohos_react_native/commit/cbd6bf44bf2e449a3a88454a7fd9236ebb7369bf)) - add enum UI_INPUT_EVENT_SOURCE_TYPE_KEY,([c5625dbe0](https://gitee.com/openharmony-sig/ohos_react_native/commit/c5625dbe04cbca9ab3dda1ac1e7ceeae1a3d1d15)) - fix: Fix the mouse click onPress responding twice on PC.,([6b628dfb4](https://gitee.com/openharmony-sig/ohos_react_native/commit/6b628dfb4c0966c0bcac4774ef453f091a7578d8)) - fix large scrollEventThrottle ScrollView missing items on ends,([16c6ef3aa](https://gitee.com/openharmony-sig/ohos_react_native/commit/16c6ef3aab69502a506e4fd089a6e2491bcbebbc)) diff --git a/tester/harmony/react_native_openharmony/oh-package.json5 b/tester/harmony/react_native_openharmony/oh-package.json5 index b1f1fc4c..3df41605 100644 --- a/tester/harmony/react_native_openharmony/oh-package.json5 +++ b/tester/harmony/react_native_openharmony/oh-package.json5 @@ -9,7 +9,7 @@ org: '', }, type: 'module', - version: '0.72.52', + version: '0.72.53', dependencies: {}, main: 'index.ets', repository: 'https://gitee.com/openharmony-sig/ohos_react_native/tree/master/' diff --git a/tester/package.json b/tester/package.json index 6c3dfdb7..ca4b3f81 100644 --- a/tester/package.json +++ b/tester/package.json @@ -8,7 +8,7 @@ "postinstall": "node ./scripts/create-build-profile && npm run reinstall:react_native_harmony && npm run reinstall:react_native_harmony_sample_package", "reinstall:react_native_harmony": "npm uninstall react-native-harmony && npm run pack_react_native_harmony && npm run install:react_native_harmony", "reinstall:react_native_harmony_sample_package": "npm uninstall react-native-harmony-sample-package && npm run pack_react_native_harmony_sample_package && npm run install:react_native_harmony_sample_package", - "install:react_native_harmony": "npm i react-native-harmony@file:../react-native-harmony/rnoh-react-native-harmony-0.72.52.tgz", + "install:react_native_harmony": "npm i react-native-harmony@file:../react-native-harmony/rnoh-react-native-harmony-0.72.53.tgz", "install:react_native_harmony_sample_package": "npm i ../react-native-harmony-sample-package/react-native-harmony-sample-package-1.0.0.tgz", "pack_react_native_harmony": "cd ../react-native-harmony && npm pack && cd ../tester", "pack_react_native_harmony_sample_package": "cd ../react-native-harmony-sample-package && npm run codegen-lib && npm pack && cd ../tester", @@ -45,7 +45,7 @@ "react": "18.2.0", "react-native": "0.72.5", "react-native-flipper-performance-plugin": "^0.4.0", - "react-native-harmony": "file:../react-native-harmony/rnoh-react-native-harmony-0.72.52.tgz", + "react-native-harmony": "file:../react-native-harmony/rnoh-react-native-harmony-0.72.53.tgz", "react-native-harmony-sample-package": "file:../react-native-harmony-sample-package/react-native-harmony-sample-package-1.0.0.tgz" }, "devDependencies": { -- Gitee