-
-
Notifications
You must be signed in to change notification settings - Fork 3.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: can not scroll when close dialog #5096
- Loading branch information
1 parent
81ab68f
commit 0f7e76b
Showing
27 changed files
with
654 additions
and
2,018 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| import getScrollBarSize from './getScrollBarSize'; | ||
| import setStyle from './setStyle'; | ||
|
|
||
| function isBodyOverflowing() { | ||
| return ( | ||
| document.body.scrollHeight > (window.innerHeight || document.documentElement.clientHeight) && | ||
| window.innerWidth > document.body.offsetWidth | ||
| ); | ||
| } | ||
|
|
||
| let cacheStyle = {}; | ||
|
|
||
| export default (close?: boolean) => { | ||
| if (!isBodyOverflowing() && !close) { | ||
| return; | ||
| } | ||
|
|
||
| // https://github.com/ant-design/ant-design/issues/19729 | ||
| const scrollingEffectClassName = 'ant-scrolling-effect'; | ||
| const scrollingEffectClassNameReg = new RegExp(`${scrollingEffectClassName}`, 'g'); | ||
| const bodyClassName = document.body.className; | ||
|
|
||
| if (close) { | ||
| if (!scrollingEffectClassNameReg.test(bodyClassName)) return; | ||
| setStyle(cacheStyle); | ||
| cacheStyle = {}; | ||
| document.body.className = bodyClassName.replace(scrollingEffectClassNameReg, '').trim(); | ||
| return; | ||
| } | ||
|
|
||
| const scrollBarSize = getScrollBarSize(); | ||
| if (scrollBarSize) { | ||
| cacheStyle = setStyle({ | ||
| position: 'relative', | ||
| width: `calc(100% - ${scrollBarSize}px)`, | ||
| }); | ||
| if (!scrollingEffectClassNameReg.test(bodyClassName)) { | ||
| const addClassName = `${bodyClassName} ${scrollingEffectClassName}`; | ||
| document.body.className = addClassName.trim(); | ||
| } | ||
| } | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,74 @@ | ||
| @import '../../style/themes/index'; | ||
| @import '../../style/mixins/index'; | ||
|
|
||
| @dialog-prefix-cls: ~'@{ant-prefix}-modal'; | ||
| @confirm-prefix-cls: ~'@{ant-prefix}-modal-confirm'; | ||
| @dialog-wrap-rtl-cls: ~'@{dialog-prefix-cls}-wrap-rtl'; | ||
|
|
||
| .@{dialog-prefix-cls} { | ||
| &-wrap { | ||
| &-rtl { | ||
| direction: rtl; | ||
| } | ||
| } | ||
|
|
||
| &-close { | ||
| .@{dialog-wrap-rtl-cls} & { | ||
| right: initial; | ||
| left: 0; | ||
| } | ||
| } | ||
|
|
||
| &-footer { | ||
| .@{dialog-wrap-rtl-cls} & { | ||
| text-align: left; | ||
| } | ||
| .@{ant-prefix}-btn + .@{ant-prefix}-btn { | ||
| .@{dialog-wrap-rtl-cls} & { | ||
| margin-right: 8px; | ||
| margin-left: 0; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| &-confirm { | ||
| &-body { | ||
| .@{dialog-wrap-rtl-cls} & { | ||
| direction: rtl; | ||
| } | ||
| > .@{iconfont-css-prefix} { | ||
| .@{dialog-wrap-rtl-cls} & { | ||
| float: right; | ||
| margin-right: 0; | ||
| margin-left: 16px; | ||
| } | ||
| + .@{confirm-prefix-cls}-title + .@{confirm-prefix-cls}-content { | ||
| .@{dialog-wrap-rtl-cls} & { | ||
| margin-right: 38px; | ||
| margin-left: 0; | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| &-btns { | ||
| .@{dialog-wrap-rtl-cls} & { | ||
| float: left; | ||
| } | ||
| .@{ant-prefix}-btn + .@{ant-prefix}-btn { | ||
| .@{dialog-wrap-rtl-cls} & { | ||
| margin-right: 8px; | ||
| margin-left: 0; | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| .@{dialog-prefix-cls}-centered { | ||
| .@{dialog-prefix-cls} { | ||
| .@{dialog-wrap-rtl-cls}& { | ||
| text-align: right; | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.