dzeio/components
1
0
Fork 0
mirror of https://github.com/dzeiocom/components.git synced 2025-06-07 16:49:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: choice not respected on startup

Browse Source 
Signed-off-by: Avior <f.bouillon@aptatio.com>
This commit is contained in:
Florian Bouillon 2022-09-28 17:11:21 +02:00
parent 4f16367039
commit 36046592fa
Signed by: Florian Bouillon
GPG Key ID: E05B3A94178D3A7C
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/Input/index.tsx
View File

@ -6,7 +6,7 @@ import { Icon } from '../interfaces'
import { buildClassName } from '../Util' import { buildClassName } from '../Util'
import css from './Input.module.styl' import css from './Input.module.styl'
import Menu from '../Menu' import Menu from '../Menu'
import { objectOmit } from '@dzeio/object-util' import { objectEqual, objectOmit } from '@dzeio/object-util'
interface Props extends React.DetailedHTMLProps<React.InputHTMLAttributes<HTMLInputElement>, HTMLInputElement> { interface Props extends React.DetailedHTMLProps<React.InputHTMLAttributes<HTMLInputElement>, HTMLInputElement> {
id?: string id?: string
@ -123,8 +123,20 @@ export default class Input extends React.PureComponent<Props, States> {
public async componentDidUpdate(prevProps: Props, prevStates: States) { public async componentDidUpdate(prevProps: Props, prevStates: States) {
if (prevProps.value !== this.props.value) { if (prevProps.value !== this.props.value && this.props.value !== this.state.value) {
this.setState({ displayedValue: this.props.value?.toString(), value : this.props.value?.toString(), valueUpdate: true }) if (this.props.choices) {
const choice = this.props.choices.find((it) => typeof it === 'string' ? it : it.value === this.props.value?.toString())
if (choice) {
this.setState({
displayedValue: typeof choice === 'string' ? choice : choice.display,
value: typeof choice === 'string' ? choice : choice.value,
valueUpdate: true
})
}
} else {
this.setState({ displayedValue: this.props.value?.toString(), value : this.props.value?.toString(), valueUpdate: true })
}
} }
if (prevStates.value !== this.state.value) { if (prevStates.value !== this.state.value) {
if (this.props.onValue) { if (this.props.onValue) {
@ -138,8 +150,10 @@ export default class Input extends React.PureComponent<Props, States> {
if ( if (
prevStates.value !== this.state.value || prevStates.value !== this.state.value ||
prevStates.displayedValue !== this.state.displayedValue || prevStates.displayedValue !== this.state.displayedValue ||
prevStates.valueUpdate !== this.state.valueUpdate prevStates.valueUpdate !== this.state.valueUpdate ||
!objectEqual(prevProps.choices ?? [], this.props.choices ?? [])
) { ) {
console.log('list updated')
this.setState({list: this.buildList()}) this.setState({list: this.buildList()})
} }
} }