Skip to content

fix(navbar): safearea displays abnormal when safeAreaInsetTop has been set true #2632

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 10, 2024
Merged

fix(navbar): safearea displays abnormal when safeAreaInsetTop has been set true #2632

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
498e66b
fix(navbar): safearea
Miles-hxy Oct 10, 2024
149ec47
fix: remove sth rest
Miles-hxy Oct 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions src/packages/navbar/navbar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/packages/navbar/navbar.taro.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -156,14 +156,14 @@ export const NavBar: FunctionComponent<Partial<NavBarProps>> = (props) => {

const classes = classNames({
[`${classPrefix}-fixed`]: fixed,
[`${classPrefix}-safe-area-inset-top`]: safeAreaInsetTop,
[`${classPrefix}-title-align-${titleAlign}`]: true,
})

const cls = classNames(classPrefix, classes, className)

return (
<>
{safeAreaInsetTop && <SafeArea position="top" />}
{fixed && placeholder ? (
<View className={`${classPrefix}-placeholder`}>{renderWrapper()}</View>
) : (
Expand Down
3 changes: 2 additions & 1 deletion src/packages/navbar/navbar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -153,14 +154,14 @@ export const NavBar: FunctionComponent<Partial<NavBarProps>> = (props) => {

const classes = classNames({
[`${classPrefix}-fixed`]: fixed,
[`${classPrefix}-safe-area-inset-top`]: safeAreaInsetTop,
[`${classPrefix}-title-align-${titleAlign}`]: true,
})

const cls = classNames(classPrefix, classes, className)

return (
<>
{safeAreaInsetTop && <SafeArea position="top" />}
{fixed && placeholder ? (
<div className={`${classPrefix}-placeholder`}>{renderWrapper()}</div>
) : (
Expand Down
Loading