From 292efb0bb3db4a2f893e478b638521c03e7210e8 Mon Sep 17 00:00:00 2001
From: Benjamin Elo <beneloca@fb.com>
Date: Mon, 29 Jul 2019 03:44:54 -0700
Subject: [PATCH] Moved NavPlugin types into seperate file

Summary: Moved Flow types into their own file. I will be adding more types as part of the auto complete for the navigation bar and this is to keep the code more organized.

Reviewed By: danielbuechele

Differential Revision: D16540279

fbshipit-source-id: d69ac0d05f91e9d92fcda37325c791ddc83a52c9
---
 .../__tests__/testNavigationPlugin.node.js    |  2 +-
 .../navigation/components/BookmarksSidebar.js |  2 +-
 .../components/SaveBookmarkDialog.js          |  2 +-
 .../navigation/components/SearchBar.js        |  2 +-
 src/plugins/navigation/components/Timeline.js |  2 +-
 src/plugins/navigation/flow-types.js          | 27 +++++++++++++++++++
 src/plugins/navigation/index.js               | 25 +++++------------
 src/plugins/navigation/util/indexedDB.js      |  2 +-
 8 files changed, 39 insertions(+), 25 deletions(-)
 create mode 100644 src/plugins/navigation/flow-types.js

diff --git a/src/plugins/navigation/__tests__/testNavigationPlugin.node.js b/src/plugins/navigation/__tests__/testNavigationPlugin.node.js
index 1642dd230..18db6fb6f 100644
--- a/src/plugins/navigation/__tests__/testNavigationPlugin.node.js
+++ b/src/plugins/navigation/__tests__/testNavigationPlugin.node.js
@@ -8,7 +8,7 @@
 
 import NavigationPlugin from '../';
 
-import type {PersistedState} from '../';
+import type {PersistedState} from '../flow-types';
 
 function constructPersistedStateMock(): PersistedState {
   return {
diff --git a/src/plugins/navigation/components/BookmarksSidebar.js b/src/plugins/navigation/components/BookmarksSidebar.js
index 791cc93b7..d6fb809ae 100644
--- a/src/plugins/navigation/components/BookmarksSidebar.js
+++ b/src/plugins/navigation/components/BookmarksSidebar.js
@@ -8,7 +8,7 @@
 
 import {DetailSidebar, FlexCenter, styled, colors} from 'flipper';
 
-import type {Bookmark} from '../';
+import type {Bookmark} from '../flow-types';
 
 type Props = {|
   bookmarks: Map<string, Bookmark>,
diff --git a/src/plugins/navigation/components/SaveBookmarkDialog.js b/src/plugins/navigation/components/SaveBookmarkDialog.js
index 3009d673e..e73036840 100644
--- a/src/plugins/navigation/components/SaveBookmarkDialog.js
+++ b/src/plugins/navigation/components/SaveBookmarkDialog.js
@@ -9,7 +9,7 @@
 import {Button, FlexColumn, Input, Sheet, styled} from 'flipper';
 import {useState} from 'react';
 
-import type {Bookmark} from '../';
+import type {Bookmark} from '../flow-types';
 
 type Props = {|
   uri: ?string,
diff --git a/src/plugins/navigation/components/SearchBar.js b/src/plugins/navigation/components/SearchBar.js
index c017ecbd6..5e8fabd62 100644
--- a/src/plugins/navigation/components/SearchBar.js
+++ b/src/plugins/navigation/components/SearchBar.js
@@ -16,7 +16,7 @@ import {
 } from 'flipper';
 import {IconButton, FavoriteButton} from './';
 
-import type {Bookmark} from '../';
+import type {Bookmark} from '../flow-types';
 
 type Props = {|
   onFavorite: (query: string) => void,
diff --git a/src/plugins/navigation/components/Timeline.js b/src/plugins/navigation/components/Timeline.js
index 8e01a08bc..18ddabbd8 100644
--- a/src/plugins/navigation/components/Timeline.js
+++ b/src/plugins/navigation/components/Timeline.js
@@ -9,7 +9,7 @@
 import {styled} from 'flipper';
 import {NavigationInfoBox} from './';
 
-import type {Bookmark, NavigationEvent} from '../';
+import type {Bookmark, NavigationEvent} from '../flow-types';
 
 type Props = {|
   bookmarks: Map<string, Bookmark>,
diff --git a/src/plugins/navigation/flow-types.js b/src/plugins/navigation/flow-types.js
new file mode 100644
index 000000000..38c3ade0d
--- /dev/null
+++ b/src/plugins/navigation/flow-types.js
@@ -0,0 +1,27 @@
+/**
+ * Copyright 2018-present Facebook.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ * @format
+ * @flow strict-local
+ */
+
+export type State = {|
+  bookmarks: Map<string, Bookmark>,
+  shouldShowSaveBookmarkDialog: boolean,
+  saveBookmarkURI: ?string,
+|};
+
+export type PersistedState = {|
+  navigationEvents: Array<NavigationEvent>,
+|};
+
+export type NavigationEvent = {|
+  date: ?Date,
+  uri: ?string,
+|};
+
+export type Bookmark = {|
+  uri: string,
+  commonName: string,
+|};
diff --git a/src/plugins/navigation/index.js b/src/plugins/navigation/index.js
index 1126a7b6d..f58f4eb8d 100644
--- a/src/plugins/navigation/index.js
+++ b/src/plugins/navigation/index.js
@@ -16,25 +16,12 @@ import {
 } from './components';
 import {readBookmarksFromDB, writeBookmarkToDB} from './util/indexedDB';
 
-type State = {|
-  bookmarks: Map<string, Bookmark>,
-  shouldShowSaveBookmarkDialog: boolean,
-  saveBookmarkURI: ?string,
-|};
-
-export type NavigationEvent = {|
-  date: ?Date,
-  uri: ?string,
-|};
-
-export type Bookmark = {|
-  uri: string,
-  commonName: string,
-|};
-
-export type PersistedState = {|
-  navigationEvents: Array<NavigationEvent>,
-|};
+import type {
+  State,
+  PersistedState,
+  Bookmark,
+  NavigationEvent,
+} from './flow-types';
 
 export default class extends FlipperPlugin<State, {}, PersistedState> {
   static title = 'Navigation';
diff --git a/src/plugins/navigation/util/indexedDB.js b/src/plugins/navigation/util/indexedDB.js
index b0fe6910a..09d1e7f39 100644
--- a/src/plugins/navigation/util/indexedDB.js
+++ b/src/plugins/navigation/util/indexedDB.js
@@ -6,7 +6,7 @@
  * @flow strict-local
  */
 
-import type {Bookmark} from '../';
+import type {Bookmark} from '../flow-types';
 
 const FLIPPER_NAVIGATION_PLUGIN_DB = 'flipper_navigation_plugin_db';
 const FLIPPER_NAVIGATION_PLUGIN_DB_VERSION = 1;