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

fix(Search): add disabled prop #6916

Merged
merged 9 commits into from
Oct 2, 2020
Merged

fix(Search): add disabled prop #6916

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1415f65
fix(Search): add `disabled` prop
emyarod Sep 25, 2020
1514972
docs(Search): expose `disabled` knob in storybook
emyarod Sep 25, 2020
eb60ac1
chore: update snapshots
emyarod Sep 25, 2020
1ae3ee8
feat(Search): add disabled class
emyarod Sep 25, 2020
35525d6
fix(search): apply disabled style to magnifier icon
emyarod Sep 25, 2020
bc25ba7
fix(Search): apply disabled button styles to clear button
emyarod Sep 25, 2020
e581433
fix(search): remove outline on disabled clear button
emyarod Sep 25, 2020
8d3381f
Merge branch 'master' into 6915-search-component-disabled-prop
andreancardona Sep 28, 2020
033c992
Merge branch 'master' into 6915-search-component-disabled-prop
kodiakhq[bot] Oct 2, 2020
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
22 changes: 18 additions & 4 deletions packages/components/src/components/search/_search.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,6 @@
}
}

.#{$prefix}--search-input[disabled] ~ .#{$prefix}--search-magnifier {
fill: $disabled;
}

.#{$prefix}--search--light .#{$prefix}--search-input {
background: $field-02;
}
Expand Down Expand Up @@ -213,6 +209,24 @@
}
}

.#{$prefix}--search--disabled .#{$prefix}--search-close {
outline: none;
cursor: not-allowed;

&:hover {
background-color: transparent;
border-bottom-color: transparent;
}

&:hover::before {
background-color: transparent;
}
}

.#{$prefix}--search--disabled svg {
fill: $disabled;
}

.#{$prefix}--search-close:focus,
.#{$prefix}--search-close:active {
&::before {
Expand Down
3 changes: 3 additions & 0 deletions 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 @@ -4370,6 +4370,9 @@ Map {
],
"type": "oneOfType",
},
"disabled": Object {
"type": "bool",
},
"id": Object {
"type": "string",
},
Expand Down
1 change: 1 addition & 0 deletions packages/react/src/components/Search/Search-story.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ const props = () => ({
className: 'some-class',
size: select('Size (size)', sizes, 'xl'),
light: boolean('Light variant (light)', false),
disabled: boolean('Disabled (disabled)', false),
name: text('Form item name (name)', ''),
defaultValue: text('Default value (defaultValue)', ''),
labelText: text('Label text (labelText)', 'Search'),
Expand Down
9 changes: 9 additions & 0 deletions packages/react/src/components/Search/Search.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,11 @@ export default class Search extends Component {
*/
defaultValue: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),

/**
* Specify whether the `<input>` should be disabled
*/
disabled: PropTypes.bool,

/**
* Specify a custom `id` for the input
*/
Expand Down Expand Up @@ -145,6 +150,7 @@ export default class Search extends Component {
small,
size = !small ? 'xl' : 'sm',
light,
disabled,
...other
} = this.props;

Expand All @@ -154,6 +160,7 @@ export default class Search extends Component {
[`${prefix}--search`]: true,
[`${prefix}--search--${size}`]: size,
[`${prefix}--search--light`]: light,
[`${prefix}--search--disabled`]: disabled,
[className]: className,
});

Expand All @@ -175,6 +182,7 @@ export default class Search extends Component {
autoComplete="off"
{...other}
type={type}
disabled={disabled}
className={`${prefix}--search-input`}
id={id}
placeholder={placeHolderText}
Expand All @@ -185,6 +193,7 @@ export default class Search extends Component {
/>
<button
className={clearClasses}
disabled={disabled}
onClick={this.clearInput}
type="button"
aria-label={closeButtonLabelText}>
Expand Down