refactor: input support cssinjs #34288
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
|
|
MadCcc
commented
Mar 3, 2022
Codecov Report
@@ Coverage Diff @@
## next #34288 +/- ##
=========================================
Coverage 100.00% 100.00%
=========================================
Files 431 431
Lines 7936 7946 +10
Branches 2281 2282 +1
=========================================
+ Hits 7936 7946 +10
Continue to review full report at Codecov.
|
|
Size Change: -1.4 kB (0%) Total Size: 948 kB
|
Closed
zombieJ
reviewed
Mar 8, 2022
components/_util/theme/util.tsx
Outdated
| opacity: 1, | ||
| }, | ||
| '&::placeholder': { | ||
| color: new TinyColor({ h: 0, s: 0, v: '75%' }).toHexString(), |
zombieJ
reviewed
Mar 8, 2022
components/_util/theme/index.tsx
Outdated
| @@ -69,6 +70,10 @@ export interface DerivativeToken extends Omit<DesignToken, 'duration'> { | |||
|
|
|||
| // TMP | |||
| tmpPrimaryHoverColorWeak: string; | |||
| tmpBackgroundLight: string; | |||
| tmpPaddingSM: number; | |||
zombieJ
reviewed
Mar 8, 2022
components/_util/theme/index.tsx
Outdated
| @@ -69,6 +70,10 @@ export interface DerivativeToken extends Omit<DesignToken, 'duration'> { | |||
|
|
|||
| // TMP | |||
| tmpPrimaryHoverColorWeak: string; | |||
| tmpBackgroundLight: string; | |||
| tmpPaddingSM: number; | |||
| tmpTextColorSecondary: string; | |||
zombieJ
reviewed
Mar 8, 2022
components/input/Group.tsx
Outdated
| </ConfigConsumer> | ||
| ); | ||
| const Group: React.FC<GroupProps> = props => { | ||
| const { getPrefixCls, direction } = useContext(ConfigContext); |
There was a problem hiding this comment.
useContext 不能在 cssinjs 里改，到 master 里改
zombieJ
reviewed
Mar 8, 2022
components/input/style/index.tsx
Outdated
| borderColor: token.inputBorderHoverColor, | ||
| borderRightWidth: token.borderWidth, | ||
|
|
||
| [`.${prefixCls}-rtl &`]: { |
There was a problem hiding this comment.
RTL 全部用逻辑位置代替：https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_Logical_Properties
不要出现 left 和 right
zombieJ
reviewed
Mar 8, 2022
components/input/style/index.tsx
Outdated
| borderStyle: token.borderStyle, | ||
| borderColor: token.borderColor, | ||
| borderRadius: token.borderRadius, | ||
| transition: `all 0.3s`, |
afc163
reviewed
Mar 8, 2022
| // | ||
| //@import './search-input'; | ||
| //@import './rtl'; | ||
| //@import './IE11'; |
afc163
reviewed
Mar 8, 2022
components/input/style/index.tsx
Outdated
| top: '8px', | ||
| right: '8px', | ||
| insetBlockStart: '8px', | ||
| insetInlineEnd: '8px', |
There was a problem hiding this comment.
zombieJ
reviewed
Mar 8, 2022
components/input/style/index.tsx
Outdated
| }); | ||
|
|
||
| export const genActiveStyle = (theme: any, token: InputToken) => ({ | ||
| borderColor: theme === 'dark' ? token.inputBorderActiveColor : token.inputBorderHoverColor, |
zombieJ
reviewed
Mar 8, 2022
components/input/style/index.tsx
Outdated
|
|
||
| export const genActiveStyle = (theme: any, token: InputToken) => ({ | ||
| borderColor: theme === 'dark' ? token.inputBorderActiveColor : token.inputBorderHoverColor, | ||
| boxShadow: `0 0 0 2px ${new TinyColor(token.inputBorderActiveColor).setAlpha(0.2)}`, // FIXME: outlineFade outlineWidth |
zombieJ
reviewed
Mar 8, 2022
components/input/style/index.tsx
Outdated
|
|
||
| // Undo padding and float of grid classes | ||
| [`&[class*='col-']`]: { | ||
| paddingInlineEnd: '8px', // FIXME: magic number |
zombieJ
reviewed
Mar 8, 2022
components/input/style/index.tsx
Outdated
|
|
||
| '&&-compact': { | ||
| display: 'block', | ||
| // .clearfix(), |
zombieJ
reviewed
Mar 8, 2022
components/input/style/index.tsx
Outdated
| }, | ||
| [`&.${prefixCls}-sm`]: { | ||
| height: token.controlHeightSM, | ||
| paddingTop: 3, |
zombieJ
reviewed
Mar 8, 2022
components/input/style/index.tsx
Outdated
| }, | ||
|
|
||
| '&-show-count-has-suffix': { | ||
| marginInlineEnd: '2px', |
zombieJ
reviewed
Mar 8, 2022
components/input/style/index.tsx
Outdated
|
|
||
| [`> .${prefixCls}-group`]: { | ||
| [`> .${prefixCls}-group-addon:last-child`]: { | ||
| insetInlineStart: '-1px', |
zombieJ
reviewed
Mar 8, 2022
components/input/style/index.tsx
Outdated
|
|
||
| const inputToken: InputToken = { | ||
| ...token, | ||
| inputAffixMargin: 4, |
afc163
reviewed
Mar 8, 2022
| display: 'table', | ||
| clear: 'both', | ||
| content: '""', | ||
| }, |
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.
[中文版模板 / Chinese template]
🤔 This is a ...
🔗 Related issue link
💡 Background and solution
📝 Changelog
☑️ Self Check before Merge