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

refactor(react): remove default placeholder from Combobox, TextArea, TextInput, MultiSelect, FilterableMultiselect #9510

Merged
merged 11 commits into from
Jan 27, 2022
Merged

refactor(react): remove default placeholder from Combobox, TextArea, TextInput, MultiSelect, FilterableMultiselect #9510

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
7e3f336
feat(Combobox): remove default placeholder
dakahn Aug 20, 2021
673d7a1
feat(TextArea, TextInput): remove default placeholder
dakahn Aug 20, 2021
a8f2af7
test: update snaps
tay1orjones Aug 31, 2021
cbd5e21
Merge branch 'main' into 5022-remove-default-placeholder
tay1orjones Aug 31, 2021
61721a5
Merge branch 'main' into 5022-remove-default-placeholder
dakahn Jan 13, 2022
538bded
Merge branch 'main' into 5022-remove-default-placeholder
dakahn Jan 26, 2022
681f8a9
fix(Multiselect, FilterableMultiselect): remove default placeholder
dakahn Jan 27, 2022
d04ce52
Merge branch 'main' of github.com:carbon-design-system/carbon into 50…
dakahn Jan 27, 2022
d05ba0d
fix(Textarea/Textinput): remove default placeholder usage
dakahn Jan 27, 2022
b5edc8a
Merge branch 'main' into 5022-remove-default-placeholder
dakahn Jan 27, 2022
d62e8ac
Merge branch 'main' into 5022-remove-default-placeholder
dakahn Jan 27, 2022
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
1 change: 0 additions & 1 deletion packages/react/__tests__/__snapshots__/PublicAPI-test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -920,7 +920,6 @@ Map {
"type": "func",
},
"placeholder": Object {
"isRequired": true,
"type": "string",
},
"selectedItem": Object {
Expand Down
4 changes: 0 additions & 4 deletions packages/react/src/components/ComboBox/ComboBox-story.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ export const ComboboxStory = () => (
id="carbon-combobox"
items={items}
itemToString={(item) => (item ? item.text : '')}
placeholder="Filter..."
titleText="ComboBox title"
helperText="Combobox helper text"
/>
Expand All @@ -79,7 +78,6 @@ ComboboxStory.storyName = 'Combobox';

const props = () => ({
id: text('Combobox ID (id)', 'carbon-combobox-example'),
placeholder: text('Placeholder text (placeholder)', 'Filter...'),
titleText: text('Title (titleText)', 'Combobox title'),
helperText: text('Helper text (helperText)', 'Optional helper text here'),
light: boolean('Light (light)', false),
Expand Down Expand Up @@ -127,7 +125,6 @@ export const Disabled = () => (
disabled
items={items}
itemToString={(item) => (item ? item.text : '')}
placeholder="Filter..."
titleText="ComboBox title"
helperText="Combobox helper text"
/>
Expand All @@ -142,7 +139,6 @@ export const Light = () => (
light
items={items}
itemToString={(item) => (item ? item.text : '')}
placeholder="Filter..."
titleText="ComboBox title"
helperText="Combobox helper text"
/>
Expand Down
2 changes: 1 addition & 1 deletion packages/react/src/components/ComboBox/ComboBox.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -509,7 +509,7 @@ ComboBox.propTypes = {
* Used to provide a placeholder text node before a user enters any input.
* This is only present if the control has no items selected
*/
placeholder: PropTypes.string.isRequired,
placeholder: PropTypes.string,

/**
* For full control of the selection
Expand Down
2 changes: 1 addition & 1 deletion packages/react/src/components/MultiSelect/next/FilterableMultiSelect.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -531,7 +531,7 @@ FilterableMultiSelect.propTypes = {
* Generic `placeholder` that will be used as the textual representation of
* what this field is for
*/
placeholder: PropTypes.string.isRequired,
placeholder: PropTypes.string,

/**
* Specify feedback (mode) of the selection.
Expand Down
4 changes: 0 additions & 4 deletions packages/react/src/components/MultiSelect/next/MultiSelect.stories.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@ export const _Filterable = () => {
helperText="This is helper text"
items={items}
itemToString={(item) => (item ? item.text : '')}
placeholder="Filter"
selectionFeedback="top-after-reopen"
/>
</div>
Expand Down Expand Up @@ -142,7 +141,6 @@ export const _FilterableWithLayer = () => {
helperText="This is helper text"
items={items}
itemToString={(item) => (item ? item.text : '')}
placeholder="Filter"
selectionFeedback="top-after-reopen"
/>
<Layer>
Expand All @@ -152,7 +150,6 @@ export const _FilterableWithLayer = () => {
helperText="This is helper text"
items={items}
itemToString={(item) => (item ? item.text : '')}
placeholder="Filter"
selectionFeedback="top-after-reopen"
/>
<Layer>
Expand All @@ -162,7 +159,6 @@ export const _FilterableWithLayer = () => {
helperText="This is helper text"
items={items}
itemToString={(item) => (item ? item.text : '')}
placeholder="Filter"
selectionFeedback="top-after-reopen"
/>
</Layer>
Expand Down
1 change: 0 additions & 1 deletion packages/react/src/components/TextArea/TextArea-story.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ const TextAreaProps = () => ({
'A valid value is required'
),
helperText: text('Helper text (helperText)', 'Optional helper text.'),
placeholder: text('Placeholder text (placeholder)', 'Placeholder text.'),
id: 'test2',
cols: number('Columns (columns)', 50),
rows: number('Rows (rows)', 4),
Expand Down
4 changes: 0 additions & 4 deletions packages/react/src/components/TextArea/next/TextArea.stories.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ export const Default = () => (
<TextArea
labelText="Text Area label"
helperText="Optional helper text"
placeholder="Placeholder text"
cols={50}
rows={4}
id="text-area-1"
Expand All @@ -34,7 +33,6 @@ export const WithLayer = () => {
<TextArea
labelText="First layer"
helperText="Optional helper text"
placeholder="Placeholder text"
cols={50}
rows={4}
id="text-area-1"
Expand All @@ -43,7 +41,6 @@ export const WithLayer = () => {
<TextArea
labelText="Second layer"
helperText="Optional helper text"
placeholder="Placeholder text"
cols={50}
rows={4}
id="text-area-1"
Expand All @@ -52,7 +49,6 @@ export const WithLayer = () => {
<TextArea
labelText="Third layer"
helperText="Optional helper text"
placeholder="Placeholder text"
cols={50}
rows={4}
id="text-area-1"
Expand Down
1 change: 0 additions & 1 deletion packages/react/src/components/TextInput/TextInput-story.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ const props = {
),
size: select('Field size (size)', sizes, undefined) || undefined,
labelText: text('Label text (labelText)', 'Text input label'),
placeholder: text('Placeholder text (placeholder)', 'Placeholder text'),
light: boolean('Light variant (light)', false),
disabled: boolean('Disabled (disabled)', false),
hideLabel: boolean('No label (hideLabel)', false),
Expand Down
11 changes: 1 addition & 10 deletions packages/react/src/components/TextInput/next/TextInput.stories.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,26 +29,20 @@ export const Default = () => (
<TextInput
type="text"
labelText="Text input label"
defaultValue="This is not a default value"
helperText="Optional help text"
/>
);

export const Fluid = () => (
<FluidForm>
<TextInput
type="text"
labelText="Text input label"
defaultValue="This is not a default value"
/>
<TextInput type="text" labelText="Text input label" />
</FluidForm>
);

export const TogglePasswordVisibility = () => {
return (
<TextInput.PasswordInput
labelText="Text input label"
defaultValue="This is not a default value"
helperText="Optional help text"
/>
);
Expand All @@ -60,21 +54,18 @@ export const WithLayer = () => {
<TextInput
type="text"
labelText="First layer"
defaultValue="This is not a default value"
helperText="Optional help text"
/>
<Layer>
<TextInput
type="text"
labelText="Second layer"
defaultValue="This is not a default value"
helperText="Optional help text"
/>
<Layer>
<TextInput
type="text"
labelText="Third layer"
defaultValue="This is not a default value"
helperText="Optional help text"
/>
</Layer>
Expand Down