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

Jump to bottom

feat(Popover): change default zIndex to 1030 of popover #150

Merged
merged 2 commits into from Jun 27, 2019
Merged

feat(Popover): change default zIndex to 1030 of popover #150

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
8a8f7b5
feat(Popover): change default zIndex to 1030 of popover
ZxBing0066 Jun 27, 2019
cd3c1aa
feat(Popover): change default zIndex to 1030 of popover
ZxBing0066 Jun 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 3 additions & 2 deletions README.md
View file
Open in desktop
Expand Up @@ -115,8 +115,9 @@ export default App;

### zIndex 说明

* Modal 默认的 zIndex 为 1010
* Modal,Drawer 默认的 zIndex 为 1010
* Popover，Tooltip 默认的 zIndex 为 1030，包括其他的用到 Popover 且默认容器为 body 的地方，如 Table.ActionList、Table 的 contxtMenu 等
* Message 默认的 zIndex 为 1060
* Popover 默认的 zIndex 为 100
* Select、DatePicker 等的弹出层默认容器为组件内部，所以 zIndex 比较低为 100
* Loading 默认的 zIndex 为 10
* 其余内部使用的 zIndex 为 10 以下
36 changes: 22 additions & 14 deletions src/components/LocaleProvider/__tests__/__snapshots__/index.test.js.snap
View file
Open in desktop
Expand Up @@ -86,7 +86,7 @@ exports[`LocaleProvider Slider 1`] = `
>
<div>
<div
class="uc-fe-popover style__PopoverWrap-sc-1yqouou-0 cbBWdK uc-fe-tooltip-popup uc-fe-slider-tooltip uc-fe-popover-placement-top uc-fe-popover-animation-fade-appear"
class="uc-fe-popover style__PopoverWrap-sc-1yqouou-0 bRVwjN uc-fe-tooltip-popup uc-fe-slider-tooltip uc-fe-popover-placement-top uc-fe-popover-animation-fade-appear"
style="left: -999px; top: -1006px;"
>
<div
Expand Down Expand Up @@ -189,7 +189,7 @@ exports[`LocaleProvider Slider 2`] = `
>
<div>
<div
class="uc-fe-popover style__PopoverWrap-sc-1yqouou-0 cbBWdK uc-fe-tooltip-popup uc-fe-slider-tooltip uc-fe-popover-placement-top uc-fe-popover-animation-fade-appear"
class="uc-fe-popover style__PopoverWrap-sc-1yqouou-0 bRVwjN uc-fe-tooltip-popup uc-fe-slider-tooltip uc-fe-popover-placement-top uc-fe-popover-animation-fade-appear"
style="left: -999px; top: -1006px;"
>
<div
Expand Down Expand Up @@ -292,7 +292,7 @@ exports[`LocaleProvider Slider 3`] = `
>
<div>
<div
class="uc-fe-popover style__PopoverWrap-sc-1yqouou-0 cbBWdK uc-fe-tooltip-popup uc-fe-slider-tooltip uc-fe-popover-placement-top"
class="uc-fe-popover style__PopoverWrap-sc-1yqouou-0 bRVwjN uc-fe-tooltip-popup uc-fe-slider-tooltip uc-fe-popover-placement-top"
style="left: -999px; top: -1006px;"
>
<div
Expand Down Expand Up @@ -395,7 +395,7 @@ exports[`LocaleProvider Slider 4`] = `
>
<div>
<div
class="uc-fe-popover style__PopoverWrap-sc-1yqouou-0 cbBWdK uc-fe-tooltip-popup uc-fe-slider-tooltip uc-fe-popover-placement-top"
class="uc-fe-popover style__PopoverWrap-sc-1yqouou-0 bRVwjN uc-fe-tooltip-popup uc-fe-slider-tooltip uc-fe-popover-placement-top"
style="left: -999px; top: -1006px;"
>
<div
Expand Down Expand Up @@ -663,7 +663,8 @@ exports[`LocaleProvider switch locale 1`] = `
>
<div>
<div
class="uc-fe-popover style__PopoverWrap-sc-1yqouou-0 cbBWdK uc-fe-popover-placement-bottomLeft uc-fe-popover-hidden"
class="uc-fe-popover style__PopoverWrap-sc-1yqouou-0 bRVwjN uc-fe-popover-placement-bottomLeft uc-fe-popover-hidden"
style="z-index: 100;"
>
<div
class="style__MenuWrap-no8vyj-4 eUQDIJ"
Expand Down Expand Up @@ -1599,7 +1600,7 @@ exports[`LocaleProvider switch locale 1`] = `
>
<div>
<div
class="uc-fe-popover style__PopoverWrap-sc-1yqouou-0 cbBWdK uc-fe-popover-placement-bottomLeft uc-fe-popover-hidden"
class="uc-fe-popover style__PopoverWrap-sc-1yqouou-0 bRVwjN uc-fe-popover-placement-bottomLeft uc-fe-popover-hidden"
style="z-index: 100;"
>
<div
Expand Down Expand Up @@ -1666,7 +1667,8 @@ exports[`LocaleProvider switch locale 1`] = `
>
<div>
<div
class="uc-fe-popover style__PopoverWrap-sc-1yqouou-0 cbBWdK uc-fe-popover-placement-bottomLeft uc-fe-popover-hidden"
class="uc-fe-popover style__PopoverWrap-sc-1yqouou-0 bRVwjN uc-fe-popover-placement-bottomLeft uc-fe-popover-hidden"
style="z-index: 100;"
>
<div
class="style__MenuWrap-no8vyj-4 eUQDIJ"
Expand Down Expand Up @@ -1720,7 +1722,8 @@ exports[`LocaleProvider switch locale 1`] = `
>
<div>
<div
class="uc-fe-popover style__PopoverWrap-sc-1yqouou-0 cbBWdK uc-fe-popover-placement-bottomLeft uc-fe-popover-hidden"
class="uc-fe-popover style__PopoverWrap-sc-1yqouou-0 bRVwjN uc-fe-popover-placement-bottomLeft uc-fe-popover-hidden"
style="z-index: 100;"
>
<div
class="style__MenuWrap-no8vyj-4 eUQDIJ"
Expand Down Expand Up @@ -2257,7 +2260,8 @@ exports[`LocaleProvider switch locale 1`] = `
>
<div>
<div
class="uc-fe-popover style__PopoverWrap-sc-1yqouou-0 cbBWdK uc-fe-popover-placement-bottomLeft uc-fe-popover-hidden"
class="uc-fe-popover style__PopoverWrap-sc-1yqouou-0 bRVwjN uc-fe-popover-placement-bottomLeft uc-fe-popover-hidden"
style="z-index: 100;"
>
<div
class="style__MenuWrap-no8vyj-4 eUQDIJ"
Expand Down Expand Up @@ -2640,7 +2644,8 @@ exports[`LocaleProvider switch locale 2`] = `
>
<div>
<div
class="uc-fe-popover style__PopoverWrap-sc-1yqouou-0 cbBWdK uc-fe-popover-placement-bottomLeft uc-fe-popover-hidden"
class="uc-fe-popover style__PopoverWrap-sc-1yqouou-0 bRVwjN uc-fe-popover-placement-bottomLeft uc-fe-popover-hidden"
style="z-index: 100;"
>
<div
class="style__MenuWrap-no8vyj-4 eUQDIJ"
Expand Down Expand Up @@ -3576,7 +3581,7 @@ exports[`LocaleProvider switch locale 2`] = `
>
<div>
<div
class="uc-fe-popover style__PopoverWrap-sc-1yqouou-0 cbBWdK uc-fe-popover-placement-bottomLeft uc-fe-popover-hidden"
class="uc-fe-popover style__PopoverWrap-sc-1yqouou-0 bRVwjN uc-fe-popover-placement-bottomLeft uc-fe-popover-hidden"
style="z-index: 100;"
>
<div
Expand Down Expand Up @@ -3643,7 +3648,8 @@ exports[`LocaleProvider switch locale 2`] = `
>
<div>
<div
class="uc-fe-popover style__PopoverWrap-sc-1yqouou-0 cbBWdK uc-fe-popover-placement-bottomLeft uc-fe-popover-hidden"
class="uc-fe-popover style__PopoverWrap-sc-1yqouou-0 bRVwjN uc-fe-popover-placement-bottomLeft uc-fe-popover-hidden"
style="z-index: 100;"
>
<div
class="style__MenuWrap-no8vyj-4 eUQDIJ"
Expand Down Expand Up @@ -3697,7 +3703,8 @@ exports[`LocaleProvider switch locale 2`] = `
>
<div>
<div
class="uc-fe-popover style__PopoverWrap-sc-1yqouou-0 cbBWdK uc-fe-popover-placement-bottomLeft uc-fe-popover-hidden"
class="uc-fe-popover style__PopoverWrap-sc-1yqouou-0 bRVwjN uc-fe-popover-placement-bottomLeft uc-fe-popover-hidden"
style="z-index: 100;"
>
<div
class="style__MenuWrap-no8vyj-4 eUQDIJ"
Expand Down Expand Up @@ -4234,7 +4241,8 @@ exports[`LocaleProvider switch locale 2`] = `
>
<div>
<div
class="uc-fe-popover style__PopoverWrap-sc-1yqouou-0 cbBWdK uc-fe-popover-placement-bottomLeft uc-fe-popover-hidden"
class="uc-fe-popover style__PopoverWrap-sc-1yqouou-0 bRVwjN uc-fe-popover-placement-bottomLeft uc-fe-popover-hidden"
style="z-index: 100;"
>
<div
class="style__MenuWrap-no8vyj-4 eUQDIJ"
Expand Down
2 changes: 1 addition & 1 deletion src/components/Popover/__tests__/__snapshots__/demo.test.js.snap
View file
Open in desktop
Expand Up @@ -55,7 +55,7 @@ exports[`Popover demo -- control 1`] = `
position: absolute;
left: -9999px;
top: -9999px;
z-index: 100;
z-index: 1030;
display: block;
}

Expand Down
2 changes: 1 addition & 1 deletion src/components/Popover/__tests__/__snapshots__/index.test.js.snap
View file
Open in desktop
Expand Up @@ -27,7 +27,7 @@ exports[`Popover popover align 2`] = `
>
<div>
<div
class="uc-fe-popover style__PopoverWrap-sc-1yqouou-0 cbBWdK uc-fe-popover-placement-bottomLeft uc-fe-popover-animation-fade-appear"
class="uc-fe-popover style__PopoverWrap-sc-1yqouou-0 bRVwjN uc-fe-popover-placement-bottomLeft uc-fe-popover-animation-fade-appear"
style="left: -999px; top: -994px;"
>
<div>
Expand Down
2 changes: 1 addition & 1 deletion src/components/Popover/style/index.js
View file
Open in desktop
Expand Up @@ -50,7 +50,7 @@ export const PopoverWrap = styled(RcTriggerWrap)`
position: absolute;
left: -9999px;
top: -9999px;
z-index: 100;
z-index: 1030;
display: block;

&-hidden {
Expand Down
1 change: 1 addition & 0 deletions src/components/Select/Select.jsx
View file
Open in desktop
Expand Up @@ -286,6 +286,7 @@ class Select extends Component {
trigger={['click']}
getPopupContainer={triggerNode => triggerNode.parentNode}
visible={visible}
zIndex={100}
{...popover}
{...popoverProps}
>
Expand Down
10 changes: 5 additions & 5 deletions src/components/Slider/__tests__/__snapshots__/index.test.js.snap
View file
Open in desktop
Expand Up @@ -295,7 +295,7 @@ exports[`Slider numberInputTipFormatter 2`] = `
>
<div>
<div
class="uc-fe-popover style__PopoverWrap-sc-1yqouou-0 cbBWdK uc-fe-tooltip-popup uc-fe-slider-tooltip uc-fe-popover-placement-top uc-fe-popover-animation-fade-appear"
class="uc-fe-popover style__PopoverWrap-sc-1yqouou-0 bRVwjN uc-fe-tooltip-popup uc-fe-slider-tooltip uc-fe-popover-placement-top uc-fe-popover-animation-fade-appear"
style="left: -999px; top: -1006px;"
>
<div
Expand Down Expand Up @@ -398,7 +398,7 @@ exports[`Slider numberInputTipFormatter 3`] = `
>
<div>
<div
class="uc-fe-popover style__PopoverWrap-sc-1yqouou-0 cbBWdK uc-fe-tooltip-popup uc-fe-slider-tooltip uc-fe-popover-placement-top uc-fe-popover-hidden"
class="uc-fe-popover style__PopoverWrap-sc-1yqouou-0 bRVwjN uc-fe-tooltip-popup uc-fe-slider-tooltip uc-fe-popover-placement-top uc-fe-popover-hidden"
style="left: -999px; top: -1006px;"
>
<div
Expand Down Expand Up @@ -501,7 +501,7 @@ exports[`Slider numberInputTipFormatter 4`] = `
>
<div>
<div
class="uc-fe-popover style__PopoverWrap-sc-1yqouou-0 cbBWdK uc-fe-tooltip-popup uc-fe-slider-tooltip uc-fe-popover-placement-top uc-fe-popover-animation-fade-enter"
class="uc-fe-popover style__PopoverWrap-sc-1yqouou-0 bRVwjN uc-fe-tooltip-popup uc-fe-slider-tooltip uc-fe-popover-placement-top uc-fe-popover-animation-fade-enter"
style="left: -999px; top: -1006px;"
>
<div
Expand Down Expand Up @@ -612,7 +612,7 @@ exports[`Slider numberInputTipFormatter 5`] = `
>
<div>
<div
class="uc-fe-popover style__PopoverWrap-sc-1yqouou-0 cbBWdK uc-fe-tooltip-popup uc-fe-slider-tooltip uc-fe-popover-placement-top"
class="uc-fe-popover style__PopoverWrap-sc-1yqouou-0 bRVwjN uc-fe-tooltip-popup uc-fe-slider-tooltip uc-fe-popover-placement-top"
style="left: -999px; top: -1006px;"
>
<div
Expand Down Expand Up @@ -723,7 +723,7 @@ exports[`Slider numberInputTipFormatter 6`] = `
>
<div>
<div
class="uc-fe-popover style__PopoverWrap-sc-1yqouou-0 cbBWdK uc-fe-tooltip-popup uc-fe-slider-tooltip uc-fe-popover-placement-top"
class="uc-fe-popover style__PopoverWrap-sc-1yqouou-0 bRVwjN uc-fe-tooltip-popup uc-fe-slider-tooltip uc-fe-popover-placement-top"
style="left: -999px; top: -1006px;"
>
<div
Expand Down
4 changes: 2 additions & 2 deletions src/components/Tooltip/__tests__/__snapshots__/demo.test.js.snap
View file
Open in desktop
Expand Up @@ -5,7 +5,7 @@ exports[`Tooltip demo -- placement 1`] = `
position: absolute;
left: -9999px;
top: -9999px;
z-index: 100;
z-index: 1030;
display: block;
}

Expand Down Expand Up @@ -867,7 +867,7 @@ exports[`Tooltip demo -- theme 1`] = `
position: absolute;
left: -9999px;
top: -9999px;
z-index: 100;
z-index: 1030;
display: block;
}

Expand Down
2 changes: 1 addition & 1 deletion src/components/Tooltip/__tests__/__snapshots__/index.test.js.snap
View file
Open in desktop
Expand Up @@ -20,7 +20,7 @@ exports[`Tooltip tooltip 2`] = `
>
<div>
<div
class="uc-fe-popover style__PopoverWrap-sc-1yqouou-0 cbBWdK uc-fe-tooltip-popup uc-fe-popover-placement-topLeft uc-fe-popover-animation-fade-appear"
class="uc-fe-popover style__PopoverWrap-sc-1yqouou-0 bRVwjN uc-fe-tooltip-popup uc-fe-popover-placement-topLeft uc-fe-popover-animation-fade-appear"
style="left: -999px; top: -1006px;"
>
<div
Expand Down