From 4186b7e0d0718a4634010b59a5e05ff14f02d1aa Mon Sep 17 00:00:00 2001
From: Fernanda Toledo <fertoledo93@gmail.com>
Date: Wed, 26 May 2021 10:28:20 -0300
Subject: [PATCH 1/3] fix: add testID prop to ui components

---
 src/components/ui/autocomplete/autocomplete.component.tsx | 3 ++-
 src/components/ui/datepicker/baseDatepicker.component.tsx | 5 ++++-
 src/components/ui/input/input.component.tsx               | 2 ++
 src/components/ui/select/select.component.tsx             | 2 ++
 src/components/ui/spinner/spinner.component.tsx           | 2 +-
 src/components/ui/tab/tabBar.component.tsx                | 4 ++--
 src/components/ui/toggle/toggle.component.tsx             | 3 ++-
 7 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/components/ui/autocomplete/autocomplete.component.tsx b/src/components/ui/autocomplete/autocomplete.component.tsx
index 8782a22f0..b36d2aa9c 100644
--- a/src/components/ui/autocomplete/autocomplete.component.tsx
+++ b/src/components/ui/autocomplete/autocomplete.component.tsx
@@ -205,13 +205,14 @@ export class Autocomplete extends React.Component<AutocompleteProps, State> {
   };
 
   public render(): PopoverElement {
-    const { placement, children, ...inputProps } = this.props;
+    const { placement, children, testID, ...inputProps } = this.props;
 
     return (
       <Popover
         ref={this.popoverRef}
         style={styles.popover}
         placement={placement}
+        testID={testID}
         visible={this.state.listVisible}
         fullWidth={true}
         anchor={() => this.renderInputElement(inputProps)}
diff --git a/src/components/ui/datepicker/baseDatepicker.component.tsx b/src/components/ui/datepicker/baseDatepicker.component.tsx
index ba6ace83f..7201cfe2b 100644
--- a/src/components/ui/datepicker/baseDatepicker.component.tsx
+++ b/src/components/ui/datepicker/baseDatepicker.component.tsx
@@ -229,6 +229,7 @@ export abstract class BaseDatepickerComponent<P, D = Date> extends React.Compone
     const {
       eva,
       style,
+      testID,
       backdropStyle,
       controlStyle,
       placement,
@@ -242,7 +243,9 @@ export abstract class BaseDatepickerComponent<P, D = Date> extends React.Compone
     const evaStyle = this.getComponentStyle(eva.style);
 
     return (
-      <View style={style}>
+      <View 
+      style={style}
+      testID={testID}>
         <FalsyText
           style={[evaStyle.label, styles.label]}
           component={label}
diff --git a/src/components/ui/input/input.component.tsx b/src/components/ui/input/input.component.tsx
index 46ba2a9c6..ba0fcefa9 100644
--- a/src/components/ui/input/input.component.tsx
+++ b/src/components/ui/input/input.component.tsx
@@ -254,6 +254,7 @@ export class Input extends React.Component<InputProps> implements WebEventRespon
       caption,
       accessoryLeft,
       accessoryRight,
+      testID,
       ...textInputProps
     } = this.props;
 
@@ -261,6 +262,7 @@ export class Input extends React.Component<InputProps> implements WebEventRespon
 
     return (
       <TouchableWithoutFeedback
+        testID={testID}
         style={evaStyle.container}
         onPress={this.focus}>
         <FalsyText
diff --git a/src/components/ui/select/select.component.tsx b/src/components/ui/select/select.component.tsx
index 34d179021..d8eec9182 100644
--- a/src/components/ui/select/select.component.tsx
+++ b/src/components/ui/select/select.component.tsx
@@ -69,6 +69,7 @@ export interface SelectProps extends TouchableWebProps, SelectStyledProps {
   accessoryRight?: RenderProp<Partial<ImageProps>>;
   status?: EvaStatus;
   size?: EvaInputSize;
+  testID?: React.ReactText;
 }
 
 export type SelectElement = React.ReactElement<SelectProps>;
@@ -455,6 +456,7 @@ export class Select extends React.Component<SelectProps, State> {
 
     return (
       <TouchableWeb
+        testID={props.testID}
         style={[styles.input, evaStyle.input]}
         onPress={this.onPress}
         onMouseEnter={this.onMouseEnter}
diff --git a/src/components/ui/spinner/spinner.component.tsx b/src/components/ui/spinner/spinner.component.tsx
index 6dd3b960e..d28c6b57b 100644
--- a/src/components/ui/spinner/spinner.component.tsx
+++ b/src/components/ui/spinner/spinner.component.tsx
@@ -159,7 +159,7 @@ export class Spinner extends React.PureComponent<SpinnerProps> {
     const evaStyle = this.getComponentStyle(this.animation.toProps());
 
     return (
-      <View style={containerSize}>
+      <View testID={this.props.testID} style={containerSize}>
         {this.renderArcElement(evaStyle.start, containerSize)}
         {this.renderArcElement(evaStyle.end, containerSize)}
       </View>
diff --git a/src/components/ui/tab/tabBar.component.tsx b/src/components/ui/tab/tabBar.component.tsx
index f126ab243..61bcde8cf 100644
--- a/src/components/ui/tab/tabBar.component.tsx
+++ b/src/components/ui/tab/tabBar.component.tsx
@@ -180,12 +180,12 @@ export class TabBar extends React.Component<TabBarProps> {
   };
 
   public render(): React.ReactElement<ViewProps> {
-    const { eva, style, indicatorStyle, selectedIndex, children, ...viewProps } = this.props;
+    const { eva, style, testID, indicatorStyle, selectedIndex, children, ...viewProps } = this.props;
     const evaStyle = this.getComponentStyle(eva.style);
     const tabElements: TabElement[] = this.renderTabElements(children);
 
     return (
-      <View>
+      <View testID={testID}>
         <View
           {...viewProps}
           style={[evaStyle.container, styles.container, style]}>
diff --git a/src/components/ui/toggle/toggle.component.tsx b/src/components/ui/toggle/toggle.component.tsx
index 9710986f7..d541a1596 100644
--- a/src/components/ui/toggle/toggle.component.tsx
+++ b/src/components/ui/toggle/toggle.component.tsx
@@ -370,11 +370,12 @@ export class Toggle extends React.Component<ToggleProps> implements PanResponder
   };
 
   public render(): React.ReactElement<ViewProps> {
-    const { eva, style, checked, children, ...touchableProps } = this.props;
+    const { eva, style, checked, children, testID, ...touchableProps } = this.props;
     const evaStyle = this.getComponentStyle(eva.style);
 
     return (
       <View
+        testID={testID}
         {...this.panResponder.panHandlers}
         style={[styles.container, style]}>
         <TouchableWeb

From 2b6b8bdfb1c63c0dd9c01654083dc4d1c871794e Mon Sep 17 00:00:00 2001
From: Ivan Vezhnavets <ivanvezhnavets@MacBook-Pro-Ivan.local>
Date: Fri, 4 Jun 2021 19:16:10 +0300
Subject: [PATCH 2/3] Fix: update interface

---
 src/components/ui/select/select.component.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/ui/select/select.component.tsx b/src/components/ui/select/select.component.tsx
index d8eec9182..14f139c2f 100644
--- a/src/components/ui/select/select.component.tsx
+++ b/src/components/ui/select/select.component.tsx
@@ -69,7 +69,6 @@ export interface SelectProps extends TouchableWebProps, SelectStyledProps {
   accessoryRight?: RenderProp<Partial<ImageProps>>;
   status?: EvaStatus;
   size?: EvaInputSize;
-  testID?: React.ReactText;
 }
 
 export type SelectElement = React.ReactElement<SelectProps>;

From fd699a5f0c6ea640bec47edf382d3113c624dbeb Mon Sep 17 00:00:00 2001
From: malashkevich <alexei.malashkevich@gmail.com>
Date: Tue, 15 Jun 2021 17:53:41 +0300
Subject: [PATCH 3/3] fix(styles): code style

---
 src/components/ui/datepicker/baseDatepicker.component.tsx | 6 +++---
 src/components/ui/spinner/spinner.component.tsx           | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/components/ui/datepicker/baseDatepicker.component.tsx b/src/components/ui/datepicker/baseDatepicker.component.tsx
index 7201cfe2b..13f943c5e 100644
--- a/src/components/ui/datepicker/baseDatepicker.component.tsx
+++ b/src/components/ui/datepicker/baseDatepicker.component.tsx
@@ -243,9 +243,9 @@ export abstract class BaseDatepickerComponent<P, D = Date> extends React.Compone
     const evaStyle = this.getComponentStyle(eva.style);
 
     return (
-      <View 
-      style={style}
-      testID={testID}>
+      <View
+        style={style}
+        testID={testID}>
         <FalsyText
           style={[evaStyle.label, styles.label]}
           component={label}
diff --git a/src/components/ui/spinner/spinner.component.tsx b/src/components/ui/spinner/spinner.component.tsx
index d28c6b57b..6e25ba5e1 100644
--- a/src/components/ui/spinner/spinner.component.tsx
+++ b/src/components/ui/spinner/spinner.component.tsx
@@ -159,7 +159,9 @@ export class Spinner extends React.PureComponent<SpinnerProps> {
     const evaStyle = this.getComponentStyle(this.animation.toProps());
 
     return (
-      <View testID={this.props.testID} style={containerSize}>
+      <View
+        testID={this.props.testID}
+        style={containerSize}>
         {this.renderArcElement(evaStyle.start, containerSize)}
         {this.renderArcElement(evaStyle.end, containerSize)}
       </View>