Skip to content

Commit 36087e5

Browse files
feat(FileUploader): FileUploader size prop update (#8462)
* feat(Button): start size work on Button * feat(Button): finish size prop update * feat(Button): revert xl, 2xl changes * feat(Button): add xl, 2xl updates behind feature flag * feat(FileUploader): update size prop * chore(storybook): remove old story * test(snapshot): update snapshot tests * test(snapshot): remove snapshot from different pr * chore(tests): update snapshots Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
1 parent f151656 commit 36087e5

File tree

7 files changed

+48
-19
lines changed

7 files changed

+48
-19
lines changed

packages/components/src/components/file-uploader/_file-uploader.scss

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,9 @@
162162
}
163163
}
164164

165-
.#{$prefix}--file__selected-file--field {
165+
// V11: Remove --field
166+
.#{$prefix}--file__selected-file--field,
167+
.#{$prefix}--file__selected-file--md {
166168
min-height: rem(40px);
167169
gap: $carbon--spacing-03 $carbon--spacing-05;
168170
}
@@ -192,7 +194,9 @@
192194
padding: $carbon--spacing-02 0;
193195
}
194196

195-
.#{$prefix}--file__selected-file--invalid.#{$prefix}--file__selected-file--field {
197+
// V11: Remove --field
198+
.#{$prefix}--file__selected-file--invalid.#{$prefix}--file__selected-file--field,
199+
.#{$prefix}--file__selected-file--invalid.#{$prefix}--file__selected-file--md {
196200
padding: $carbon--spacing-03 0;
197201
}
198202

@@ -206,7 +210,10 @@
206210
padding-top: rem(7px);
207211
}
208212

213+
// V11: Remove --field
209214
.#{$prefix}--file__selected-file--invalid.#{$prefix}--file__selected-file--field
215+
.#{$prefix}--form-requirement,
216+
.#{$prefix}--file__selected-file--invalid.#{$prefix}--file__selected-file--md
210217
.#{$prefix}--form-requirement {
211218
padding-top: rem(11px);
212219
}

packages/react/__tests__/__snapshots__/PublicAPI-test.js.snap

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2633,6 +2633,9 @@ Map {
26332633
"default",
26342634
"field",
26352635
"small",
2636+
"sm",
2637+
"md",
2638+
"lg",
26362639
],
26372640
],
26382641
"type": "oneOf",
@@ -2731,6 +2734,9 @@ Map {
27312734
"default",
27322735
"field",
27332736
"small",
2737+
"sm",
2738+
"md",
2739+
"lg",
27342740
],
27352741
],
27362742
"type": "oneOf",
@@ -2788,6 +2794,9 @@ Map {
27882794
"default",
27892795
"field",
27902796
"small",
2797+
"sm",
2798+
"md",
2799+
"lg",
27912800
],
27922801
],
27932802
"type": "oneOf",
@@ -2827,6 +2836,9 @@ Map {
28272836
"default",
28282837
"field",
28292838
"small",
2839+
"sm",
2840+
"md",
2841+
"lg",
28302842
],
28312843
],
28322844
"type": "oneOf",

packages/react/src/components/FileUploader/FileUploader-story.js

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,16 @@ const buttonKinds = {
3434
'Danger Primary (danger--primary)': 'danger--primary',
3535
'Tertiary (tertiary)': 'tertiary',
3636
};
37+
3738
const sizes = {
38-
Default: 'default',
39-
Field: 'field',
40-
Small: 'small',
39+
'Compat check - Field': 'field',
40+
'Compat check - Small': 'small',
41+
'Compat check - default': 'default',
42+
'Small (sm)': 'sm',
43+
'Medium (md)': 'md',
44+
'Large (lg) - Default': 'lg',
4145
};
46+
4247
const filenameStatuses = {
4348
'Edit (edit)': 'edit',
4449
'Complete (complete)': 'complete',

packages/react/src/components/FileUploader/FileUploader.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,9 @@ export default class FileUploader extends React.Component {
9191
/**
9292
* Specify the size of the FileUploaderButton, from a list of available
9393
* sizes. For `default` buttons, this prop can remain unspecified.
94+
* V11: `default`, `field`, and `small` will be removed
9495
*/
95-
size: PropTypes.oneOf(['default', 'field', 'small']),
96+
size: PropTypes.oneOf(['default', 'field', 'small', 'sm', 'md', 'lg']),
9697
};
9798

9899
static defaultProps = {
@@ -179,8 +180,8 @@ export default class FileUploader extends React.Component {
179180
});
180181

181182
const selectedFileClasses = classNames(`${prefix}--file__selected-file`, {
182-
[`${prefix}--file__selected-file--field`]: size === 'field',
183-
[`${prefix}--file__selected-file--sm`]: size === 'small',
183+
[`${prefix}--file__selected-file--md`]: size === 'field' || size === 'md',
184+
[`${prefix}--file__selected-file--sm`]: size === 'small' || size === 'sm',
184185
});
185186

186187
return (

packages/react/src/components/FileUploader/FileUploaderButton.js

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,9 @@ function FileUploaderButton({
4040
const classes = cx(`${prefix}--btn`, className, {
4141
[`${prefix}--btn--${buttonKind}`]: buttonKind,
4242
[`${prefix}--btn--disabled`]: disabled,
43-
[`${prefix}--btn--field`]: size === 'field',
44-
[`${prefix}--btn--sm`]: size === 'small',
43+
// V11: remove field, small
44+
[`${prefix}--btn--md`]: size === 'field' || size === 'md',
45+
[`${prefix}--btn--sm`]: size === 'small' || size === 'sm',
4546
});
4647

4748
// Adjust label text state based on changes to the labelText prop
@@ -174,10 +175,11 @@ FileUploaderButton.propTypes = {
174175
role: PropTypes.string,
175176

176177
/**
177-
* Specify the size of the button, from a list of available sizes.
178-
* For `default` buttons, this prop can remain unspecified.
178+
* Specify the size of the FileUploaderButton, from a list of available
179+
* sizes. For `default` buttons, this prop can remain unspecified.
180+
* V11: `default`, `field`, and `small` will be removed
179181
*/
180-
size: PropTypes.oneOf(['default', 'field', 'small']),
182+
size: PropTypes.oneOf(['default', 'field', 'small', 'sm', 'md', 'lg']),
181183

182184
/**
183185
* Provide a custom tabIndex value for the <FileUploaderButton>

packages/react/src/components/FileUploader/FileUploaderDropContainer.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,9 +186,10 @@ FileUploaderDropContainer.propTypes = {
186186

187187
/**
188188
* Specify the size of the uploaded items, from a list of available
189-
* sizes. For `default` size, this prop can remain unspecified.
189+
* sizes. For `default` buttons, this prop can remain unspecified.
190+
* V11: `default`, `field`, and `small` will be removed
190191
*/
191-
size: PropTypes.oneOf(['default', 'field', 'small']),
192+
size: PropTypes.oneOf(['default', 'field', 'small', 'sm', 'md', 'lg']),
192193

193194
/**
194195
* Provide a custom tabIndex value for the <FileUploaderButton>

packages/react/src/components/FileUploader/FileUploaderItem.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ function FileUploaderItem({
3030
const { current: id } = useRef(uuid || uid());
3131
const classes = cx(`${prefix}--file__selected-file`, {
3232
[`${prefix}--file__selected-file--invalid`]: invalid,
33-
[`${prefix}--file__selected-file--field`]: size === 'field',
34-
[`${prefix}--file__selected-file--sm`]: size === 'small',
33+
[`${prefix}--file__selected-file--md`]: size === 'field' || size === 'md',
34+
[`${prefix}--file__selected-file--sm`]: size === 'small' || size === 'sm',
3535
});
3636
return (
3737
<span className={classes} {...other}>
@@ -107,9 +107,10 @@ FileUploaderItem.propTypes = {
107107

108108
/**
109109
* Specify the size of the uploaded items, from a list of available
110-
* sizes. For `default` size, this prop can remain unspecified.
110+
* sizes. For `default` buttons, this prop can remain unspecified.
111+
* V11: `default`, `field`, and `small` will be removed
111112
*/
112-
size: PropTypes.oneOf(['default', 'field', 'small']),
113+
size: PropTypes.oneOf(['default', 'field', 'small', 'sm', 'md', 'lg']),
113114

114115
/**
115116
* Status of the file upload

0 commit comments

Comments
 (0)