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.

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

Dropdown-Input is selectable when disabled and using tab-key #63

Merged
merged 2 commits into from
Jan 21, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
146 changes: 146 additions & 0 deletions __tests__/__snapshots__/index.spec.js.snap
Original file line number Diff line number Diff line change
@@ -1,5 +1,145 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`<Select/> component <Select/> is disabled 1`] = `
.emotion-2 {
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-flex: 1;
-ms-flex: 1;
flex: 1;
-webkit-flex-wrap: wrap;
-ms-flex-wrap: wrap;
flex-wrap: wrap;
}

.emotion-0 {
line-height: inherit;
width: calc(9ch + 5px);
border: none;
margin-left: 5px;
background: transparent;
font-size: smaller;
}

.emotion-0:focus {
outline: none;
}

.emotion-4 {
text-align: center;
pointer-events: none;
margin: 0 0 0 5px;
-webkit-transform: rotate(180deg);
-ms-transform: rotate(180deg);
transform: rotate(180deg);
cursor: pointer;
}

.emotion-4 svg {
width: 16px;
height: 16px;
}

.emotion-4:hover path {
stroke: #0074D9;
}

.emotion-4:focus {
outline: none;
}

.emotion-4:focus path {
stroke: #0074D9;
}

.emotion-6 {
position: relative;
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
border: 1px solid #ccc;
width: 100%;
border-radius: 2px;
padding: 2px 5px;
-webkit-flex-direction: row;
-ms-flex-direction: row;
flex-direction: row;
direction: ltr;
-webkit-align-items: center;
-webkit-box-align: center;
-ms-flex-align: center;
align-items: center;
cursor: pointer;
min-height: 36px;
cursor: not-allowed;
pointer-events: none;
opacity: 0.3;
}

.emotion-6:hover,
.emotion-6:focus-within {
border-color: #0074D9;
}

.emotion-6:focus,
.emotion-6:focus-within {
outline: 0;
box-shadow: 0 0 0 3px rgba(0,116,217,0.2);
}

<div>
<div
className="react-dropdown-select undefined emotion-6 emotion-7"
color="#0074D9"
direction="ltr"
disabled={true}
onClick={[Function]}
onFocus={[Function]}
onKeyDown={[Function]}
tabIndex="-1"
>
<div
className="react-dropdown-select-content react-dropdown-select-type-single emotion-2 emotion-3"
onClick={[Function]}
>
<input
className="react-dropdown-select-input emotion-0 emotion-1"
disabled={true}
onBlur={[Function]}
onChange={[Function]}
onClick={[Function]}
onKeyPress={[Function]}
placeholder="Select..."
readOnly={false}
size={9}
tabIndex="-1"
value=""
/>
</div>
<div
className="react-dropdown-select-dropdown-handle emotion-4 emotion-5"
color="#0074D9"
onClick={[Function]}
onKeyDown={[Function]}
onKeyPress={[Function]}
tabIndex="-1"
>
<svg
fill="currentColor"
viewBox="0 0 40 40"
>
<path
d="M31 26.4q0 .3-.2.5l-1.1 1.2q-.3.2-.6.2t-.5-.2l-8.7-8.8-8.8 8.8q-.2.2-.5.2t-.5-.2l-1.2-1.2q-.2-.2-.2-.5t.2-.5l10.4-10.4q.3-.2.6-.2t.5.2l10.4 10.4q.2.2.2.5z"
/>
</svg>
</div>
</div>
</div>
`;

exports[`<Select/> component <Select/> renders correctly 1`] = `
.emotion-6 {
position: relative;
Expand Down Expand Up @@ -105,6 +245,7 @@ exports[`<Select/> component <Select/> renders correctly 1`] = `
>
<input
className="react-dropdown-select-input emotion-0 emotion-1"
disabled={false}
onBlur={[Function]}
onChange={[Function]}
onClick={[Function]}
Expand Down Expand Up @@ -256,6 +397,7 @@ exports[`<Select/> component <Select/> renders with clearable 1`] = `
>
<input
className="react-dropdown-select-input emotion-0 emotion-1"
disabled={false}
onBlur={[Function]}
onChange={[Function]}
onClick={[Function]}
Expand Down Expand Up @@ -422,6 +564,7 @@ exports[`<Select/> component <Select/> renders with loading 1`] = `
>
<input
className="react-dropdown-select-input emotion-0 emotion-1"
disabled={false}
onBlur={[Function]}
onChange={[Function]}
onClick={[Function]}
Expand Down Expand Up @@ -563,6 +706,7 @@ exports[`<Select/> component <Select/> renders with name 1`] = `
>
<input
className="react-dropdown-select-input emotion-0 emotion-1"
disabled={false}
onBlur={[Function]}
onChange={[Function]}
onClick={[Function]}
Expand All @@ -575,6 +719,7 @@ exports[`<Select/> component <Select/> renders with name 1`] = `
/>
</div>
<input
disabled={false}
name="form-select"
pattern={false}
required={false}
Expand Down Expand Up @@ -720,6 +865,7 @@ exports[`<Select/> component <Select/> renders with separator 1`] = `
>
<input
className="react-dropdown-select-input emotion-0 emotion-1"
disabled={false}
onBlur={[Function]}
onChange={[Function]}
onClick={[Function]}
Expand Down
6 changes: 6 additions & 0 deletions __tests__/components/Input.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,9 @@ it('<Input/> renders correctly', () => {

expect(tree).toMatchSnapshot();
});

it('<Input/> is disabled', () => {
const tree = renderer.create(<Input {...props({disabled: true})}/>).toJSON();

expect(tree).toMatchSnapshot();
});
25 changes: 25 additions & 0 deletions __tests__/components/__snapshots__/Input.spec.js.snap
Original file line number Diff line number Diff line change
@@ -1,5 +1,30 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`<Input/> is disabled 1`] = `
.emotion-0 {
line-height: inherit;
width: calc(undefinedch + 5px);
border: none;
margin-left: 5px;
background: transparent;
font-size: smaller;
}

.emotion-0:focus {
outline: none;
}

<input
className="react-dropdown-select-input emotion-0 emotion-1"
onBlur={[Function]}
onClick={[Function]}
onKeyPress={[Function]}
placeholder=""
readOnly={false}
tabIndex="-1"
/>
`;

exports[`<Input/> renders correctly 1`] = `
.emotion-0 {
line-height: inherit;
Expand Down
7 changes: 6 additions & 1 deletion __tests__/index.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import React from 'react';
import TestRenderer from 'react-test-renderer';

import Select from '../src/index';
import { options } from './options';

const props = (props = {}) => ({
onChange: () => undefined,
Expand Down Expand Up @@ -53,4 +52,10 @@ describe('<Select/> component', () => {

expect(tree).toMatchSnapshot();
});

it('<Select/> is disabled', () => {
const tree = selectWithProps(<Select {...props({ disabled: true })} />).toJSON();

expect(tree).toMatchSnapshot();
})
});
1 change: 1 addition & 0 deletions src/components/Input.js
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ class Input extends Component {
onChange={methods.setSearch}
onBlur={this.onBlur}
placeholder={handlePlaceHolder(props, state)}
disabled={props.disabled}
/>
);
}
Expand Down
7 changes: 4 additions & 3 deletions src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ export class Select extends Component {
const enter = event.key === 'Enter';
const arrowUp = event.key === 'ArrowUp';
const arrowDown = event.key === 'ArrowDown';
const tab = event.key === 'Tab' && !event.shiftKey;
const tab = event.key === 'Tab' && !event.shiftKey;
const shiftTab = event.shiftKey && event.key === 'Tab';

if ((arrowDown || tab) && cursor === null) {
Expand Down Expand Up @@ -448,7 +448,7 @@ export class Select extends Component {
onKeyDown={this.handleKeyDown}
onClick={(event) => this.dropDown('open', event)}
onFocus={(event) => this.dropDown('open', event)}
tabIndex="0"
tabIndex={this.props.disabled ? '-1' : '0'}
direction={this.props.direction}
style={this.props.style}
ref={this.select}
Expand All @@ -465,6 +465,7 @@ export class Select extends Component {
required={this.props.required}
pattern={this.props.pattern}
value={this.state.values.map(value => value[this.props.labelField]).toString() || []}
disabled={this.props.disabled}
/>
)}

Expand All @@ -487,7 +488,7 @@ export class Select extends Component {
/>
)}

{this.state.dropdown && this.renderDropdown()}
{this.state.dropdown && !this.props.disabled && this.renderDropdown()}
</ReactDropdownSelect>
</ClickOutside>
);
Expand Down