1 files changed, 10 insertions, 5 deletions

diff --git a/src/components/ui/select/index.tsx b/src/components/ui/select/index.tsx
index c3b5314e3..1ce6c674b 100644
--- a/src/components/ui/select/index.tsx
+++ b/src/components/ui/select/index.tsx
@@ -177,12 +177,16 @@ class SelectComponent extends Component<IProps> {
 
   private keyListener: any;
 
-  componentWillReceiveProps(nextProps: IProps) {
-    if (nextProps.value && nextProps.value !== this.props.value) {
-      this.setState({
+  static getDerivedStateFromProps(nextProps: IProps, prevState: IProps) {
+    if (nextProps.value && nextProps.value !== prevState.value) {
+      return {
         value: nextProps.value,
-      });
+      };
     }
+
+    return {
+      value: prevState.value,
+    };
   }
 
   componentDidUpdate() {
@@ -199,6 +203,7 @@ class SelectComponent extends Component<IProps> {
 
       if (data) {
         Object.keys(data).map(
+          // eslint-disable-next-line no-return-assign
           key => (this.inputRef.current!.dataset[key] = data[key]),
         );
       }
@@ -458,6 +463,6 @@ class SelectComponent extends Component<IProps> {
   }
 }
 
-export const Select = injectStyle(styles, { injectTheme: true })(
+export default injectStyle(styles, { injectTheme: true })(
   SelectComponent,
 );