Skip to content

Commit 4857eef

Browse files
authored
Merge branch 'master' into update_date_picker_props
2 parents ad15b7b + ef52e15 commit 4857eef

5 files changed

Lines changed: 13 additions & 11 deletions

File tree

components/button/style/variant.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,8 @@ const genVariantStyle: GenerateStyle<ButtonToken> = (token) => {
209209

210210
[`&${componentCls}-variant-solid`]: {
211211
[getCssVar('text-color')]: token.solidTextColor,
212+
[getCssVar('text-color-hover')]: `var(${getCssVar('text-color')})`,
213+
[getCssVar('text-color-active')]: `var(${getCssVar('text-color')})`,
212214
},
213215

214216
[`&${componentCls}-variant-filled, &${componentCls}-variant-text`]: {

components/input-number/index.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,8 @@ const InternalInputNumber = React.forwardRef<RcInputNumberRef, InternalInputNumb
109109
size: customizeSize,
110110
disabled: customDisabled,
111111
prefixCls,
112-
addonBefore,
113-
addonAfter,
112+
addonBefore: _addonBefore,
113+
addonAfter: _addonAfter,
114114
prefix,
115115
suffix,
116116
bordered,

components/input/style/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ export const genInputGroupStyle = (token: InputToken): CSSObject => {
248248
borderEndEndRadius: 0,
249249
},
250250

251-
[`&:not(:first-child)`]: {
251+
'&:not(:first-child)': {
252252
borderStartStartRadius: 0,
253253
borderEndStartRadius: 0,
254254
},

components/space/style/addon.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,12 +91,12 @@ const genSpaceAddonStyle: GenerateStyle<SpaceToken> = (token) => {
9191
background: 'var(--space-addon-background)',
9292

9393
// ======================= Outlined =======================
94-
[`&-variant-outlined`]: {
94+
'&-variant-outlined': {
9595
'--space-addon-border-color': 'var(--space-addon-border-color-outlined)',
9696
},
9797

9898
// ======================== Filled ========================
99-
[`&-variant-filled`]: {
99+
'&-variant-filled': {
100100
'--space-addon-border-color': 'transparent',
101101
'--space-addon-background': 'var(--space-addon-background-filled)',
102102

@@ -108,13 +108,13 @@ const genSpaceAddonStyle: GenerateStyle<SpaceToken> = (token) => {
108108
},
109109

110110
// ====================== Borderless ======================
111-
[`&-variant-borderless`]: {
111+
'&-variant-borderless': {
112112
border: 'none',
113113
background: 'transparent',
114114
},
115115

116116
// ====================== Underlined ======================
117-
[`&-variant-underlined`]: {
117+
'&-variant-underlined': {
118118
border: 'none',
119119
background: 'transparent',
120120
},

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@
111111
"dependencies": {
112112
"@ant-design/colors": "^8.0.0",
113113
"@ant-design/cssinjs": "^2.0.0",
114-
"@ant-design/cssinjs-utils": "^2.0.0",
114+
"@ant-design/cssinjs-utils": "^2.0.1",
115115
"@ant-design/fast-color": "^3.0.0",
116116
"@ant-design/icons": "^6.1.0",
117117
"@ant-design/react-slick": "~1.1.2",
@@ -124,7 +124,7 @@
124124
"@rc-component/dropdown": "~1.0.0",
125125
"@rc-component/form": "~1.4.0",
126126
"@rc-component/image": "~1.5.1",
127-
"@rc-component/input": "~1.1.0",
127+
"@rc-component/input": "~1.1.2",
128128
"@rc-component/input-number": "~1.6.2",
129129
"@rc-component/mentions": "~1.5.5",
130130
"@rc-component/menu": "~1.1.4",
@@ -142,7 +142,7 @@
142142
"@rc-component/slider": "~1.0.0",
143143
"@rc-component/steps": "~1.2.1",
144144
"@rc-component/switch": "~1.0.2",
145-
"@rc-component/table": "~1.8.1",
145+
"@rc-component/table": "~1.8.2",
146146
"@rc-component/tabs": "~1.6.0",
147147
"@rc-component/textarea": "~1.1.2",
148148
"@rc-component/tooltip": "~1.3.3",
@@ -257,7 +257,7 @@
257257
"http-server": "^14.1.1",
258258
"husky": "^9.1.7",
259259
"identity-obj-proxy": "^3.0.0",
260-
"immer": "^10.1.3",
260+
"immer": "^11.0.0",
261261
"is-ci": "^4.1.0",
262262
"isomorphic-fetch": "^3.0.0",
263263
"jest": "^30.2.0",

0 commit comments

Comments
 (0)