From 7845377174a55f323a120436d46b030abe2c1da0 Mon Sep 17 00:00:00 2001
From: Brent Vatne <brentvatne@gmail.com>
Date: Thu, 15 Feb 2018 13:24:40 -0800
Subject: [PATCH] Revert "Add getParam navigation helper (#3510)" (#3532)

This reverts commit 50dcb37cd728715da4a971646127c684b5597088.
---
 .../__tests__/addNavigationHelpers-test.js    | 39 -------------------
 .../src/addNavigationHelpers.js               | 10 -----
 .../__snapshots__/StackNavigator-test.js.snap |  2 -
 .../__snapshots__/TabView-test.js.snap        |  1 -
 4 files changed, 52 deletions(-)

diff --git a/packages/react-navigation/src/__tests__/addNavigationHelpers-test.js b/packages/react-navigation/src/__tests__/addNavigationHelpers-test.js
index b2877db7..d5ff1fba 100644
--- a/packages/react-navigation/src/__tests__/addNavigationHelpers-test.js
+++ b/packages/react-navigation/src/__tests__/addNavigationHelpers-test.js
@@ -76,43 +76,4 @@ describe('addNavigationHelpers', () => {
     });
     expect(mockedDispatch.mock.calls.length).toBe(1);
   });
-
-  it('handles GetParams action', () => {
-    const mockedDispatch = jest
-      .fn(() => false)
-      .mockImplementationOnce(() => true);
-    expect(
-      addNavigationHelpers({
-        state: { key: 'B', routeName: 'Settings', params: { name: 'Peter' } },
-        dispatch: mockedDispatch,
-        addListener: dummyEventSubscriber,
-      }).getParam('name', 'Brent')
-    ).toEqual('Peter');
-  });
-
-  it('handles GetParams action with default param', () => {
-    const mockedDispatch = jest
-      .fn(() => false)
-      .mockImplementationOnce(() => true);
-    expect(
-      addNavigationHelpers({
-        state: { key: 'B', routeName: 'Settings' },
-        dispatch: mockedDispatch,
-        addListener: dummyEventSubscriber,
-      }).getParam('name', 'Brent')
-    ).toEqual('Brent');
-  });
-
-  it('handles GetParams action with param value as null', () => {
-    const mockedDispatch = jest
-      .fn(() => false)
-      .mockImplementationOnce(() => true);
-    expect(
-      addNavigationHelpers({
-        state: { key: 'B', routeName: 'Settings', params: { name: null } },
-        dispatch: mockedDispatch,
-        addListener: dummyEventSubscriber,
-      }).getParam('name')
-    ).toEqual(null);
-  });
 });
diff --git a/packages/react-navigation/src/addNavigationHelpers.js b/packages/react-navigation/src/addNavigationHelpers.js
index 559f8df9..a56721cf 100644
--- a/packages/react-navigation/src/addNavigationHelpers.js
+++ b/packages/react-navigation/src/addNavigationHelpers.js
@@ -61,16 +61,6 @@ export default function(navigation) {
       return navigation.dispatch(NavigationActions.setParams({ params, key }));
     },
 
-    getParam: (paramName, defaultValue) => {
-      const params = navigation.state.params;
-
-      if (params && paramName in params) {
-        return params[paramName];
-      }
-
-      return defaultValue;
-    },
-
     push: (routeName, params, action) =>
       navigation.dispatch(
         NavigationActions.push({ routeName, params, action })
diff --git a/packages/react-navigation/src/navigators/__tests__/__snapshots__/StackNavigator-test.js.snap b/packages/react-navigation/src/navigators/__tests__/__snapshots__/StackNavigator-test.js.snap
index 2da09869..603882d5 100644
--- a/packages/react-navigation/src/navigators/__tests__/__snapshots__/StackNavigator-test.js.snap
+++ b/packages/react-navigation/src/navigators/__tests__/__snapshots__/StackNavigator-test.js.snap
@@ -95,7 +95,6 @@ exports[`StackNavigator applies correct values when headerRight is present 1`] =
         Object {
           "addListener": [Function],
           "dispatch": [Function],
-          "getParam": [Function],
           "goBack": [Function],
           "navigate": [Function],
           "pop": [Function],
@@ -335,7 +334,6 @@ exports[`StackNavigator renders successfully 1`] = `
         Object {
           "addListener": [Function],
           "dispatch": [Function],
-          "getParam": [Function],
           "goBack": [Function],
           "navigate": [Function],
           "pop": [Function],
diff --git a/packages/react-navigation/src/views/__tests__/__snapshots__/TabView-test.js.snap b/packages/react-navigation/src/views/__tests__/__snapshots__/TabView-test.js.snap
index 48b73902..a5527dff 100644
--- a/packages/react-navigation/src/views/__tests__/__snapshots__/TabView-test.js.snap
+++ b/packages/react-navigation/src/views/__tests__/__snapshots__/TabView-test.js.snap
@@ -237,7 +237,6 @@ exports[`TabBarBottom renders successfully 1`] = `
               Object {
                 "addListener": [Function],
                 "dispatch": undefined,
-                "getParam": [Function],
                 "goBack": [Function],
                 "navigate": [Function],
                 "pop": [Function],