react-router-native 5.1.2 → 5.3.1

package/BackButton.js

@@ -1,7 +1,7 @@
 import React from "react";
 import { BackHandler } from "react-native";
 
-import { __RouterContext as RouterContext } from "react-router";
+import { __HistoryContext as HistoryContext } from "react-router";
 
 class BackButton extends React.Component {
   handleBack = () => {
@@ -23,12 +23,12 @@ class BackButton extends React.Component {
 
   render() {
     return (
-      <RouterContext.Consumer>
-        {context => {
-          this.history = context.history;
+      <HistoryContext.Consumer>
+        {history => {
+          this.history = history;
           return this.props.children || null;
         }}
-      </RouterContext.Consumer>
+      </HistoryContext.Consumer>
     );
   }
 }

package/DeepLinking.js

@@ -1,7 +1,7 @@
 import React from "react";
 import { Linking } from "react-native";
 
-import { __RouterContext as RouterContext } from "react-router";
+import { __HistoryContext as HistoryContext } from "react-router";
 
 const protocolAndSlashes = /.*?:\/\//g;
 
@@ -27,12 +27,12 @@ class DeepLinking extends React.Component {
 
   render() {
     return (
-      <RouterContext.Consumer>
-        {context => {
-          this.history = context.history;
+      <HistoryContext.Consumer>
+        {history => {
+          this.history = history;
           return this.props.children || null;
         }}
-      </RouterContext.Consumer>
+      </HistoryContext.Consumer>
     );
   }
 }

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) React Training 2016-2018
+Copyright (c) React Training
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/Link.js

@@ -2,9 +2,9 @@ import React from "react";
 import { TouchableHighlight } from "react-native";
 import PropTypes from "prop-types";
 
-import { __RouterContext as RouterContext } from "react-router";
+import { __HistoryContext as HistoryContext } from "react-router";
 
-class Link extends React.Component {
+export default class Link extends React.Component {
   static defaultProps = {
     component: TouchableHighlight,
     replace: false
@@ -28,14 +28,14 @@ class Link extends React.Component {
     const { component: Component, to, replace, ...rest } = this.props;
 
     return (
-      <RouterContext.Consumer>
-        {context => (
+      <HistoryContext.Consumer>
+        {history => (
           <Component
             {...rest}
-            onPress={event => this.handlePress(event, context.history)}
+            onPress={event => this.handlePress(event, history)}
           />
         )}
-      </RouterContext.Consumer>
+      </HistoryContext.Consumer>
     );
   }
 }
@@ -45,10 +45,8 @@ const __DEV__ = true; // TODO
 if (__DEV__) {
   Link.propTypes = {
     onPress: PropTypes.func,
-    component: PropTypes.func,
+    component: PropTypes.elementType,
     replace: PropTypes.bool,
     to: PropTypes.oneOfType([PropTypes.string, PropTypes.object])
   };
 }
-
-export default Link;

package/README.md

@@ -1,6 +1,6 @@
 # react-router-native
 
-[React Native](https://facebook.github.io/react-native/) bindings for [React Router](https://reacttraining.com/react-router).
+[React Native](https://facebook.github.io/react-native/) bindings for [React Router](https://reactrouter.com).
 
 ## Installation
 
@@ -22,7 +22,7 @@ var Link = require("react-router-native").Link;
 
 ## Issues
 
-If you find a bug, please file an issue on [our issue tracker on GitHub](https://github.com/ReactTraining/react-router/issues).
+If you find a bug, please file an issue on [our issue tracker on GitHub](https://github.com/remix-run/react-router/issues).
 
 ## Credits
 

package/experimental/StackRoute.js

@@ -10,7 +10,7 @@ import { Route, Redirect } from "react-router";
 import { Text, View, Dimensions, Animated, PanResponder } from "react-native";
 import PropTypes from "prop-types";
 
-import Link from "../Link";
+import Link from "../Link.js";
 
 class StackContainer extends Component {
   static contextTypes = {
@@ -136,7 +136,7 @@ class AnimatedStack extends React.Component {
             Animated.timing(this.animation, {
               toValue: 0,
               duration: releaseRatio * ANIMATION_DURATION + 2000
-            }).start(({ finished }) => {
+            }).start(() => {
               this.props.onCancelPan();
             });
           }
@@ -147,7 +147,7 @@ class AnimatedStack extends React.Component {
           Animated.timing(this.animation, {
             toValue: width,
             duration: (1 - releaseRatio) * ANIMATION_DURATION + 2000
-          }).start(({ finished }) => {
+          }).start(() => {
             this.setState({
               previousProps: null
             });
@@ -186,7 +186,7 @@ class AnimatedStack extends React.Component {
             Animated.timing(this.animation, {
               toValue: width,
               duration: ANIMATION_DURATION
-            }).start(({ finished }) => {
+            }).start(() => {
               this.setState({ previousProps: null });
             });
           }
@@ -198,7 +198,7 @@ class AnimatedStack extends React.Component {
   render() {
     const { width, height } = Dimensions.get("window");
     const { direction } = this.props;
-    const { previousProps, panDx, panning, panStartLeft } = this.state;
+    const { previousProps, panning, panStartLeft } = this.state;
     const animating = !!previousProps;
     const bothProps = [this.props];
     if (animating) bothProps.push(previousProps);
@@ -229,14 +229,14 @@ class AnimatedStack extends React.Component {
                   opacity: !transitioning
                     ? 1
                     : isParent
-                      ? this.animation.interpolate({
-                          inputRange: [0, width],
-                          outputRange: [0, 1]
-                        })
-                      : this.animation.interpolate({
-                          inputRange: [0, width],
-                          outputRange: [1, 0]
-                        }),
+                    ? this.animation.interpolate({
+                        inputRange: [0, width],
+                        outputRange: [0, 1]
+                      })
+                    : this.animation.interpolate({
+                        inputRange: [0, width],
+                        outputRange: [1, 0]
+                      }),
                   flexDirection: "row",
                   alignItems: "center",
                   position: "absolute",
@@ -272,42 +272,39 @@ class AnimatedStack extends React.Component {
                       translateX: !transitioning
                         ? 0
                         : panning
-                          ? isParent
-                            ? this.animation.interpolate({
-                                inputRange: [0, width],
-                                outputRange: [
-                                  -PARENT_TRAVEL_DISTANCE - panStartLeft,
-                                  -panStartLeft
-                                ]
-                              })
-                            : this.animation.interpolate({
-                                inputRange: [0, width],
-                                outputRange: [
-                                  -panStartLeft,
-                                  width - panStartLeft
-                                ]
-                              })
+                        ? isParent
+                          ? this.animation.interpolate({
+                              inputRange: [0, width],
+                              outputRange: [
+                                -PARENT_TRAVEL_DISTANCE - panStartLeft,
+                                -panStartLeft
+                              ]
+                            })
                           : this.animation.interpolate({
                               inputRange: [0, width],
-                              outputRange: isParent
-                                ? direction === "down"
-                                  ? [width + CARD_SHADOW_RADIUS, 0]
-                                  : [-PARENT_TRAVEL_DISTANCE, 0]
-                                : direction === "down"
-                                  ? [0, -PARENT_TRAVEL_DISTANCE]
-                                  : [0, width + CARD_SHADOW_RADIUS]
+                              outputRange: [-panStartLeft, width - panStartLeft]
                             })
+                        : this.animation.interpolate({
+                            inputRange: [0, width],
+                            outputRange: isParent
+                              ? direction === "down"
+                                ? [width + CARD_SHADOW_RADIUS, 0]
+                                : [-PARENT_TRAVEL_DISTANCE, 0]
+                              : direction === "down"
+                              ? [0, -PARENT_TRAVEL_DISTANCE]
+                              : [0, width + CARD_SHADOW_RADIUS]
+                          })
                     }
                   ],
                   zIndex: !transitioning
                     ? 1
                     : isParent
-                      ? direction === "down"
-                        ? 1
-                        : 0
-                      : direction === "down"
-                        ? 0
-                        : 1,
+                    ? direction === "down"
+                      ? 1
+                      : 0
+                    : direction === "down"
+                    ? 0
+                    : 1,
                   position: "absolute",
                   width,
                   height,
@@ -323,20 +320,20 @@ class AnimatedStack extends React.Component {
                           outputRange: [PARENT_FINAL_OPACITY, 1]
                         })
                     : !transitioning
-                      ? 1
-                      : isParent && "direction" === "down"
-                        ? 1
-                        : this.animation.interpolate({
-                            inputRange: [0, width],
-                            outputRange:
-                              index === 1 && direction === "down"
-                                ? [1, PARENT_FINAL_OPACITY]
-                                : isParent && direction === "up"
-                                  ? [PARENT_FINAL_OPACITY, 1]
-                                  : index === 1 && direction === "up"
-                                    ? [1, 1]
-                                    : [1, 1]
-                          })
+                    ? 1
+                    : isParent && "direction" === "down"
+                    ? 1
+                    : this.animation.interpolate({
+                        inputRange: [0, width],
+                        outputRange:
+                          index === 1 && direction === "down"
+                            ? [1, PARENT_FINAL_OPACITY]
+                            : isParent && direction === "up"
+                            ? [PARENT_FINAL_OPACITY, 1]
+                            : index === 1 && direction === "up"
+                            ? [1, 1]
+                            : [1, 1]
+                      })
                 }}
               >
                 {props.content}

package/experimental/TabRoutes.js

@@ -2,7 +2,7 @@ import React from "react";
 import { Route } from "react-router";
 import { View } from "react-native";
 
-import Link from "../Link";
+import Link from "../Link.js";
 
 export class TabRoutes extends React.Component {
   render() {

package/main.js

@@ -1,14 +1,22 @@
-export * from "react-router";
-
-import BackButton from "./BackButton";
-import DeepLinking from "./DeepLinking";
-import Link from "./Link";
-import NativeRouter from "./NativeRouter";
-
 export {
-  BackButton,
-  BackButton as AndroidBackButton,
-  DeepLinking,
-  Link,
-  NativeRouter
-};
+  MemoryRouter,
+  Prompt,
+  Redirect,
+  Route,
+  Router,
+  StaticRouter,
+  Switch,
+  generatePath,
+  matchPath,
+  withRouter,
+  useHistory,
+  useLocation,
+  useParams,
+  useRouteMatch
+} from "react-router";
+
+export { default as BackButton } from "./BackButton.js";
+export { default as AndroidBackButton } from "./BackButton.js";
+export { default as DeepLinking } from "./DeepLinking.js";
+export { default as Link } from "./Link.js";
+export { default as NativeRouter } from "./NativeRouter.js";

package/package.json

@@ -1,20 +1,23 @@
 {
   "name": "react-router-native",
-  "version": "5.1.2",
+  "version": "5.3.1",
   "description": "React Native bindings for React Router",
-  "repository": "ReactTraining/react-router",
+  "homepage": "https://reactrouter.com/",
+  "repository": {
+    "url": "https://github.com/remix-run/react-router.git",
+    "type": "git",
+    "directory": "packages/react-router-native"
+  },
   "license": "MIT",
-  "authors": [
-    "Michael Jackson",
-    "Ryan Florence"
-  ],
+  "author": "React Training <hello@reacttraining.com>",
   "main": "main.js",
   "sideEffects": false,
   "scripts": {
-    "start": "node node_modules/react-native/local-cli/cli.js start",
-    "test": "jest"
+    "start": "node node_modules/react-native/local-cli/cli.js start"
   },
   "files": [
+    "LICENSE",
+    "README.md",
     "BackButton.js",
     "DeepLinking.js",
     "Link.js",
@@ -29,16 +32,6 @@
   },
   "dependencies": {
     "prop-types": "^15.6.1",
-    "react-router": "5.1.2"
-  },
-  "devDependencies": {
-    "babel-jest": "^24.8.0",
-    "jest": "^24.8.0",
-    "jest-circus": "^24.8.0",
-    "metro-react-native-babel-preset": "^0.53.1",
-    "react": "^16.8.3",
-    "react-native": "^0.59.8",
-    "react-test-renderer": "^16.8.3"
-  },
-  "gitHead": "f31bb27aa61dd4cb1c3cd9aa78133f739e2e9bb9"
+    "react-router": "5.3.1"
+  }
 }