Feat/input legacy method fix (#1090)

alfa-laboratory · Mar 27, 2020 · 1ecb020 · 1ecb020
1 parent 44138fc
commit 1ecb020
Show file tree

Hide file tree

Showing 10 changed files with 36 additions and 38 deletions.
diff --git a/...on-color.calendar-input_size_l.calendar-input_prop-set_3/focused/chromeWin7.png b/...on-color.calendar-input_size_l.calendar-input_prop-set_3/focused/chromeWin7.png
diff --git a/...on-color.calendar-input_size_m.calendar-input_prop-set_3/focused/chromeWin7.png b/...on-color.calendar-input_size_m.calendar-input_prop-set_3/focused/chromeWin7.png
diff --git a/...on-color.calendar-input_size_s.calendar-input_prop-set_3/focused/chromeWin7.png b/...on-color.calendar-input_size_s.calendar-input_prop-set_3/focused/chromeWin7.png
diff --git a/...n-color.calendar-input_size_xl.calendar-input_prop-set_3/focused/chromeWin7.png b/...n-color.calendar-input_size_xl.calendar-input_prop-set_3/focused/chromeWin7.png
diff --git a/...on-white.calendar-input_size_l.calendar-input_prop-set_3/focused/chromeWin7.png b/...on-white.calendar-input_size_l.calendar-input_prop-set_3/focused/chromeWin7.png
diff --git a/...on-white.calendar-input_size_m.calendar-input_prop-set_3/focused/chromeWin7.png b/...on-white.calendar-input_size_m.calendar-input_prop-set_3/focused/chromeWin7.png
diff --git a/...on-white.calendar-input_size_s.calendar-input_prop-set_3/focused/chromeWin7.png b/...on-white.calendar-input_size_s.calendar-input_prop-set_3/focused/chromeWin7.png
diff --git a/...n-white.calendar-input_size_xl.calendar-input_prop-set_3/focused/chromeWin7.png b/...n-white.calendar-input_size_xl.calendar-input_prop-set_3/focused/chromeWin7.png
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/input/input.tsx b/src/input/input.tsx
@@ -248,10 +248,27 @@ export type InputProps = DeepReadonly<{
     'data-test-id'?: string;
 }>;
 
+type InputState = {
+    /**
+     * Состояние фокуса в поле
+     */
+    focused: boolean;
+
+    /**
+     * Ошибка
+     */
+    error: InputProps['error'] | null;
+
+    /**
+     * Содержимое поля ввода
+     */
+    value: string;
+}
+
 /**
  * Компонент текстового поля ввода.
  */
-export class Input extends React.PureComponent<InputProps> {
+export class Input extends React.PureComponent<InputProps, InputState> {
     protected cn = createCn('input');
 
     static defaultProps: Partial<InputProps> = {
@@ -262,6 +279,13 @@ export class Input extends React.PureComponent<InputProps> {
         resetError: true
     };
 
+    componentDidUpdate(prevProps: InputProps) {
+        if (prevProps.error !== this.props.error) {
+            // eslint-disable-next-line react/no-did-update-set-state
+            this.setState({ error: this.props.error });
+        }
+    }
+
     state = {
         focused: false,
         error: this.props.error || null,
@@ -282,13 +306,6 @@ export class Input extends React.PureComponent<InputProps> {
      */
     private control;
 
-    // eslint-disable-next-line camelcase
-    UNSAFE_componentWillReceiveProps(nextProps) {
-        this.setState({
-            error: nextProps.error
-        });
-    }
-
     render() {
         const hasAddons = !!this.props.rightAddons || !!this.props.leftAddons;
         const hasLeftAddons = !!this.props.leftAddons;