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

fix(Button): form submit with Button-Link in theme 22 #3355

Merged
merged 7 commits into from
Feb 13, 2024
Merged

fix(Button): form submit with Button-Link in theme 22 #3355

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2c67f80
chore: fix form submit with use submit
Funkicide Jan 29, 2024
cac0397
test: add test
Funkicide Feb 6, 2024
0e25214
test: make test less specific
Funkicide Feb 8, 2024
9462803
chore: update solution
Funkicide Feb 8, 2024
e64d553
test: add test case
Funkicide Feb 8, 2024
7bc82ee
refactor: small changes
Funkicide Feb 9, 2024
54ebb3e
refactor: add method
Funkicide Feb 9, 2024
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
10 changes: 9 additions & 1 deletion packages/react-ui/components/Button/Button.tsx
View file
Open in desktop
zhzz marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,7 @@ export class Button extends React.Component<ButtonProps, ButtonState> {

const isFocused = this.state.focusedByTab || visuallyFocused;
const isLink = use === 'link';
const isSubmit = type === 'submit';
const _isTheme2022 = isTheme2022(this.theme);

// eslint-disable-next-line react-hooks/rules-of-hooks
Expand Down Expand Up @@ -473,7 +474,14 @@ export class Button extends React.Component<ButtonProps, ButtonState> {
if (_isTheme2022 && isLink && !loading) {
captionNode = (
<ThemeContext.Provider value={getInnerLinkTheme(this.theme)}>
<Link focused={isFocused} disabled={disabled} icon={this.renderIcon2022(icon)} as="span" tabIndex={-1}>
<Link
href={isSubmit ? '#!' : ''}
zhzz marked this conversation as resolved.
Show resolved Hide resolved
focused={isFocused}
disabled={disabled}
icon={this.renderIcon2022(icon)}
as="span"
tabIndex={-1}
>
{children}
</Link>
</ThemeContext.Provider>
Expand Down