Remove dup code, solve whitespace issue

eea · Oct 12, 2020 · ed5dd18 · ed5dd18
1 parent 20603e3
commit ed5dd18
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/src/ColumnsBlock/styles.less b/src/ColumnsBlock/styles.less
@@ -170,4 +170,4 @@
 .layout-select-widget-selection-icon {
   vertical-align: middle;
   margin-right: 1.5rem;
-}
+}
diff --git a/src/Widgets/LayoutSelectWidget.jsx b/src/Widgets/LayoutSelectWidget.jsx
@@ -88,7 +88,7 @@ export class LayoutSelectWidget extends Component {
     selectedOption: null,
   };
 
-  componentDidMount() {
+  updateSelectedOption = () => {
     this.setState({
       selectedOption: {
         value: this.props.value,
@@ -97,18 +97,15 @@ export class LayoutSelectWidget extends Component {
         )?.[1],
       },
     });
+  };
+
+  componentDidMount() {
+    this.updateSelectedOption();
   }
 
   componentDidUpdate(prevProps) {
     if (!isEqual(prevProps.value, this.props.value)) {
-      this.setState({
-        selectedOption: {
-          value: this.props.value,
-          label: this.props.choices.find((x) =>
-            isEqual(x[0], this.props.value),
-          )?.[1],
-        },
-      });
+      this.updateSelectedOption();
     }
   }