From 498e66b319d1ed4973e30b7298c2cca456ea0112 Mon Sep 17 00:00:00 2001
From: huxiyang3 <1872591453@qq.com>
Date: Thu, 10 Oct 2024 16:14:11 +0800
Subject: [PATCH 1/2] fix(navbar): safearea

---
 src/packages/navbar/navbar.scss     | 5 -----
 src/packages/navbar/navbar.taro.tsx | 3 ++-
 src/packages/navbar/navbar.tsx      | 3 ++-
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/packages/navbar/navbar.scss b/src/packages/navbar/navbar.scss
index 1a66821e60..338d13364b 100644
--- a/src/packages/navbar/navbar.scss
+++ b/src/packages/navbar/navbar.scss
@@ -24,11 +24,6 @@
     width: 100%;
   }
 
-  &-safe-area-inset-top {
-    padding-top: constant(safe-area-inset-top);
-    padding-top: env(safe-area-inset-top);
-  }
-
   &-title {
     min-width: 53%;
     margin: 0 auto;
diff --git a/src/packages/navbar/navbar.taro.tsx b/src/packages/navbar/navbar.taro.tsx
index 2c3739de8d..05cef6c839 100644
--- a/src/packages/navbar/navbar.taro.tsx
+++ b/src/packages/navbar/navbar.taro.tsx
@@ -1,9 +1,9 @@
 import React, { FunctionComponent, useEffect, useRef, useState } from 'react'
 import classNames from 'classnames'
-
 import { ITouchEvent, View } from '@tarojs/components'
 import { BasicComponent, ComponentDefaults } from '@/utils/typings'
 import { getRectByTaro } from '@/utils/get-rect-by-taro'
+import { SafeArea } from '@/packages/safearea/safearea.taro'
 
 export interface NavBarProps extends BasicComponent {
   left: React.ReactNode
@@ -164,6 +164,7 @@ export const NavBar: FunctionComponent<Partial<NavBarProps>> = (props) => {
 
   return (
     <>
+      {safeAreaInsetTop && <SafeArea position="top" />}
       {fixed && placeholder ? (
         <View className={`${classPrefix}-placeholder`}>{renderWrapper()}</View>
       ) : (
diff --git a/src/packages/navbar/navbar.tsx b/src/packages/navbar/navbar.tsx
index 8ddf755514..dae8145a73 100644
--- a/src/packages/navbar/navbar.tsx
+++ b/src/packages/navbar/navbar.tsx
@@ -3,6 +3,7 @@ import classNames from 'classnames'
 
 import { BasicComponent, ComponentDefaults } from '@/utils/typings'
 import { getRect } from '@/utils/use-client-rect'
+import { SafeArea } from '@/packages/safearea/safearea'
 
 export interface NavBarProps extends BasicComponent {
   left: React.ReactNode
@@ -153,7 +154,6 @@ export const NavBar: FunctionComponent<Partial<NavBarProps>> = (props) => {
 
   const classes = classNames({
     [`${classPrefix}-fixed`]: fixed,
-    [`${classPrefix}-safe-area-inset-top`]: safeAreaInsetTop,
     [`${classPrefix}-title-align-${titleAlign}`]: true,
   })
 
@@ -161,6 +161,7 @@ export const NavBar: FunctionComponent<Partial<NavBarProps>> = (props) => {
 
   return (
     <>
+      {safeAreaInsetTop && <SafeArea position="top" />}
       {fixed && placeholder ? (
         <div className={`${classPrefix}-placeholder`}>{renderWrapper()}</div>
       ) : (

From 149ec471fbc1ca0bd8e017e929bfd9a7ca0dc062 Mon Sep 17 00:00:00 2001
From: huxiyang3 <1872591453@qq.com>
Date: Thu, 10 Oct 2024 16:22:31 +0800
Subject: [PATCH 2/2] fix: remove sth rest

---
 src/packages/navbar/navbar.taro.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/packages/navbar/navbar.taro.tsx b/src/packages/navbar/navbar.taro.tsx
index 05cef6c839..131379ec57 100644
--- a/src/packages/navbar/navbar.taro.tsx
+++ b/src/packages/navbar/navbar.taro.tsx
@@ -156,7 +156,6 @@ export const NavBar: FunctionComponent<Partial<NavBarProps>> = (props) => {
 
   const classes = classNames({
     [`${classPrefix}-fixed`]: fixed,
-    [`${classPrefix}-safe-area-inset-top`]: safeAreaInsetTop,
     [`${classPrefix}-title-align-${titleAlign}`]: true,
   })