yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-12-05 03:21:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1527 from waful/master

Browse Source 
Content Manager: fix react-select blowing away user input on rerender
This commit is contained in:
Jim LAURIE 2018-07-13 12:20:44 +02:00 committed by GitHub
commit 94dce3444c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/strapi-plugin-content-manager/admin/src/components/SelectMany/index.js
View File

@ -141,6 +141,7 @@ class SelectMany extends React.Component {
isLoading={this.state.isLoading} isLoading={this.state.isLoading}
onMenuScrollToBottom={this.handleBottomScroll} onMenuScrollToBottom={this.handleBottomScroll}
onInputChange={this.handleInputChange} onInputChange={this.handleInputChange}
onSelectResetsInput={false}
multi multi
value={ value={
isNull(value) || isUndefined(value) || value.size === 0 isNull(value) || isUndefined(value) || value.size === 0

1
packages/strapi-plugin-content-manager/admin/src/components/SelectOne/index.js
View File

@ -133,6 +133,7 @@ class SelectOne extends React.Component { // eslint-disable-line react/prefer-st
isLoading={this.state.isLoading} isLoading={this.state.isLoading}
onMenuScrollToBottom={this.handleBottomScroll} onMenuScrollToBottom={this.handleBottomScroll}
onInputChange={this.handleInputChange} onInputChange={this.handleInputChange}
onSelectResetsInput={false}
simpleValue simpleValue
value={isNull(value) || isUndefined(value) ? null : { value={isNull(value) || isUndefined(value) ? null : {
value: isFunction(value.toJS) ? value.toJS() : value, value: isFunction(value.toJS) ? value.toJS() : value,

4
packages/strapi-plugin-content-manager/package.json
View File

@ -22,7 +22,7 @@
"prepublishOnly": "IS_MONOREPO=true npm run build" "prepublishOnly": "IS_MONOREPO=true npm run build"
}, },
"devDependencies": { "devDependencies": {
"react-select": "^1.0.0-rc.5", "react-select": "^1.2.1",
"strapi-helper-plugin": "3.0.0-alpha.12.7.1" "strapi-helper-plugin": "3.0.0-alpha.12.7.1"
}, },
"author": { "author": {
@ -46,4 +46,4 @@
"npm": ">= 5.0.0" "npm": ">= 5.0.0"
}, },
"license": "MIT" "license": "MIT"
} }