Skip to content

Select: #972, fix Multiple Select option order problem / remote Multiple Select value bind problem #977

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Select: #972, fix Multiple Select option order problem / remote Multiple Select value bind problem #977

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
75 changes: 65 additions & 10 deletions site/docs/en-US/select.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,17 @@ constructor(props) {
}],
value: ''
};
this.handleInput = this.handleInput.bind(this);
}

handleInput(value) {
this.setState({ value });
console.log(value);
}

render() {
return (
<Select value={this.state.value}>
<Select value={this.state.value} onChange={this.handleInput}>
{
this.state.options.map(el => {
return <Select.Option key={el.value} label={el.label} value={el.value} />
Expand Down Expand Up @@ -73,11 +79,17 @@ constructor(props) {
}],
value: ''
};
this.handleInput = this.handleInput.bind(this);
}

handleInput(value) {
this.setState({ value });
console.log(value);
}

render() {
return (
<Select value={this.state.value}>
<Select value={this.state.value} onChange={this.handleInput}>
{
this.state.options.map(el => {
return <Select.Option key={el.value} label={el.label} value={el.value} disabled={el.disabled} />
Expand Down Expand Up @@ -117,11 +129,17 @@ constructor(props) {
}],
value: ''
};
this.handleInput = this.handleInput.bind(this);
}

handleInput(value) {
this.setState({ value });
console.log(value);
}

render() {
return (
<Select value={this.state.value} disabled={true}>
<Select value={this.state.value} disabled={true} onChange={this.handleInput}>
{
this.state.options.map(el => {
return <Select.Option key={el.value} label={el.label} value={el.value} />
Expand Down Expand Up @@ -161,11 +179,17 @@ constructor(props) {
}],
value: ''
};
this.handleInput = this.handleInput.bind(this);
}

handleInput(value) {
this.setState({ value });
console.log(value);
}

render() {
return (
<Select value={this.state.value} clearable={true}>
<Select value={this.state.value} clearable={true} onChange={this.handleInput}>
{
this.state.options.map(el => {
return <Select.Option key={el.value} label={el.label} value={el.value} />
Expand Down Expand Up @@ -205,11 +229,17 @@ constructor(props) {
}],
value: []
};
this.handleInput = this.handleInput.bind(this);
}

handleInput(value) {
this.setState({ value });
console.log(value);
}

render() {
return (
<Select value={this.state.value} multiple={true}>
<Select value={this.state.value} multiple={true} onChange={this.handleInput}>
{
this.state.options.map(el => {
return <Select.Option key={el.value} label={el.label} value={el.value} />
Expand Down Expand Up @@ -253,11 +283,17 @@ constructor(props) {
}],
value: []
};
this.handleInput = this.handleInput.bind(this);
}

handleInput(value) {
this.setState({ value });
console.log(value);
}

render() {
return (
<Select value={this.state.value}>
<Select value={this.state.value} onChange={this.handleInput}>
{
this.state.cities.map(el => {
return (
Expand Down Expand Up @@ -312,11 +348,17 @@ constructor(props) {
}],
value: ''
};
this.handleInput = this.handleInput.bind(this);
}

handleInput(value) {
this.setState({ value });
console.log(value);
}

render() {
return (
<Select value={this.state.value}>
<Select value={this.state.value} onChange={this.handleInput}>
{
this.state.options.map(group => {
return (
Expand Down Expand Up @@ -369,11 +411,17 @@ constructor(props) {
}],
value: []
};
this.handleInput = this.handleInput.bind(this);
}

handleInput(value) {
this.setState({ value });
console.log(value);
}

render() {
return (
<Select value={this.state.value} filterable={true}>
<Select value={this.state.value} filterable={true} onChange={this.handleInput}>
{
this.state.options.map(el => {
return <Select.Option key={el.value} label={el.label} value={el.value} />
Expand All @@ -396,10 +444,17 @@ constructor(props) {
super(props);

this.state = {
value: [],
options: [],
states: ["Alabama", "Alaska", "Arizona", "Arkansas", "California", "Colorado", "Connecticut", "Delaware", "Florida", "Georgia", "Hawaii", "Idaho", "Illinois", "Indiana", "Iowa", "Kansas", "Kentucky", "Louisiana", "Maine", "Maryland", "Massachusetts", "Michigan", "Minnesota", "Mississippi", "Missouri", "Montana", "Nebraska", "Nevada", "New Hampshire", "New Jersey", "New Mexico", "New York", "North Carolina", "North Dakota", "Ohio", "Oklahoma", "Oregon", "Pennsylvania", "Rhode Island", "South Carolina", "South Dakota", "Tennessee", "Texas",
"Utah", "Vermont", "Virginia", "Washington", "West Virginia", "Wisconsin", "Wyoming"]
}
};
this.handleInput = this.handleInput.bind(this);
}

handleInput(value) {
this.setState({ value });
console.log(value);
}

onSearch(query) {
Expand Down Expand Up @@ -427,7 +482,7 @@ onSearch(query) {

render() {
return (
<Select value={this.state.value} multiple={true} filterable={true} remote={true} remoteMethod={this.onSearch.bind(this)} loading={this.state.loading}>
<Select value={this.state.value} multiple={true} filterable={true} remote={true} remoteMethod={this.onSearch.bind(this)} loading={this.state.loading} onChange={this.handleInput}>
{
this.state.options.map(el => {
return <Select.Option key={el.value} label={el.label} value={el.value} />
Expand Down
76 changes: 66 additions & 10 deletions site/docs/zh-CN/select.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,17 @@ constructor(props) {
}],
value: ''
};
this.handleInput = this.handleInput.bind(this);
}

handleInput(value) {
this.setState({ value });
console.log(value);
}

render() {
return (
<Select value={this.state.value} placeholder="请选择">
<Select value={this.state.value} placeholder="请选择" onChange={this.handleInput}>
{
this.state.options.map(el => {
return <Select.Option key={el.value} label={el.label} value={el.value} />
Expand Down Expand Up @@ -72,11 +79,17 @@ constructor(props) {
}],
value: ''
};
this.handleInput = this.handleInput.bind(this);
}

handleInput(value) {
this.setState({ value });
console.log(value);
}

render() {
return (
<Select value={this.state.value}>
<Select value={this.state.value} onChange={this.handleInput}>
{
this.state.options.map(el => {
return <Select.Option key={el.value} label={el.label} value={el.value} disabled={el.disabled} />
Expand Down Expand Up @@ -116,11 +129,17 @@ constructor(props) {
}],
value: ''
};
this.handleInput = this.handleInput.bind(this);
}

handleInput(value) {
this.setState({ value });
console.log(value);
}

render() {
return (
<Select value={this.state.value} disabled={true}>
<Select value={this.state.value} disabled={true} onChange={this.handleInput}>
{
this.state.options.map(el => {
return <Select.Option key={el.value} label={el.label} value={el.value} />
Expand Down Expand Up @@ -160,11 +179,17 @@ constructor(props) {
}],
value: ''
};
this.handleInput = this.handleInput.bind(this);
}

handleInput(value) {
this.setState({ value });
console.log(value);
}

render() {
return (
<Select value={this.state.value} clearable={true}>
<Select value={this.state.value} clearable={true} onChange={this.handleInput}>
{
this.state.options.map(el => {
return <Select.Option key={el.value} label={el.label} value={el.value} />
Expand Down Expand Up @@ -204,11 +229,17 @@ constructor(props) {
}],
value: []
};
this.handleInput = this.handleInput.bind(this);
}

handleInput(value) {
this.setState({ value });
console.log(value);
}

render() {
return (
<Select value={this.state.value} multiple={true}>
<Select value={this.state.value} multiple={true} onChange={this.handleInput}>
{
this.state.options.map(el => {
return <Select.Option key={el.value} label={el.label} value={el.value} />
Expand Down Expand Up @@ -251,11 +282,17 @@ constructor(props) {
}],
value: []
};
this.handleInput = this.handleInput.bind(this);
}

handleInput(value) {
this.setState({ value });
console.log(value);
}

render() {
return (
<Select value={this.state.value}>
<Select value={this.state.value} onChange={this.handleInput}>
{
this.state.cities.map(el => {
return (
Expand Down Expand Up @@ -309,11 +346,17 @@ constructor(props) {
}],
value: ''
};
this.handleInput = this.handleInput.bind(this);
}

handleInput(value) {
this.setState({ value });
console.log(value);
}

render() {
return (
<Select value={this.state.value}>
<Select value={this.state.value} onChange={this.handleInput}>
{
this.state.options.map(group => {
return (
Expand Down Expand Up @@ -366,11 +409,17 @@ constructor(props) {
}],
value: []
};
this.handleInput = this.handleInput.bind(this);
}

handleInput(value) {
this.setState({ value });
console.log(value);
}

render() {
return (
<Select value={this.state.value} filterable={true}>
<Select value={this.state.value} filterable={true} multiple={true} onChange={this.handleInput}>
{
this.state.options.map(el => {
return <Select.Option key={el.value} label={el.label} value={el.value} />
Expand All @@ -392,10 +441,17 @@ constructor(props) {
super(props);

this.state = {
value: [],
options: [],
states: ["Alabama", "Alaska", "Arizona", "Arkansas", "California", "Colorado", "Connecticut", "Delaware", "Florida", "Georgia", "Hawaii", "Idaho", "Illinois", "Indiana", "Iowa", "Kansas", "Kentucky", "Louisiana", "Maine", "Maryland", "Massachusetts", "Michigan", "Minnesota", "Mississippi", "Missouri", "Montana", "Nebraska", "Nevada", "New Hampshire", "New Jersey", "New Mexico", "New York", "North Carolina", "North Dakota", "Ohio", "Oklahoma", "Oregon", "Pennsylvania", "Rhode Island", "South Carolina", "South Dakota", "Tennessee", "Texas",
"Utah", "Vermont", "Virginia", "Washington", "West Virginia", "Wisconsin", "Wyoming"]
}
};
this.handleInput = this.handleInput.bind(this);
}

handleInput(value) {
this.setState({ value });
console.log(value);
}

onSearch(query) {
Expand Down Expand Up @@ -423,7 +479,7 @@ onSearch(query) {

render() {
return (
<Select value={this.state.value} multiple={true} filterable={true} remote={true} remoteMethod={this.onSearch.bind(this)} loading={this.state.loading}>
<Select value={this.state.value} multiple={true} filterable={true} remote={true} remoteMethod={this.onSearch.bind(this)} loading={this.state.loading} onChange={this.handleInput}>
{
this.state.options.map(el => {
return <Select.Option key={el.value} label={el.label} value={el.value} />
Expand Down
23 changes: 16 additions & 7 deletions src/select/Select.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,15 +168,24 @@ class Select extends Component {
}

handleValueChange() {
const { multiple } = this.props;
const { value, options } = this.state;
const { multiple, remote } = this.props;
const { value, options, selected: oldSelected } = this.state;

if (multiple && Array.isArray(value)) {
this.setState({
selected: options.reduce((prev, curr) => {
return value.indexOf(curr.props.value) > -1 ? prev.concat(curr) : prev;
}, [])
}, () => {
const currentSelected = value.reduce((selecteds, selectedValue) => {
const currOption = options.find(option => option.props.value === selectedValue);
return currOption ? [...selecteds, currOption] : selecteds;
}, []);

const otherSelected = oldSelected.filter((item) => {
const isDuplicateSelected = !!currentSelected.find(selected => item.props.value === selected.props.value);
const isDeletedSelected = !value.find(selectedValue => item.props.value === selectedValue);
return !isDuplicateSelected && !isDeletedSelected;
});

const selected = !remote ? currentSelected : [...otherSelected, ...currentSelected];

this.setState({ selected }, () => {
this.onSelectedChange(this.state.selected, false);
});
} else {
Expand Down