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: Input.Search large size button style #48527

Merged
merged 3 commits into from
Apr 18, 2024
Merged

fix: Input.Search large size button style #48527

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a3ae1b4
fix: Input.Search large size button style
zombieJ Apr 18, 2024
08714fa
chore: adjust logic
zombieJ Apr 18, 2024
b55e065
chore: rename
zombieJ Apr 18, 2024
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
3 changes: 3 additions & 0 deletions components/input/style/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -881,4 +881,7 @@ export default genStyleHooks(
];
},
initComponentToken,
{
resetStyle: 'strict',
},
);
35 changes: 20 additions & 15 deletions components/style/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,29 +107,34 @@
token: DerivativeToken,
componentPrefixCls: string,
rootCls?: string,
strict = false,

Check warning on line 110 in components/style/index.ts

View check run for this annotation

Codecov / codecov/patch

components/style/index.ts#L110 

Added line #L110 was not covered by tests
): CSSObject => {
const { fontFamily, fontSize } = token;

const prefixSelector = `[class^="${componentPrefixCls}"], [class*=" ${componentPrefixCls}"]`;
const rootPrefixSelector = rootCls ? `.${rootCls}` : prefixSelector;

return {
[rootPrefixSelector]: {
fontFamily,
fontSize,
const resetStyle: CSSObject = {
boxSizing: 'border-box',

'&::before, &::after': {
boxSizing: 'border-box',
},
};

let resetFont: CSSObject = {};

'&::before, &::after': {
boxSizing: 'border-box',
},
if (!strict) {
resetFont = {
fontFamily: token.fontFamily,
fontSize: token.fontSize,
};
}

[prefixSelector]: {
boxSizing: 'border-box',
return {
[rootPrefixSelector]: {
...resetFont,
...resetStyle,

'&::before, &::after': {
boxSizing: 'border-box',
},
},
[prefixSelector]: resetStyle,
},
};
};
Expand Down
8 changes: 5 additions & 3 deletions components/theme/util/genComponentStyleHook.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ export default function genComponentStyleHook<C extends OverrideComponent>(
styleFn: GenStyleFn<C>,
getDefaultToken?: GetDefaultToken<C>,
options: {
resetStyle?: boolean;
resetStyle?: boolean | 'strict';
// Deprecated token key map [["oldTokenKey", "newTokenKey"], ["oldTokenKey", "newTokenKey"]]
deprecatedTokens?: [ComponentTokenKey<C>, ComponentTokenKey<C>][];
/**
Expand Down Expand Up @@ -243,7 +243,9 @@ export default function genComponentStyleHook<C extends OverrideComponent>(
});
flush(component, componentToken);
return [
options.resetStyle === false ? null : genCommonStyle(mergedToken, prefixCls, rootCls),
options.resetStyle === false
? null
: genCommonStyle(mergedToken, prefixCls, rootCls, options.resetStyle === 'strict'),
styleInterpolation,
];
},
Expand Down Expand Up @@ -377,7 +379,7 @@ export const genStyleHooks = <C extends OverrideComponent>(
styleFn: GenStyleFn<C>,
getDefaultToken?: GetDefaultToken<C>,
options?: {
resetStyle?: boolean;
resetStyle?: boolean | 'strict';
deprecatedTokens?: [ComponentTokenKey<C>, ComponentTokenKey<C>][];
/**
* Component tokens that do not need unit.
Expand Down