Skip to content
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

fix(back-top): 修复 svg 样式被覆盖 #2213

Merged
merged 2 commits into from
Aug 29, 2022
Merged

fix(back-top): 修复 svg 样式被覆盖 #2213

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
2b8f3bd
fix(back-top): 修复 svg 样式被覆盖
zyprepare Aug 29, 2022
e1c0e4e
fix(back-top): 将内联样式改为更精确的类样式
zyprepare Aug 29, 2022
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
2 changes: 1 addition & 1 deletion packages/ui/back-top/src/styles/back-top.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ $prefix: "#{$component-prefix}-back-top" !default;

@include render-status();

> svg {
> svg[class^=hi-v4-icon] {
width: use-height-size(5);
height: use-height-size(5);
}
Expand Down
17 changes: 6 additions & 11 deletions packages/ui/back-top/stories/basic.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,22 +13,17 @@ export const Basic = () => {
<div style={{ position: 'relative', height: 400 }}>
<BackTop
style={{ position: 'absolute' }}
container={() => document.getElementById('back-top_target') as HTMLElement}
container={() => document.getElementById('back-top_target')}
/>
<div
id="back-top_target"
style={{ position: 'relative', height: 400, overflowY: 'scroll' }}
>
<div style={{ padding: 30, background: '#f3f2f9' }}>页面内容1</div>
<div style={{ padding: 30, background: '#f3f2f9' }}>页面内容2</div>
<div style={{ padding: 30, background: '#f3f2f9' }}>页面内容3</div>
<div style={{ padding: 30, background: '#f3f2f9' }}>页面内容4</div>
<div style={{ padding: 30, background: '#f3f2f9' }}>页面内容5</div>
<div style={{ padding: 30, background: '#f3f2f9' }}>页面内容6</div>
<div style={{ padding: 30, background: '#f3f2f9' }}>页面内容7</div>
<div style={{ padding: 30, background: '#f3f2f9' }}>页面内容8</div>
<div style={{ padding: 30, background: '#f3f2f9' }}>页面内容9</div>
<div style={{ padding: 30, background: '#f3f2f9' }}>页面内容10</div>
{Array.from({ length: 10 }, (_, index) => (
<div key={index} style={{ padding: 30, background: '#f2f3f7' }}>
页面内容{index}
</div>
))}
</div>
</div>
</div>
Expand Down
17 changes: 6 additions & 11 deletions packages/ui/back-top/stories/compose.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,22 +58,17 @@ export const Compose = () => {
<BackTop
shape="circle"
style={{ position: 'absolute' }}
container={() => document.getElementById('back-top_compose') as HTMLElement}
container={() => document.getElementById('back-top_compose')}
/>
<div
id="back-top_compose"
style={{ position: 'relative', height: 400, overflowY: 'scroll' }}
>
<div style={{ padding: 30, background: '#f3f2f9' }}>页面内容1</div>
<div style={{ padding: 30, background: '#f3f2f9' }}>页面内容2</div>
<div style={{ padding: 30, background: '#f3f2f9' }}>页面内容3</div>
<div style={{ padding: 30, background: '#f3f2f9' }}>页面内容4</div>
<div style={{ padding: 30, background: '#f3f2f9' }}>页面内容5</div>
<div style={{ padding: 30, background: '#f3f2f9' }}>页面内容6</div>
<div style={{ padding: 30, background: '#f3f2f9' }}>页面内容7</div>
<div style={{ padding: 30, background: '#f3f2f9' }}>页面内容8</div>
<div style={{ padding: 30, background: '#f3f2f9' }}>页面内容9</div>
<div style={{ padding: 30, background: '#f3f2f9' }}>页面内容10</div>
{Array.from({ length: 10 }, (_, index) => (
<div key={index} style={{ padding: 30, background: '#f2f3f7' }}>
页面内容{index}
</div>
))}
</div>
</div>
</div>
Expand Down
17 changes: 6 additions & 11 deletions packages/ui/back-top/stories/custom.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export const Custom = () => {
<Tooltip title="回到顶部" placement="left">
<BackTop
style={{ position: 'absolute', right: 50, bottom: 112 }}
container={() => document.getElementById('back-top_custom') as HTMLElement}
container={() => document.getElementById('back-top_custom')}
>
<div
style={{
Expand All @@ -39,16 +39,11 @@ export const Custom = () => {
id="back-top_custom"
style={{ position: 'relative', height: 400, overflowY: 'scroll' }}
>
<div style={{ padding: 30, background: '#f3f2f9' }}>页面内容1</div>
<div style={{ padding: 30, background: '#f3f2f9' }}>页面内容2</div>
<div style={{ padding: 30, background: '#f3f2f9' }}>页面内容3</div>
<div style={{ padding: 30, background: '#f3f2f9' }}>页面内容4</div>
<div style={{ padding: 30, background: '#f3f2f9' }}>页面内容5</div>
<div style={{ padding: 30, background: '#f3f2f9' }}>页面内容6</div>
<div style={{ padding: 30, background: '#f3f2f9' }}>页面内容7</div>
<div style={{ padding: 30, background: '#f3f2f9' }}>页面内容8</div>
<div style={{ padding: 30, background: '#f3f2f9' }}>页面内容9</div>
<div style={{ padding: 30, background: '#f3f2f9' }}>页面内容10</div>
{Array.from({ length: 10 }, (_, index) => (
<div key={index} style={{ padding: 30, background: '#f2f3f7' }}>
页面内容{index}
</div>
))}
</div>
</div>
</div>
Expand Down
17 changes: 6 additions & 11 deletions packages/ui/back-top/stories/settings.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,22 +48,17 @@ export const Settings = () => {
duration={duration}
visibleHeight={visibleHeight}
style={{ position: 'absolute' }}
container={() => document.getElementById('back-top_setting') as HTMLElement}
container={() => document.getElementById('back-top_setting')}
/>
<div
id="back-top_setting"
style={{ position: 'relative', height: 400, overflowY: 'scroll' }}
>
<div style={{ padding: 30, background: '#f3f2f9' }}>页面内容1</div>
<div style={{ padding: 30, background: '#f3f2f9' }}>页面内容2</div>
<div style={{ padding: 30, background: '#f3f2f9' }}>页面内容3</div>
<div style={{ padding: 30, background: '#f3f2f9' }}>页面内容4</div>
<div style={{ padding: 30, background: '#f3f2f9' }}>页面内容5</div>
<div style={{ padding: 30, background: '#f3f2f9' }}>页面内容6</div>
<div style={{ padding: 30, background: '#f3f2f9' }}>页面内容7</div>
<div style={{ padding: 30, background: '#f3f2f9' }}>页面内容8</div>
<div style={{ padding: 30, background: '#f3f2f9' }}>页面内容9</div>
<div style={{ padding: 30, background: '#f3f2f9' }}>页面内容10</div>
{Array.from({ length: 10 }, (_, index) => (
<div key={index} style={{ padding: 30, background: '#f2f3f7' }}>
页面内容{index}
</div>
))}
</div>
</div>
</div>
Expand Down