From 7cac0f98ad4f4d542118f93bb555dde45c194c85 Mon Sep 17 00:00:00 2001 From: human Date: Sun, 22 Dec 2024 19:55:27 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix:=20bugfix=E7=9B=B8=E4=BA=A4&nav?= =?UTF-8?q?=E5=8A=A8=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/create-intersection-observer/rnIntersectionObserver.js | 2 +- packages/core/src/platform/createApp.ios.js | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/api-proxy/src/platform/api/create-intersection-observer/rnIntersectionObserver.js b/packages/api-proxy/src/platform/api/create-intersection-observer/rnIntersectionObserver.js index 059ae453b..038b67099 100644 --- a/packages/api-proxy/src/platform/api/create-intersection-observer/rnIntersectionObserver.js +++ b/packages/api-proxy/src/platform/api/create-intersection-observer/rnIntersectionObserver.js @@ -96,7 +96,7 @@ class RNIntersectionObserver { const windowRect = { top: navigationLayout.y + this.margins.top, - left: navigationLayout.x + this.margins.left, + left: this.margins.left, right: navigationLayout.width - this.margins.right, bottom: navigationLayout.y + navigationLayout.height - this.margins.bottom } diff --git a/packages/core/src/platform/createApp.ios.js b/packages/core/src/platform/createApp.ios.js index 5fae55fa0..cd11268bc 100644 --- a/packages/core/src/platform/createApp.ios.js +++ b/packages/core/src/platform/createApp.ios.js @@ -191,7 +191,8 @@ export default function createApp (option, config = {}) { // 7.x替换headerBackTitleVisible // headerBackButtonDisplayMode: 'minimal', headerBackTitleVisible: false, - headerMode: 'float' + // 安卓上会出现回退的时，如果设置为flat的话 navigator出现右滑退出，screen部分是fade的方式，交互效果不佳 + headerMode: 'screen' } if (headerBackImageProps) { navScreenOpts.headerBackImage = () => { From 2306880055e9d47e09d6c176bf6d8d431eebee60 Mon Sep 17 00:00:00 2001 From: human Date: Sun, 22 Dec 2024 21:20:41 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix:=20navigtion=20=E5=AE=89=E5=8D=93?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E9=97=AA=E7=8E=B0=E5=AF=BC=E8=88=AA?= =?UTF-8?q?=E6=9D=A1=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/core/src/platform/createApp.ios.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/core/src/platform/createApp.ios.js b/packages/core/src/platform/createApp.ios.js index cd11268bc..dbcee86aa 100644 --- a/packages/core/src/platform/createApp.ios.js +++ b/packages/core/src/platform/createApp.ios.js @@ -192,7 +192,9 @@ export default function createApp (option, config = {}) { // headerBackButtonDisplayMode: 'minimal', headerBackTitleVisible: false, // 安卓上会出现回退的时，如果设置为flat的话 navigator出现右滑退出，screen部分是fade的方式，交互效果不佳 - headerMode: 'screen' + headerMode: 'screen', + // 安卓上会出现初始化时闪现导航条的问题 + headerShown: false } if (headerBackImageProps) { navScreenOpts.headerBackImage = () => { From cb6492a834a4e8e1137b8974adc5c71faad1234f Mon Sep 17 00:00:00 2001 From: human Date: Sun, 22 Dec 2024 21:25:42 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix:=20=E6=96=87=E6=A1=88=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=B8=80=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/core/src/platform/createApp.ios.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/core/src/platform/createApp.ios.js b/packages/core/src/platform/createApp.ios.js index dbcee86aa..e775a9d9b 100644 --- a/packages/core/src/platform/createApp.ios.js +++ b/packages/core/src/platform/createApp.ios.js @@ -191,7 +191,7 @@ export default function createApp (option, config = {}) { // 7.x替换headerBackTitleVisible // headerBackButtonDisplayMode: 'minimal', headerBackTitleVisible: false, - // 安卓上会出现回退的时，如果设置为flat的话 navigator出现右滑退出，screen部分是fade的方式，交互效果不佳 + // 安卓上回退时，如果设置为float的话 navigator出现右滑退出，screen其实是fade的方式退出，交互不匹配，体验差，另外float模式会导致偶现状态栏透出native部分 headerMode: 'screen', // 安卓上会出现初始化时闪现导航条的问题 headerShown: false From 6104de2bc4d981ddb04c589a30020a868505a9cd Mon Sep 17 00:00:00 2001 From: human Date: Mon, 23 Dec 2024 11:41:07 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix:=20headerMode=E9=87=87=E7=94=A8stack?= =?UTF-8?q?=E7=9A=84=E9=BB=98=E8=AE=A4=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/core/src/platform/createApp.ios.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/core/src/platform/createApp.ios.js b/packages/core/src/platform/createApp.ios.js index e775a9d9b..2b15210bc 100644 --- a/packages/core/src/platform/createApp.ios.js +++ b/packages/core/src/platform/createApp.ios.js @@ -191,8 +191,6 @@ export default function createApp (option, config = {}) { // 7.x替换headerBackTitleVisible // headerBackButtonDisplayMode: 'minimal', headerBackTitleVisible: false, - // 安卓上回退时，如果设置为float的话 navigator出现右滑退出，screen其实是fade的方式退出，交互不匹配，体验差，另外float模式会导致偶现状态栏透出native部分 - headerMode: 'screen', // 安卓上会出现初始化时闪现导航条的问题 headerShown: false }