Skip to content
Open
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
43 changes: 18 additions & 25 deletions src/SelectMultiple.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,30 +55,23 @@ export default class SelectMultiple extends Component {
renderLabel: null
}

constructor (props) {
super(props)
this.state = { dataSource: [] }
}

componentDidMount () {
const rows = this.getRowData(this.props)
this.setState({ dataSource: rows })
}

componentWillReceiveProps (nextProps) {
const rows = this.getRowData(nextProps)
this.setState({ dataSource: rows })
}

getRowData ({ items, selectedItems }) {
items = items.map(this.toLabelValueObject)
selectedItems = (selectedItems || []).map(this.toLabelValueObject)

items.forEach((item) => {
item.selected = selectedItems.some((i) => i.value === item.value)
})
items = undefined
selectedItems = undefined
rowData = []

getRowData (items, selectedItems) {
if (items !== this.items || selectedItems !== this.selectedItems) {
this.items = items
this.selectedItems = selectedItems
this.rowData = items.map(this.toLabelValueObject)
selectedItems = (selectedItems || []).map(this.toLabelValueObject)

this.rowData.forEach((item) => {
item.selected = selectedItems.some((i) => i.value === item.value)
})
}

return items
return this.rowData
}

onRowPress (row) {
Expand Down Expand Up @@ -113,8 +106,8 @@ export default class SelectMultiple extends Component {
keyExtractor = (item, index) => index.toString()

render () {
const { dataSource } = this.state
const { style, flatListProps, keyExtractor } = this.props
const { style, flatListProps, keyExtractor, items, selectedItems } = this.props
const dataSource = this.getRowData(items, selectedItems)
return (
<FlatList
style={style}
Expand Down