From e9028d1d35718d4565ff76fda6214b1a4c8e860f Mon Sep 17 00:00:00 2001
From: Brian Vaughn <bvaughn@fb.com>
Date: Wed, 6 Mar 2019 14:01:52 -0800
Subject: [PATCH] Re-organized views slightly in preparation for Profiler UI

---
 src/devtools/views/DevTools.js                         | 10 +++++-----
 src/devtools/views/{ => Elements}/EditableValue.css    |  0
 src/devtools/views/{ => Elements}/EditableValue.js     |  4 ++--
 src/devtools/views/{ => Elements}/Element.css          |  0
 src/devtools/views/{ => Elements}/Element.js           |  4 ++--
 src/devtools/views/{ => Elements}/Elements.css         |  0
 src/devtools/views/{ => Elements}/Elements.js          |  0
 src/devtools/views/{ => Elements}/HooksTree.css        |  0
 src/devtools/views/{ => Elements}/HooksTree.js         |  8 ++++----
 .../views/{ => Elements}/InspectHostNodesToggle.js     |  6 +++---
 .../views/{ => Elements}/InspectedElementTree.css      |  0
 .../views/{ => Elements}/InspectedElementTree.js       |  6 +++---
 src/devtools/views/{ => Elements}/KeyValue.css         |  0
 src/devtools/views/{ => Elements}/KeyValue.js          |  4 ++--
 src/devtools/views/{ => Elements}/OwnersStack.css      |  0
 src/devtools/views/{ => Elements}/OwnersStack.js       |  8 ++++----
 src/devtools/views/{ => Elements}/SearchInput.css      |  0
 src/devtools/views/{ => Elements}/SearchInput.js       |  6 +++---
 src/devtools/views/{ => Elements}/SelectedElement.css  |  0
 src/devtools/views/{ => Elements}/SelectedElement.js   | 10 +++++-----
 src/devtools/views/{ => Elements}/Tree.css             |  0
 src/devtools/views/{ => Elements}/Tree.js              |  2 +-
 src/devtools/views/{ => Elements}/TreeContext.js       |  6 +++---
 src/devtools/views/{ => Profiler}/Profiler.css         |  0
 src/devtools/views/{ => Profiler}/Profiler.js          |  0
 src/devtools/views/{ => Settings}/Settings.css         |  0
 src/devtools/views/{ => Settings}/Settings.js          |  0
 src/devtools/views/{ => Settings}/SettingsContext.js   |  4 ++--
 28 files changed, 39 insertions(+), 39 deletions(-)
 rename src/devtools/views/{ => Elements}/EditableValue.css (100%)
 rename src/devtools/views/{ => Elements}/EditableValue.js (97%)
 rename src/devtools/views/{ => Elements}/Element.css (100%)
 rename src/devtools/views/{ => Elements}/Element.js (98%)
 rename src/devtools/views/{ => Elements}/Elements.css (100%)
 rename src/devtools/views/{ => Elements}/Elements.js (100%)
 rename src/devtools/views/{ => Elements}/HooksTree.css (100%)
 rename src/devtools/views/{ => Elements}/HooksTree.js (96%)
 rename src/devtools/views/{ => Elements}/InspectHostNodesToggle.js (89%)
 rename src/devtools/views/{ => Elements}/InspectedElementTree.css (100%)
 rename src/devtools/views/{ => Elements}/InspectedElementTree.js (92%)
 rename src/devtools/views/{ => Elements}/KeyValue.css (100%)
 rename src/devtools/views/{ => Elements}/KeyValue.js (97%)
 rename src/devtools/views/{ => Elements}/OwnersStack.css (100%)
 rename src/devtools/views/{ => Elements}/OwnersStack.js (89%)
 rename src/devtools/views/{ => Elements}/SearchInput.css (100%)
 rename src/devtools/views/{ => Elements}/SearchInput.js (96%)
 rename src/devtools/views/{ => Elements}/SelectedElement.css (100%)
 rename src/devtools/views/{ => Elements}/SelectedElement.js (96%)
 rename src/devtools/views/{ => Elements}/Tree.css (100%)
 rename src/devtools/views/{ => Elements}/Tree.js (98%)
 rename src/devtools/views/{ => Elements}/TreeContext.js (99%)
 rename src/devtools/views/{ => Profiler}/Profiler.css (100%)
 rename src/devtools/views/{ => Profiler}/Profiler.js (100%)
 rename src/devtools/views/{ => Settings}/Settings.css (100%)
 rename src/devtools/views/{ => Settings}/Settings.js (100%)
 rename src/devtools/views/{ => Settings}/SettingsContext.js (97%)

diff --git a/src/devtools/views/DevTools.js b/src/devtools/views/DevTools.js
index 773794b88a..4ed6ec74cf 100644
--- a/src/devtools/views/DevTools.js
+++ b/src/devtools/views/DevTools.js
@@ -3,12 +3,12 @@
 import React, { useState } from 'react';
 import Store from '../store';
 import { BridgeContext, StoreContext } from './context';
-import Elements from './Elements';
-import Profiler from './Profiler';
-import Settings from './Settings';
+import Elements from './Elements/Elements';
+import Profiler from './Profiler/Profiler';
+import Settings from './Settings/Settings';
 import TabBar from './TabBar';
-import { SettingsContextController } from './SettingsContext';
-import { TreeContextController } from './TreeContext';
+import { SettingsContextController } from './Settings/SettingsContext';
+import { TreeContextController } from './Elements/TreeContext';
 
 import styles from './DevTools.css';
 
diff --git a/src/devtools/views/EditableValue.css b/src/devtools/views/Elements/EditableValue.css
similarity index 100%
rename from src/devtools/views/EditableValue.css
rename to src/devtools/views/Elements/EditableValue.css
diff --git a/src/devtools/views/EditableValue.js b/src/devtools/views/Elements/EditableValue.js
similarity index 97%
rename from src/devtools/views/EditableValue.js
rename to src/devtools/views/Elements/EditableValue.js
index d29e336781..23e35c9679 100644
--- a/src/devtools/views/EditableValue.js
+++ b/src/devtools/views/Elements/EditableValue.js
@@ -1,8 +1,8 @@
 // @flow
 
 import React, { Fragment, useCallback, useRef, useState } from 'react';
-import Button from './Button';
-import ButtonIcon from './ButtonIcon';
+import Button from '../Button';
+import ButtonIcon from '../ButtonIcon';
 import styles from './EditableValue.css';
 
 type OverrideValueFn = (path: Array<string | number>, value: any) => void;
diff --git a/src/devtools/views/Element.css b/src/devtools/views/Elements/Element.css
similarity index 100%
rename from src/devtools/views/Element.css
rename to src/devtools/views/Elements/Element.css
diff --git a/src/devtools/views/Element.js b/src/devtools/views/Elements/Element.js
similarity index 98%
rename from src/devtools/views/Element.js
rename to src/devtools/views/Elements/Element.js
index c797641556..610360586f 100644
--- a/src/devtools/views/Element.js
+++ b/src/devtools/views/Elements/Element.js
@@ -9,10 +9,10 @@ import React, {
   useRef,
 } from 'react';
 import { ElementTypeClass, ElementTypeFunction } from 'src/devtools/types';
-import { createRegExp } from './utils';
+import { createRegExp } from '../utils';
 import { TreeContext } from './TreeContext';
 
-import type { Element } from '../types';
+import type { Element } from '../../types';
 
 import styles from './Element.css';
 
diff --git a/src/devtools/views/Elements.css b/src/devtools/views/Elements/Elements.css
similarity index 100%
rename from src/devtools/views/Elements.css
rename to src/devtools/views/Elements/Elements.css
diff --git a/src/devtools/views/Elements.js b/src/devtools/views/Elements/Elements.js
similarity index 100%
rename from src/devtools/views/Elements.js
rename to src/devtools/views/Elements/Elements.js
diff --git a/src/devtools/views/HooksTree.css b/src/devtools/views/Elements/HooksTree.css
similarity index 100%
rename from src/devtools/views/HooksTree.css
rename to src/devtools/views/Elements/HooksTree.css
diff --git a/src/devtools/views/HooksTree.js b/src/devtools/views/Elements/HooksTree.js
similarity index 96%
rename from src/devtools/views/HooksTree.js
rename to src/devtools/views/Elements/HooksTree.js
index b35260f753..65cfb9cc22 100644
--- a/src/devtools/views/HooksTree.js
+++ b/src/devtools/views/Elements/HooksTree.js
@@ -2,12 +2,12 @@
 
 import { copy } from 'clipboard-js';
 import React, { useCallback, useContext } from 'react';
-import { BridgeContext, StoreContext } from './context';
-import Button from './Button';
-import ButtonIcon from './ButtonIcon';
+import { BridgeContext, StoreContext } from '../context';
+import Button from '../Button';
+import ButtonIcon from '../ButtonIcon';
 import EditableValue from './EditableValue';
 import KeyValue from './KeyValue';
-import { serializeHooksForCopy } from './utils';
+import { serializeHooksForCopy } from '../utils';
 import styles from './HooksTree.css';
 
 import type { HooksNode, HooksTree } from 'src/backend/types';
diff --git a/src/devtools/views/InspectHostNodesToggle.js b/src/devtools/views/Elements/InspectHostNodesToggle.js
similarity index 89%
rename from src/devtools/views/InspectHostNodesToggle.js
rename to src/devtools/views/Elements/InspectHostNodesToggle.js
index 2546059cd9..a20107fcb7 100644
--- a/src/devtools/views/InspectHostNodesToggle.js
+++ b/src/devtools/views/Elements/InspectHostNodesToggle.js
@@ -1,9 +1,9 @@
 // @flow
 
 import React, { useCallback, useContext, useEffect, useState } from 'react';
-import { BridgeContext } from './context';
-import Toggle from './Toggle';
-import ButtonIcon from './ButtonIcon';
+import { BridgeContext } from '../context';
+import Toggle from '../Toggle';
+import ButtonIcon from '../ButtonIcon';
 
 export default function InspectHostNodesToggle() {
   const [isInspecting, setIsInspecting] = useState(false);
diff --git a/src/devtools/views/InspectedElementTree.css b/src/devtools/views/Elements/InspectedElementTree.css
similarity index 100%
rename from src/devtools/views/InspectedElementTree.css
rename to src/devtools/views/Elements/InspectedElementTree.css
diff --git a/src/devtools/views/InspectedElementTree.js b/src/devtools/views/Elements/InspectedElementTree.js
similarity index 92%
rename from src/devtools/views/InspectedElementTree.js
rename to src/devtools/views/Elements/InspectedElementTree.js
index 5b14f48fb6..727760cd6b 100644
--- a/src/devtools/views/InspectedElementTree.js
+++ b/src/devtools/views/Elements/InspectedElementTree.js
@@ -2,10 +2,10 @@
 
 import { copy } from 'clipboard-js';
 import React, { useCallback } from 'react';
-import Button from './Button';
-import ButtonIcon from './ButtonIcon';
+import Button from '../Button';
+import ButtonIcon from '../ButtonIcon';
 import KeyValue from './KeyValue';
-import { serializeDataForCopy } from './utils';
+import { serializeDataForCopy } from '../utils';
 import styles from './InspectedElementTree.css';
 
 type OverrideValueFn = (path: Array<string | number>, value: any) => void;
diff --git a/src/devtools/views/KeyValue.css b/src/devtools/views/Elements/KeyValue.css
similarity index 100%
rename from src/devtools/views/KeyValue.css
rename to src/devtools/views/Elements/KeyValue.css
diff --git a/src/devtools/views/KeyValue.js b/src/devtools/views/Elements/KeyValue.js
similarity index 97%
rename from src/devtools/views/KeyValue.js
rename to src/devtools/views/Elements/KeyValue.js
index f2186ea16d..ead0293b8f 100644
--- a/src/devtools/views/KeyValue.js
+++ b/src/devtools/views/Elements/KeyValue.js
@@ -2,8 +2,8 @@
 
 import React from 'react';
 import EditableValue from './EditableValue';
-import { getMetaValueLabel } from './utils';
-import { meta } from '../../hydration';
+import { getMetaValueLabel } from '../utils';
+import { meta } from '../../../hydration';
 import styles from './KeyValue.css';
 
 type OverrideValueFn = (path: Array<string | number>, value: any) => void;
diff --git a/src/devtools/views/OwnersStack.css b/src/devtools/views/Elements/OwnersStack.css
similarity index 100%
rename from src/devtools/views/OwnersStack.css
rename to src/devtools/views/Elements/OwnersStack.css
diff --git a/src/devtools/views/OwnersStack.js b/src/devtools/views/Elements/OwnersStack.js
similarity index 89%
rename from src/devtools/views/OwnersStack.js
rename to src/devtools/views/Elements/OwnersStack.js
index e4f0eff30a..716f55a05d 100644
--- a/src/devtools/views/OwnersStack.js
+++ b/src/devtools/views/Elements/OwnersStack.js
@@ -1,12 +1,12 @@
 // @flow
 
 import React, { useCallback, useContext } from 'react';
-import Button from './Button';
-import ButtonIcon from './ButtonIcon';
+import Button from '../Button';
+import ButtonIcon from '../ButtonIcon';
 import { TreeContext } from './TreeContext';
-import { StoreContext } from './context';
+import { StoreContext } from '../context';
 
-import type { Element } from '../types';
+import type { Element } from '../../types';
 
 import styles from './OwnersStack.css';
 
diff --git a/src/devtools/views/SearchInput.css b/src/devtools/views/Elements/SearchInput.css
similarity index 100%
rename from src/devtools/views/SearchInput.css
rename to src/devtools/views/Elements/SearchInput.css
diff --git a/src/devtools/views/SearchInput.js b/src/devtools/views/Elements/SearchInput.js
similarity index 96%
rename from src/devtools/views/SearchInput.js
rename to src/devtools/views/Elements/SearchInput.js
index 103858138d..14d86e5261 100644
--- a/src/devtools/views/SearchInput.js
+++ b/src/devtools/views/Elements/SearchInput.js
@@ -2,9 +2,9 @@
 
 import React, { useCallback, useContext, useEffect, useRef } from 'react';
 import { TreeContext } from './TreeContext';
-import Button from './Button';
-import ButtonIcon from './ButtonIcon';
-import Icon from './Icon';
+import Button from '../Button';
+import ButtonIcon from '../ButtonIcon';
+import Icon from '../Icon';
 
 import styles from './SearchInput.css';
 
diff --git a/src/devtools/views/SelectedElement.css b/src/devtools/views/Elements/SelectedElement.css
similarity index 100%
rename from src/devtools/views/SelectedElement.css
rename to src/devtools/views/Elements/SelectedElement.css
diff --git a/src/devtools/views/SelectedElement.js b/src/devtools/views/Elements/SelectedElement.js
similarity index 96%
rename from src/devtools/views/SelectedElement.js
rename to src/devtools/views/Elements/SelectedElement.js
index ce3023db29..6b6074a81d 100644
--- a/src/devtools/views/SelectedElement.js
+++ b/src/devtools/views/Elements/SelectedElement.js
@@ -8,16 +8,16 @@ import React, {
   useState,
 } from 'react';
 import { TreeContext } from './TreeContext';
-import { BridgeContext, StoreContext } from './context';
-import Button from './Button';
-import ButtonIcon from './ButtonIcon';
+import { BridgeContext, StoreContext } from '../context';
+import Button from '../Button';
+import ButtonIcon from '../ButtonIcon';
 import HooksTree from './HooksTree';
 import InspectedElementTree from './InspectedElementTree';
 import { hydrate } from 'src/hydration';
 import styles from './SelectedElement.css';
-import { ElementTypeClass, ElementTypeFunction } from '../types';
+import { ElementTypeClass, ElementTypeFunction } from '../../types';
 
-import type { InspectedElement } from '../types';
+import type { InspectedElement } from '../../types';
 import type { DehydratedData, Element } from 'src/devtools/types';
 
 export type Props = {||};
diff --git a/src/devtools/views/Tree.css b/src/devtools/views/Elements/Tree.css
similarity index 100%
rename from src/devtools/views/Tree.css
rename to src/devtools/views/Elements/Tree.css
diff --git a/src/devtools/views/Tree.js b/src/devtools/views/Elements/Tree.js
similarity index 98%
rename from src/devtools/views/Tree.js
rename to src/devtools/views/Elements/Tree.js
index d2972e70a6..ae6c2b7a4a 100644
--- a/src/devtools/views/Tree.js
+++ b/src/devtools/views/Elements/Tree.js
@@ -10,7 +10,7 @@ import React, {
 import AutoSizer from 'react-virtualized-auto-sizer';
 import { FixedSizeList } from 'react-window';
 import { TreeContext } from './TreeContext';
-import { SettingsContext } from './SettingsContext';
+import { SettingsContext } from '../Settings/SettingsContext';
 import Element from './Element';
 import InspectHostNodesToggle from './InspectHostNodesToggle';
 import OwnersStack from './OwnersStack';
diff --git a/src/devtools/views/TreeContext.js b/src/devtools/views/Elements/TreeContext.js
similarity index 99%
rename from src/devtools/views/TreeContext.js
rename to src/devtools/views/Elements/TreeContext.js
index 715eee3cbf..616f6409cf 100644
--- a/src/devtools/views/TreeContext.js
+++ b/src/devtools/views/Elements/TreeContext.js
@@ -25,9 +25,9 @@ import React, {
   useMemo,
   useReducer,
 } from 'react';
-import { createRegExp } from './utils';
-import { BridgeContext, StoreContext } from './context';
-import Store from '../store';
+import { createRegExp } from '../utils';
+import { BridgeContext, StoreContext } from '../context';
+import Store from '../../store';
 
 import type { Element } from 'src/devtools/types';
 
diff --git a/src/devtools/views/Profiler.css b/src/devtools/views/Profiler/Profiler.css
similarity index 100%
rename from src/devtools/views/Profiler.css
rename to src/devtools/views/Profiler/Profiler.css
diff --git a/src/devtools/views/Profiler.js b/src/devtools/views/Profiler/Profiler.js
similarity index 100%
rename from src/devtools/views/Profiler.js
rename to src/devtools/views/Profiler/Profiler.js
diff --git a/src/devtools/views/Settings.css b/src/devtools/views/Settings/Settings.css
similarity index 100%
rename from src/devtools/views/Settings.css
rename to src/devtools/views/Settings/Settings.css
diff --git a/src/devtools/views/Settings.js b/src/devtools/views/Settings/Settings.js
similarity index 100%
rename from src/devtools/views/Settings.js
rename to src/devtools/views/Settings/Settings.js
diff --git a/src/devtools/views/SettingsContext.js b/src/devtools/views/Settings/SettingsContext.js
similarity index 97%
rename from src/devtools/views/SettingsContext.js
rename to src/devtools/views/Settings/SettingsContext.js
index 7898a68568..32f1df1930 100644
--- a/src/devtools/views/SettingsContext.js
+++ b/src/devtools/views/Settings/SettingsContext.js
@@ -1,9 +1,9 @@
 // @flow
 
 import React, { createContext, useLayoutEffect, useMemo } from 'react';
-import { useLocalStorage } from './hooks';
+import { useLocalStorage } from '../hooks';
 
-import type { BrowserTheme } from './DevTools';
+import type { BrowserTheme } from '../DevTools';
 
 export type DisplayDensity = 'compact' | 'comfortable';
 export type Theme = 'auto' | 'light' | 'dark';