From cd10856c3e9444c59cec0c07d0d3064bf76e6f50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20B=C3=BCchele?= Date: Tue, 20 Aug 2019 03:18:32 -0700 Subject: [PATCH] Colors Summary: _typescript_ Reviewed By: priteshrnandgaonkar Differential Revision: D16828226 fbshipit-source-id: e6dd9946ae642a27ebc8a3f6dfce6773051f5a7a --- src/ui/components/Button.js | 2 +- src/ui/components/FocusableBox.js | 2 +- src/ui/components/Input.js | 2 +- src/ui/components/Link.js | 2 +- src/ui/components/MarkerTimeline.js | 2 +- src/ui/components/Panel.js | 2 +- src/ui/components/Popover.js | 2 +- src/ui/components/Sidebar.js | 2 +- src/ui/components/SidebarLabel.js | 2 +- src/ui/components/StackTrace.js | 2 +- src/ui/components/Tabs.js | 2 +- src/ui/components/ToggleSwitch.js | 2 +- src/ui/components/Toolbar.js | 2 +- src/ui/components/TooltipProvider.js | 2 +- src/ui/components/{colors.js => colors.tsx} | 0 src/ui/components/data-inspector/DataDescription.js | 2 +- src/ui/components/data-inspector/DataInspector.js | 2 +- src/ui/components/elements-inspector/elements.js | 2 +- src/ui/components/filter/FilterRow.js | 2 +- src/ui/components/searchable/FilterToken.js | 2 +- src/ui/components/searchable/Searchable.js | 2 +- src/ui/components/table/TableHead.js | 2 +- src/ui/components/table/TableRow.js | 2 +- src/ui/components/table/TypeBasedValueRenderer.js | 2 +- src/ui/index.js | 2 +- 25 files changed, 24 insertions(+), 24 deletions(-) rename src/ui/components/{colors.js => colors.tsx} (100%) diff --git a/src/ui/components/Button.js b/src/ui/components/Button.js index a8e39031d..4eab3d50f 100644 --- a/src/ui/components/Button.js +++ b/src/ui/components/Button.js @@ -10,7 +10,7 @@ import Glyph from './Glyph.js'; import PropTypes from 'prop-types'; import electron from 'electron'; import styled from '../styled/index.js'; -import {colors} from './colors.js'; +import {colors} from './colors.tsx'; import {connect} from 'react-redux'; import {findDOMNode} from 'react-dom'; import {keyframes} from 'react-emotion'; diff --git a/src/ui/components/FocusableBox.js b/src/ui/components/FocusableBox.js index c69288ebc..69f4b5fd0 100644 --- a/src/ui/components/FocusableBox.js +++ b/src/ui/components/FocusableBox.js @@ -7,7 +7,7 @@ import {Component} from 'react'; import Box from './Box.js'; -import {colors} from './colors'; +import {colors} from './colors.tsx'; import styled from '../styled/index.js'; const FocusableBoxBorder = styled(Box)({ diff --git a/src/ui/components/Input.js b/src/ui/components/Input.js index 7c2776513..e48caf611 100644 --- a/src/ui/components/Input.js +++ b/src/ui/components/Input.js @@ -6,7 +6,7 @@ */ import styled from '../styled/index.js'; -import {colors} from './colors.js'; +import {colors} from './colors.tsx'; export const inputStyle = (compact: boolean) => ({ border: `1px solid ${colors.light15}`, diff --git a/src/ui/components/Link.js b/src/ui/components/Link.js index c870bf241..173d2fb16 100644 --- a/src/ui/components/Link.js +++ b/src/ui/components/Link.js @@ -6,7 +6,7 @@ */ import styled from '../styled/index.js'; -import {colors} from './colors.js'; +import {colors} from './colors.tsx'; import {Component} from 'react'; import {shell} from 'electron'; diff --git a/src/ui/components/MarkerTimeline.js b/src/ui/components/MarkerTimeline.js index d03c81218..bb950ae18 100644 --- a/src/ui/components/MarkerTimeline.js +++ b/src/ui/components/MarkerTimeline.js @@ -9,7 +9,7 @@ import {Component} from 'react'; import styled from '../styled/index.js'; import Text from './Text.js'; import FlexRow from './FlexRow.js'; -import {colors} from './colors.js'; +import {colors} from './colors.tsx'; type DataPoint = { time: number, diff --git a/src/ui/components/Panel.js b/src/ui/components/Panel.js index 9a1014f47..fd251642b 100644 --- a/src/ui/components/Panel.js +++ b/src/ui/components/Panel.js @@ -9,7 +9,7 @@ import React from 'react'; import styled from '../styled/index.js'; import FlexColumn from './FlexColumn.js'; import FlexBox from './FlexBox.js'; -import {colors} from './colors.js'; +import {colors} from './colors.tsx'; import Glyph from './Glyph.js'; const BORDER = '1px solid #dddfe2'; diff --git a/src/ui/components/Popover.js b/src/ui/components/Popover.js index be60cf252..a70f61c88 100644 --- a/src/ui/components/Popover.js +++ b/src/ui/components/Popover.js @@ -8,7 +8,7 @@ import {PureComponent} from 'react'; import FlexColumn from './FlexColumn.js'; import styled from '../styled/index.js'; -import {colors} from './colors.js'; +import {colors} from './colors.tsx'; const Anchor = styled('img')({ zIndex: 6, diff --git a/src/ui/components/Sidebar.js b/src/ui/components/Sidebar.js index 154a9b922..8ad664a41 100644 --- a/src/ui/components/Sidebar.js +++ b/src/ui/components/Sidebar.js @@ -7,7 +7,7 @@ import Interactive from './Interactive.js'; import FlexColumn from './FlexColumn.js'; -import {colors} from './colors'; +import {colors} from './colors.tsx'; import {Component} from 'react'; import styled from '../styled/index.js'; diff --git a/src/ui/components/SidebarLabel.js b/src/ui/components/SidebarLabel.js index f405e5084..12edabb18 100644 --- a/src/ui/components/SidebarLabel.js +++ b/src/ui/components/SidebarLabel.js @@ -5,7 +5,7 @@ * @format */ -import {colors} from './colors.js'; +import {colors} from './colors.tsx'; import Label from './Label.js'; import styled from '../styled/index.js'; diff --git a/src/ui/components/StackTrace.js b/src/ui/components/StackTrace.js index 3184dbe1b..a870b3221 100644 --- a/src/ui/components/StackTrace.js +++ b/src/ui/components/StackTrace.js @@ -7,7 +7,7 @@ import {Component} from 'react'; import Text from './Text'; -import {colors} from './colors'; +import {colors} from './colors.tsx'; import ManagedTable from './table/ManagedTable'; import FlexRow from './FlexRow'; import Glyph from './Glyph'; diff --git a/src/ui/components/Tabs.js b/src/ui/components/Tabs.js index 7e0d43e7e..d47cca094 100644 --- a/src/ui/components/Tabs.js +++ b/src/ui/components/Tabs.js @@ -9,7 +9,7 @@ import FlexColumn from './FlexColumn.js'; import styled from '../styled/index.js'; import Orderable from './Orderable.js'; import FlexRow from './FlexRow.js'; -import {colors} from './colors.js'; +import {colors} from './colors.tsx'; import Tab from './Tab.js'; const TabList = styled(FlexRow)({ diff --git a/src/ui/components/ToggleSwitch.js b/src/ui/components/ToggleSwitch.js index ee17963a5..0cf94f596 100644 --- a/src/ui/components/ToggleSwitch.js +++ b/src/ui/components/ToggleSwitch.js @@ -7,7 +7,7 @@ import React from 'react'; import styled from '../styled/index.js'; -import {colors} from './colors.js'; +import {colors} from './colors.tsx'; import Text from './Text'; export const StyledButton = styled('div')(props => ({ diff --git a/src/ui/components/Toolbar.js b/src/ui/components/Toolbar.js index baf17be6f..caa369b4a 100644 --- a/src/ui/components/Toolbar.js +++ b/src/ui/components/Toolbar.js @@ -5,7 +5,7 @@ * @format */ -import {colors} from './colors.js'; +import {colors} from './colors.tsx'; import FlexRow from './FlexRow.js'; import FlexBox from './FlexBox.js'; import styled from '../styled/index.js'; diff --git a/src/ui/components/TooltipProvider.js b/src/ui/components/TooltipProvider.js index f35a0e3e1..99cbfe4b3 100644 --- a/src/ui/components/TooltipProvider.js +++ b/src/ui/components/TooltipProvider.js @@ -6,7 +6,7 @@ */ import styled from '../styled/index.js'; -import {colors} from './colors.js'; +import {colors} from './colors.tsx'; import {Component} from 'react'; import PropTypes from 'prop-types'; diff --git a/src/ui/components/colors.js b/src/ui/components/colors.tsx similarity index 100% rename from src/ui/components/colors.js rename to src/ui/components/colors.tsx diff --git a/src/ui/components/data-inspector/DataDescription.js b/src/ui/components/data-inspector/DataDescription.js index a0c7f1bba..8dc585cb5 100644 --- a/src/ui/components/data-inspector/DataDescription.js +++ b/src/ui/components/data-inspector/DataDescription.js @@ -11,7 +11,7 @@ import styled from '../../styled/index.js'; import {SketchPicker} from 'react-color'; import {Component, Fragment} from 'react'; import Popover from '../Popover.js'; -import {colors} from '../colors.js'; +import {colors} from '../colors.tsx'; import Input from '../Input.js'; const NullValue = styled('span')({ diff --git a/src/ui/components/data-inspector/DataInspector.js b/src/ui/components/data-inspector/DataInspector.js index d6b88be9f..527d80756 100644 --- a/src/ui/components/data-inspector/DataInspector.js +++ b/src/ui/components/data-inspector/DataInspector.js @@ -14,7 +14,7 @@ import DataPreview from './DataPreview.js'; import createPaste from '../../../fb-stubs/createPaste.tsx'; import {reportInteraction} from '../../../utils/InteractionTracker.tsx'; import {getSortedKeys} from './utils.js'; -import {colors} from '../colors.js'; +import {colors} from '../colors.tsx'; import {clipboard} from 'electron'; const deepEqual = require('deep-equal'); diff --git a/src/ui/components/elements-inspector/elements.js b/src/ui/components/elements-inspector/elements.js index 77e62fc33..47acb5ccf 100644 --- a/src/ui/components/elements-inspector/elements.js +++ b/src/ui/components/elements-inspector/elements.js @@ -16,7 +16,7 @@ import {PureComponent, type Element as ReactElement} from 'react'; import FlexRow from '../FlexRow.js'; import FlexColumn from '../FlexColumn.js'; import Glyph from '../Glyph.js'; -import {colors} from '../colors.js'; +import {colors} from '../colors.tsx'; import Text from '../Text.js'; import styled from '../../styled/index.js'; import {clipboard} from 'electron'; diff --git a/src/ui/components/filter/FilterRow.js b/src/ui/components/filter/FilterRow.js index cfd525c02..e1df8647d 100644 --- a/src/ui/components/filter/FilterRow.js +++ b/src/ui/components/filter/FilterRow.js @@ -10,7 +10,7 @@ import {PureComponent} from 'react'; import ContextMenu from '../ContextMenu.js'; import textContent from '../../../utils/textContent.tsx'; import styled from '../../styled/index.js'; -import {colors} from '../colors.js'; +import {colors} from '../colors.tsx'; const FilterText = styled('div')({ display: 'flex', diff --git a/src/ui/components/searchable/FilterToken.js b/src/ui/components/searchable/FilterToken.js index be5f8502a..903a956bd 100644 --- a/src/ui/components/searchable/FilterToken.js +++ b/src/ui/components/searchable/FilterToken.js @@ -10,7 +10,7 @@ import {PureComponent} from 'react'; import Text from '../Text.js'; import styled from '../../styled/index.js'; import {findDOMNode} from 'react-dom'; -import {colors} from '../colors.js'; +import {colors} from '../colors.tsx'; import electron from 'electron'; const Token = styled(Text)(props => ({ diff --git a/src/ui/components/searchable/Searchable.js b/src/ui/components/searchable/Searchable.js index 613c0cdc7..ece0b5fd3 100644 --- a/src/ui/components/searchable/Searchable.js +++ b/src/ui/components/searchable/Searchable.js @@ -11,7 +11,7 @@ import {PureComponent} from 'react'; import Toolbar from '../Toolbar.js'; import FlexRow from '../FlexRow.js'; import Input from '../Input.js'; -import {colors} from '../colors.js'; +import {colors} from '../colors.tsx'; import Text from '../Text.js'; import FlexBox from '../FlexBox.js'; import Glyph from '../Glyph.js'; diff --git a/src/ui/components/table/TableHead.js b/src/ui/components/table/TableHead.js index 9e6e11668..c125275af 100644 --- a/src/ui/components/table/TableHead.js +++ b/src/ui/components/table/TableHead.js @@ -19,7 +19,7 @@ import {PureComponent} from 'react'; import ContextMenu from '../ContextMenu.js'; import Interactive from '../Interactive.js'; import styled from '../../styled/index.js'; -import {colors} from '../colors.js'; +import {colors} from '../colors.tsx'; import FlexRow from '../FlexRow.js'; diff --git a/src/ui/components/table/TableRow.js b/src/ui/components/table/TableRow.js index 1efe45546..279d75712 100644 --- a/src/ui/components/table/TableRow.js +++ b/src/ui/components/table/TableRow.js @@ -16,7 +16,7 @@ import React from 'react'; import FilterRow from '../filter/FilterRow.js'; import styled from '../../styled/index.js'; import FlexRow from '../FlexRow.js'; -import {colors} from '../colors.js'; +import {colors} from '../colors.tsx'; import {normaliseColumnWidth} from './utils.js'; import {DEFAULT_ROW_HEIGHT} from './types'; diff --git a/src/ui/components/table/TypeBasedValueRenderer.js b/src/ui/components/table/TypeBasedValueRenderer.js index 7679a07b4..e90b07aeb 100644 --- a/src/ui/components/table/TypeBasedValueRenderer.js +++ b/src/ui/components/table/TypeBasedValueRenderer.js @@ -5,7 +5,7 @@ * @format */ import {default as styled} from 'react-emotion'; -import {colors} from '../colors'; +import {colors} from '../colors.tsx'; import {default as Text} from '../Text'; export type Value = diff --git a/src/ui/index.js b/src/ui/index.js index 998808932..c58d97f46 100644 --- a/src/ui/index.js +++ b/src/ui/index.js @@ -15,7 +15,7 @@ export {default as ButtonGroup} from './components/ButtonGroup.js'; export {default as ButtonGroupChain} from './components/ButtonGroupChain.js'; // -export {colors, darkColors, brandColors} from './components/colors.js'; +export {colors, darkColors, brandColors} from './components/colors.tsx'; // export {default as Glyph} from './components/Glyph.js';