Kepler.gl is a powerful open source geospatial analysis tool for large-scale data sets.
[Chore]: Components/common 1st part (#1729)
dariaterekhovaaee5d5d1baed8c
diff --git a/.nvmrc b/.nvmrcindex 260a0e20f..898e643b0 100644--- a/.nvmrc+++ b/.nvmrc@@ -1 +1 @@-12.19.0+12.22.0diff --git a/package.json b/package.jsonindex 568af69b6..b28685f93 100644--- a/package.json+++ b/package.json@@ -54,7 +54,7 @@"docs": "babel-node ./scripts/documentation.js","typedoc": "typedoc --theme markdown --out typedoc --inputFiles ./src/reducers --inputFiles ./src/actions --excludeExternals --excludeNotExported --excludePrivate","example-version": "babel-node ./scripts/edit-version.js",- "prettier-all": "prettier --write '{src,examples,test}/**/*.js'",+ "prettier-all": "prettier --write '{src,examples,test}/**/*.{js,tsx,ts}'","lint": "yarn typescript && eslint src test webpack examples/*.js examples/**/src website/*.js website/src --fix","lint:css": "stylelint './src/**/*.js'","typescript": "tsc --noEmit",@@ -103,7 +103,15 @@"@turf/bbox": "^6.0.1","@turf/boolean-within": "^6.0.1","@turf/helpers": "^6.1.4",+ "@types/classnames": "^2.3.1",+ "@types/d3-brush": "^3.0.1",+ "@types/d3-selection": "^3.0.2",+ "@types/exenv": "^1.2.0","@types/keymirror": "^0.1.1",+ "@types/lodash.pick": "^4.4.6",+ "@types/react-lifecycles-compat": "^3.0.1",+ "@types/react-modal": "^3.13.1",+ "@types/react-vis": "^1.8.0","classnames": "^2.2.1","colorbrewer": "^1.5.0","copy-to-clipboard": "^3.3.1",diff --git a/src/components/common/action-panel.d.ts b/src/components/common/action-panel.d.tsdeleted file mode 100644index 3076cf1b5..000000000--- a/src/components/common/action-panel.d.ts+++ /dev/null@@ -1,24 +0,0 @@-import {FunctionComponent, PropsWithChildren, ElementType, CSSProperties} from 'react';--export type ActionPanelItemProps = PropsWithChildren<{- color?: string,- className?: string,- Icon?: ElementType,- label: string,- onClick?: () => void,- isSelection?: boolean,- isActive?: boolean,- style?: CSSProperties-}>;--export const ActionPanelItem: FunctionComponent<ActionPanelItemProps>;--export type ActionPanelProps = PropsWithChildren<{- color?: string,- className?: string,- direction?: string-}>;--export const ActionPanel: FunctionComponent<ActionPanelProps>;--export default ActionPanel;diff --git a/src/components/common/action-panel.js b/src/components/common/action-panel.tsxsimilarity index 84%rename from src/components/common/action-panel.jsrename to src/components/common/action-panel.tsxindex 6ae4a84bd..1d75e8742 100644--- a/src/components/common/action-panel.js+++ b/src/components/common/action-panel.tsx@@ -18,12 +18,33 @@// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN// THE SOFTWARE.-import React, {useCallback} from 'react';+import React, {useCallback, PropsWithChildren, ElementType, CSSProperties, ReactNode} from 'react';import styled from 'styled-components';import classnames from 'classnames';import {ArrowRight} from 'components/common/icons';import Checkbox from 'components/common/switch';+export type ActionPanelProps = PropsWithChildren<{+ color?: string;+ className?: string;+ direction?: string;+}>;++export type ActionPanelItemProps = PropsWithChildren<{+ color?: string;+ className?: string;+ Icon?: ElementType;+ label: string;+ onClick?: () => void;+ isSelection?: boolean;+ isActive?: boolean;+ style?: CSSProperties;+}>;++export interface DirectionProp {+ direction: string;+}+const StyledItem = styled.div`display: flex;flex-direction: row;@@ -90,13 +111,12 @@ const StyledCheckedbox = styled(Checkbox)`}`;-const renderChildren = (child, index) =>+const renderChildren = (child: ReactNode, index: number) =>+ React.isValidElement<any>(child) &&React.cloneElement(child, {onClick: () => {- if (React.isValidElement(child)) {- if (child.props.onClick) {- child.props.onClick(index);- }+ if (child.props.onClick) {+ child.props.onClick(index);}},className: classnames('action-panel-item', child.props.className)@@ -104,7 +124,17 @@ const renderChildren = (child, index) =>/** @type {typeof import('./action-panel').ActionPanelItem} */export const ActionPanelItem = React.memo(- ({children, color, className, Icon, label, onClick, isSelection, isActive, style}) => {+ ({+ children,+ color,+ className,+ Icon,+ label,+ onClick,+ isSelection,+ isActive,+ style+ }: ActionPanelItemProps) => {const onClickCallback = useCallback(event => {event.preventDefault();@@ -147,7 +177,7 @@ export const ActionPanelItem = React.memo(ActionPanelItem.displayName = 'ActionPanelItem';-const StyledActionPanel = styled.div`+const StyledActionPanel = styled.div<DirectionProp>`display: flex;flex-direction: ${props => props.direction};box-shadow: ${props => props.theme.dropdownListShadow};@@ -166,7 +196,7 @@ const StyledActionPanel = styled.div`// React compound element https://medium.com/@Dane_s/react-js-compound-components-a6e54b5c9992/** @type {typeof import('./action-panel').ActionPanel} */-const ActionPanel = ({children, className, direction = 'column'}) => (+const ActionPanel = ({children, className, direction = 'column'}: ActionPanelProps) => (<StyledActionPanel className={className} direction={direction}>{React.Children.map(children, renderChildren)}</StyledActionPanel>diff --git a/src/components/common/checkbox.d.ts b/src/components/common/checkbox.d.tsdeleted file mode 100644index 4e12c64f5..000000000--- a/src/components/common/checkbox.d.ts+++ /dev/null@@ -1,3 +0,0 @@-export const Checkbox: (...props: any[]) => JSX.Element;--export default Checkbox;diff --git a/src/components/common/checkbox.js b/src/components/common/checkbox.tsxsimilarity index 76%rename from src/components/common/checkbox.jsrename to src/components/common/checkbox.tsxindex f675b5822..0750a0997 100644--- a/src/components/common/checkbox.js+++ b/src/components/common/checkbox.tsx@@ -18,15 +18,18 @@// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN// THE SOFTWARE.-import React, {Component} from 'react';-import PropTypes from 'prop-types';+import React, {ChangeEventHandler, Component, FocusEventHandler, ReactNode} from 'react';import styled from 'styled-components';import pick from 'lodash.pick';import classnames from 'classnames';function noop() {}-const StyledSwitchInput = styled.label`+interface StyledSwitchInputProps {+ secondary?: boolean;+}++const StyledSwitchInput = styled.label<StyledSwitchInputProps>`${props => (props.secondary ? props.theme.secondarySwitch : props.theme.inputSwitch)};`;@@ -43,29 +46,35 @@ const HiddenInput = styled.input`display: none;`;-const StyledCheckbox = styled.div`+interface StyledCheckboxProps {+ type?: string;+}++const StyledCheckbox = styled.div<StyledCheckboxProps>`display: flex;min-height: ${props => props.theme.switchHeight}px;margin-left: ${props => (props.type === 'radio' ? 0 : props.theme.switchLabelMargin)}px;`;-export default class Checkbox extends Component {- static propTypes = {- id: PropTypes.string.isRequired,- label: PropTypes.node,- value: PropTypes.oneOf([true, false, 'indeterminate']),- checked: PropTypes.bool,- disabled: PropTypes.bool,-- error: PropTypes.string,- switch: PropTypes.bool,- activeColor: PropTypes.string,- secondary: PropTypes.bool,- onBlur: PropTypes.func,- onChange: PropTypes.func,- onFocus: PropTypes.func- };+interface CheckboxProps {+ id: string;+ type?: string;+ label?: ReactNode;+ className?: string;+ value?: string | 'indeterminate';+ checked?: boolean;+ disabled?: boolean;++ error?: string;+ switch?: boolean;+ activeColor?: string;+ secondary?: boolean;+ onBlur: FocusEventHandler<HTMLInputElement>;+ onChange?: ChangeEventHandler<HTMLInputElement>;+ onFocus: FocusEventHandler<HTMLInputElement>;+}+export default class Checkbox extends Component<CheckboxProps> {static defaultProps = {disabled: false,checked: false,@@ -79,12 +88,12 @@ export default class Checkbox extends Component {focused: false};- handleFocus = args => {+ handleFocus: FocusEventHandler<HTMLInputElement> = args => {this.setState({focused: true});this.props.onFocus(args);};- handleBlur = args => {+ handleBlur: FocusEventHandler<HTMLInputElement> = args => {this.setState({focused: false});this.props.onBlur(args);};diff --git a/src/components/common/color-legend.js b/src/components/common/color-legend.tsxsimilarity index 92%rename from src/components/common/color-legend.jsrename to src/components/common/color-legend.tsxindex 127ef96e1..a4462febd 100644--- a/src/components/common/color-legend.js+++ b/src/components/common/color-legend.tsx@@ -19,14 +19,12 @@// THE SOFTWARE.import React, {Component} from 'react';-import PropTypes from 'prop-types';import styled from 'styled-components';import {createSelector} from 'reselect';import {format} from 'd3-format';import moment from 'moment';import {SCALE_TYPES, SCALE_FUNC, ALL_FIELD_TYPES} from 'constants/default-settings';import {getTimeWidgetHintFormatter} from 'utils/filter-utils';-import {isObject} from 'utils/utils';const ROW_H = 10;const GAP = 4;@@ -100,16 +98,23 @@ const getQuantLegends = (scale, labelFormat) => {};};-export default class ColorLegend extends Component {- static propTypes = {- width: PropTypes.number.isRequired,- scaleType: PropTypes.string,- domain: PropTypes.oneOfType([PropTypes.array, PropTypes.object]),- fieldType: PropTypes.string,- range: PropTypes.object,- labelFormat: PropTypes.func- };+type RangeType = {+ colorMap?: [string, string][];+ colorLegends?: {[key: string]: string};+ colors: string[];+};++interface ColorLegendProps {+ width: number;+ scaleType?: string;+ domain?: any[] | object;+ fieldType?: string | null;+ range?: RangeType;+ labelFormat?: Function;+ displayLabel?: boolean;+}+export default class ColorLegend extends Component<ColorLegendProps> {domainSelector = props => props.domain;rangeSelector = props => props.range;labelFormatSelector = props => props.labelFormat;@@ -130,7 +135,7 @@ export default class ColorLegend extends Component {if (!range) {return empty;}- if (isObject(range.colorLegends)) {+ if (range.colorLegends) {return {data: Object.keys(range.colorLegends),labels: Object.values(range.colorLegends)diff --git a/src/components/common/dataset-label.js b/src/components/common/dataset-label.tsxsimilarity index 91%rename from src/components/common/dataset-label.jsrename to src/components/common/dataset-label.tsxindex 593a2e024..2ab0b69b6 100644--- a/src/components/common/dataset-label.js+++ b/src/components/common/dataset-label.tsx@@ -30,7 +30,14 @@ const DatasetName = styled.div.attrs({color: ${props => props.theme.titleColorLT};`;-const DatasetLabel = ({dataset}) => (+interface DatasetLabelType {+ dataset: {+ color?: string;+ label?: string;+ };+}++const DatasetLabel = ({dataset}: DatasetLabelType) => (<CenterFlexbox><DatasetSquare className="dataset-clolor" color={dataset.color} /><DatasetName>{dataset.label}</DatasetName>diff --git a/src/components/common/error-boundary.js b/src/components/common/error-boundary.tsxsimilarity index 94%rename from src/components/common/error-boundary.jsrename to src/components/common/error-boundary.tsxindex 6c9e0ff90..786a4ee26 100644--- a/src/components/common/error-boundary.js+++ b/src/components/common/error-boundary.tsx@@ -18,7 +18,7 @@// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN// THE SOFTWARE.-import React from 'react';+import React, {ErrorInfo} from 'react';import console from 'global/console';export default class ErrorBoundary extends React.Component {@@ -27,7 +27,7 @@ export default class ErrorBoundary extends React.Component {return {hasError: true, error};}state = {hasError: false};- componentDidCatch(error, errorInfo) {+ componentDidCatch(error: Error, errorInfo: ErrorInfo) {// You can also log the error to an error reporting serviceconsole.error(error, errorInfo);}diff --git a/src/components/common/field-selector.js b/src/components/common/field-selector.tsxsimilarity index 81%rename from src/components/common/field-selector.jsrename to src/components/common/field-selector.tsxindex 5c8ae30ef..1dd8ec12d 100644--- a/src/components/common/field-selector.js+++ b/src/components/common/field-selector.tsx@@ -18,9 +18,8 @@// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN// THE SOFTWARE.-import React, {Component} from 'react';+import React, {Component, ComponentType} from 'react';import styled from 'styled-components';-import PropTypes from 'prop-types';import {createSelector} from 'reselect';import ItemSelector from './item-selector/item-selector';@@ -61,43 +60,43 @@ export function FieldListItemFactoryFactory(FieldToken) {const SuggestedFieldHeader = () => <div>Suggested Field</div>;-const FieldType = PropTypes.oneOfType([- PropTypes.string,- PropTypes.arrayOf(PropTypes.string),- PropTypes.arrayOf(- PropTypes.shape({- name: PropTypes.string,- format: PropTypes.string- })- ),- PropTypes.shape({- format: PropTypes.string,- id: PropTypes.string,- name: PropTypes.string,- fieldIdx: PropTypes.number,- type: PropTypes.number- })-]);--function FieldSelectorFactory(FieldListItemFactory) {- class FieldSelector extends Component {- static propTypes = {- fields: PropTypes.oneOfType([PropTypes.array, PropTypes.arrayOf(FieldType)]),- onSelect: PropTypes.func.isRequired,- placement: PropTypes.string,- value: FieldType,- filterFieldTypes: PropTypes.oneOfType([FieldType, PropTypes.arrayOf(FieldType)]),- inputTheme: PropTypes.string,- placeholder: PropTypes.string,- erasable: PropTypes.bool,- error: PropTypes.bool,- multiSelect: PropTypes.bool,- closeOnSelect: PropTypes.bool,- showToken: PropTypes.bool,- suggested: PropTypes.arrayOf(PropTypes.any),- CustomChickletComponent: PropTypes.func+type FieldType =+ | string+ | string[]+ | {+ name?: string;+ format?: string;+ }[]+ | {+ format?: string;+ id?: string;+ name?: string;+ fieldIdx?: number;+ type?: number;};+interface FieldSelectorFactoryProps {+ fields?: FieldType[];+ onSelect: (items: readonly (string | number | boolean | object)[]) => void;+ placement?: string;+ value?: FieldType;+ filterFieldTypes?: FieldType | FieldType[];+ inputTheme?: string;+ placeholder?: string;+ erasable?: boolean;+ error?: boolean;+ multiSelect?: boolean;+ closeOnSelect?: boolean;+ showToken?: boolean;+ suggested?: any[]; //TODO+ CustomChickletComponent?: ComponentType;+ size?: string;+}++function FieldSelectorFactory(+ FieldListItemFactory: ReturnType<typeof FieldListItemFactoryFactory>+) {+ class FieldSelector extends Component<FieldSelectorFactoryProps> {static defaultProps = {erasable: true,error: false,diff --git a/src/components/common/field-token.js b/src/components/common/field-token.tsxsimilarity index 93%rename from src/components/common/field-token.jsrename to src/components/common/field-token.tsxindex 8b097ce15..abb246f22 100644--- a/src/components/common/field-token.js+++ b/src/components/common/field-token.tsx@@ -21,7 +21,11 @@import React from 'react';import styled from 'styled-components';import {FILED_TYPE_DISPLAY, FIELD_COLORS} from 'constants/default-settings';-function FieldTokenFactory(fieldTypeDisplay, fieldColors) {++function FieldTokenFactory(+ fieldTypeDisplay: ReturnType<typeof getFieldTypes>,+ fieldColors: ReturnType<typeof getFieldColors>+) {const FieldTag = styled.div`background-color: rgba(${props => props.color}, 0.2);border-radius: 2px;diff --git a/src/components/common/histogram-plot.js b/src/components/common/histogram-plot.tsxsimilarity index 77%rename from src/components/common/histogram-plot.jsrename to src/components/common/histogram-plot.tsxindex 09d2e34df..142fe7809 100644--- a/src/components/common/histogram-plot.js+++ b/src/components/common/histogram-plot.tsx@@ -18,11 +18,12 @@// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN// THE SOFTWARE.-import React, {useMemo} from 'react';+import React, {ReactElement, useMemo} from 'react';import {scaleLinear} from 'd3-scale';import {max} from 'd3-array';import styled from 'styled-components';import classnames from 'classnames';+import {HistogramBin} from 'reducers';const histogramStyle = {highlightW: 0.7,@@ -41,11 +42,32 @@ const HistogramWrapper = styled.svg`}`;+interface HistogramPlotParams {+ width: number;+ height: number;+ margin: {top: number; bottom: number; left: number; right: number};+ isRanged?: boolean;+ histogram: HistogramBin[];+ value: number[];+ brushComponent?: ReactElement;+}+function HistogramPlotFactory() {- const HistogramPlot = ({width, height, margin, isRanged, histogram, value, brushComponent}) => {- const domain = useMemo(() => [histogram[0].x0, histogram[histogram.length - 1].x1], [- histogram- ]);+ const HistogramPlot = ({+ width,+ height,+ margin,+ isRanged,+ histogram,+ value,+ brushComponent+ }: HistogramPlotParams) => {+ const undefinedToZero = (x: number | undefined) => (x ? x : 0);+ const domain = useMemo(+ () =>+ [histogram[0].x0, histogram[histogram.length - 1].x1].map(item => undefinedToZero(item)),+ [histogram]+ );const dataId = Object.keys(histogram[0]).filter(k => k !== 'x0' && k !== 'x1')[0];// use 1st for now@@ -73,7 +95,8 @@ function HistogramPlotFactory() {<HistogramWrapper width={width} height={height} style={{marginTop: `${margin.top}px`}}><g className="histogram-bars">{histogram.map(bar => {- const inRange = bar.x1 <= value[1] && bar.x0 >= value[0];+ const inRange =+ undefinedToZero(bar.x1) <= value[1] && undefinedToZero(bar.x0) >= value[0];const wRatio = inRange ? histogramStyle.highlightW : histogramStyle.unHighlightedW;return (<rect@@ -81,7 +104,7 @@ function HistogramPlotFactory() {key={bar.x0}height={y(getValue(bar))}width={barWidth * wRatio}- x={x(bar.x0) + (barWidth * (1 - wRatio)) / 2}+ x={x(undefinedToZero(bar.x0)) + (barWidth * (1 - wRatio)) / 2}rx={1}ry={1}y={height - y(getValue(bar))}diff --git a/src/components/common/icons/add.js b/src/components/common/icons/add.tsxsimilarity index 87%rename from src/components/common/icons/add.jsrename to src/components/common/icons/add.tsxindex d80eb9319..70c6fcc98 100644--- a/src/components/common/icons/add.js+++ b/src/components/common/icons/add.tsx@@ -19,15 +19,9 @@// THE SOFTWARE.import React, {Component} from 'react';-import PropTypes from 'prop-types';-import Base from './base';--export default class Add extends Component {- static propTypes = {- /** Set the height of the icon, ex. '16px' */- height: PropTypes.string- };+import Base, {BaseProps} from './base';+export default class Add extends Component<Partial<BaseProps>> {static defaultProps = {height: '16px',predefinedClassName: 'data-ex-icons-add'diff --git a/src/components/common/icons/anchor_window.js b/src/components/common/icons/anchor_window.tsxsimilarity index 92%rename from src/components/common/icons/anchor_window.jsrename to src/components/common/icons/anchor_window.tsxindex 8fcfe8a67..462f1b69b 100644--- a/src/components/common/icons/anchor_window.js+++ b/src/components/common/icons/anchor_window.tsx@@ -19,10 +19,9 @@// THE SOFTWARE.import React from 'react';-import Base from './base';-import PropTypes from 'prop-types';+import Base, {BaseProps} from './base';-const AnchorWindow = props => (+const AnchorWindow = (props: Partial<BaseProps>) => (<Base {...props}><pathfillRule="evenodd"@@ -41,10 +40,7 @@ const AnchorWindow = props => (/></Base>);-AnchorWindow.propTypes = {- /** Set the height of the icon, ex. '16px' */- height: PropTypes.string-};+AnchorWindow.defaultProps = {height: '16px',viewBox: '0 0 16 16',diff --git a/src/components/common/icons/arrow-down-alt.js b/src/components/common/icons/arrow-down-alt.tsxsimilarity index 90%rename from src/components/common/icons/arrow-down-alt.jsrename to src/components/common/icons/arrow-down-alt.tsxindex 19b8a8c2d..6105f3cea 100644--- a/src/components/common/icons/arrow-down-alt.js+++ b/src/components/common/icons/arrow-down-alt.tsx@@ -19,15 +19,9 @@// THE SOFTWARE.import React, {Component} from 'react';-import PropTypes from 'prop-types';-import Base from './base';--export default class ArrowDownAlt extends Component {- static propTypes = {- /** Set the height of the icon, ex. '16px' */- height: PropTypes.string- };+import Base, {BaseProps} from './base';+export default class ArrowDownAlt extends Component<Partial<BaseProps>> {static defaultProps = {height: '16px',predefinedClassName: 'data-ex-icons-arrow_down_alt'diff --git a/src/components/common/icons/arrow-down-solid .js b/src/components/common/icons/arrow-down-solid.tsxsimilarity index 86%rename from src/components/common/icons/arrow-down-solid .jsrename to src/components/common/icons/arrow-down-solid.tsxindex ec7efa4ef..e05b07ec4 100644--- a/src/components/common/icons/arrow-down-solid .js+++ b/src/components/common/icons/arrow-down-solid.tsx@@ -19,15 +19,9 @@// THE SOFTWARE.import React, {Component} from 'react';-import PropTypes from 'prop-types';-import Base from './base';--export default class ArrowDownSolid extends Component {- static propTypes = {- /** Set the height of the icon, ex. '16px' */- height: PropTypes.string- };+import Base, {BaseProps} from './base';+export default class ArrowDownSolid extends Component<Partial<BaseProps>> {static defaultProps = {height: '16px',predefinedClassName: 'data-ex-icons-arrowdown-solid'diff --git a/src/components/common/icons/arrow-down.js b/src/components/common/icons/arrow-down.tsxsimilarity index 87%rename from src/components/common/icons/arrow-down.jsrename to src/components/common/icons/arrow-down.tsxindex 070397ada..80e6c22e2 100644--- a/src/components/common/icons/arrow-down.js+++ b/src/components/common/icons/arrow-down.tsx@@ -19,15 +19,9 @@// THE SOFTWARE.import React, {Component} from 'react';-import PropTypes from 'prop-types';-import Base from './base';--export default class ArrowDown extends Component {- static propTypes = {- /** Set the height of the icon, ex. '16px' */- height: PropTypes.string- };+import Base, {BaseProps} from './base';+export default class ArrowDown extends Component<Partial<BaseProps>> {static defaultProps = {height: '16px',predefinedClassName: 'data-ex-icons-arrowdown'diff --git a/src/components/common/icons/arrow-left.js b/src/components/common/icons/arrow-left.tsxsimilarity index 88%rename from src/components/common/icons/arrow-left.jsrename to src/components/common/icons/arrow-left.tsxindex b411cce4a..7a1c587ab 100644--- a/src/components/common/icons/arrow-left.js+++ b/src/components/common/icons/arrow-left.tsx@@ -19,15 +19,9 @@// THE SOFTWARE.import React, {Component} from 'react';-import PropTypes from 'prop-types';-import Base from './base';--export default class ArrowLeft extends Component {- static propTypes = {- /** Set the height of the icon, ex. '16px' */- height: PropTypes.string- };+import Base, {BaseProps} from './base';+export default class ArrowLeft extends Component<Partial<BaseProps>> {static defaultProps = {height: '16px',predefinedClassName: 'data-ex-icons-arrowleft'diff --git a/src/components/common/icons/arrow-right.js b/src/components/common/icons/arrow-right.tsxsimilarity index 87%rename from src/components/common/icons/arrow-right.jsrename to src/components/common/icons/arrow-right.tsxindex 2c90f2a7e..3046100fe 100644--- a/src/components/common/icons/arrow-right.js+++ b/src/components/common/icons/arrow-right.tsx@@ -19,15 +19,9 @@// THE SOFTWARE.import React, {Component} from 'react';-import PropTypes from 'prop-types';-import Base from './base';--export default class ArrowRight extends Component {- static propTypes = {- /** Set the height of the icon, ex. '16px' */- height: PropTypes.string- };+import Base, {BaseProps} from './base';+export default class ArrowRight extends Component<Partial<BaseProps>> {static defaultProps = {height: '16px',predefinedClassName: 'data-ex-icons-arrowright'diff --git a/src/components/common/icons/arrow-up-alt.js b/src/components/common/icons/arrow-up-alt.tsxsimilarity index 90%rename from src/components/common/icons/arrow-up-alt.jsrename to src/components/common/icons/arrow-up-alt.tsxindex 5baee5bb9..5825c729e 100644--- a/src/components/common/icons/arrow-up-alt.js+++ b/src/components/common/icons/arrow-up-alt.tsx@@ -19,15 +19,9 @@// THE SOFTWARE.import React, {Component} from 'react';-import PropTypes from 'prop-types';-import Base from './base';--export default class ArrowUpAlt extends Component {- static propTypes = {- /** Set the height of the icon, ex. '16px' */- height: PropTypes.string- };+import Base, {BaseProps} from './base';+export default class ArrowUpAlt extends Component<Partial<BaseProps>> {static defaultProps = {height: '16px',predefinedClassName: 'data-ex-icons-arrow_up_alt'diff --git a/src/components/common/icons/arrow-up-solid.js b/src/components/common/icons/arrow-up-solid.tsxsimilarity index 86%rename from src/components/common/icons/arrow-up-solid.jsrename to src/components/common/icons/arrow-up-solid.tsxindex c2267a001..d772a89b8 100644--- a/src/components/common/icons/arrow-up-solid.js+++ b/src/components/common/icons/arrow-up-solid.tsx@@ -19,15 +19,9 @@// THE SOFTWARE.import React, {Component} from 'react';-import PropTypes from 'prop-types';-import Base from './base';--export default class ArrowUpSolid extends Component {- static propTypes = {- /** Set the height of the icon, ex. '16px' */- height: PropTypes.string- };+import Base, {BaseProps} from './base';+export default class ArrowUpSolid extends Component<Partial<BaseProps>> {static defaultProps = {height: '16px',predefinedClassName: 'data-ex-icons-arrowup-solid'diff --git a/src/components/common/icons/arrow-up.js b/src/components/common/icons/arrow-up.tsxsimilarity index 87%rename from src/components/common/icons/arrow-up.jsrename to src/components/common/icons/arrow-up.tsxindex 4c10e3e8c..9cccbedec 100644--- a/src/components/common/icons/arrow-up.js+++ b/src/components/common/icons/arrow-up.tsx@@ -19,15 +19,9 @@// THE SOFTWARE.import React, {Component} from 'react';-import PropTypes from 'prop-types';-import Base from './base';--export default class ArrowUp extends Component {- static propTypes = {- /** Set the height of the icon, ex. '16px' */- height: PropTypes.string- };+import Base, {BaseProps} from './base';+export default class ArrowUp extends Component<Partial<BaseProps>> {static defaultProps = {height: '16px',predefinedClassName: 'data-ex-icons-arrow_up'diff --git a/src/components/common/icons/base.js b/src/components/common/icons/base.tsxsimilarity index 76%rename from src/components/common/icons/base.jsrename to src/components/common/icons/base.tsxindex 974382c77..9cb966ab0 100644--- a/src/components/common/icons/base.js+++ b/src/components/common/icons/base.tsx@@ -18,30 +18,34 @@// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN// THE SOFTWARE.-import React, {Component} from 'react';-import PropTypes from 'prop-types';+import React, {Component, CSSProperties} from 'react';-const getStyleClassFromColor = (totalColor, colors) =>+const getStyleClassFromColor = (totalColor: number, colors: string[]) =>new Array(totalColor).fill(1).reduce((accu, c, i) => `${accu}.cr${i + 1} {fill:${colors[i % colors.length]};}`, '');-export default class Base extends Component {- static displayName = 'Base Icon';+const nop = () => {};- static propTypes = {- /** Set the height of the icon, ex. '16px' */- height: PropTypes.string,- /** Set the width of the icon, ex. '16px' */- width: PropTypes.string,- /** Set the viewbox of the svg */- viewBox: PropTypes.string,- /** Path element */- children: PropTypes.node,+export type BaseProps = {+ /** Set the height of the icon, ex. '16px' */+ height?: string;+ /** Set the width of the icon, ex. '16px' */+ width?: string;+ /** Set the viewbox of the svg */+ viewBox?: string;+ /** Path element */- predefinedClassName: PropTypes.string,- className: PropTypes.string- };+ predefinedClassName?: string;+ className?: string;+ style?: CSSProperties;+ colors?: string[];+ totalColor?: number;+} & React.SVGAttributes<SVGSVGElement> &+ React.DOMAttributes<SVGSVGElement>;++export default class Base extends Component<BaseProps> {+ static displayName = 'Base Icon';static defaultProps = {height: null,@@ -73,6 +77,7 @@ export default class Base extends Component {const fillStyle =Array.isArray(colors) && totalColor && getStyleClassFromColor(totalColor, colors);+return (<svgviewBox={viewBox}@@ -80,6 +85,7 @@ export default class Base extends Component {height={svgHeight}style={style}className={`${predefinedClassName} ${className}`}+ onClick={nop}{...props}>{fillStyle ? <style type="text/css">{fillStyle}</style> : null}diff --git a/src/components/common/icons/bug.js b/src/components/common/icons/bug.tsxsimilarity index 91%rename from src/components/common/icons/bug.jsrename to src/components/common/icons/bug.tsxindex ba097476e..137689207 100644--- a/src/components/common/icons/bug.js+++ b/src/components/common/icons/bug.tsx@@ -19,15 +19,9 @@// THE SOFTWARE.import React, {Component} from 'react';-import PropTypes from 'prop-types';-import Base from './base';--export default class Bug extends Component {- static propTypes = {- /** Set the height of the icon, ex. '16px' */- height: PropTypes.string- };+import Base, {BaseProps} from './base';+export default class Bug extends Component<Partial<BaseProps>> {static defaultProps = {height: '16px',predefinedClassName: 'data-ex-icons-bug'diff --git a/src/components/common/icons/cancel.js b/src/components/common/icons/cancel.tsxsimilarity index 89%rename from src/components/common/icons/cancel.jsrename to src/components/common/icons/cancel.tsxindex 9d0664abc..0069d126d 100644--- a/src/components/common/icons/cancel.js+++ b/src/components/common/icons/cancel.tsx@@ -19,15 +19,9 @@// THE SOFTWARE.import React, {Component} from 'react';-import PropTypes from 'prop-types';-import Base from './base';--export default class Cancel extends Component {- static propTypes = {- /** Set the height of the icon, ex. '16px' */- height: PropTypes.string- };+import Base, {BaseProps} from './base';+export default class Cancel extends Component<Partial<BaseProps>> {static defaultProps = {height: '16px',predefinedClassName: 'data-ex-icons-cancel'diff --git a/src/components/common/icons/checkmark.js b/src/components/common/icons/checkmark.tsxsimilarity index 89%rename from src/components/common/icons/checkmark.jsrename to src/components/common/icons/checkmark.tsxindex ab0bb4a35..f92e5dd8e 100644--- a/src/components/common/icons/checkmark.js+++ b/src/components/common/icons/checkmark.tsx@@ -19,15 +19,9 @@// THE SOFTWARE.import React, {Component} from 'react';-import PropTypes from 'prop-types';-import Base from './base';--export default class Checkmark extends Component {- static propTypes = {- /** Set the height of the icon, ex. '16px' */- height: PropTypes.string- };+import Base, {BaseProps} from './base';+export default class Checkmark extends Component<Partial<BaseProps>> {static defaultProps = {height: '16px',predefinedClassName: 'data-ex-icons-checkmark',diff --git a/src/components/common/icons/clipboard.js b/src/components/common/icons/clipboard.tsxsimilarity index 91%rename from src/components/common/icons/clipboard.jsrename to src/components/common/icons/clipboard.tsxindex 38599c676..c005131ce 100644--- a/src/components/common/icons/clipboard.js+++ b/src/components/common/icons/clipboard.tsx@@ -19,15 +19,9 @@// THE SOFTWARE.import React, {Component} from 'react';-import PropTypes from 'prop-types';-import Base from './base';--export default class Clipboard extends Component {- static propTypes = {- /** Set the height of the icon, ex. '16px' */- height: PropTypes.string- };+import Base, {BaseProps} from './base';+export default class Clipboard extends Component<Partial<BaseProps>> {static defaultProps = {height: '16px',predefinedClassName: 'data-ex-icons-clipboard'diff --git a/src/components/common/icons/clock.js b/src/components/common/icons/clock.tsxsimilarity index 87%rename from src/components/common/icons/clock.jsrename to src/components/common/icons/clock.tsxindex cc83a29a5..30f3444f8 100644--- a/src/components/common/icons/clock.js+++ b/src/components/common/icons/clock.tsx@@ -19,15 +19,9 @@// THE SOFTWARE.import React, {Component} from 'react';-import PropTypes from 'prop-types';-import Base from './base';--export default class Clock extends Component {- static propTypes = {- /** Set the height of the icon, ex. '16px' */- height: PropTypes.string- };+import Base, {BaseProps} from './base';+export default class Clock extends Component<Partial<BaseProps>> {static defaultProps = {height: '16px',predefinedClassName: 'data-ex-icons-clock'diff --git a/src/components/common/icons/close.js b/src/components/common/icons/close.tsxsimilarity index 91%rename from src/components/common/icons/close.jsrename to src/components/common/icons/close.tsxindex 11ee6c9f4..442c62611 100644--- a/src/components/common/icons/close.js+++ b/src/components/common/icons/close.tsx@@ -19,15 +19,9 @@// THE SOFTWARE.import React, {Component} from 'react';-import PropTypes from 'prop-types';-import Base from './base';--export default class Close extends Component {- static propTypes = {- /** Set the height of the icon, ex. '16px' */- height: PropTypes.string- };+import Base, {BaseProps} from './base';+export default class Close extends Component<Partial<BaseProps>> {static defaultProps = {height: '16px',predefinedClassName: 'data-ex-icons-closewindow'diff --git a/src/components/common/icons/code-alt.js b/src/components/common/icons/code-alt.tsxsimilarity index 91%rename from src/components/common/icons/code-alt.jsrename to src/components/common/icons/code-alt.tsxindex 370e73371..c29a83f4f 100644--- a/src/components/common/icons/code-alt.js+++ b/src/components/common/icons/code-alt.tsx@@ -19,15 +19,9 @@// THE SOFTWARE.import React, {Component} from 'react';-import PropTypes from 'prop-types';-import Base from './base';--export default class CodeAlt extends Component {- static propTypes = {- /** Set the height of the icon, ex. '16px' */- height: PropTypes.string- };+import Base, {BaseProps} from './base';+export default class CodeAlt extends Component<Partial<BaseProps>> {static defaultProps = {height: '16px',predefinedClassName: 'data-ex-icons-codealt'diff --git a/src/components/common/icons/copy.js b/src/components/common/icons/copy.tsxsimilarity index 90%rename from src/components/common/icons/copy.jsrename to src/components/common/icons/copy.tsxindex 85344e81e..335e63b0e 100644--- a/src/components/common/icons/copy.js+++ b/src/components/common/icons/copy.tsx@@ -19,15 +19,9 @@// THE SOFTWARE.import React, {Component} from 'react';-import PropTypes from 'prop-types';-import Base from './base';--export default class Copy extends Component {- static propTypes = {- /** Set the height of the icon, ex. '16px' */- height: PropTypes.string- };+import Base, {BaseProps} from './base';+export default class Copy extends Component<Partial<BaseProps>> {static defaultProps = {height: '16px',predefinedClassName: 'data-ex-icons-copy'diff --git a/src/components/common/icons/crosshairs.js b/src/components/common/icons/crosshairs.tsxsimilarity index 89%rename from src/components/common/icons/crosshairs.jsrename to src/components/common/icons/crosshairs.tsxindex 8301dda70..167c6b788 100644--- a/src/components/common/icons/crosshairs.js+++ b/src/components/common/icons/crosshairs.tsx@@ -19,15 +19,9 @@// THE SOFTWARE.import React, {Component} from 'react';-import PropTypes from 'prop-types';-import Base from './base';--export default class Crosshairs extends Component {- static propTypes = {- /** Set the height of the icon, ex. '16px' */- height: PropTypes.string- };+import Base, {BaseProps} from './base';+export default class Crosshairs extends Component<Partial<BaseProps>> {static defaultProps = {height: '16px',predefinedClassName: 'data-ex-icons-crosshairs'diff --git a/src/components/common/icons/cube-3d.js b/src/components/common/icons/cube-3d.tsxsimilarity index 88%rename from src/components/common/icons/cube-3d.jsrename to src/components/common/icons/cube-3d.tsxindex 7fdde4be1..5083f66fe 100644--- a/src/components/common/icons/cube-3d.js+++ b/src/components/common/icons/cube-3d.tsx@@ -19,15 +19,9 @@// THE SOFTWARE.import React, {Component} from 'react';-import PropTypes from 'prop-types';-import Base from './base';--export default class Cube3D extends Component {- static propTypes = {- /** Set the height of the icon, ex. '16px' */- height: PropTypes.string- };+import Base, {BaseProps} from './base';+export default class Cube3D extends Component<Partial<BaseProps>> {static defaultProps = {height: '16px',predefinedClassName: 'data-ex-icons-cube3d'diff --git a/src/components/common/icons/cursor-click.js b/src/components/common/icons/cursor-click.tsxsimilarity index 88%rename from src/components/common/icons/cursor-click.jsrename to src/components/common/icons/cursor-click.tsxindex d8a6df042..fbf2b53d6 100644--- a/src/components/common/icons/cursor-click.js+++ b/src/components/common/icons/cursor-click.tsx@@ -19,15 +19,9 @@// THE SOFTWARE.import React, {Component} from 'react';-import PropTypes from 'prop-types';-import Base from './base';--export default class CursorClick extends Component {- static propTypes = {- /** Set the height of the icon, ex. '16px' */- height: PropTypes.string- };+import Base, {BaseProps} from './base';+export default class CursorClick extends Component<Partial<BaseProps>> {static defaultProps = {height: '16px',predefinedClassName: 'data-ex-icons-cursorclick'diff --git a/src/components/common/icons/data-table.js b/src/components/common/icons/data-table.tsxsimilarity index 95%rename from src/components/common/icons/data-table.jsrename to src/components/common/icons/data-table.tsxindex eaf47468c..790cc4998 100644--- a/src/components/common/icons/data-table.js+++ b/src/components/common/icons/data-table.tsx@@ -19,15 +19,10 @@// THE SOFTWARE.import React, {Component} from 'react';-import PropTypes from 'prop-types';-import Base from './base';+import Base, {BaseProps} from './base';-export default class DataTable extends Component {+export default class DataTable extends Component<Partial<BaseProps>> {static displayName = 'DataTable';- static propTypes = {- /** Set the height of the icon, ex. '16px' */- height: PropTypes.string- };static defaultProps = {height: '16px',predefinedClassName: 'data-ex-icons-datatable'diff --git a/src/components/common/icons/db.js b/src/components/common/icons/db.tsxsimilarity index 94%rename from src/components/common/icons/db.jsrename to src/components/common/icons/db.tsxindex bccf472ae..47829cff5 100644--- a/src/components/common/icons/db.js+++ b/src/components/common/icons/db.tsx@@ -19,15 +19,10 @@// THE SOFTWARE.import React, {Component} from 'react';-import PropTypes from 'prop-types';-import Base from './base';+import Base, {BaseProps} from './base';-export default class Db extends Component {+export default class Db extends Component<Partial<BaseProps>> {static displayName = 'Db';- static propTypes = {- /** Set the height of the icon, ex. '16px' */- height: PropTypes.string- };static defaultProps = {height: '16px',predefinedClassName: 'data-ex-icons-db'diff --git a/src/components/common/icons/delete.js b/src/components/common/icons/delete.tsxsimilarity index 92%rename from src/components/common/icons/delete.jsrename to src/components/common/icons/delete.tsxindex a7eecc930..50f6c23fc 100644--- a/src/components/common/icons/delete.js+++ b/src/components/common/icons/delete.tsx@@ -19,14 +19,9 @@// THE SOFTWARE.import React, {Component} from 'react';-import PropTypes from 'prop-types';-import Base from './base';--export default class Delete extends Component {- static propTypes = {- height: PropTypes.string- };+import Base, {BaseProps} from './base';+export default class Delete extends Component<Partial<BaseProps>> {static defaultProps = {height: '16px',predefinedClassName: 'data-ex-icons-delete'diff --git a/src/components/common/icons/docs.js b/src/components/common/icons/docs.tsxsimilarity index 88%rename from src/components/common/icons/docs.jsrename to src/components/common/icons/docs.tsxindex 9f4a32b29..c9977ab39 100644--- a/src/components/common/icons/docs.js+++ b/src/components/common/icons/docs.tsx@@ -19,15 +19,9 @@// THE SOFTWARE.import React, {Component} from 'react';-import PropTypes from 'prop-types';-import Base from './base';--export default class Docs extends Component {- static propTypes = {- /** Set the height of the icon, ex. '16px' */- height: PropTypes.string- };+import Base, {BaseProps} from './base';+export default class Docs extends Component<Partial<BaseProps>> {static defaultProps = {height: '16px',predefinedClassName: 'data-ex-icons-docs'diff --git a/src/components/common/icons/drag-n-drop.js b/src/components/common/icons/drag-n-drop.tsxsimilarity index 88%rename from src/components/common/icons/drag-n-drop.jsrename to src/components/common/icons/drag-n-drop.tsxindex 6dd0fa006..30ca644b4 100644--- a/src/components/common/icons/drag-n-drop.js+++ b/src/components/common/icons/drag-n-drop.tsx@@ -19,15 +19,9 @@// THE SOFTWARE.import React, {Component} from 'react';-import PropTypes from 'prop-types';-import Base from './base';--export default class DragNDrop extends Component {- static propTypes = {- /** Set the height of the icon, ex. '16px' */- height: PropTypes.string- };+import Base, {BaseProps} from './base';+export default class DragNDrop extends Component<Partial<BaseProps>> {static defaultProps = {height: '16px',predefinedClassName: 'data-ex-icons-dragndrop'diff --git a/src/components/common/icons/draw-polygon.js b/src/components/common/icons/draw-polygon.tsxsimilarity index 88%rename from src/components/common/icons/draw-polygon.jsrename to src/components/common/icons/draw-polygon.tsxindex 3ed998bfc..4ea91a0df 100644--- a/src/components/common/icons/draw-polygon.js+++ b/src/components/common/icons/draw-polygon.tsx@@ -19,18 +19,9 @@// THE SOFTWARE.import React, {Component} from 'react';-import PropTypes from 'prop-types';-import Base from './base';--export default class DrawPolygon extends Component {- static propTypes = {- /** Set the height of the icon, ex. '16px' */- height: PropTypes.string,- predefinedClassName: PropTypes.string,- viewBox: PropTypes.string,- style: PropTypes.object- };+import Base, {BaseProps} from './base';+export default class DrawPolygon extends Component<Partial<BaseProps>> {static defaultProps = {height: '16px',predefinedClassName: 'data-ex-icons-draw-polygon',diff --git a/src/components/common/icons/email.js b/src/components/common/icons/email.tsxsimilarity index 88%rename from src/components/common/icons/email.jsrename to src/components/common/icons/email.tsxindex 655b2696f..8b5a83ebd 100644--- a/src/components/common/icons/email.js+++ b/src/components/common/icons/email.tsx@@ -19,15 +19,9 @@// THE SOFTWARE.import React, {Component} from 'react';-import PropTypes from 'prop-types';-import Base from './base';--export default class Email extends Component {- static propTypes = {- /** Set the height of the icon, ex. '16px' */- height: PropTypes.string- };+import Base, {BaseProps} from './base';+export default class Email extends Component<Partial<BaseProps>> {static defaultProps = {height: '16px',predefinedClassName: 'data-ex-icons-email'diff --git a/src/components/common/icons/expand.js b/src/components/common/icons/expand.tsxsimilarity index 90%rename from src/components/common/icons/expand.jsrename to src/components/common/icons/expand.tsxindex 6a47349ed..d5fdfab4d 100644--- a/src/components/common/icons/expand.js+++ b/src/components/common/icons/expand.tsx@@ -19,15 +19,9 @@// THE SOFTWARE.import React, {Component} from 'react';-import PropTypes from 'prop-types';-import Base from './base';--export default class Expand extends Component {- static propTypes = {- /** Set the height of the icon, ex. '16px' */- height: PropTypes.string- };+import Base, {BaseProps} from './base';+export default class Expand extends Component<Partial<BaseProps>> {static defaultProps = {height: '16px',predefinedClassName: 'data-ex-icons-expand'diff --git a/src/components/common/icons/eye-seen.js b/src/components/common/icons/eye-seen.tsxsimilarity index 89%rename from src/components/common/icons/eye-seen.jsrename to src/components/common/icons/eye-seen.tsxindex ff3f38107..332783795 100644--- a/src/components/common/icons/eye-seen.js+++ b/src/components/common/icons/eye-seen.tsx@@ -19,15 +19,9 @@// THE SOFTWARE.import React, {Component} from 'react';-import PropTypes from 'prop-types';-import Base from './base';--export default class EyeSeen extends Component {- static propTypes = {- /** Set the height of the icon, ex. '16px' */- height: PropTypes.string- };+import Base, {BaseProps} from './base';+export default class EyeSeen extends Component<Partial<BaseProps>> {static defaultProps = {height: '16px',predefinedClassName: 'data-ex-icons-eyeseen'diff --git a/src/components/common/icons/eye-unseen.js b/src/components/common/icons/eye-unseen.tsxsimilarity index 89%rename from src/components/common/icons/eye-unseen.jsrename to src/components/common/icons/eye-unseen.tsxindex afb38dd67..b0fa99917 100644--- a/src/components/common/icons/eye-unseen.js+++ b/src/components/common/icons/eye-unseen.tsx@@ -19,15 +19,9 @@// THE SOFTWARE.import React, {Component} from 'react';-import PropTypes from 'prop-types';-import Base from './base';--export default class EyeUnseen extends Component {- static propTypes = {- /** Set the height of the icon, ex. '16px' */- height: PropTypes.string- };+import Base, {BaseProps} from './base';+export default class EyeUnseen extends Component<Partial<BaseProps>> {static defaultProps = {height: '16px',predefinedClassName: 'data-ex-icons-eyeunseen'diff --git a/src/components/common/icons/file-type.js b/src/components/common/icons/file-type.tsxsimilarity index 80%rename from src/components/common/icons/file-type.jsrename to src/components/common/icons/file-type.tsxindex aacf6a1cb..934b76a13 100644--- a/src/components/common/icons/file-type.js+++ b/src/components/common/icons/file-type.tsx@@ -18,12 +18,16 @@// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN// THE SOFTWARE.-import React from 'react';+import React, {ReactNode} from 'react';import styled from 'styled-components';import {File} from 'components/common/icons';-const FileNameTag = styled.div`+interface FileNameTagProps {+ fontSize: string;+}++const FileNameTag = styled.div<FileNameTagProps>`background-color: currentColor;border-radius: 1px;display: inline-block;@@ -38,14 +42,24 @@ const FileNameTag = styled.div`}`;-const FileTypeIconWrapper = styled.div`+interface FileTypeIconWrapperProps {+ height: string;+}++const FileTypeIconWrapper = styled.div<FileTypeIconWrapperProps>`display: inline-block;position: relative;color: currentColor;height: ${props => props.height};`;-const FileTypeIcon = ({ext, height, fontSize}) => (+interface FileTypeIconProps {+ ext?: ReactNode;+ height: string;+ fontSize: string;+}++const FileTypeIcon = ({ext, height, fontSize}: FileTypeIconProps) => (<FileTypeIconWrapper height={height}><File height={height} /><FileNameTag fontSize={fontSize}>diff --git a/src/components/common/icons/file.js b/src/components/common/icons/file.tsxsimilarity index 88%rename from src/components/common/icons/file.jsrename to src/components/common/icons/file.tsxindex 5a95c03b5..9a03d85b3 100644--- a/src/components/common/icons/file.js+++ b/src/components/common/icons/file.tsx@@ -19,15 +19,9 @@// THE SOFTWARE.import React, {Component} from 'react';-import PropTypes from 'prop-types';-import Base from './base';--export default class File extends Component {- static propTypes = {- /** Set the height of the icon, ex. '16px' */- height: PropTypes.string- };+import Base, {BaseProps} from './base';+export default class File extends Component<Partial<BaseProps>> {static defaultProps = {height: '16px',predefinedClassName: 'data-ex-icons-file'diff --git a/src/components/common/icons/files.js b/src/components/common/icons/files.tsxsimilarity index 87%rename from src/components/common/icons/files.jsrename to src/components/common/icons/files.tsxindex 193cde9e9..2ab78c4ee 100644--- a/src/components/common/icons/files.js+++ b/src/components/common/icons/files.tsx@@ -18,15 +18,10 @@// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN// THE SOFTWARE.-import PropTypes from 'prop-types';import React from 'react';-import Base from './base';+import Base, {BaseProps} from './base';-export default class Files extends React.Component {- static propTypes = {- /** Set the height of the icon, ex. '16px' */- height: PropTypes.string- };+export default class Files extends React.Component<Partial<BaseProps>> {static defaultProps = {height: '16px',predefinedClassName: 'data-ex-icons-files'diff --git a/src/components/common/icons/filter-funnel.js b/src/components/common/icons/filter-funnel.tsxsimilarity index 88%rename from src/components/common/icons/filter-funnel.jsrename to src/components/common/icons/filter-funnel.tsxindex 118614c98..9dd44d0c5 100644--- a/src/components/common/icons/filter-funnel.js+++ b/src/components/common/icons/filter-funnel.tsx@@ -19,15 +19,9 @@// THE SOFTWARE.import React, {Component} from 'react';-import PropTypes from 'prop-types';-import Base from './base';--export default class FilterFunnel extends Component {- static propTypes = {- /** Set the height of the icon, ex. '16px' */- height: PropTypes.string- };+import Base, {BaseProps} from './base';+export default class FilterFunnel extends Component<Partial<BaseProps>> {static defaultProps = {height: '16px',predefinedClassName: 'data-ex-icons-filterfunnel'diff --git a/src/components/common/icons/free-window.js b/src/components/common/icons/free-window.tsxsimilarity index 92%rename from src/components/common/icons/free-window.jsrename to src/components/common/icons/free-window.tsxindex 107eaefc6..eb9f88b24 100644--- a/src/components/common/icons/free-window.js+++ b/src/components/common/icons/free-window.tsx@@ -19,10 +19,9 @@// THE SOFTWARE.import React from 'react';-import Base from './base';-import PropTypes from 'prop-types';+import Base, {BaseProps} from './base';-const FreeWindow = props => (+const FreeWindow = (props: Partial<BaseProps>) => (<Base {...props}><pathfillRule="evenodd"@@ -41,10 +40,6 @@ const FreeWindow = props => (/></Base>);-FreeWindow.propTypes = {- /** Set the height of the icon, ex. '16px' */- height: PropTypes.string-};FreeWindow.defaultProps = {height: '16px',viewBox: '0 0 16 16',diff --git a/src/components/common/icons/gear.js b/src/components/common/icons/gear.tsxsimilarity index 95%rename from src/components/common/icons/gear.jsrename to src/components/common/icons/gear.tsxindex 000aafe5d..75aae25b8 100644--- a/src/components/common/icons/gear.js+++ b/src/components/common/icons/gear.tsx@@ -19,14 +19,9 @@// THE SOFTWARE.import React, {Component} from 'react';-import PropTypes from 'prop-types';-import Base from './base';+import Base, {BaseProps} from './base';-export default class Gear extends Component {- static propTypes = {- /** Set the height of the icon, ex. '16px' */- height: PropTypes.string- };+export default class Gear extends Component<Partial<BaseProps>> {static defaultProps = {height: '16px',predefinedClassName: 'data-ex-icons-gear'diff --git a/src/components/common/icons/hash.js b/src/components/common/icons/hash.tsxsimilarity index 88%rename from src/components/common/icons/hash.jsrename to src/components/common/icons/hash.tsxindex 4b34a3128..5b769b4f4 100644--- a/src/components/common/icons/hash.js+++ b/src/components/common/icons/hash.tsx@@ -19,15 +19,9 @@// THE SOFTWARE.import React, {Component} from 'react';-import PropTypes from 'prop-types';-import Base from './base';--export default class Hash extends Component {- static propTypes = {- /** Set the height of the icon, ex. '16px' */- height: PropTypes.string- };+import Base, {BaseProps} from './base';+export default class Hash extends Component<Partial<BaseProps>> {static defaultProps = {height: '16px',predefinedClassName: 'data-ex-icons-hash'diff --git a/src/components/common/icons/histogram.js b/src/components/common/icons/histogram.tsxsimilarity index 90%rename from src/components/common/icons/histogram.jsrename to src/components/common/icons/histogram.tsxindex 03fe7d151..1c7105f12 100644--- a/src/components/common/icons/histogram.js+++ b/src/components/common/icons/histogram.tsx@@ -19,14 +19,9 @@// THE SOFTWARE.import React from 'react';-import PropTypes from 'prop-types';-import Base from './base';--export default class Histogram extends React.Component {- static propTypes = {- height: PropTypes.string- };+import Base, {BaseProps} from './base';+export default class Histogram extends React.Component<Partial<BaseProps>> {static defaultProps = {height: '16px',predefinedClassName: 'data-ex-icons-histogram'diff --git a/src/components/common/icons/index.d.ts b/src/components/common/icons/index.d.tsdeleted file mode 100644index 7da7df421..000000000--- a/src/components/common/icons/index.d.ts+++ /dev/null@@ -1,76 +0,0 @@-import React from 'react';--export const Add: React.ElementType;-export const AnchorWindow: React.ElementType;-export const ArrowDown: React.ElementType;-export const ArrowDownAlt: React.ElementType;-export const ArrowDownSolid: React.ElementType;-export const ArrowLeft: React.ElementType;-export const ArrowRight: React.ElementType;-export const ArrowUpSolid: React.ElementType;-export const ArrowUpAlt: React.ElementType;-export const ArrowUp: React.ElementType;-export const Base: React.ElementType;-export const Bug: React.ElementType;-export const Cancel: React.ElementType;-export const Checkmark: React.ElementType;-export const Clipboard: React.ElementType;-export const Clock: React.ElementType;-export const Close: React.ElementType;-export const Copy: React.ElementType;-export const Crosshairs: React.ElementType;-export const Cube3d: React.ElementType;-export const CursorClick: React.ElementType;-export const DataTable: React.ElementType;-export const Db: React.ElementType;-export const Delete: React.ElementType;-export const Docs: React.ElementType;-export const DragNDrop: React.ElementType;-export const Email: React.ElementType;-export const Expand: React.ElementType;-export const EyeSeen: React.ElementType;-export const EyeUnseen: React.ElementType;-export const File: React.ElementType;-export const Files: React.ElementType;-export const FileType: React.ElementType;-export const FilterFunnel: React.ElementType;-export const FreeWindow: React.ElementType;-export const Gear: React.ElementType;-export const Hash: React.ElementType;-export const Histogram: React.ElementType;-export const Info: React.ElementType;-export const Layers: React.ElementType;-export const LeftArrow: React.ElementType;-export const Legend: React.ElementType;-export const LineChart: React.ElementType;-export const Logout: React.ElementType;-export const Login: React.ElementType;-export const Map: React.ElementType;-export const MapIcon: React.ElementType;-export const Minus: React.ElementType;-export const Messages: React.ElementType;-export const Pause: React.ElementType;-export const Picture: React.ElementType;-export const Pin: React.ElementType;-export const Play: React.ElementType;-export const Reduce: React.ElementType;-export const Reset: React.ElementType;-export const Rocket: React.ElementType;-export const Save: React.ElementType;-export const Save2: React.ElementType;-export const Share: React.ElementType;-export const SquareSelect: React.ElementType;-export const Settings: React.ElementType;-export const Search: React.ElementType;-export const Split: React.ElementType;-export const Table: React.ElementType;-export const Trash: React.ElementType;-export const Upload: React.ElementType;-export const VertDots: React.ElementType;-export const VertThreeDots: React.ElementType;-export const IconWrapper: React.ElementType;-export const CodeAlt: React.ElementType;-export const Warning: React.ElementType;-export const DrawPolygon: React.ElementType;-export const Polygon: React.ElementType;-export const Rectangle: React.ElementType;diff --git a/src/components/common/icons/index.js b/src/components/common/icons/index.tsxsimilarity index 100%rename from src/components/common/icons/index.jsrename to src/components/common/icons/index.tsxdiff --git a/src/components/common/icons/info.js b/src/components/common/icons/info.tsxsimilarity index 90%rename from src/components/common/icons/info.jsrename to src/components/common/icons/info.tsxindex f85df8a7c..52c60ec54 100644--- a/src/components/common/icons/info.js+++ b/src/components/common/icons/info.tsx@@ -19,15 +19,9 @@// THE SOFTWARE.import React, {Component} from 'react';-import PropTypes from 'prop-types';-import Base from './base';--export default class Info extends Component {- static propTypes = {- /** Set the height of the icon, ex. '16px' */- height: PropTypes.string- };+import Base, {BaseProps} from './base';+export default class Info extends Component<Partial<BaseProps> & {stroke?: string}> {static defaultProps = {height: '16px',predefinedClassName: 'data-ex-icons-info',diff --git a/src/components/common/icons/layers.js b/src/components/common/icons/layers.tsxsimilarity index 89%rename from src/components/common/icons/layers.jsrename to src/components/common/icons/layers.tsxindex 942b55087..64f65e49d 100644--- a/src/components/common/icons/layers.js+++ b/src/components/common/icons/layers.tsx@@ -19,15 +19,9 @@// THE SOFTWARE.import React, {Component} from 'react';-import PropTypes from 'prop-types';-import Base from './base';--export default class Layers extends Component {- static propTypes = {- /** Set the height of the icon, ex. '16px' */- height: PropTypes.string- };+import Base, {BaseProps} from './base';+export default class Layers extends Component<Partial<BaseProps>> {static defaultProps = {height: '16px',predefinedClassName: 'data-ex-icons-layers'diff --git a/src/components/common/icons/left-arrow.js b/src/components/common/icons/left-arrow.tsxsimilarity index 87%rename from src/components/common/icons/left-arrow.jsrename to src/components/common/icons/left-arrow.tsxindex 3fba6cfd4..af01a0f87 100644--- a/src/components/common/icons/left-arrow.js+++ b/src/components/common/icons/left-arrow.tsx@@ -19,15 +19,9 @@// THE SOFTWARE.import React, {Component} from 'react';-import PropTypes from 'prop-types';-import Base from './base';--export default class LeftArrow extends Component {- static propTypes = {- /** Set the height of the icon, ex. '16px' */- height: PropTypes.string- };+import Base, {BaseProps} from './base';+export default class LeftArrow extends Component<Partial<BaseProps>> {static defaultProps = {height: '16px',predefinedClassName: 'data-ex-icons-left-arrow'diff --git a/src/components/common/icons/legend.js b/src/components/common/icons/legend.tsxsimilarity index 88%rename from src/components/common/icons/legend.jsrename to src/components/common/icons/legend.tsxindex fcaf7410f..0787c4707 100644--- a/src/components/common/icons/legend.js+++ b/src/components/common/icons/legend.tsx@@ -19,15 +19,9 @@// THE SOFTWARE.import React, {Component} from 'react';-import PropTypes from 'prop-types';-import Base from './base';--export default class Legend extends Component {- static propTypes = {- /** Set the height of the icon, ex. '16px' */- height: PropTypes.string- };+import Base, {BaseProps} from './base';+export default class Legend extends Component<Partial<BaseProps>> {static defaultProps = {height: '16px',predefinedClassName: 'data-ex-icons-legend'diff --git a/src/components/common/icons/line-chart.js b/src/components/common/icons/line-chart.tsxsimilarity index 90%rename from src/components/common/icons/line-chart.jsrename to src/components/common/icons/line-chart.tsxindex e8679cd67..9516249c9 100644--- a/src/components/common/icons/line-chart.js+++ b/src/components/common/icons/line-chart.tsx@@ -19,14 +19,9 @@// THE SOFTWARE.import React, {Component} from 'react';-import PropTypes from 'prop-types';-import Base from './base';--export default class LineChart extends Component {- static propTypes = {- height: PropTypes.string- };+import Base, {BaseProps} from './base';+export default class LineChart extends Component<Partial<BaseProps>> {static defaultProps = {height: '16px',predefinedClassName: 'data-ex-icons-linechart'diff --git a/src/components/common/icons/login.js b/src/components/common/icons/login.tsxsimilarity index 92%rename from src/components/common/icons/login.jsrename to src/components/common/icons/login.tsxindex 00a7f6932..bc2170f61 100644--- a/src/components/common/icons/login.js+++ b/src/components/common/icons/login.tsx@@ -19,14 +19,9 @@// THE SOFTWARE.import React, {Component} from 'react';-import Base from './base';-import PropTypes from 'prop-types';--export default class Login extends Component {- static propTypes = {- height: PropTypes.string- };+import Base, {BaseProps} from './base';+export default class Login extends Component<Partial<BaseProps>> {static defaultProps = {height: '16px',predefinedClassName: 'data-ex-icons-login'diff --git a/src/components/common/icons/logout.js b/src/components/common/icons/logout.tsxsimilarity index 92%rename from src/components/common/icons/logout.jsrename to src/components/common/icons/logout.tsxindex 9e41223f6..d6789f950 100644--- a/src/components/common/icons/logout.js+++ b/src/components/common/icons/logout.tsx@@ -19,14 +19,9 @@// THE SOFTWARE.import React, {Component} from 'react';-import Base from './base';-import PropTypes from 'prop-types';--export default class Logout extends Component {- static propTypes = {- height: PropTypes.string- };+import Base, {BaseProps} from './base';+export default class Logout extends Component<Partial<BaseProps>> {static defaultProps = {height: '16px',predefinedClassName: 'data-ex-icons-logout'diff --git a/src/components/common/icons/map-icon.js b/src/components/common/icons/map-icon.tsxsimilarity index 93%rename from src/components/common/icons/map-icon.jsrename to src/components/common/icons/map-icon.tsxindex 27829ebb2..8b39f82fc 100644--- a/src/components/common/icons/map-icon.js+++ b/src/components/common/icons/map-icon.tsx@@ -19,16 +19,9 @@// THE SOFTWARE.import React, {Component} from 'react';-import PropTypes from 'prop-types';-import Base from './base';--class MapIcon extends Component {- static propTypes = {- /** Set the height of the icon, ex. '16px' */- height: PropTypes.string,- colors: PropTypes.arrayOf(PropTypes.string)- };+import Base, {BaseProps} from './base';+class MapIcon extends Component<Partial<BaseProps>> {static defaultProps = {height: '16px',predefinedClassName: 'data-ex-icons-map-icon',diff --git a/src/components/common/icons/map.js b/src/components/common/icons/map.tsxsimilarity index 93%rename from src/components/common/icons/map.jsrename to src/components/common/icons/map.tsxindex 25d052191..54b3fa298 100644--- a/src/components/common/icons/map.js+++ b/src/components/common/icons/map.tsx@@ -19,16 +19,9 @@// THE SOFTWARE.import React, {Component} from 'react';-import PropTypes from 'prop-types';-import Base from './base';--class MapIcon extends Component {- static propTypes = {- /** Set the height of the icon, ex. '16px' */- height: PropTypes.string,- colors: PropTypes.arrayOf(PropTypes.string)- };+import Base, {BaseProps} from './base';+class MapIcon extends Component<Partial<BaseProps>> {static defaultProps = {height: '16px',predefinedClassName: 'data-ex-icons-add',diff --git a/src/components/common/icons/messages.js b/src/components/common/icons/messages.tsxsimilarity index 87%rename from src/components/common/icons/messages.jsrename to src/components/common/icons/messages.tsxindex 07aa7cc56..2fb375bb4 100644--- a/src/components/common/icons/messages.js+++ b/src/components/common/icons/messages.tsx@@ -19,15 +19,9 @@// THE SOFTWARE.import React, {Component} from 'react';-import PropTypes from 'prop-types';-import Base from './base';--export default class Messages extends Component {- static propTypes = {- /** Set the height of the icon, ex. '16px' */- height: PropTypes.string- };+import Base, {BaseProps} from './base';+export default class Messages extends Component<Partial<BaseProps>> {static defaultProps = {height: '16px',predefinedClassName: 'data-ex-icons-messages'diff --git a/src/components/common/icons/minus.js b/src/components/common/icons/minus.tsxsimilarity index 87%rename from src/components/common/icons/minus.jsrename to src/components/common/icons/minus.tsxindex 03016ac67..58eb9e453 100644--- a/src/components/common/icons/minus.js+++ b/src/components/common/icons/minus.tsx@@ -19,15 +19,9 @@// THE SOFTWARE.import React, {Component} from 'react';-import PropTypes from 'prop-types';-import Base from './base';--export default class Minus extends Component {- static propTypes = {- /** Set the height of the icon, ex. '16px' */- height: PropTypes.string- };+import Base, {BaseProps} from './base';+export default class Minus extends Component<Partial<BaseProps>> {static defaultProps = {height: '16px',predefinedClassName: 'data-ex-icons-minus'diff --git a/src/components/common/icons/order-by-dataset.js b/src/components/common/icons/order-by-dataset.tsxsimilarity index 94%rename from src/components/common/icons/order-by-dataset.jsrename to src/components/common/icons/order-by-dataset.tsxindex 7e70dd55a..b7a786db5 100644--- a/src/components/common/icons/order-by-dataset.js+++ b/src/components/common/icons/order-by-dataset.tsx@@ -19,10 +19,9 @@// THE SOFTWARE.import React from 'react';-import Base from './base';-import PropTypes from 'prop-types';+import Base, {BaseProps} from './base';-const OrderByDataset = props => (+const OrderByDataset = (props: Partial<BaseProps>) => (<Base {...props}><pathd="M14.7225 13.7778C14.7225 14.1294 14.6183 14.4731 14.4229 14.7655C14.2276 15.0578 13.9499 15.2857 13.6251 15.4202C13.3003 15.5548 12.9428 15.59 12.5979 15.5214C12.2531 15.4528 11.9363 15.2835 11.6877 15.0349C11.4391 14.7862 11.2697 14.4695 11.2012 14.1246C11.1326 13.7798 11.1678 13.4223 11.3023 13.0975C11.4369 12.7726 11.6647 12.495 11.9571 12.2996C12.2494 12.1043 12.5932 12 12.9448 12C13.4163 12 13.8685 12.1873 14.2018 12.5207C14.5352 12.8541 14.7225 13.3063 14.7225 13.7778ZM23.5003 13.7778C23.5003 13.542 23.4067 13.3159 23.24 13.1492C23.0733 12.9825 22.8472 12.8889 22.6114 12.8889H18.2781C18.0424 12.8889 17.8163 12.9825 17.6496 13.1492C17.4829 13.3159 17.3892 13.542 17.3892 13.7778C17.3892 14.0135 17.4829 14.2396 17.6496 14.4063C17.8163 14.573 18.0424 14.6667 18.2781 14.6667H22.6114C22.8472 14.6667 23.0733 14.573 23.24 14.4063C23.4067 14.2396 23.5003 14.0135 23.5003 13.7778ZM12.9448 18.2222C12.5932 18.2222 12.2494 18.3265 11.9571 18.5218C11.6647 18.7172 11.4369 18.9948 11.3023 19.3197C11.1678 19.6445 11.1326 20.002 11.2012 20.3468C11.2697 20.6917 11.4391 21.0085 11.6877 21.2571C11.9363 21.5057 12.2531 21.675 12.5979 21.7436C12.9428 21.8122 13.3003 21.777 13.6251 21.6425C13.9499 21.5079 14.2276 21.28 14.4229 20.9877C14.6183 20.6953 14.7225 20.3516 14.7225 20C14.7225 19.5285 14.5352 19.0763 14.2018 18.7429C13.8685 18.4095 13.4163 18.2222 12.9448 18.2222ZM23.5003 20C23.5003 19.7643 23.4067 19.5382 23.24 19.3715C23.0733 19.2048 22.8472 19.1111 22.6114 19.1111H18.2781C18.0424 19.1111 17.8163 19.2048 17.6496 19.3715C17.4829 19.5382 17.3892 19.7643 17.3892 20C17.3892 20.2357 17.4829 20.4618 17.6496 20.6285C17.8163 20.7952 18.0424 20.8889 18.2781 20.8889H22.6114C22.8472 20.8889 23.0733 20.7952 23.24 20.6285C23.4067 20.4618 23.5003 20.2357 23.5003 20Z"@@ -40,11 +39,6 @@ const OrderByDataset = props => (/></Base>);-OrderByDataset.propTypes = {- /** Set the height of the icon, ex. '16px' */- height: PropTypes.string,- fill: PropTypes.string-};OrderByDataset.defaultProps = {height: '20px',fill: 'currentColor',diff --git a/src/components/common/icons/order-by-list.js b/src/components/common/icons/order-by-list.tsxsimilarity index 94%rename from src/components/common/icons/order-by-list.jsrename to src/components/common/icons/order-by-list.tsxindex 2f1d9f76d..0828dd7de 100644--- a/src/components/common/icons/order-by-list.js+++ b/src/components/common/icons/order-by-list.tsx@@ -19,10 +19,9 @@// THE SOFTWARE.import React from 'react';-import Base from './base';-import PropTypes from 'prop-types';+import Base, {BaseProps} from './base';-const OrderByList = props => (+const OrderByList = (props: Partial<BaseProps>) => (<Base {...props}><pathd="M8.55556 14C8.55556 14.3516 8.45129 14.6953 8.25595 14.9877C8.0606 15.28 7.78295 15.5079 7.4581 15.6425C7.13326 15.777 6.77581 15.8122 6.43095 15.7436C6.0861 15.675 5.76933 15.5057 5.5207 15.2571C5.27207 15.0085 5.10276 14.6917 5.03416 14.3468C4.96556 14.002 5.00077 13.6445 5.13533 13.3197C5.26988 12.9948 5.49774 12.7172 5.7901 12.5218C6.08245 12.3265 6.42617 12.2222 6.77778 12.2222C7.24927 12.2222 7.70146 12.4095 8.03486 12.7429C8.36826 13.0763 8.55556 13.5285 8.55556 14ZM23.3333 14C23.3333 13.7643 23.2397 13.5382 23.073 13.3715C22.9063 13.2048 22.6802 13.1111 22.4444 13.1111H12.1111C11.8754 13.1111 11.6493 13.2048 11.4826 13.3715C11.3159 13.5382 11.2222 13.7643 11.2222 14C11.2222 14.2357 11.3159 14.4618 11.4826 14.6285C11.6493 14.7952 11.8754 14.8889 12.1111 14.8889H22.4444C22.6802 14.8889 22.9063 14.7952 23.073 14.6285C23.2397 14.4618 23.3333 14.2357 23.3333 14ZM6.77778 6C6.42617 6 6.08245 6.10426 5.7901 6.29961C5.49774 6.49495 5.26988 6.7726 5.13533 7.09745C5.00077 7.4223 4.96556 7.77975 5.03416 8.1246C5.10276 8.46946 5.27207 8.78623 5.5207 9.03486C5.76933 9.28348 6.0861 9.4528 6.43095 9.5214C6.77581 9.58999 7.13326 9.55479 7.4581 9.42023C7.78295 9.28567 8.0606 9.05781 8.25595 8.76546C8.45129 8.4731 8.55556 8.12939 8.55556 7.77778C8.55556 7.30628 8.36826 6.8541 8.03486 6.5207C7.70146 6.1873 7.24927 6 6.77778 6ZM23.3333 7.77778C23.3333 7.54203 23.2397 7.31594 23.073 7.14924C22.9063 6.98254 22.6802 6.88889 22.4444 6.88889H12.1111C11.8754 6.88889 11.6493 6.98254 11.4826 7.14924C11.3159 7.31594 11.2222 7.54203 11.2222 7.77778C11.2222 8.01353 11.3159 8.23962 11.4826 8.40632C11.6493 8.57302 11.8754 8.66667 12.1111 8.66667H22.4444C22.6802 8.66667 22.9063 8.57302 23.073 8.40632C23.2397 8.23962 23.3333 8.01353 23.3333 7.77778ZM6.77778 18.4444C6.42617 18.4444 6.08245 18.5487 5.7901 18.7441C5.49774 18.9394 5.26988 19.217 5.13533 19.5419C5.00077 19.8667 4.96556 20.2242 5.03416 20.569C5.10276 20.9139 5.27207 21.2307 5.5207 21.4793C5.76933 21.7279 6.0861 21.8972 6.43095 21.9658C6.77581 22.0344 7.13326 21.9992 7.4581 21.8647C7.78295 21.7301 8.0606 21.5023 8.25595 21.2099C8.45129 20.9175 8.55556 20.5738 8.55556 20.2222C8.55556 19.7507 8.36826 19.2985 8.03486 18.9651C7.70146 18.6317 7.24927 18.4444 6.77778 18.4444ZM23.3333 20.2222C23.3333 19.9865 23.2397 19.7604 23.073 19.5937C22.9063 19.427 22.6802 19.3333 22.4444 19.3333H12.1111C11.8754 19.3333 11.6493 19.427 11.4826 19.5937C11.3159 19.7604 11.2222 19.9865 11.2222 20.2222C11.2222 20.458 11.3159 20.6841 11.4826 20.8508C11.6493 21.0175 11.8754 21.1111 12.1111 21.1111H22.4444C22.6802 21.1111 22.9063 21.0175 23.073 20.8508C23.2397 20.6841 23.3333 20.458 23.3333 20.2222Z"@@ -30,11 +29,6 @@ const OrderByList = props => (/></Base>);-OrderByList.propTypes = {- /** Set the height of the icon, ex. '16px' */- height: PropTypes.string,- fill: PropTypes.string-};OrderByList.defaultProps = {height: '20px',fill: 'currentColor',diff --git a/src/components/common/icons/pause.js b/src/components/common/icons/pause.tsxsimilarity index 87%rename from src/components/common/icons/pause.jsrename to src/components/common/icons/pause.tsxindex 148ddef55..17bfdc2b6 100644--- a/src/components/common/icons/pause.js+++ b/src/components/common/icons/pause.tsx@@ -19,15 +19,9 @@// THE SOFTWARE.import React, {Component} from 'react';-import PropTypes from 'prop-types';-import Base from './base';--export default class Pause extends Component {- static propTypes = {- /** Set the height of the icon, ex. '16px' */- height: PropTypes.string- };+import Base, {BaseProps} from './base';+export default class Pause extends Component<Partial<BaseProps>> {static defaultProps = {height: '16px',predefinedClassName: 'data-ex-icons-pause'diff --git a/src/components/common/icons/picture.js b/src/components/common/icons/picture.tsxsimilarity index 88%rename from src/components/common/icons/picture.jsrename to src/components/common/icons/picture.tsxindex 88eed1e5d..ae7921355 100644--- a/src/components/common/icons/picture.js+++ b/src/components/common/icons/picture.tsx@@ -18,16 +18,10 @@// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN// THE SOFTWARE.-import PropTypes from 'prop-types';import React from 'react';-import Base from './base';--export default class Picture extends React.Component {- static propTypes = {- /** Set the height of the icon, ex. '16px' */- height: PropTypes.string- };+import Base, {BaseProps} from './base';+export default class Picture extends React.Component<Partial<BaseProps>> {static defaultProps = {height: '16px',predefinedClassName: 'data-ex-icons-minus'diff --git a/src/components/common/icons/pin.js b/src/components/common/icons/pin.tsxsimilarity index 88%rename from src/components/common/icons/pin.jsrename to src/components/common/icons/pin.tsxindex eab4f80f8..05c45e214 100644--- a/src/components/common/icons/pin.js+++ b/src/components/common/icons/pin.tsx@@ -19,20 +19,14 @@// THE SOFTWARE.import React, {Component} from 'react';-import PropTypes from 'prop-types';-import Base from './base';+import Base, {BaseProps} from './base';import styled from 'styled-components';const StyledBase = styled(Base)`transform: rotate(30deg);`;-export default class Pin extends Component {- static propTypes = {- /** Set the height of the icon, ex. '16px' */- height: PropTypes.string- };-+export default class Pin extends Component<Partial<BaseProps>> {static defaultProps = {size: 'tiny',predefinedClassName: 'data-ex-icons-pin'diff --git a/src/components/common/icons/play.js b/src/components/common/icons/play.tsxsimilarity index 87%rename from src/components/common/icons/play.jsrename to src/components/common/icons/play.tsxindex 23f65e057..a9b7d41f4 100644--- a/src/components/common/icons/play.js+++ b/src/components/common/icons/play.tsx@@ -19,15 +19,9 @@// THE SOFTWARE.import React, {Component} from 'react';-import PropTypes from 'prop-types';-import Base from './base';--export default class Play extends Component {- static propTypes = {- /** Set the height of the icon, ex. '16px' */- height: PropTypes.string- };+import Base, {BaseProps} from './base';+export default class Play extends Component<Partial<BaseProps>> {static defaultProps = {height: '16px',predefinedClassName: 'data-ex-icons-play'diff --git a/src/components/common/icons/polygon.js b/src/components/common/icons/polygon.tsxsimilarity index 88%rename from src/components/common/icons/polygon.jsrename to src/components/common/icons/polygon.tsxindex aaf1e7082..9ed14f8e7 100644--- a/src/components/common/icons/polygon.js+++ b/src/components/common/icons/polygon.tsx@@ -19,18 +19,9 @@// THE SOFTWARE.import React, {Component} from 'react';-import PropTypes from 'prop-types';-import Base from './base';--export default class DrawPolygon extends Component {- static propTypes = {- /** Set the height of the icon, ex. '16px' */- height: PropTypes.string,- predefinedClassName: PropTypes.string,- viewBox: PropTypes.string,- style: PropTypes.object- };+import Base, {BaseProps} from './base';+export default class DrawPolygon extends Component<Partial<BaseProps>> {static defaultProps = {height: '16px',predefinedClassName: 'data-ex-icons-polygon',diff --git a/src/components/common/icons/rectangle.js b/src/components/common/icons/rectangle.tsxsimilarity index 88%rename from src/components/common/icons/rectangle.jsrename to src/components/common/icons/rectangle.tsxindex 78962c8d7..621e13b52 100644--- a/src/components/common/icons/rectangle.js+++ b/src/components/common/icons/rectangle.tsx@@ -19,18 +19,9 @@// THE SOFTWARE.import React, {Component} from 'react';-import PropTypes from 'prop-types';-import Base from './base';--export default class Rectangle extends Component {- static propTypes = {- /** Set the height of the icon, ex. '16px' */- height: PropTypes.string,- predefinedClassName: PropTypes.string,- viewBox: PropTypes.string,- style: PropTypes.object- };+import Base, {BaseProps} from './base';+export default class Rectangle extends Component<Partial<BaseProps>> {static defaultProps = {height: '16px',predefinedClassName: 'data-ex-icons-rectangle',diff --git a/src/components/common/icons/reduce.js b/src/components/common/icons/reduce.tsxsimilarity index 90%rename from src/components/common/icons/reduce.jsrename to src/components/common/icons/reduce.tsxindex 5bc1adf49..5b8757d94 100644--- a/src/components/common/icons/reduce.js+++ b/src/components/common/icons/reduce.tsx@@ -19,15 +19,9 @@// THE SOFTWARE.import React, {Component} from 'react';-import PropTypes from 'prop-types';-import Base from './base';--export default class Reduce extends Component {- static propTypes = {- /** Set the height of the icon, ex. '16px' */- height: PropTypes.string- };+import Base, {BaseProps} from './base';+export default class Reduce extends Component<Partial<BaseProps>> {static defaultProps = {height: '16px',predefinedClassName: 'data-ex-icons-reduce'diff --git a/src/components/common/icons/reset.js b/src/components/common/icons/reset.tsxsimilarity index 88%rename from src/components/common/icons/reset.jsrename to src/components/common/icons/reset.tsxindex 29bd0d1c3..2929432a2 100644--- a/src/components/common/icons/reset.js+++ b/src/components/common/icons/reset.tsx@@ -19,15 +19,9 @@// THE SOFTWARE.import React, {Component} from 'react';-import PropTypes from 'prop-types';-import Base from './base';--export default class Reset extends Component {- static propTypes = {- /** Set the height of the icon, ex. '16px' */- height: PropTypes.string- };+import Base, {BaseProps} from './base';+export default class Reset extends Component<Partial<BaseProps>> {static defaultProps = {height: '16px',predefinedClassName: 'data-ex-icons-reset'diff --git a/src/components/common/icons/rocket.js b/src/components/common/icons/rocket.tsxsimilarity index 87%rename from src/components/common/icons/rocket.jsrename to src/components/common/icons/rocket.tsxindex 2ace81b0a..8a0027500 100644--- a/src/components/common/icons/rocket.js+++ b/src/components/common/icons/rocket.tsx@@ -19,15 +19,9 @@// THE SOFTWARE.import React, {Component} from 'react';-import PropTypes from 'prop-types';-import Base from './base';--export default class Rocket extends Component {- static propTypes = {- /** Set the height of the icon, ex. '16px' */- height: PropTypes.string- };+import Base, {BaseProps} from './base';+export default class Rocket extends Component<Partial<BaseProps>> {static defaultProps = {height: '16px',predefinedClassName: 'data-ex-icons-rocket'diff --git a/src/components/common/icons/save.js b/src/components/common/icons/save.tsxsimilarity index 89%rename from src/components/common/icons/save.jsrename to src/components/common/icons/save.tsxindex d07c12493..20a6e2220 100644--- a/src/components/common/icons/save.js+++ b/src/components/common/icons/save.tsx@@ -19,15 +19,9 @@// THE SOFTWARE.import React, {Component} from 'react';-import PropTypes from 'prop-types';-import Base from './base';--export default class Save extends Component {- static propTypes = {- /** Set the height of the icon, ex. '16px' */- height: PropTypes.string- };+import Base, {BaseProps} from './base';+export default class Save extends Component<Partial<BaseProps>> {static defaultProps = {height: '16px',predefinedClassName: 'data-ex-icons-save'diff --git a/src/components/common/icons/save2.js b/src/components/common/icons/save2.tsxsimilarity index 94%rename from src/components/common/icons/save2.jsrename to src/components/common/icons/save2.tsxindex a81551d9e..e572d5bc6 100644--- a/src/components/common/icons/save2.js+++ b/src/components/common/icons/save2.tsx@@ -19,14 +19,9 @@// THE SOFTWARE.import React, {Component} from 'react';-import PropTypes from 'prop-types';-import Base from './base';+import Base, {BaseProps} from './base';-export default class Save2 extends Component {- static propTypes = {- /** Set the height of the icon, ex. '16px' */- height: PropTypes.string- };+export default class Save2 extends Component<Partial<BaseProps>> {static defaultProps = {height: '16px',predefinedClassName: 'data-ex-icons-save2'diff --git a/src/components/common/icons/search.js b/src/components/common/icons/search.tsxsimilarity index 88%rename from src/components/common/icons/search.jsrename to src/components/common/icons/search.tsxindex 3fb6fe893..1fb9a07f1 100644--- a/src/components/common/icons/search.js+++ b/src/components/common/icons/search.tsx@@ -19,15 +19,9 @@// THE SOFTWARE.import React, {Component} from 'react';-import PropTypes from 'prop-types';-import Base from './base';--export default class Search extends Component {- static propTypes = {- /** Set the height of the icon, ex. '16px' */- height: PropTypes.string- };+import Base, {BaseProps} from './base';+export default class Search extends Component<Partial<BaseProps>> {static defaultProps = {height: '16px',predefinedClassName: 'data-ex-icons-search'diff --git a/src/components/common/icons/settings.js b/src/components/common/icons/settings.tsxsimilarity index 89%rename from src/components/common/icons/settings.jsrename to src/components/common/icons/settings.tsxindex 00acd2e40..3ac53c88e 100644--- a/src/components/common/icons/settings.js+++ b/src/components/common/icons/settings.tsx@@ -19,15 +19,9 @@// THE SOFTWARE.import React, {Component} from 'react';-import PropTypes from 'prop-types';-import Base from './base';--export default class Settings extends Component {- static propTypes = {- /** Set the height of the icon, ex. '16px' */- height: PropTypes.string- };+import Base, {BaseProps} from './base';+export default class Settings extends Component<Partial<BaseProps>> {static defaultProps = {height: '16px',predefinedClassName: 'data-ex-icons-settings'diff --git a/src/components/common/icons/share.js b/src/components/common/icons/share.tsxsimilarity index 89%rename from src/components/common/icons/share.jsrename to src/components/common/icons/share.tsxindex 0c37c7d8e..8a8d48662 100644--- a/src/components/common/icons/share.js+++ b/src/components/common/icons/share.tsx@@ -19,15 +19,9 @@// THE SOFTWARE.import React, {Component} from 'react';-import PropTypes from 'prop-types';-import Base from './base';--export default class Share extends Component {- static propTypes = {- /** Set the height of the icon, ex. '16px' */- height: PropTypes.string- };+import Base, {BaseProps} from './base';+export default class Share extends Component<Partial<BaseProps>> {static defaultProps = {height: '16px',predefinedClassName: 'data-ex-icons-share'diff --git a/src/components/common/icons/split.js b/src/components/common/icons/split.tsxsimilarity index 91%rename from src/components/common/icons/split.jsrename to src/components/common/icons/split.tsxindex 3b3053c7c..fab965a62 100644--- a/src/components/common/icons/split.js+++ b/src/components/common/icons/split.tsx@@ -19,15 +19,9 @@// THE SOFTWARE.import React, {Component} from 'react';-import PropTypes from 'prop-types';-import Base from './base';--export default class Split extends Component {- static propTypes = {- /** Set the height of the icon, ex. '16px' */- height: PropTypes.string- };+import Base, {BaseProps} from './base';+export default class Split extends Component<Partial<BaseProps>> {static defaultProps = {height: '16px',predefinedClassName: 'data-ex-icons-split'diff --git a/src/components/common/icons/square-select.js b/src/components/common/icons/square-select.tsxsimilarity index 88%rename from src/components/common/icons/square-select.jsrename to src/components/common/icons/square-select.tsxindex ed2d423b5..3c23f70cd 100644--- a/src/components/common/icons/square-select.js+++ b/src/components/common/icons/square-select.tsx@@ -19,15 +19,9 @@// THE SOFTWARE.import React, {Component} from 'react';-import PropTypes from 'prop-types';-import Base from './base';--export default class SquareSelect extends Component {- static propTypes = {- /** Set the height of the icon, ex. '16px' */- height: PropTypes.string- };+import Base, {BaseProps} from './base';+export default class SquareSelect extends Component<Partial<BaseProps>> {static defaultProps = {height: '16px',predefinedClassName: 'data-ex-icons-select'diff --git a/src/components/common/icons/table.js b/src/components/common/icons/table.tsxsimilarity index 90%rename from src/components/common/icons/table.jsrename to src/components/common/icons/table.tsxindex 8c844b71b..a47c1e3f7 100644--- a/src/components/common/icons/table.js+++ b/src/components/common/icons/table.tsx@@ -19,14 +19,9 @@// THE SOFTWARE.import React, {Component} from 'react';-import PropTypes from 'prop-types';-import Base from './base';--export default class Table extends Component {- static propTypes = {- height: PropTypes.string- };+import Base, {BaseProps} from './base';+export default class Table extends Component<Partial<BaseProps>> {static defaultProps = {height: '16px',predefinedClassName: 'data-ex-icons-table'diff --git a/src/components/common/icons/trash.js b/src/components/common/icons/trash.tsxsimilarity index 89%rename from src/components/common/icons/trash.jsrename to src/components/common/icons/trash.tsxindex 723fd42c8..4997ee3b2 100644--- a/src/components/common/icons/trash.js+++ b/src/components/common/icons/trash.tsx@@ -19,15 +19,9 @@// THE SOFTWARE.import React, {Component} from 'react';-import PropTypes from 'prop-types';-import Base from './base';--export default class Trash extends Component {- static propTypes = {- /** Set the height of the icon, ex. '16px' */- height: PropTypes.string- };+import Base, {BaseProps} from './base';+export default class Trash extends Component<Partial<BaseProps>> {static defaultProps = {height: '16px',predefinedClassName: 'data-ex-icons-trash'diff --git a/src/components/common/icons/upload.js b/src/components/common/icons/upload.tsxsimilarity index 85%rename from src/components/common/icons/upload.jsrename to src/components/common/icons/upload.tsxindex f9fc8f369..4b1a0586c 100644--- a/src/components/common/icons/upload.js+++ b/src/components/common/icons/upload.tsx@@ -19,16 +19,9 @@// THE SOFTWARE.import React, {Component} from 'react';-import PropTypes from 'prop-types';-import Base from './base';--export default class Upload extends Component {- static propTypes = {- /** Set the height of the icon, ex. '16px' */- height: PropTypes.string,- predefinedClassName: PropTypes.string- };+import Base, {BaseProps} from './base';+export default class Upload extends Component<Partial<BaseProps>> {static defaultProps = {height: '16px',predefinedClassName: 'data-ex-icons-upload'diff --git a/src/components/common/icons/vert-dots.js b/src/components/common/icons/vert-dots.tsxsimilarity index 89%rename from src/components/common/icons/vert-dots.jsrename to src/components/common/icons/vert-dots.tsxindex a8a14e923..8b58f69ac 100644--- a/src/components/common/icons/vert-dots.js+++ b/src/components/common/icons/vert-dots.tsx@@ -19,15 +19,9 @@// THE SOFTWARE.import React, {Component} from 'react';-import PropTypes from 'prop-types';-import Base from './base';--export default class VertDots extends Component {- static propTypes = {- /** Set the height of the icon, ex. '16px' */- height: PropTypes.string- };+import Base, {BaseProps} from './base';+export default class VertDots extends Component<Partial<BaseProps>> {static defaultProps = {height: '16px',predefinedClassName: 'data-ex-icons-vertdot'diff --git a/src/components/common/icons/vert-three-dots.js b/src/components/common/icons/vert-three-dots.tsxsimilarity index 86%rename from src/components/common/icons/vert-three-dots.jsrename to src/components/common/icons/vert-three-dots.tsxindex 60ea54158..d0e0df0f5 100644--- a/src/components/common/icons/vert-three-dots.js+++ b/src/components/common/icons/vert-three-dots.tsx@@ -19,15 +19,9 @@// THE SOFTWARE.import React, {Component} from 'react';-import PropTypes from 'prop-types';-import Base from './base';--export default class VertThreeDots extends Component {- static propTypes = {- /** Set the height of the icon, ex. '16px' */- height: PropTypes.string- };+import Base, {BaseProps} from './base';+export default class VertThreeDots extends Component<Partial<BaseProps>> {static defaultProps = {height: '16px',predefinedClassName: 'data-ex-icons-vert-three-dots'diff --git a/src/components/common/icons/warning.js b/src/components/common/icons/warning.tsxsimilarity index 87%rename from src/components/common/icons/warning.jsrename to src/components/common/icons/warning.tsxindex 8efcee69c..76ec68dd9 100644--- a/src/components/common/icons/warning.js+++ b/src/components/common/icons/warning.tsx@@ -19,15 +19,9 @@// THE SOFTWARE.import React, {Component} from 'react';-import PropTypes from 'prop-types';-import Base from './base';--export default class Warning extends Component {- static propTypes = {- /** Set the height of the icon, ex. '16px' */- height: PropTypes.string- };+import Base, {BaseProps} from './base';+export default class Warning extends Component<Partial<BaseProps>> {static defaultProps = {height: '16px',predefinedClassName: 'data-ex-icons-warning',diff --git a/src/components/common/image-preview.js b/src/components/common/image-preview.tsxsimilarity index 94%rename from src/components/common/image-preview.jsrename to src/components/common/image-preview.tsxindex a9ece3692..31c1104af 100644--- a/src/components/common/image-preview.js+++ b/src/components/common/image-preview.tsx@@ -21,6 +21,7 @@import React from 'react';import styled from 'styled-components';import LoadingSpinner from 'components/common/loading-spinner';+import {ExportImage} from 'reducers';/** @typedef {import('../../reducers/ui-state-updaters').ExportImage} ExportImage */@@ -69,13 +70,19 @@ const StyledImagePreview = styled.div.attrs({}`;+interface ImagePreviewProps {+ exportImage?: ExportImage;+ width?: number;+ showDimension?: false;+}+/*** @param {object} props* @param {ExportImage} [props.exportImage]* @param {number} [props.width]* @param {boolean} [props.showDimension]*/-const ImagePreview = ({exportImage, width = 400, showDimension = false}) => {+const ImagePreview = ({exportImage, width = 400, showDimension = false}: ImagePreviewProps) => {const {error, imageDataUri, processing, imageSize: {imageW = 0, imageH = 0} = {}} =exportImage || {};diff --git a/src/components/common/info-helper.js b/src/components/common/info-helper.tsxsimilarity index 90%rename from src/components/common/info-helper.jsrename to src/components/common/info-helper.tsxindex 5c736d8ea..bad328db3 100644--- a/src/components/common/info-helper.js+++ b/src/components/common/info-helper.tsx@@ -19,7 +19,6 @@// THE SOFTWARE.import React from 'react';-import PropTypes from 'prop-types';import {useIntl} from 'react-intl';import {FormattedMessage} from 'localization';import {Tooltip} from './styled-components';@@ -27,7 +26,11 @@ import {Docs} from 'components/common/icons';import styled from 'styled-components';import {camelize} from 'utils/utils';-const StyledInfoHelper = styled.div`+interface StyledInfoHelperProps {+ width: number;+}++const StyledInfoHelper = styled.div<StyledInfoHelperProps>`align-items: center;margin-left: 10px;color: ${props => props.theme.labelColor};@@ -42,12 +45,16 @@ const StyledInfoHelper = styled.div`}`;+interface InfoHelperProps {+ description: string;+ containerClass?: string;+ width: number;+ property?: string;+ id: string;+}+function InfoHelperFactory() {- const propTypes = {- description: PropTypes.string.isRequired,- containerClass: PropTypes.string- };- const InfoHelper = ({description, property, containerClass, width, id}) => {+ const InfoHelper = ({description, property, containerClass, width, id}: InfoHelperProps) => {// TODO: move intl outconst intl = useIntl();@@ -77,7 +84,6 @@ function InfoHelperFactory() {</StyledInfoHelper>);};- InfoHelper.propTypes = propTypes;return InfoHelper;}diff --git a/src/components/common/line-chart.js b/src/components/common/line-chart.tsxsimilarity index 78%rename from src/components/common/line-chart.jsrename to src/components/common/line-chart.tsxindex 27ead9b16..c3dbdd056 100644--- a/src/components/common/line-chart.js+++ b/src/components/common/line-chart.tsx@@ -26,8 +26,11 @@ import {CustomSVGSeries,Hint,YAxis,- MarkSeries+ MarkSeries,+ LineSeriesPoint,+ RVNearestXData} from 'react-vis';+import {LineChart} from 'reducers';import styled from 'styled-components';import {datetimeFormatter} from 'utils/data-utils';@@ -63,13 +66,45 @@ const StyledHint = styled.div`user-select: none;`;-const HintContent = ({x, y, format}) => (+interface HintContentProps {+ x: number;+ y: number;+ format: (ts: number) => string;+}++const HintContent = ({x, y, format}: HintContentProps) => (<StyledHint><div className="hint--x">{format(x)}</div><div className="row">{y}</div></StyledHint>);+export interface HoverDP {+ x: number;+ y: number;+ color?: string | number;+ opacity?: string | number;+ stroke?: string | number;+ fill?: string | number;+ size?: string | number;+}++interface LineChartProps {+ brushComponent?: any;+ brushing?: boolean;+ color?: string;+ enableChartHover?: boolean;+ height: number;+ hoveredDP?: HoverDP | null;+ isEnlarged?: boolean;+ lineChart: LineChart;+ margin: {top?: number; bottom?: number; left?: number; right?: number};+ onMouseMove: (datapoint: LineSeriesPoint | null, data?: RVNearestXData<LineSeriesPoint>) => void;+ width: number;+ timezone?: string | null;+ timeFormat: string;+}+const MARGIN = {top: 0, bottom: 0, left: 0, right: 0};function LineChartFactory() {const LineChart = ({@@ -86,7 +121,7 @@ function LineChartFactory() {width,timezone,timeFormat- }) => {+ }: LineChartProps) => {const {series, yDomain} = lineChart;const brushData = useMemo(() => {@@ -111,12 +146,11 @@ function LineChartFactory() {<HorizontalGridLines tickTotal={3} /><LineSeriesstyle={{fill: 'none'}}- strokeWidth={2}color={color}data={series}- onNearestX={enableChartHover ? onMouseMove : null}+ onNearestX={enableChartHover ? onMouseMove : undefined}/>- <MarkSeries data={hoveredDP ? [hoveredDP] : []} color={color} size={3} />+ <MarkSeries data={hoveredDP ? [hoveredDP] : []} color={color} /><CustomSVGSeries data={brushData} />{isEnlarged && <YAxis tickTotal={3} />}{hoveredDP && enableChartHover && !brushing ? (diff --git a/src/components/common/loading-spinner.js b/src/components/common/loading-spinner.tsxsimilarity index 87%rename from src/components/common/loading-spinner.jsrename to src/components/common/loading-spinner.tsxindex 6c80e5ace..162832829 100644--- a/src/components/common/loading-spinner.js+++ b/src/components/common/loading-spinner.tsx@@ -43,13 +43,24 @@ const Loader = styled.span`animation-name: ${animationName};}`;-const LoadingWrapper = styled.div`+interface LoadingWrapper {+ borderColor?: string;+}++const LoadingWrapper = styled.div<LoadingWrapper>`border-radius: 50%;border: 3px solid ${props => props.borderColor || props.theme.borderColorLT};padding: 2px;`;-const LoadingSpinner = ({size = 32, color = '', borderColor = '', strokeWidth = 3, gap = 2}) => (+interface LoadingSpinnerProps {+ size?: number;+ color?: string;+ strokeWidth?: number;+ gap?: number;+}++const LoadingSpinner = ({size = 32, color = '', strokeWidth = 3, gap = 2}: LoadingSpinnerProps) => (<LoadingWrapper style={{width: `${size}px`, height: `${size}px`, padding: `${gap}px`}}><Loadercolor={color}diff --git a/src/components/common/logo.js b/src/components/common/logo.tsxsimilarity index 86%rename from src/components/common/logo.jsrename to src/components/common/logo.tsxindex 9b8ab81a5..8551d1071 100644--- a/src/components/common/logo.js+++ b/src/components/common/logo.tsx@@ -19,7 +19,6 @@// THE SOFTWARE.import React from 'react';-import PropTypes from 'prop-types';import styled from 'styled-components';import {KEPLER_GL_NAME, KEPLER_GL_VERSION, KEPLER_GL_WEBSITE} from 'constants/default-settings';@@ -60,8 +59,17 @@ const LogoSvg = () => (</g></svg>);+interface KeplerGlLogoProps {+ appName?: string;+ version?: string | boolean;+ appWebsite?: string;+}-const KeplerGlLogo = ({appName, appWebsite = KEPLER_GL_WEBSITE, version}) => (+const KeplerGlLogo = ({+ appName = KEPLER_GL_NAME,+ appWebsite = KEPLER_GL_WEBSITE,+ version = KEPLER_GL_VERSION+}: KeplerGlLogoProps) => (<LogoWrapper className="side-panel-logo"><LogoSvgWrapper><LogoSvg />@@ -77,16 +85,4 @@ const KeplerGlLogo = ({appName, appWebsite = KEPLER_GL_WEBSITE, version}) => (</LogoWrapper>);-KeplerGlLogo.propTypes = {- appName: PropTypes.string,- version: PropTypes.oneOfType([PropTypes.string, PropTypes.bool]),- appWebsite: PropTypes.string-};--KeplerGlLogo.defaultProps = {- appName: KEPLER_GL_NAME,- version: KEPLER_GL_VERSION,- appWebsite: KEPLER_GL_WEBSITE-};-export default KeplerGlLogo;diff --git a/src/components/common/map-layer-selector.d.ts b/src/components/common/map-layer-selector.d.tsdeleted file mode 100644index e03908e5d..000000000--- a/src/components/common/map-layer-selector.d.ts+++ /dev/null@@ -1,10 +0,0 @@-import {FunctionComponent} from 'react';-import {Layer} from 'reducers';--export type MapLayerSelectorProps = {- layers: ReadonlyArray<Layer>,- onMapToggleLayer: (layerId: string) => void-};--const MapLayerSelector: FunctionComponent<MapLayerSelectorProps>;-export default MapLayerSelector;diff --git a/src/components/common/map-layer-selector.js b/src/components/common/map-layer-selector.tsxsimilarity index 88%rename from src/components/common/map-layer-selector.jsrename to src/components/common/map-layer-selector.tsxindex 321942895..79b66ddf0 100644--- a/src/components/common/map-layer-selector.js+++ b/src/components/common/map-layer-selector.tsx@@ -30,9 +30,19 @@ const MapLayerSelect = styled.div`margin: 12px 0;}`;+interface Layer {+ id: string;+ name: string;+ isVisible: boolean;+}++interface MapLayerSelectorProps {+ layers: Layer[];+ onMapToggleLayer: (layerId: string) => void;+}/** @type {typeof import('./map-layer-selector').default} */-const MapLayerSelector = ({layers, onMapToggleLayer}) => (+const MapLayerSelector = ({layers, onMapToggleLayer}: MapLayerSelectorProps) => (<MapLayerSelect className="map-layer-selector">{layers.map((layer, index) => (<div key={layer.id} className="map-layer-selector__item">diff --git a/src/components/common/modal.js b/src/components/common/modal.tsxsimilarity index 88%rename from src/components/common/modal.jsrename to src/components/common/modal.tsxindex 039b48b93..14e31af28 100644--- a/src/components/common/modal.js+++ b/src/components/common/modal.tsx@@ -19,16 +19,19 @@// THE SOFTWARE.import React, {Component} from 'react';-import PropTypes from 'prop-types';import {FormattedMessage} from 'localization';-import styled from 'styled-components';+import styled, {FlattenSimpleInterpolation} from 'styled-components';import Modal from 'react-modal';import {Delete} from 'components/common/icons';import {Button} from 'components/common/styled-components';import {media} from 'styles/media-breakpoints';-const ModalContentWrapper = styled.div`+interface ModalContentWrapperProps {+ cssStyle?: FlattenSimpleInterpolation | string;+}++const ModalContentWrapper = styled.div<ModalContentWrapperProps>`overflow-y: auto;max-width: 70vw;max-height: 85vh;@@ -137,19 +140,24 @@ export const ModalFooter = ({cancel, confirm, cancelButton, confirmButton}) => {);};-class ModalDialog extends Component {- static propTypes = {- footer: PropTypes.bool,- close: PropTypes.bool,- onConfirm: PropTypes.func,- onCancel: PropTypes.func,- confirmButton: PropTypes.object,- confirmButtonLabel: PropTypes.string,- cancelButton: PropTypes.object,- cancelButtonLabel: PropTypes.string,- cssStyle: PropTypes.arrayOf(PropTypes.any)- };+export interface ModalDialogProps {+ footer: boolean;+ close: boolean;+ isOpen: boolean;+ title?: string;+ className?: string;+ onConfirm: (...args: any) => any;+ onCancel: (...args: any) => any;+ confirmButton: object;+ confirmButtonLabel: string;+ cancelButton: object;+ cancelButtonLabel: string;+ cssStyle?: FlattenSimpleInterpolation | string;+ style?: React.CSSProperties;+ theme: any;+}+class ModalDialog extends Component<ModalDialogProps> {static defaultProps = {footer: false,close: true,@@ -176,11 +184,7 @@ class ModalDialog extends Component {}}}>- <ModalContentWrapper- className="modal--wrapper"- cssStyle={props.cssStyle}- footer={props.footer}- >+ <ModalContentWrapper className="modal--wrapper" cssStyle={props.cssStyle}>{props.close && (<CloseButton className="modal--close" onClick={props.onCancel}><Delete height="14px" />diff --git a/src/components/common/portaled.js b/src/components/common/portaled.tsxsimilarity index 85%rename from src/components/common/portaled.jsrename to src/components/common/portaled.tsxindex 89597c3ad..dbed7159b 100644--- a/src/components/common/portaled.js+++ b/src/components/common/portaled.tsx@@ -18,7 +18,7 @@// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN// THE SOFTWARE.-import React, {Component, createRef} from 'react';+import React, {Component, createRef, ElementType} from 'react';import debounce from 'lodash.debounce';import isEqual from 'lodash.isequal';@@ -50,7 +50,22 @@ const addEventListeners = () => {window.addEventListener('resize', debounce(startListening, 50, true));};-export const getChildPos = ({offsets, rect, childRect, pageOffset, padding}) => {+interface GetChildPosProps {+ offsets: {+ topOffset: number;+ leftOffset: number;+ rightOffset: number;+ };+ rect: DOMRect;+ childRect: DOMRect;+ pageOffset: {+ x: number;+ y: number;+ };+ padding: number;+}++export const getChildPos = ({offsets, rect, childRect, pageOffset, padding}: GetChildPosProps) => {const {topOffset, leftOffset, rightOffset} = offsets;const anchorLeft = leftOffset !== undefined;@@ -116,7 +131,36 @@ const WINDOW_PAD = 40;const noop = () => {};-class Portaled extends Component {+interface PortaledProps {+ component: ElementType;+ onClose?: (+ event: React.MouseEvent<Element, globalThis.MouseEvent> | React.KeyboardEvent<Element>+ ) => void;+ theme?: any;+ isOpened: boolean;+ top: number;+ left: number;+ right: number;+ overlayZIndex?: number;+ modalProps: Partial<ReactModal.Props>;+ modalStyle?: Partial<typeof defaultModalStyle>;+}++interface PortaledState {+ pos:+ | {+ left: number;+ top: number;+ }+ | {+ right: number;+ top: number;+ }+ | null;+ isVisible: boolean;+}++class Portaled extends Component<PortaledProps, PortaledState> {static defaultProps = {component: 'div',onClose: noop,@@ -128,6 +172,9 @@ class Portaled extends Component {isVisible: false};+ unsubscribe: (() => boolean) | undefined = undefined;+ _unmounted: boolean = false;+componentDidMount() {// relativethis.unsubscribe = subscribe(this.handleScroll);@@ -153,14 +200,14 @@ class Portaled extends Component {this.unsubscribe();}- element = createRef();- child = createRef();+ element = createRef<HTMLDivElement>();+ child = createRef<HTMLDivElement>();// eslint-disable-next-line complexityhandleScroll = () => {- if (this.child.current) {+ if (this.child.current && this.element.current) {const rect = this.element.current.getBoundingClientRect();- const childRect = this.child.current && this.child.current.getBoundingClientRect();+ const childRect = this.child.current.getBoundingClientRect();const pageOffset = getPageOffset();const {top: topOffset, left: leftOffset, right: rightOffset} = this.props;@@ -237,7 +284,6 @@ class Portaled extends Component {style={{position: 'fixed',opacity: isVisible ? 1 : 0,- top: this.state.top,transition: this.props.theme.transition,marginTop: isVisible ? '0px' : '14px',// @ts-ignorediff --git a/src/components/common/progress-bar.d.ts b/src/components/common/progress-bar.d.tsdeleted file mode 100644index 46e6ddaaa..000000000--- a/src/components/common/progress-bar.d.ts+++ /dev/null@@ -1,13 +0,0 @@-import {FunctionComponent} from 'react';--export type ProgressBarProps = {- percent: string,- height?: number,- isLoading: boolean,- barColor: any;- trackColor?: any;- theme: object;-};--const ProgressBar: FunctionComponent<ProgressBarProps>;-export default ProgressBar;diff --git a/src/components/common/progress-bar.js b/src/components/common/progress-bar.tsxsimilarity index 81%rename from src/components/common/progress-bar.jsrename to src/components/common/progress-bar.tsxindex cfebf7495..5a469705c 100644--- a/src/components/common/progress-bar.js+++ b/src/components/common/progress-bar.tsx@@ -23,21 +23,46 @@ import styled from 'styled-components';/** @typedef {import('./progress-bar').ProgressBarProps} ProgressBarProps */+interface StyledBarProps {+ barColor?: string;+}+const StyledBar = styled.span.attrs({className: 'progress-bar__bar'-})`+})<StyledBarProps>`background-color: ${props => props.barColor || props.theme.progressBarColor};/* transition: width 200ms; */display: block;`;++interface StyledTrackProps {+ trackColor?: string;+}+const StyledTrack = styled.div.attrs({className: 'progress-bar'-})`+})<StyledTrackProps>`background-color: ${props => props.trackColor || props.theme.progressBarTrackColor};`;+export type ProgressBarProps = {+ percent: string;+ height?: number;+ isLoading: boolean;+ barColor: string;+ trackColor?: string;+ theme: any;+};+/** @type {React.FunctionComponent<ProgressBarProps>} */-const ProgressBar = ({percent, height = 4, isLoading, barColor, trackColor, theme}) => (+const ProgressBar = ({+ percent,+ height = 4,+ isLoading,+ barColor,+ trackColor,+ theme+}: ProgressBarProps) => (<StyledTrack trackColor={trackColor} theme={theme}><StyledBarbarColor={barColor}diff --git a/src/components/common/range-brush.js b/src/components/common/range-brush.tsxsimilarity index 77%rename from src/components/common/range-brush.jsrename to src/components/common/range-brush.tsxindex cfef8b203..2f9ad1ca9 100644--- a/src/components/common/range-brush.js+++ b/src/components/common/range-brush.tsx@@ -19,13 +19,16 @@// THE SOFTWARE.import React, {Component, createRef} from 'react';-import PropTypes from 'prop-types';import styled, {withTheme} from 'styled-components';-import {select} from 'd3-selection';-import {brushX} from 'd3-brush';+import {select, Selection} from 'd3-selection';+import {BrushBehavior, brushX} from 'd3-brush';import {normalizeSliderValue} from 'utils/data-utils';-const StyledG = styled.g`+interface StyledGProps {+ isRanged?: boolean;+}++const StyledG = styled.g<StyledGProps>`.selection {stroke: none;fill: ${props => (props.isRanged ? props.theme.rangeBrushBgd : props.theme.BLUE2)};@@ -45,7 +48,7 @@ function moveRight(startSel, selection) {}// style brush resize handle// https://github.com/crossfilter/crossfilter/blob/gh-pages/index.html#L466-const getHandlePath = props => {+const getHandlePath = (props: RangeBrushProps) => {return function brushResizePath(d) {const e = Number(d.type === 'e');const x = e ? 1 : -1;@@ -57,20 +60,42 @@ const getHandlePath = props => {};};-function RangeBrushFactory() {- class RangeBrush extends Component {- static propTypes = {- onBrush: PropTypes.func.isRequired,- range: PropTypes.arrayOf(PropTypes.number).isRequired,- value: PropTypes.arrayOf(PropTypes.number).isRequired,- width: PropTypes.number.isRequired,- isRanged: PropTypes.bool- };+export type OnBrush = (val0: number, val1: number) => void;++export interface RangeBrushProps {+ isRanged?: boolean;+ theme: any;+ range: number[];+ value: number[];+ onBrushStart: () => void;+ onBrushEnd: () => void;+ width: number;+ height: number;+ onBrush: OnBrush;+ step?: number;+ marks?: number[];+ onMouseoverHandle: () => void;+ onMouseoutHandle: () => void;+}+function RangeBrushFactory() {+ class RangeBrush extends Component<RangeBrushProps> {static defaultProps = {isRanged: true};+ rootContainer = createRef<SVGGElement>();++ brushing: boolean = false;+ moving: boolean = false;++ root = this.rootContainer.current ? select(this.rootContainer.current) : undefined;+ brush: BrushBehavior<any> | undefined;+ _startSel: number[] | undefined;+ _lastSel: number[] | undefined;++ handle: Selection<SVGPathElement, {type: string}, SVGGElement | null, unknown> | undefined;+componentDidMount() {// We want the React app to respond to brush state and vice-versa// but d3-brush fires the same events for both user-initiated brushing@@ -80,10 +105,7 @@ function RangeBrushFactory() {// We don't use state because that would trigger another `componentDidUpdate`const {theme, isRanged, onMouseoverHandle, onMouseoutHandle} = this.props;- this.brushing = false;- this.moving = false;-- this.root = select(this.rootContainer.current);+ this.root = this.rootContainer.current ? select(this.rootContainer.current) : undefined;this.brush = brushX().handleSize(3).on('start', event => {@@ -117,10 +139,10 @@ function RangeBrushFactory() {this.moving = false;});- this.root.call(this.brush);+ this.root?.call(this.brush);const brushResizePath = getHandlePath(this.props);this.handle = this.root- .selectAll('.handle--custom')+ ?.selectAll('.handle--custom').data([{type: 'w'}, {type: 'e'}]).enter().append('path')@@ -153,7 +175,7 @@ function RangeBrushFactory() {if (prevProps.width !== width) {// width change should not trigger this._brushedthis.moving = true;- this.root.call(this.brush);+ if (this.brush) this.root?.call(this.brush);this._move(val0, val1);}@@ -164,33 +186,31 @@ function RangeBrushFactory() {}}- if (!this.props.isRanged) {+ if (!this.props.isRanged && this.handle) {this.handle.attr('display', 'none');}}- rootContainer = createRef();-_click(selection) {// fake brushthis.brushing = true;this._brushed({sourceEvent: {}, selection});}- _move(val0, val1) {+ _move(val0: number = 0, val1: number = 0) {const {range: [min, max],width,isRanged} = this.props;- if (width && max - min) {- const scale = x => ((x - min) * width) / (max - min);+ if (width && max - min && this.brush && this.handle) {+ const scale = (x: number) => ((x - min) * width) / (max - min);if (!isRanged) {// only draw a 1 pixel line- this.brush.move(this.root, [scale(val0), scale(val0) + 1]);+ if (this.root) this.brush.move(this.root, [scale(val0), scale(val0) + 1]);} else {- this.brush.move(this.root, [scale(val0), scale(val1)]);+ if (this.root) this.brush.move(this.root, [scale(val0), scale(val1)]);this.handle.attr('display', null)@@ -199,7 +219,7 @@ function RangeBrushFactory() {}}- _brushed = evt => {+ _brushed = (evt: {sourceEvent: any; selection: number[]}) => {// Ignore brush events which don't have an underlying sourceEventif (!evt.sourceEvent) return;const [sel0, sel1] = evt.selection;@@ -207,12 +227,12 @@ function RangeBrushFactory() {const {range: [min, max],- step,+ step = 0,width,marks,isRanged} = this.props;- const invert = x => (x * (max - min)) / width + min;+ const invert = (x: number) => (x * (max - min)) / width + min;let d0 = invert(sel0);let d1 = invert(sel1);@@ -226,7 +246,7 @@ function RangeBrushFactory() {else this._onBrush(right ? d1 : d0);};- _onBrush(val0, val1) {+ _onBrush(val0: number = 0, val1: number = 0) {const {isRanged,value: [currentVal0, currentVal1]diff --git a/src/components/common/range-plot.js b/src/components/common/range-plot.tsxsimilarity index 82%rename from src/components/common/range-plot.jsrename to src/components/common/range-plot.tsxindex 30d8a45fc..bdbd38a03 100644--- a/src/components/common/range-plot.js+++ b/src/components/common/range-plot.tsx@@ -19,12 +19,12 @@// THE SOFTWARE.import React, {useState, useCallback} from 'react';-import PropTypes from 'prop-types';import styled, {withTheme} from 'styled-components';-import RangeBrushFactory from './range-brush';+import RangeBrushFactory, {OnBrush, RangeBrushProps} from './range-brush';import HistogramPlotFactory from './histogram-plot';-import LineChartFactory from './line-chart';+import LineChartFactory, {HoverDP} from './line-chart';import {isTest} from 'utils/utils';+import {LineChart} from 'reducers';const StyledRangePlot = styled.div`margin-bottom: ${props => props.theme.sliderBarHeight}px;@@ -32,9 +32,29 @@ const StyledRangePlot = styled.div`position: 'relative';`;+interface RangePlotProps {+ onBrush: OnBrush;+ range: number[];+ value: number[];+ width: number;+ plotType?: string;+ lineChart: LineChart;+ histogram?: {x0: number; x1: number}[];+ isEnlarged?: boolean;+ isRanged?: boolean;+ theme: any;+ timeFormat: string;+ timezone?: string;+ playbackControlWidth?: number;+}+RangePlotFactory.deps = [RangeBrushFactory, HistogramPlotFactory, LineChartFactory];-export default function RangePlotFactory(RangeBrush, HistogramPlot, LineChart) {+export default function RangePlotFactory(+ RangeBrush: ReturnType<typeof RangeBrushFactory>,+ HistogramPlot: ReturnType<typeof HistogramPlotFactory>,+ LineChart: ReturnType<typeof LineChartFactory>+) {const RangePlot = ({onBrush,range,@@ -47,9 +67,9 @@ export default function RangePlotFactory(RangeBrush, HistogramPlot, LineChart) {isRanged,theme,...chartProps- }) => {+ }: RangePlotProps & Partial<RangeBrushProps>) => {const [brushing, setBrushing] = useState(false);- const [hoveredDP, onMouseMove] = useState(null);+ const [hoveredDP, onMouseMove] = useState<HoverDP | null>(null);const [enableChartHover, setEnableChartHover] = useState(false);const height = isEnlarged ? theme.rangePlotHLarge : theme.rangePlotH;@@ -121,19 +141,5 @@ export default function RangePlotFactory(RangeBrush, HistogramPlot, LineChart) {);};- RangePlot.propTypes = {- value: PropTypes.arrayOf(PropTypes.number).isRequired,- histogram: PropTypes.arrayOf(- PropTypes.shape({- x0: PropTypes.number,- x1: PropTypes.number- })- ),- lineChart: PropTypes.object,- plotType: PropTypes.string,- isEnlarged: PropTypes.bool,- onBlur: PropTypes.func,- width: PropTypes.number.isRequired- };return withTheme(RangePlot);}diff --git a/src/components/common/range-slider.js b/src/components/common/range-slider.tsxsimilarity index 82%rename from src/components/common/range-slider.jsrename to src/components/common/range-slider.tsxindex 48620c77d..ce603c776 100644--- a/src/components/common/range-slider.js+++ b/src/components/common/range-slider.tsx@@ -18,10 +18,9 @@// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN// THE SOFTWARE.-import React, {Component, createRef} from 'react';+import React, {Component, createRef, ElementType} from 'react';import {polyfill} from 'react-lifecycles-compat';import {createSelector} from 'reselect';-import PropTypes from 'prop-types';import styled from 'styled-components';import RangePlotFactory from './range-plot';import Slider from 'components/common/slider/slider';@@ -29,15 +28,26 @@ import {Input} from 'components/common/styled-components';import {roundValToStep, clamp} from 'utils/data-utils';import {observeDimensions, unobserveDimensions} from '../../utils/observe-dimensions';+import {LineChart} from 'reducers';-const SliderInput = styled(Input)`+interface SliderInputProps {+ flush?: boolean;+ inputSize?: string;+}++const SliderInput = styled(Input)<SliderInputProps>`width: ${props => props.theme.sliderInputWidth}px;- margin-left: ${props => (props.flush ? 0 : props.size === 'tiny' ? 12 : 18)}px;+ margin-left: ${props => (props.flush ? 0 : props.inputSize === 'tiny' ? 12 : 18)}px;font-size: ${props => props.theme.sliderInputFontSize}; // 10px // 12px;padding: ${props => props.theme.sliderInputPadding}; // 4px 6px; // 6px 12px;`;-const SliderWrapper = styled.div`+interface SliderWrapperProps {+ isRanged?: boolean;+ showInput?: boolean;+}++const SliderWrapper = styled.div<SliderWrapperProps>`display: flex;position: relative;align-items: ${props => (!props.isRanged && props.showInput ? 'center' : 'flex-start')};@@ -49,26 +59,33 @@ const RangeInputWrapper = styled.div`justify-content: space-between;`;-RangeSliderFactory.deps = [RangePlotFactory];+interface RangeSliderProps {+ range?: number[];+ value0: number;+ value1: number;+ onChange: (val: number[]) => void; //TODO+ histogram?: any[];+ isRanged?: boolean;+ isEnlarged?: boolean;+ showInput?: boolean;+ inputTheme?: string;+ inputSize?: string;+ step?: number;+ sliderHandleWidth?: number;+ xAxis?: ElementType;+ timezone?: string;+ timeFormat: string;+ playbackControlWidth?: number;+ lineChart: LineChart;+ marks?: number[];+ plotType?: string;+ plotValue?: number[];+}-export default function RangeSliderFactory(RangePlot) {- class RangeSlider extends Component {- static propTypes = {- range: PropTypes.arrayOf(PropTypes.number),- value0: PropTypes.number.isRequired,- value1: PropTypes.number.isRequired,- onChange: PropTypes.func.isRequired,- histogram: PropTypes.arrayOf(PropTypes.any),- isRanged: PropTypes.bool,- isEnlarged: PropTypes.bool,- showInput: PropTypes.bool,- inputTheme: PropTypes.string,- inputSize: PropTypes.string,- step: PropTypes.number,- sliderHandleWidth: PropTypes.number,- xAxis: PropTypes.elementType- };+RangeSliderFactory.deps = [RangePlotFactory];+export default function RangeSliderFactory(RangePlot: ReturnType<typeof RangePlotFactory>) {+ class RangeSlider extends Component<RangeSliderProps> {static defaultProps = {isEnlarged: false,isRanged: true,@@ -80,7 +97,7 @@ export default function RangeSliderFactory(RangePlot) {};static getDerivedStateFromProps(props, state) {- let update = null;+ let update: {value1?: any; prevValue1?: any; value0?: any; prevValue0?: any} | null = null;const {value0, value1} = props;if (props.value0 !== state.prevValue0 && !isNaN(value0)) {update = {...(update || {}), value0, prevValue0: value0};@@ -99,6 +116,8 @@ export default function RangeSliderFactory(RangePlot) {width: 288};+ sliderContainer: HTMLDivElement | null = null;+componentDidMount() {if (this.sliderContainer instanceof Element) {observeDimensions(this.sliderContainer, this._resize);@@ -115,13 +134,12 @@ export default function RangeSliderFactory(RangePlot) {}}- sliderContainer = null;- setSliderContainer = element => {+ setSliderContainer: React.LegacyRef<HTMLDivElement> = element => {this.sliderContainer = element;this._resize();};- inputValue0 = createRef();- inputValue1 = createRef();+ inputValue0 = createRef<HTMLInputElement>();+ inputValue1 = createRef<HTMLInputElement>();value0Selector = props => props.value0;value1Selector = props => props.value1;filterValueSelector = createSelector(@@ -132,12 +150,13 @@ export default function RangeSliderFactory(RangePlot) {_roundValToStep = val => {const {range, step} = this.props;-+ if (!range || !step) return;return roundValToStep(range[0], step, val);};_setRangeVal1 = val => {const {value0, range, onChange} = this.props;+ if (!range) return;const val1 = Number(val);onChange([value0, clamp([value0, range[1]], this._roundValToStep(val1))]);return true;@@ -145,6 +164,7 @@ export default function RangeSliderFactory(RangePlot) {_setRangeVal0 = val => {const {value1, range, onChange} = this.props;+ if (!range) return;const val0 = Number(val);onChange([clamp([range[0], value1], this._roundValToStep(val0)), value1]);return true;@@ -186,12 +206,12 @@ export default function RangeSliderFactory(RangePlot) {onKeyPress={e => {if (e.key === 'Enter') {update(e);- ref.current.blur();+ (ref.current as any).blur();}}}onBlur={update}flush={key === 'value0'}- size={this.props.inputSize}+ inputSize={this.props.inputSize}secondary={this.props.inputTheme === 'secondary'}/>);@@ -214,12 +234,12 @@ export default function RangeSliderFactory(RangePlot) {} = this.props;const {width} = this.state;- const plotWidth = Math.max(width - sliderHandleWidth, 0);+ const plotWidth = Math.max(width - Number(sliderHandleWidth), 0);const renderPlot = (histogram && histogram.length) || lineChart;return (<divclassName="kg-range-slider"- style={{width: '100%', padding: `0 ${sliderHandleWidth / 2}px`}}+ style={{width: '100%', padding: `0 ${Number(sliderHandleWidth) / 2}px`}}ref={this.setSliderContainer}>{Array.isArray(range) && range.every(Number.isFinite) && (diff --git a/src/components/common/styled-components.d.ts b/src/components/common/styled-components.d.tsdeleted file mode 100644index f9c177126..000000000--- a/src/components/common/styled-components.d.ts+++ /dev/null@@ -1,48 +0,0 @@-export type ReactElement = (...props: any[]) => JSX.Element;--export const Tooltip: ReactElement;-export const BottomWidgetInner: ReactElement;-export const CenterFlexbox: ReactElement;-export const DatasetSquare: ReactElement;-export const TruncatedTitleText: ReactElement;-export const Button: ReactElement;-export const Input: ReactElement;-export const PanelLabel: ReactElement;-export const StyledFilterContent: ReactElement;-export const PanelLabel: ReactElement;-export const SidePanelSection: ReactElement;-export const SelectTextBold: ReactElement;-export const IconRoundSmall: ReactElement;-export const StyledAttrbution: ReactElement;-export const MapControlButton: ReactElement;-export const IconRoundSmall: ReactElement;-export const StyledModalContent: ReactElement;-export const InputLight: ReactElement;-export const StyledMapContainer: ReactElement;-export const StyledModalVerticalPanel: ReactElement;-export const StyledModalSection: ReactElement;-export const CenterVerticalFlexbox: ReactElement;-export const CheckMark: ReactElement;-export const StyledExportSection: ReactElement;-export const StyledFilteredOption: ReactElement;-export const StyledModalContent: ReactElement;-export const StyledType: ReactElement;-export const SelectionButton: ReactElement;-export const TextAreaLight: ReactElement;-export const StyledModalInputFootnote: ReactElement;-export const SidePanelDivider: ReactElement;-export const StyledPanelHeader: ReactElement;-export const PanelHeaderTitle: ReactElement;-export const PanelHeaderContent: ReactElement;-export const PanelContent: ReactElement;-export const SBFlexboxNoMargin: ReactElement;-export const StyledPanelDropdown: ReactElement;-export const InlineInput: ReactElement;-export const SBFlexboxItem: ReactElement;-export const SpaceBetweenFlexbox: ReactElement;-export const PanelLabelWrapper: ReactElement;-export const PanelLabelBold: ReactElement;-export const PanelHeaderContent: ReactElement;---diff --git a/src/components/common/styled-components.js b/src/components/common/styled-components.tsxsimilarity index 93%rename from src/components/common/styled-components.jsrename to src/components/common/styled-components.tsxindex f3ff88c3e..69c80585e 100644--- a/src/components/common/styled-components.js+++ b/src/components/common/styled-components.tsx@@ -134,9 +134,13 @@ export const PanelContent = styled.div.attrs({padding: 12px;`;+interface SidePanelSectionProps {+ disabled?: boolean;+}+export const SidePanelSection = styled.div.attrs({className: 'side-panel-section'-})`+})<SidePanelSectionProps>`margin-bottom: 12px;opacity: ${props => (props.disabled ? 0.4 : 1)};@@ -189,9 +193,21 @@ export const Tooltip = styled(ReactTooltip)`}`;+interface ButtonProps {+ negative?: boolean;+ secondary?: boolean;+ link?: boolean;+ floating?: boolean;+ cta?: boolean;+ large?: boolean;+ small?: boolean;+ disabled?: boolean;+ width?: string;+}+export const Button = styled.div.attrs(props => ({className: classnames('button', props.className)-}))`+}))<ButtonProps>`align-items: center;background-color: ${props =>props.negative@@ -284,7 +300,11 @@ export const Button = styled.div.attrs(props => ({}`;-export const Input = styled.input`+interface InputProps {+ secondary?: boolean;+}++export const Input = styled.input<InputProps>`${props => (props.secondary ? props.theme.secondaryInput : props.theme.input)};`;@@ -292,7 +312,7 @@ export const InputLight = styled.input`${props => props.theme.inputLT};`;-export const TextArea = styled.textarea`+export const TextArea = styled.textarea<InputProps>`${props => (props.secondary ? props.theme.secondaryInput : props.theme.input)};`;export const TextAreaLight = styled.textarea`@@ -304,7 +324,12 @@ export const InlineInput = styled(Input)`${props => props.theme.inlineInput};`;-export const StyledPanelHeader = styled.div`+interface StyledPanelHeaderProps {+ active?: boolean;+ labelRCGColorValues?: string[];+}++export const StyledPanelHeader = styled.div<StyledPanelHeaderProps>`background-color: ${props =>props.active ? props.theme.panelBackgroundHover : props.theme.panelBackground};border-left: 3px solid@@ -320,7 +345,11 @@ export const StyledPanelHeader = styled.div`transition: ${props => props.theme.transition};`;-export const StyledPanelDropdown = styled.div`+interface StyledPanelDropdownProps {+ type?: string;+}++export const StyledPanelDropdown = styled.div<StyledPanelDropdownProps>`${props => props.theme.panelDropdownScrollBar}background-color: ${props =>props.type === 'light' ? props.theme.modalDropdownBackground : props.theme.panelBackground};@@ -349,7 +378,11 @@ export const ButtonGroup = styled.div`}`;-export const DatasetSquare = styled.div`+interface StyledPanelHeaderProps {+ color: string[];+}++export const DatasetSquare = styled.div<StyledPanelHeaderProps>`display: inline-block;width: 10px;height: 10px;@@ -357,7 +390,11 @@ export const DatasetSquare = styled.div`margin-right: 12px;`;-export const SelectionButton = styled.div`+interface SelectionButtonProps {+ selected?: boolean;+}++export const SelectionButton = styled.div<SelectionButtonProps>`position: relative;border-radius: 2px;border: 1px solid@@ -462,9 +499,13 @@ export const StyledModalSection = styled.div.attrs({`};`;+interface StyledModalInputFootnoteProps {+ error?: boolean;+}+export const StyledModalInputFootnote = styled.div.attrs({className: 'modal-input__footnote'-})`+})<StyledModalInputFootnoteProps>`display: flex;justify-content: flex-end;color: ${props => (props.error ? props.theme.errorColor : props.theme.subtextColorLT)};@@ -516,7 +557,11 @@ export const StyledAttrbution = styled.div.attrs({}`;-export const StyledExportSection = styled.div`+interface StyledExportSectionProps {+ disabled?: boolean;+}++export const StyledExportSection = styled.div<StyledExportSectionProps>`display: flex;flex-direction: row;margin: 35px 0;@@ -620,9 +665,13 @@ export const BottomWidgetInner = styled.div`margin-top: ${props => props.theme.bottomPanelGap}px;`;+interface MapControlButtonProps {+ active?: boolean;+}+export const MapControlButton = styled(Button).attrs({className: 'map-control-button'-})`+})<MapControlButtonProps>`box-shadow: 0 6px 12px 0 rgba(0, 0, 0, 0.16);height: 32px;width: 32px;diff --git a/src/components/common/switch.js b/src/components/common/switch.tsxsimilarity index 75%rename from src/components/common/switch.jsrename to src/components/common/switch.tsxindex 7a79d08fb..935e6b668 100644--- a/src/components/common/switch.js+++ b/src/components/common/switch.tsx@@ -18,24 +18,23 @@// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN// THE SOFTWARE.-import React from 'react';-import PropTypes from 'prop-types';+import React, {ChangeEventHandler, FocusEventHandler, ReactNode} from 'react';import Checkbox from './checkbox';-const propTypes = {- checked: PropTypes.bool,- type: PropTypes.string,- id: PropTypes.string.isRequired,- label: PropTypes.node,- error: PropTypes.string,- onBlur: PropTypes.func,- onChange: PropTypes.func,- onFocus: PropTypes.func,- value: PropTypes.string,- secondary: PropTypes.bool-};+interface SwitchProps {+ checked?: boolean;+ type?: string;+ id: string;+ label?: ReactNode;+ error?: string;+ onBlur?: FocusEventHandler<HTMLInputElement>;+ onChange?: ChangeEventHandler<HTMLInputElement>;+ onFocus?: FocusEventHandler<HTMLInputElement>;+ value?: string;+ secondary?: boolean;+}-const Switch = props => {+const Switch = (props: SwitchProps) => {const switchProps = {...props,switch: props.type !== 'checkbox'@@ -44,6 +43,4 @@ const Switch = props => {return <Checkbox {...switchProps} />;};-Switch.propTypes = propTypes;-export default Switch;diff --git a/src/components/common/time-range-slider-time-title.js b/src/components/common/time-range-slider-time-title.tsxsimilarity index 88%rename from src/components/common/time-range-slider-time-title.jsrename to src/components/common/time-range-slider-time-title.tsxindex 8e4c8f5e2..6c407c603 100644--- a/src/components/common/time-range-slider-time-title.js+++ b/src/components/common/time-range-slider-time-title.tsx@@ -23,7 +23,11 @@ import styled from 'styled-components';import {Minus} from 'components/common/icons';import {datetimeFormatter} from 'utils/data-utils';-const TimeValueWrapper = styled.div`+interface TimeValueWrapperProps {+ isEnlarged?: boolean;+}++const TimeValueWrapper = styled.div<TimeValueWrapperProps>`display: flex;align-items: center;font-size: ${props => props.theme.timeTitleFontSize};@@ -57,8 +61,15 @@ const TimeValue = ({value}) => (</div>);+interface TimeTitleProps {+ value: number[];+ isEnlarged?: boolean;+ timezone?: string;+ timeFormat: string;+}+function TimeRangeSliderTimeTitleFactory() {- const TimeTitle = ({value, isEnlarged, timezone, timeFormat}) => (+ const TimeTitle = ({value, isEnlarged, timezone, timeFormat}: TimeTitleProps) => (<TimeValueWrapper isEnlarged={isEnlarged} className="time-range-slider__time-title"><TimeValue key={0} value={datetimeFormatter(timezone)(timeFormat)(value[0])} />{isEnlarged ? (diff --git a/src/components/common/time-range-slider.js b/src/components/common/time-range-slider.tsxsimilarity index 92%rename from src/components/common/time-range-slider.jsrename to src/components/common/time-range-slider.tsxindex b3d3d5f78..fa439897c 100644--- a/src/components/common/time-range-slider.js+++ b/src/components/common/time-range-slider.tsx@@ -30,7 +30,11 @@ import TimeRangeSliderTimeTitleFactory from 'components/common/time-range-sliderconst animationControlWidth = 176;-const StyledSliderContainer = styled.div`+interface StyledSliderContainerProps {+ isEnlarged?: boolean;+}++const StyledSliderContainer = styled.div<StyledSliderContainerProps>`align-items: flex-end;display: flex;flex-direction: row;@@ -54,10 +58,10 @@ TimeRangeSliderFactory.deps = [];export default function TimeRangeSliderFactory(- PlaybackControls,- RangeSlider,- TimeSliderMarker,- TimeRangeSliderTimeTitle+ PlaybackControls: ReturnType<typeof PlaybackControlsFactory>,+ RangeSlider: ReturnType<typeof RangeSliderFactory>,+ TimeSliderMarker: ReturnType<typeof TimeSliderMarkerFactory>,+ TimeRangeSliderTimeTitle: ReturnType<typeof TimeRangeSliderTimeTitleFactory>) {const TimeRangeSlider = props => {const {diff --git a/src/components/common/time-slider-marker.js b/src/components/common/time-slider-marker.tsxsimilarity index 90%rename from src/components/common/time-slider-marker.jsrename to src/components/common/time-slider-marker.tsxindex 568a3eb2a..9bea7ee74 100644--- a/src/components/common/time-slider-marker.js+++ b/src/components/common/time-slider-marker.tsx@@ -21,7 +21,7 @@import React, {useRef, useEffect, useMemo} from 'react';import moment from 'moment-timezone';import PropTypes from 'prop-types';-import {scaleUtc} from 'd3-scale';+import {NumberValue, scaleUtc} from 'd3-scale';import {select} from 'd3-selection';import {axisBottom} from 'd3-axis';import styled from 'styled-components';@@ -82,7 +82,7 @@ const TICK_FORMATS = {// timezone sensitive tick formatter based on moment// adapted based on d3 time scale tick format https://github.com/d3/d3-scale/blob/master/src/time.js#L59-export function getTickFormat(timezone) {+export function getTickFormat(timezone: string) {// date is js date objectconst toMoment = timezone ? date => moment(date).tz(timezone) : moment;const formatter = datetimeFormatter(timezone);@@ -106,7 +106,12 @@ export function getTickFormat(timezone) {}// create a helper function so we can test it-export function getXAxis(domain, width, isEnlarged, timezone) {+export function getXAxis(+ domain: Date[] | NumberValue[],+ width: number,+ isEnlarged: boolean,+ timezone: string+) {if (!Array.isArray(domain) || !domain.every(Number.isFinite)) {return null;}@@ -138,8 +143,22 @@ export function updateAxis(xAxisRef, xAxis) {select(xAxisRef.current).call(xAxis);}+interface TimeSliderMarkerProps {+ width: number;+ domain: Date[] | NumberValue[];+ isEnlarged?: boolean;+ height?: number;+ timezone: string;+}+function TimeSliderMarkerFactory() {- const TimeSliderMarker = ({width, domain, isEnlarged = true, height = HEIGHT, timezone}) => {+ const TimeSliderMarker = ({+ width,+ domain,+ isEnlarged = true,+ height = HEIGHT,+ timezone+ }: TimeSliderMarkerProps) => {const xAxisRef = useRef(null);const xAxis = useMemo(() => getXAxis(domain, width, isEnlarged, timezone), [domain,diff --git a/src/components/common/tippy-tooltip.d.ts b/src/components/common/tippy-tooltip.d.tsdeleted file mode 100644index bdb3dac7b..000000000--- a/src/components/common/tippy-tooltip.d.ts+++ /dev/null@@ -1,26 +0,0 @@-// Copyright (c) 2021 Uber Technologies, Inc.-//-// Permission is hereby granted, free of charge, to any person obtaining a copy-// of this software and associated documentation files (the "Software"), to deal-// in the Software without restriction, including without limitation the rights-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell-// copies of the Software, and to permit persons to whom the Software is-// furnished to do so, subject to the following conditions:-//-// The above copyright notice and this permission notice shall be included in-// all copies or substantial portions of the Software.-//-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN-// THE SOFTWARE.--import {TippyProps} from '@tippyjs/react';-import {FC} from 'react';--const TippyTooltip: FC<TippyProps>;--export default TippyTooltip;diff --git a/src/components/common/tippy-tooltip.js b/src/components/common/tippy-tooltip.tsxsimilarity index 96%rename from src/components/common/tippy-tooltip.jsrename to src/components/common/tippy-tooltip.tsxindex e533afb70..3b173b164 100644--- a/src/components/common/tippy-tooltip.js+++ b/src/components/common/tippy-tooltip.tsx@@ -20,7 +20,7 @@import styled from 'styled-components';import React, {useState} from 'react';-import Tippy from '@tippyjs/react';+import Tippy, {TippyProps} from '@tippyjs/react';const TippyArrow = styled.div`position: absolute;@@ -87,7 +87,7 @@ const TippyTooltipContent = styled(({children, ...props}) => (}`;-const TippyTooltip = ({children, render, duration = 200, ...rest}) => {+const TippyTooltip = ({children, render, duration = 200, ...rest}: TippyProps) => {const [opacity, setOpacity] = useState(0);const [timer, setTimer] = useState(null);function onMount() {@@ -104,7 +104,7 @@ const TippyTooltip = ({children, render, duration = 200, ...rest}) => {if (!instance.state?.isDestroyed) {unmount();}- }, duration);+ }, duration[0] || duration);// @ts-ignoresetTimer(timeout);setOpacity(0);@@ -116,7 +116,7 @@ const TippyTooltip = ({children, render, duration = 200, ...rest}) => {animation={true}render={attrs => (<TippyTooltipContent {...attrs} style={{opacity, transition: `opacity ${duration}ms`}}>- {render()}+ {render?.(attrs)}</TippyTooltipContent>)}onMount={onMount}diff --git a/src/components/common/toolbar-item.d.ts b/src/components/common/toolbar-item.d.tsdeleted file mode 100644index 2b9b8fb64..000000000--- a/src/components/common/toolbar-item.d.ts+++ /dev/null@@ -1,14 +0,0 @@-import {ComponentType, FunctionComponent, MouseEvent} from 'react';--export type ToolbarItemProps = {- id?: string,- label: string,- className?: string,- active?: boolean,- onClose?: () => void,- onClick: (event: MouseEvent<HTMLDivElement>) => void,- icon?: ComponentType<any>-};--export const ToolbarItem: FunctionComponent<ToolbarItemProps>;-export default ToolbarItem;diff --git a/src/components/common/toolbar-item.js b/src/components/common/toolbar-item.tsxsimilarity index 87%rename from src/components/common/toolbar-item.jsrename to src/components/common/toolbar-item.tsxindex 231fe0732..81d1c38c4 100644--- a/src/components/common/toolbar-item.js+++ b/src/components/common/toolbar-item.tsx@@ -21,10 +21,15 @@import React from 'react';import styled from 'styled-components';import {FormattedMessage} from 'localization';+import {ComponentType, MouseEvent} from 'react';++interface StyledDivProps {+ active?: boolean;+}const StyledDiv = styled.div.attrs({className: 'toolbar-item'-})`+})<StyledDivProps>`color: ${props =>props.active ? props.theme.toolbarItemIconHover : props.theme.panelHeaderIcon};padding: 12px 20px;@@ -56,8 +61,18 @@ const StyledDiv = styled.div.attrs({}`;+export type ToolbarItemProps = {+ id?: string;+ label: string;+ className?: string;+ active?: boolean;+ onClose?: () => void;+ onClick: (event: MouseEvent<HTMLDivElement>) => void;+ icon?: ComponentType<any>;+};+/** @type {typeof import('./toolbar-item').ToolbarItem} */-const ToolbarItem = React.memo(props => (+const ToolbarItem = React.memo((props: ToolbarItemProps) => (<StyledDivid={props.id}className={props.className}diff --git a/src/components/common/toolbar.js b/src/components/common/toolbar.tsxsimilarity index 95%rename from src/components/common/toolbar.jsrename to src/components/common/toolbar.tsxindex 71d7d8355..ddcbb5ec4 100644--- a/src/components/common/toolbar.js+++ b/src/components/common/toolbar.tsx@@ -20,7 +20,11 @@import styled from 'styled-components';-const Toolbar = styled.div`+interface ToolbarProps {+ show?: boolean;+}++const Toolbar = styled.div<ToolbarProps>`display: flex;flex-direction: row;background-color: ${props => props.theme.dropdownListBgd};diff --git a/src/components/common/vertical-toolbar.js b/src/components/common/vertical-toolbar.tsxsimilarity index 100%rename from src/components/common/vertical-toolbar.jsrename to src/components/common/vertical-toolbar.tsxdiff --git a/src/components/index.d.ts b/src/components/index.d.tsindex 292ebff4a..e86e2d992 100644--- a/src/components/index.d.ts+++ b/src/components/index.d.ts@@ -16,10 +16,10 @@ export * from './container';export * from './map/map-legend';export * from './map/split-map-button';export * from './side-panel/common/dataset-tag';-export * from './common/checkbox';+export {default as Checkbox} from './common/checkbox';export * from './common/styled-components';export * from './common/tippy-tooltip'-export * as Icons from './common/icons';+export * as Icons from './common/icons/index.tsx';export * from './common/file-uploader/file-drop';export * from './common/file-uploader/upload-button';export {default as Portaled} from './common/portaled';diff --git a/src/connect/with-local-selector.tsx b/src/connect/with-local-selector.tsxindex 8ab5b2023..384dc69f9 100644--- a/src/connect/with-local-selector.tsx+++ b/src/connect/with-local-selector.tsx@@ -44,7 +44,7 @@ const withLocalSelector = (ParentComponent): ComponentType => {this.selectorFromProps,(ctx, props) => mergeSelectors(ctx, props));-+contextSelector = createSelector(this.computedSelector, this.idFromProps, (selector, id) => ({selector,iddiff --git a/src/styles/media-breakpoints.ts b/src/styles/media-breakpoints.tsindex 4d497f30c..ab2c939e7 100644--- a/src/styles/media-breakpoints.ts+++ b/src/styles/media-breakpoints.ts@@ -29,7 +29,7 @@ const breakPoints = {/*** Contains media rules for different device types* @namespace- * @property {object} media+ * @property {object} media* @property {string} media.palm - rule for palm devices* @property {string} media.portable - rule for portable devices* @property {string} media.desk - rule for desktopsdiff --git a/src/utils/data-utils.ts b/src/utils/data-utils.tsindex acbc4a156..fb6833b69 100644--- a/src/utils/data-utils.ts+++ b/src/utils/data-utils.ts@@ -109,7 +109,7 @@ export function getLatLngBounds(return [Math.max(lats[0], limit[0]), Math.min(lats[lats.length - 1], limit[1])];}-export function clamp([min, max]: [number, number], val: number): number {+export function clamp([min, max]: [number, number], val: number = 0): number {return val <= min ? min : val >= max ? max : val;}diff --git a/yarn.lock b/yarn.lockindex 370336f83..a9ecc4d25 100644--- a/yarn.lock+++ b/yarn.lock@@ -3137,11 +3137,25 @@dependencies:"@babel/types" "^7.3.0"+"@types/classnames@^2.3.1":+ version "2.3.1"+ resolved "https://registry.yarnpkg.com/@types/classnames/-/classnames-2.3.1.tgz#3c2467aa0f1a93f1f021e3b9bcf938bd5dfdc0dd"+ integrity sha512-zeOWb0JGBoVmlQoznvqXbE0tEC/HONsnoUNH19Hc96NFsTAwTXbTqb8FMYkru1F/iqp7a18Ws3nWJvtA1sHD1A==+ dependencies:+ classnames "*"+"@types/d3-array@^2.0.0":version "2.8.0"resolved "https://registry.yarnpkg.com/@types/d3-array/-/d3-array-2.8.0.tgz#4b70ccb0c6d2ef28dac1e7e653b3ecd1f4b1d1ee"integrity sha512-Q0ubcGHAmCRPh90/hoYB4eKWhxYKUxphwSeQrlz2tiabQ8S9zqhaE2CZJtCaLH2cjqKcjr52WPvmOA7ha0O4ZA==+"@types/d3-brush@^3.0.1":+ version "3.0.1"+ resolved "https://registry.yarnpkg.com/@types/d3-brush/-/d3-brush-3.0.1.tgz#ae5f17ce391935ca88b29000e60ee20452c6357c"+ integrity sha512-B532DozsiTuQMHu2YChdZU0qsFJSio3Q6jmBYGYNp3gMDzBmuFFgPt9qKA4VYuLZMp4qc6eX7IUFUEsvHiXZAw==+ dependencies:+ "@types/d3-selection" "*"+"@types/d3-scale@^3.2.2":version "3.3.2"resolved "https://registry.yarnpkg.com/@types/d3-scale/-/d3-scale-3.3.2.tgz#18c94e90f4f1c6b1ee14a70f14bfca2bd1c61d06"@@ -3149,6 +3163,11 @@dependencies:"@types/d3-time" "^2"+"@types/d3-selection@*", "@types/d3-selection@^3.0.2":+ version "3.0.2"+ resolved "https://registry.yarnpkg.com/@types/d3-selection/-/d3-selection-3.0.2.tgz#23e48a285b24063630bbe312cc0cfe2276de4a59"+ integrity sha512-d29EDd0iUBrRoKhPndhDY6U/PYxOWqgIZwKTooy2UkBfU7TNZNpRho0yLWPxlatQrFWk2mnTu71IZQ4+LRgKlQ==+"@types/d3-time@^2":version "2.1.1"resolved "https://registry.yarnpkg.com/@types/d3-time/-/d3-time-2.1.1.tgz#743fdc821c81f86537cbfece07093ac39b4bc342"@@ -3159,6 +3178,11 @@resolved "https://registry.yarnpkg.com/@types/detect-indent/-/detect-indent-0.1.30.tgz#dc682bb412b4e65ba098e70edad73b4833fb910d"integrity sha1-3GgrtBK05lugmOcO2tc7SDP7kQ0=+"@types/exenv@^1.2.0":+ version "1.2.0"+ resolved "https://registry.yarnpkg.com/@types/exenv/-/exenv-1.2.0.tgz#84ff936feeafc917c3c66f80b43e917f56eed00b"+ integrity sha512-kSyh9q6bvrOGEnJ9X9Io5gjXaakcSRQTax/Nj2ZKJHuOZ7bH4uvUgLyXA9uV2QBCP7+T8KS0JHbPfP1/79ckKw==+"@types/geojson@^7946.0.7":version "7946.0.7"resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.7.tgz#c8fa532b60a0042219cdf173ca21a975ef0666ad"@@ -3239,6 +3263,18 @@resolved "https://registry.yarnpkg.com/@types/keymirror/-/keymirror-0.1.1.tgz#1fe48e6e5e2a969cafecf0f24485ae23c72abd30"integrity sha1-H+SObl4qlpyv7PDyRIWuI8cqvTA=+"@types/lodash.pick@^4.4.6":+ version "4.4.6"+ resolved "https://registry.yarnpkg.com/@types/lodash.pick/-/lodash.pick-4.4.6.tgz#ae4e8f109e982786313bb6aac4b1a73aefa6e9be"+ integrity sha512-u8bzA16qQ+8dY280z3aK7PoWb3fzX5ATJ0rJB6F+uqchOX2VYF02Aqa+8aYiHiHgPzQiITqCgeimlyKFy4OA6g==+ dependencies:+ "@types/lodash" "*"++"@types/lodash@*":+ version "4.14.178"+ resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.178.tgz#341f6d2247db528d4a13ddbb374bcdc80406f4f8"+ integrity sha512-0d5Wd09ItQWH1qFbEyQ7oTQ3GZrMfth5JkbN3EvTKLXcHLRDSXeLnlvlOn0wvxVIwK5o2M8JzP/OWz7T3NRsbw==+"@types/mdast@^3.0.0", "@types/mdast@^3.0.3":version "3.0.3"resolved "https://registry.yarnpkg.com/@types/mdast/-/mdast-3.0.3.tgz#2d7d671b1cd1ea3deb306ea75036c2a0407d2deb"@@ -3296,6 +3332,20 @@resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.3.tgz#2ab0d5da2e5815f94b0b9d4b95d1e5f243ab2ca7"integrity sha512-KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw==+"@types/react-lifecycles-compat@^3.0.1":+ version "3.0.1"+ resolved "https://registry.yarnpkg.com/@types/react-lifecycles-compat/-/react-lifecycles-compat-3.0.1.tgz#a0b1fe18cfb9435bd52737829a69cbe93faf32e2"+ integrity sha512-4KiU5s1Go4xRbf7t6VxUUpBeN5PGjpjpBv9VvET4uiPHC500VNYBclU13f8ehHkHoZL39b2cfwHu6RzbV3b44A==+ dependencies:+ "@types/react" "*"++"@types/react-modal@^3.13.1":+ version "3.13.1"+ resolved "https://registry.yarnpkg.com/@types/react-modal/-/react-modal-3.13.1.tgz#5b9845c205fccc85d9a77966b6e16dc70a60825a"+ integrity sha512-iY/gPvTDIy6Z+37l+ibmrY+GTV4KQTHcCyR5FIytm182RQS69G5ps4PH2FxtC7bAQ2QRHXMevsBgck7IQruHNg==+ dependencies:+ "@types/react" "*"+"@types/react-test-renderer@*":version "17.0.0"resolved "https://registry.yarnpkg.com/@types/react-test-renderer/-/react-test-renderer-17.0.0.tgz#9be47b375eeb906fced37049e67284a438d56620"@@ -3303,6 +3353,13 @@dependencies:"@types/react" "*"+"@types/react-vis@^1.8.0":+ version "1.11.10"+ resolved "https://registry.yarnpkg.com/@types/react-vis/-/react-vis-1.11.10.tgz#eb281db2366215665a14f7f5161f377e90da34b7"+ integrity sha512-QQiBRQ4pfLue9dPhd20v3kpgB4U5TyW4dMcP231/y0b5qaxpaIXDDMZpEqYtNgqeGV566G0vVy9521p1s1tyww==+ dependencies:+ "@types/react" "*"+"@types/react@*":version "17.0.0"resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.0.tgz#5af3eb7fad2807092f0046a1302b7823e27919b8"@@ -5000,6 +5057,11 @@ class-utils@^0.3.5:isobject "^3.0.0"static-extend "^0.1.1"+classnames@*:+ version "2.3.1"+ resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.3.1.tgz#dfcfa3891e306ec1dad105d0e88f4417b8535e8e"+ integrity sha512-OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA==+classnames@^2.2.1:version "2.2.6"resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.2.6.tgz#43935bffdd291f326dad0a205309b38d00f650ce"