Fix issue 4593 #4807
Open
Fix issue 4593 #4807
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
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
Yuchaocheng
force-pushed
the
fix-issue-4593
branch
2 times, most recently
from
0114ee1
to
88d6f6d
Compare
eternalsky
requested changes
May 14, 2024
| }, 500); | ||
| cy.mount(<Message animation={false} title="title" closeable />); | ||
| cy.get('.next-message-close').should('have.length', 1); | ||
| cy.clock(); |
There was a problem hiding this comment.
clock，tick 都是没有必要的，get 本身就有延时获取的效果，done 也可以去掉。变成同步的 case 即可。
| 'Message' | ||
| ); | ||
| cy.get('.next-message').should('have.length', 0); | ||
| cy.get<MountReturn>('@Message').then(({ component, rerender }) => { |
There was a problem hiding this comment.
这里可以用 cy.rerender 来简化写法，可以参考一下其他组件
| expect($toast.get(0).innerText.trim()).to.eq(content); | ||
| expect($toast.get(0).offsetWidth).to.be.greaterThan(200); | ||
| }); | ||
| cy.clock(); |
There was a problem hiding this comment.
此处同上，所有的 clock ，tick 都可以去掉。
| // access the native DOM element | ||
| expect($toast.get(0).innerText.trim()).to.eq('content'); | ||
| }); | ||
| cy.clock(); |
| }); | ||
|
|
||
| it('should render message when only pass content string', done => { | ||
| Message.show('content'); | ||
| assert(document.querySelector('.next-overlay-wrapper .next-message').innerText.trim() === 'content'); | ||
|
|
||
| cy.get('.next-overlay-wrapper .next-message').should($toast => { |
There was a problem hiding this comment.
这里为什么不直接使用 should('have.text')
|
|
||
| if (typeof config === 'string' || React.isValidElement(config)) { | ||
| newConfig.title = config; | ||
| } else if (obj.typeOf(config) === 'Object') { | ||
| newConfig = { ...config }; | ||
| newConfig = { ...(config as MessageQuickProps) }; |
| | closeable | Whether to show the close button | boolean | false | | | ||
| | onClose | Callback function triggered when close | () => void | () =\> \{\} | | | ||
| | afterClose | Callback function triggered after closed | () => void | () =\> \{\} | | | ||
| | animation | Whether to enable expand and collapse animation | boolean | true | | | ||
|
|
||
| <!-- api-extra-start --> |
There was a problem hiding this comment.
Message.show 这次修改后，应该由 types 生成会比较合理一些，否则两边有可能会对不上。
| @@ -96,7 +117,7 @@ export interface MessageQuickProps extends Omit<HTMLAttributesWeak, 'content'>, | |||
| /** | |||
| * 弹层相对于参照元素定位的微调 | |||
| */ | |||
| offset?: Array<any>; | |||
| offset?: Array<number>; | |||
There was a problem hiding this comment.
MessageQuickProps 也应该以 Message.show 的形式透出到文档。
| @@ -18,6 +18,8 @@ const MessageProvider = ConfigProvider.config(Message, { | |||
| }); | |||
|
|
|||
| export default MessageProvider; | |||
| export type { MessageProps, MessageQuickProps } from './types'; | |||
| export type ContextMessage = typeof toast; | |||
There was a problem hiding this comment.
这个类型的导出感觉没有必要，typeof 是很容易得的。
components/message/message.tsx
Outdated
| animation: PropTypes.bool, | ||
| locale: PropTypes.object, | ||
| rtl: PropTypes.bool, | ||
| }; | ||
| static show: Toast['show']; |
There was a problem hiding this comment.
这里其实没必要再这里多定义一遍，可以考虑在 index.tsx 中使用 assignSubComponent 进行输出。
Yuchaocheng
force-pushed
the
fix-issue-4593
branch
from
88d6f6d
to
5b19c57
Compare
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.
close #4593