Skip to content

fix(infinite): loadingText未居中 #2683

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 3 commits into from
Nov 1, 2024
Merged

fix(infinite): loadingText未居中 #2683

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4c35bd2
fix(infite): loadingText不居中
Miles-hxy Oct 31, 2024
90a1866
chore: save
Miles-hxy Oct 31, 2024
10a92d3
chore: save
Miles-hxy Oct 31, 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: 4 additions & 1 deletion src/packages/infiniteloading/demo.taro.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,10 @@ const InfiniteLoadingDemo = () => {
return (
<>
<Header />
<ScrollView className={`demo ${Taro.getEnv() === 'WEB' ? 'web' : ''}`}>
<ScrollView
className={`demo ${Taro.getEnv() === 'WEB' ? 'web' : ''}`}
showScrollbar={false}
>
<View className="h2">{translated['84aa6bce']}</View>
<Demo1 />
<View className="h2">{translated.eb4236fe}</View>
Expand Down
18 changes: 6 additions & 12 deletions src/packages/infiniteloading/infiniteloading.taro.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ export const InfiniteLoading: FunctionComponent<
const y = useRef(0)
const refreshMaxH = useRef(0)
const distance = useRef(0)
const classPrefix = 'nut-infinite'

const classes = classNames(classPrefix, className, `${classPrefix}-${type}`)

useEffect(() => {
Expand Down Expand Up @@ -189,20 +189,14 @@ export const InfiniteLoading: FunctionComponent<
onTouchMove={touchMove}
onTouchEnd={touchEnd}
>
<View
className={`${classPrefix}-top`}
ref={refreshTop}
style={getStyle()}
>
<View className={`${classPrefix}-top-tips`}>
<View className="nut-infinite-top" ref={refreshTop} style={getStyle()}>
<View className="nut-infinite-top-tips">
{pullingText || locale.infiniteloading.pullRefreshText}
</View>
</View>
<View className={`${classPrefix}-container`}>{children}</View>
<View className={`${classPrefix}-bottom`}>
<View className={`${classPrefix}-bottom-tips`}>
{getBottomTipsText()}
</View>
<View className="nut-infinite-container">{children}</View>
<View className="nut-infinite-bottom">
<View className="nut-infinite-bottom-tips">{getBottomTipsText()}</View>
</View>
</ScrollView>
)
Expand Down
Loading