From 6a0c6de32912e1efc19f90b679b1b3b9ac48f97e Mon Sep 17 00:00:00 2001
From: Brent Vatne <brentvatne@gmail.com>
Date: Fri, 24 Aug 2018 10:06:37 -0700
Subject: [PATCH] Filter out active prop on dummy screen component

---
 .../NestedNavigator-test.js.snap              |  2 --
 .../__snapshots__/StackNavigator-test.js.snap |  2 --
 src/views/StackView/StackViewCard.js          | 25 +++++++------------
 src/views/StackView/screens.js                | 15 ++++++++++-
 4 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/src/navigators/__tests__/__snapshots__/NestedNavigator-test.js.snap b/src/navigators/__tests__/__snapshots__/NestedNavigator-test.js.snap
index 9f950b6..1a93372 100644
--- a/src/navigators/__tests__/__snapshots__/NestedNavigator-test.js.snap
+++ b/src/navigators/__tests__/__snapshots__/NestedNavigator-test.js.snap
@@ -44,7 +44,6 @@ exports[`Nested navigators renders succesfully as direct child 1`] = `
       <View
         accessibilityElementsHidden={false}
         accessible={true}
-        active={1}
         collapsable={undefined}
         pointerEvents="auto"
         style={
@@ -118,7 +117,6 @@ exports[`Nested navigators renders succesfully as direct child 1`] = `
               <View
                 accessibilityElementsHidden={false}
                 accessible={true}
-                active={1}
                 collapsable={undefined}
                 pointerEvents="auto"
                 style={
diff --git a/src/navigators/__tests__/__snapshots__/StackNavigator-test.js.snap b/src/navigators/__tests__/__snapshots__/StackNavigator-test.js.snap
index 811c4b9..0784d6a 100644
--- a/src/navigators/__tests__/__snapshots__/StackNavigator-test.js.snap
+++ b/src/navigators/__tests__/__snapshots__/StackNavigator-test.js.snap
@@ -44,7 +44,6 @@ exports[`StackNavigator applies correct values when headerRight is present 1`] =
       <View
         accessibilityElementsHidden={false}
         accessible={true}
-        active={1}
         collapsable={undefined}
         pointerEvents="auto"
         style={
@@ -240,7 +239,6 @@ exports[`StackNavigator renders successfully 1`] = `
       <View
         accessibilityElementsHidden={false}
         accessible={true}
-        active={1}
         collapsable={undefined}
         pointerEvents="auto"
         style={
diff --git a/src/views/StackView/StackViewCard.js b/src/views/StackView/StackViewCard.js
index 5835dac..17cc155 100644
--- a/src/views/StackView/StackViewCard.js
+++ b/src/views/StackView/StackViewCard.js
@@ -3,7 +3,6 @@ import { StyleSheet, Platform } from 'react-native';
 import { Screen } from './screens';
 import createPointerEventsContainer from './createPointerEventsContainer';
 
-/* eslint-disable no-unused-vars */
 const EPS = 1e-5;
 
 function getAccessibilityProps(isActive) {
@@ -30,28 +29,22 @@ class Card extends React.Component {
       children,
       pointerEvents,
       style,
-      // position,
-      scene: { /* index, */ isActive },
+      position,
+      scene: { index, isActive },
     } = this.props;
 
-    // If we use react-native <= 0.55, we can't call position.__makeNative()
-    // before binding this value to the view. If we use >= 0.56, then we have
-    // to call position.__makeNative(). Unclear to me what is happening here
-    // so temporarily commented this out.
-    //
-    // const active = position.interpolate({
-    //   inputRange: [index, index + 1 - EPS, index + 1],
-    //   outputRange: [1, 1, 0],
-    //   extrapolate: 'clamp',
-    // });
+    const active = position.interpolate({
+      inputRange: [index, index + 1 - EPS, index + 1],
+      outputRange: [1, 1, 0],
+      extrapolate: 'clamp',
+    });
 
     return (
       <Screen
         pointerEvents={pointerEvents}
-        ref={this.props.onComponentRef}
+        onComponentRef={this.props.onComponentRef}
         style={[styles.main, style]}
-        // active={active}
-        active={isActive ? 1 : 0}
+        active={active}
         {...getAccessibilityProps(isActive)}
       >
         {children}
diff --git a/src/views/StackView/screens.js b/src/views/StackView/screens.js
index fce1d3f..914f215 100644
--- a/src/views/StackView/screens.js
+++ b/src/views/StackView/screens.js
@@ -1,6 +1,19 @@
+import React from 'react';
 import { Animated, View } from 'react-native';
 
 const ScreenContainer = View;
-const Screen = Animated.View;
+
+class Screen extends React.Component {
+  render() {
+    // Filter out active prop in this case because it is unused and
+    // can cause problems depending on react-native version:
+    // https://github.com/react-navigation/react-navigation/issues/4886
+
+    /* eslint-disable no-unused-vars */
+    const { active, onComponentRef, ...props } = this.props;
+
+    return <Animated.View {...props} ref={onComponentRef} />;
+  }
+}
 
 export { ScreenContainer, Screen };