From 375024024b023767b6410aa2e8e2f7885107a9bb Mon Sep 17 00:00:00 2001
From: Thomas Pucci <thomas.lb.pucci@gmail.com>
Date: Tue, 3 Apr 2018 18:27:35 +0200
Subject: [PATCH] feat(package): Can focus nested input (avoiding not focusable
 fields)

---
 src/__tests__/withNextInputAutoFocus.js | 11 ++++++++--
 src/withNextInputAutoFocus.js           | 28 +++++++++++++++++++------
 2 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/src/__tests__/withNextInputAutoFocus.js b/src/__tests__/withNextInputAutoFocus.js
index c267294..e0e9a30 100644
--- a/src/__tests__/withNextInputAutoFocus.js
+++ b/src/__tests__/withNextInputAutoFocus.js
@@ -35,7 +35,10 @@ describe("withNextInputAutoFocus", () => {
     const wrapper = mount(
       <Form>
         <Input name="first" />
-        <Input name="second" />
+        <View>
+          <View name="not-focusable" />
+          <Input name="second" />
+        </View>
         <Input name="last" />
         <Button onPress={jest.fn()} title="SUBMIT" />
       </Form>
@@ -62,7 +65,11 @@ describe("withNextInputAutoFocus", () => {
     const onSubmitEditing = jest.fn();
     const wrapper = mount(
       <Form>
-        <Input name="first" returnKeyType="correct value" onSubmitEditing={onSubmitEditing} />
+        <Input
+          name="first"
+          returnKeyType="correct value"
+          onSubmitEditing={onSubmitEditing}
+        />
       </Form>
     );
 
diff --git a/src/withNextInputAutoFocus.js b/src/withNextInputAutoFocus.js
index bad458c..4e3c18f 100644
--- a/src/withNextInputAutoFocus.js
+++ b/src/withNextInputAutoFocus.js
@@ -10,7 +10,14 @@ const withNextInputAutoFocusContextType = {
   getReturnKeyType: PropTypes.func
 };
 
-const isInput = component => component && !!component.props.name;
+getInputs = children =>
+  (isArray(children) ? children : [children]).reduce((partialInputs, child) => {
+    if (child.props.children) {
+      return partialInputs.concat(getInputs(child.props.children));
+    }
+    if (child && !!child.props.name) return partialInputs.concat(child);
+    return partialInputs;
+  }, []);
 
 export const withNextInputAutoFocusForm = WrappedComponent => {
   class WithNextInputAutoFocusForm extends React.PureComponent {
@@ -20,14 +27,15 @@ export const withNextInputAutoFocusForm = WrappedComponent => {
     constructor(props) {
       super(props);
       const { children } = props;
-      this.inputs = (isArray(children) ? children : [children]).filter(isInput);
+      this.inputs = getInputs(children);
     }
 
     inputs;
     inputNameMap;
     inputRefs = {};
 
-    getInputPosition = name => this.inputs.findIndex(input => input.props.name === name);
+    getInputPosition = name =>
+      this.inputs.findIndex(input => input.props.name === name);
 
     getChildContext = () => ({
       setInput: (name, component) => {
@@ -40,8 +48,13 @@ export const withNextInputAutoFocusForm = WrappedComponent => {
         if (isLastInput) {
           this.context.formik.submitForm();
         } else {
-          const nextInput = this.inputs[inputPosition + 1];
-          this.inputRefs[nextInput.props.name].focus();
+          const nextInputs = this.inputs.slice(inputPosition + 1);
+          const nextFocusableInput = nextInputs.find(
+            element =>
+              this.inputRefs[element.props.name] &&
+              this.inputRefs[element.props.name].focus
+          );
+          this.inputRefs[nextFocusableInput.props.name].focus();
         }
       },
       getReturnKeyType: name => {
@@ -61,7 +74,10 @@ export const withNextInputAutoFocusForm = WrappedComponent => {
 };
 
 export const withNextInputAutoFocusInput = Input => {
-  class WithNextInputAutoFocusInput extends React.Component<$FlowFixMeProps, $FlowFixMeState> {
+  class WithNextInputAutoFocusInput extends React.Component<
+    $FlowFixMeProps,
+    $FlowFixMeState
+  > {
     static contextTypes = withNextInputAutoFocusContextType;
 
     setInput = component => {