refactor: overlay(v2.0) #886
Merged
Conversation
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
xiaoyatong
reviewed
Apr 11, 2023
| @@ -146,11 +146,11 @@ export const MenuItem = forwardRef((props: Partial<MenuItemProps>, ref) => { | |||
| onClick={() => parent.toggleItemShow(orderKey)} | |||
| /> | |||
| <Overlay | |||
| overlayClass="nut-menu__overlay" | |||
| className="nut-menu__overlay" | |||
There was a problem hiding this comment.
这个在开发menu组件的时候再自行提取classprefix即可。
| style={getPosition()} | ||
| lockScroll={parent.lockScroll} | ||
| visible={_showPopup} | ||
| closeOnClickOverlay={parent.closeOnClickOverlay} | ||
| closeOnOverlayClick={parent.closeOnClickOverlay} |
There was a problem hiding this comment.
parent.closeOnClickOverlay 这个顺便改了吧，改成一致的。
There was a problem hiding this comment.
这个closeOnClickOverlay是MenuProps的一个属性，这个在开发menu组件的时候再修改即可。
src/packages/overlay/doc.md
Outdated
| @@ -99,16 +238,13 @@ export default App; | |||
| | visible | 当前组件是否显示 | boolean | `false` | | |||
| | zIndex | 遮罩层级 | number | `2000` | | |||
| | duration | 动画时长，单位秒 | number | `0.3` | | |||
| | overlayClass | 自定义遮罩类名 | string | - | | |||
| | overlayStyle | 自定义遮罩样式 | CSSProperties | - | | |||
| | className | 自定义遮罩类名 | string | - | | |||
src/packages/overlay/overlay.tsx
Outdated
| overlayClass: string | ||
| overlayStyle: React.CSSProperties | ||
| closeOnClickOverlay: boolean | ||
| className: string |
| @@ -84,13 +94,13 @@ export const Overlay: FunctionComponent< | |||
| } | |||
|
|
|||
| const handleClick = (event: ITouchEvent) => { | |||
| if (closeOnClickOverlay) { | |||
| if (closeOnOverlayClick) { | |||
| afterClose && afterClose() | |||
| position: string | ||
| transition: string | ||
| style: React.CSSProperties |
There was a problem hiding this comment.
因为这个已经继承自OverlayProps的属性了，OverlayProps属性又继承BasicComponent的属性，所以这个style属性先去掉了，为了先解决本地启动报错的问题。
| @@ -161,7 +163,7 @@ export const Popup: FunctionComponent< | |||
| } | |||
|
|
|||
| const onHandleClickOverlay = (e: ITouchEvent) => { | |||
| if (closeOnClickOverlay) { | |||
| if (closeOnOverlayClick) { | |||
| onClickOverlay && onClickOverlay(e) | |||
There was a problem hiding this comment.
这个onClickOverlay是PopupProps的一个属性，这个在开发popup组件的时候再修改即可。
oasis-cloud
approved these changes
Apr 17, 2023
oasis-cloud
approved these changes
Apr 17, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
overlayClass重命名为classNameoverlayStyle重命名为stylecloseOnClickOverlay重命名为closeOnOverlayClick