Skip to content

Kepler.gl is a powerful open source geospatial analysis tool for large-scale data sets.

[Chore]: Technical: add types for layer panel components (#1819)

jagertsb7d8edf4a43f
diff --git a/src/actions/vis-state-actions.ts b/src/actions/vis-state-actions.ts
index 398693db7..cc0ed944c 100644
--- a/src/actions/vis-state-actions.ts
+++ b/src/actions/vis-state-actions.ts
@@ -24,7 +24,8 @@ import {AddDataToMapPayload} from '../actions/actions';
import {FileCacheItem} from '../processors/types';
import {Layer, LayerBaseConfig, LayerVisConfig} from 'layers';
import {Feature, InteractionConfig} from 'reducers/vis-state-updaters';
-import {ValueOf, Merge, RGBColor} from '../reducers/types';
+import {ValueOf, Merge, RGBColor, NestedPartial} from '../reducers/types';
+import {ColorUI} from 'layers/layer-factory';
// TODO - import LoaderObject type from @loaders.gl/core when supported
// TODO - import LoadOptions type from @loaders.gl/core when supported
@@ -154,7 +155,7 @@ export function layerVisConfigChange(
export type LayerColorUIChangeUpdaterAction = {
oldLayer: Layer;
prop: string;
- newConfig: object;
+ newConfig: NestedPartial<ColorUI>;
};
/**
@@ -169,7 +170,7 @@ export type LayerColorUIChangeUpdaterAction = {
export function layerColorUIChange(
oldLayer: Layer,
prop: string,
- newConfig: object
+ newConfig: NestedPartial<ColorUI>
): Merge<LayerColorUIChangeUpdaterAction, {type: typeof ActionTypes.LAYER_COLOR_UI_CHANGE}> {
return {
type: ActionTypes.LAYER_COLOR_UI_CHANGE,
@@ -328,7 +329,7 @@ export function addFilter(
}
export type AddLayerUpdaterAction = {
- config: object;
+ config?: object;
datasetId?: string;
};
/**
@@ -340,7 +341,7 @@ export type AddLayerUpdaterAction = {
* @public
*/
export function addLayer(
- config: object,
+ config?: object,
datasetId?: string
): Merge<AddLayerUpdaterAction, {type: typeof ActionTypes.ADD_LAYER}> {
return {
diff --git a/src/components/common/field-selector.tsx b/src/components/common/field-selector.tsx
index a43874433..58342f367 100644
--- a/src/components/common/field-selector.tsx
+++ b/src/components/common/field-selector.tsx
@@ -79,7 +79,15 @@ type FieldType =
interface FieldSelectorFactoryProps {
fields?: FieldType[];
- onSelect: (items: readonly (string | number | boolean | object)[] | null) => void;
+ onSelect: (
+ items:
+ | ReadonlyArray<string | number | boolean | object>
+ | string
+ | number
+ | boolean
+ | object
+ | null
+ ) => void;
placement?: string;
value?: FieldType | null;
filterFieldTypes?: FieldType | FieldType[];
@@ -90,7 +98,7 @@ interface FieldSelectorFactoryProps {
multiSelect?: boolean;
closeOnSelect?: boolean;
showToken?: boolean;
- suggested?: any[]; //TODO
+ suggested?: ReadonlyArray<string | number | boolean | object> | null;
CustomChickletComponent?: ComponentType;
size?: string;
}
diff --git a/src/components/common/info-helper.tsx b/src/components/common/info-helper.tsx
index bad328db3..548b7cd85 100644
--- a/src/components/common/info-helper.tsx
+++ b/src/components/common/info-helper.tsx
@@ -48,9 +48,9 @@ const StyledInfoHelper = styled.div<StyledInfoHelperProps>`
interface InfoHelperProps {
description: string;
containerClass?: string;
- width: number;
+ width?: number;
property?: string;
- id: string;
+ id?: string;
}
function InfoHelperFactory() {
diff --git a/src/components/common/item-selector/item-selector.tsx b/src/components/common/item-selector/item-selector.tsx
index 078ca4f81..123b2ec12 100644
--- a/src/components/common/item-selector/item-selector.tsx
+++ b/src/components/common/item-selector/item-selector.tsx
@@ -116,10 +116,24 @@ const DropdownWrapper = styled.div<DropdownWrapperProps>`
`;
type ItemSelectorProps = {
- selectedItems: ReadonlyArray<string | number | boolean | object>;
+ selectedItems?:
+ | ReadonlyArray<string | number | boolean | object>
+ | string
+ | number
+ | boolean
+ | object
+ | null;
options: ReadonlyArray<string | number | boolean | object>;
- onChange: (items: ReadonlyArray<string | number | boolean | object> | null) => void;
- fixedOptions?: any[];
+ onChange: (
+ items:
+ | ReadonlyArray<string | number | boolean | object>
+ | string
+ | number
+ | boolean
+ | object
+ | null
+ ) => void;
+ fixedOptions?: ReadonlyArray<string | number | boolean | object> | null;
erasable?: boolean;
showArrow?: boolean;
searchable?: boolean;
@@ -178,16 +192,16 @@ class ItemSelector extends Component<ItemSelectorProps> {
// only used when multiSelect = true
e.preventDefault();
e.stopPropagation();
- const {selectedItems} = this.props;
- const index = selectedItems.findIndex(t => t === item);
+ const multiSelectedItems = toArray(this.props.selectedItems);
+ const index = multiSelectedItems.findIndex(t => t === item);
if (index < 0) {
return;
}
const items = [
- ...selectedItems.slice(0, index),
- ...selectedItems.slice(index + 1, selectedItems.length)
+ ...multiSelectedItems.slice(0, index),
+ ...multiSelectedItems.slice(index + 1, multiSelectedItems.length)
];
this.props.onChange(items);
diff --git a/src/components/common/item-selector/typeahead.tsx b/src/components/common/item-selector/typeahead.tsx
index 59040e320..9718d2d40 100644
--- a/src/components/common/item-selector/typeahead.tsx
+++ b/src/components/common/item-selector/typeahead.tsx
@@ -128,7 +128,7 @@ interface TypeaheadProps {
maxVisible?: number;
resultsTruncatedMessage?: string;
options?: ReadonlyArray<string | number | boolean | object>;
- fixedOptions?: ReadonlyArray<string | number | boolean | object>;
+ fixedOptions?: ReadonlyArray<string | number | boolean | object> | null;
allowCustomValues?: number;
initialValue?: string;
value?: string;
diff --git a/src/components/common/toolbar-item.tsx b/src/components/common/toolbar-item.tsx
index 81d1c38c4..64ab80237 100644
--- a/src/components/common/toolbar-item.tsx
+++ b/src/components/common/toolbar-item.tsx
@@ -63,11 +63,12 @@ const StyledDiv = styled.div.attrs({
export type ToolbarItemProps = {
id?: string;
+ key?: string;
label: string;
className?: string;
active?: boolean;
onClose?: () => void;
- onClick: (event: MouseEvent<HTMLDivElement>) => void;
+ onClick: ((event: MouseEvent<HTMLDivElement>) => void) | null;
icon?: ComponentType<any>;
};
@@ -83,7 +84,7 @@ const ToolbarItem = React.memo((props: ToolbarItemProps) => (
if (typeof props.onClose === 'function') {
props.onClose();
}
- props.onClick(e);
+ props.onClick?.(e);
}}
>
{props.icon && <props.icon />}
diff --git a/src/components/filters/types.ts b/src/components/filters/types.ts
index 94b654e3e..2d41d9091 100644
--- a/src/components/filters/types.ts
+++ b/src/components/filters/types.ts
@@ -47,7 +47,9 @@ export type SingleSelectFilterProps = {
export type MultiSelectFilterProps = {
filter: MultiSelectFilter;
- setFilter: (v: ReadonlyArray<string | number | boolean | object> | null) => void;
+ setFilter: (
+ v: ReadonlyArray<string | number | boolean | object> | string | number | boolean | object | null
+ ) => void;
};
export type TimeWidgetTopProps = {
diff --git a/src/components/side-panel.tsx b/src/components/side-panel.tsx
index fc11682aa..033f1135d 100644
--- a/src/components/side-panel.tsx
+++ b/src/components/side-panel.tsx
@@ -71,7 +71,7 @@ type SidePanelProps = {
layerClasses: LayerClassesType;
layerOrder: number[];
mapStyle: MapStyle;
- onSaveMap?: Function;
+ onSaveMap?: () => void;
width: number;
mapInfo: {title: string; description: string};
datasets: Datasets;
diff --git a/src/components/side-panel/common/source-data-catalog.tsx b/src/components/side-panel/common/source-data-catalog.tsx
index f100ffb8b..06ef4c290 100644
--- a/src/components/side-panel/common/source-data-catalog.tsx
+++ b/src/components/side-panel/common/source-data-catalog.tsx
@@ -45,7 +45,7 @@ function SourceDataCatalogFactory(
showDeleteDataset = false
}: SourceDataCatalogProps) => (
<SourceDataCatalogWrapper className="source-data-catalog">
- {Object.values(datasets).map((dataset, index) => (
+ {Object.values(datasets).map(dataset => (
<SidePanelSection key={dataset.id}>
<DatasetTitle
showDatasetTable={showDatasetTable}
diff --git a/src/components/side-panel/common/types.ts b/src/components/side-panel/common/types.ts
index 115aad11f..abf5e4f33 100644
--- a/src/components/side-panel/common/types.ts
+++ b/src/components/side-panel/common/types.ts
@@ -64,5 +64,13 @@ export type SourceDataSelectorProps = {
disabled: boolean;
defaultValue?: string;
inputTheme: string;
- onSelect: (items: ReadonlyArray<string | number | boolean | object> | null) => void;
+ onSelect: (
+ items:
+ | ReadonlyArray<string | number | boolean | object>
+ | string
+ | number
+ | boolean
+ | object
+ | null
+ ) => void;
};
diff --git a/src/components/side-panel/interaction-panel/tooltip-config.tsx b/src/components/side-panel/interaction-panel/tooltip-config.tsx
index dcc13b9c7..34691f7aa 100644
--- a/src/components/side-panel/interaction-panel/tooltip-config.tsx
+++ b/src/components/side-panel/interaction-panel/tooltip-config.tsx
@@ -167,10 +167,8 @@ function TooltipConfigFactory(DatasetTag, FieldSelector: ReturnType<typeof Field
[dataId]: selected.map(
f =>
config.fieldsToShow[dataId].find(
- //@ts-expect-error
tooltipField => tooltipField.name === f.name
) || {
- //@ts-expect-error
name: f.name,
// default initial tooltip is null
format: null
diff --git a/src/components/side-panel/layer-panel/add-layer-button.d.ts b/src/components/side-panel/layer-panel/add-layer-button.d.ts
deleted file mode 100644
index 74983620a..000000000
--- a/src/components/side-panel/layer-panel/add-layer-button.d.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import React from 'react';
-import {Datasets} from 'reducers/vis-state-updaters';
-import {IntlShape} from 'react-intl';
-
-export type AddLayerButtonProps = {
- datasets: Datasets;
- onOptionSelected: (dataset) => {};
- typeaheadPlaceholder?: string;
- intl: IntlShape;
-};
-
-export default function AddLayerButtonFactory(): React.Component<AddLayerButtonProps>;
diff --git a/src/components/side-panel/layer-panel/add-layer-button.js b/src/components/side-panel/layer-panel/add-layer-button.tsx
similarity index 93%
rename from src/components/side-panel/layer-panel/add-layer-button.js
rename to src/components/side-panel/layer-panel/add-layer-button.tsx
index ebe7e8373..6b5a8a31a 100644
--- a/src/components/side-panel/layer-panel/add-layer-button.js
+++ b/src/components/side-panel/layer-panel/add-layer-button.tsx
@@ -21,6 +21,7 @@
import React, {useCallback, useMemo, useState} from 'react';
import styled from 'styled-components';
import {FormattedMessage} from 'localization';
+import {WrappedComponentProps} from 'react-intl';
import Tippy from '@tippyjs/react';
import {Add} from 'components/common/icons';
@@ -28,6 +29,13 @@ import {Button} from 'components/common/styled-components';
import {DatasetSquare} from 'components';
import Typeahead from 'components/common/item-selector/typeahead';
import Accessor from 'components/common/item-selector/accessor';
+import {Datasets, RGBColor} from 'reducers';
+
+type AddLayerButtonProps = {
+ datasets: Datasets;
+ onOptionSelected: (opt: string) => void;
+ typeaheadPlaceholder?: string;
+} & WrappedComponentProps;
const DropdownContainer = styled.div.attrs({
className: 'add-layer-menu-dropdown'
@@ -99,7 +107,7 @@ function AddLayerButtonFactory() {
</ListItemWrapper>
);
- const AddLayerButton = props => {
+ const AddLayerButton: React.FC<AddLayerButtonProps> = props => {
const {datasets, onOptionSelected, typeaheadPlaceholder, intl} = props;
const [showAddLayerDropdown, setShowAddLayerDropdown] = useState(false);
@@ -112,7 +120,7 @@ function AddLayerButtonFactory() {
}, []);
const toggleSelectedOption = useCallback(
- option => {
+ (option: {label: string; value: string; color: RGBColor}) => {
onOptionSelected(option.value);
_onBlur();
},
diff --git a/src/components/side-panel/layer-panel/color-palette.js b/src/components/side-panel/layer-panel/color-palette.tsx
similarity index 79%
rename from src/components/side-panel/layer-panel/color-palette.js
rename to src/components/side-panel/layer-panel/color-palette.tsx
index ffe58d4ae..a4b07e9b5 100644
--- a/src/components/side-panel/layer-panel/color-palette.js
+++ b/src/components/side-panel/layer-panel/color-palette.tsx
@@ -19,15 +19,16 @@
// THE SOFTWARE.
import React from 'react';
-import PropTypes from 'prop-types';
+import {HexColor, RGBColor} from 'reducers';
import styled from 'styled-components';
+import classnames from 'classnames';
-const propTypes = {
- colors: PropTypes.arrayOf(PropTypes.string).isRequired,
- height: PropTypes.number,
- className: PropTypes.string,
- isSelected: PropTypes.bool,
- isReversed: PropTypes.bool
+type ColorPaletteProps = {
+ colors: RGBColor | HexColor[];
+ height?: number;
+ className?: string;
+ isSelected?: boolean;
+ isReversed?: boolean;
};
const defaultProps = {
@@ -49,9 +50,9 @@ const PaletteWrapper = styled.div.attrs({
overflow: hidden;
`;
-const PaletteContainer = styled.div.attrs({
- className: 'color-range-palette'
-})`
+const PaletteContainer = styled.div.attrs(props => ({
+ className: classnames('color-range-palette', props.className)
+}))<{isSelected: boolean}>`
display: flex;
flex-grow: 1;
border-width: 1px;
@@ -67,17 +68,22 @@ const StyledColorBlock = styled.div.attrs({
flex-grow: 1;
`;
-const ColorPalette = ({colors, height, className, isSelected, isReversed}) => (
+const ColorPalette: React.FC<ColorPaletteProps> = ({
+ colors,
+ height,
+ className,
+ isSelected,
+ isReversed
+}) => (
<PaletteContainer className={className} isSelected={isSelected}>
<PaletteWrapper style={{height, transform: `scale(${isReversed ? -1 : 1}, 1)`}}>
- {colors.map((color, index) => (
+ {colors.map((color: number | string, index: number) => (
<StyledColorBlock key={`${color}-${index}`} style={{backgroundColor: color}} />
))}
</PaletteWrapper>
</PaletteContainer>
);
-ColorPalette.propTypes = propTypes;
ColorPalette.defaultProps = defaultProps;
export default ColorPalette;
diff --git a/src/components/side-panel/layer-panel/color-range-selector.js b/src/components/side-panel/layer-panel/color-range-selector.tsx
similarity index 71%
rename from src/components/side-panel/layer-panel/color-range-selector.js
rename to src/components/side-panel/layer-panel/color-range-selector.tsx
index 0b88a78cd..8a2d3f238 100644
--- a/src/components/side-panel/layer-panel/color-range-selector.js
+++ b/src/components/side-panel/layer-panel/color-range-selector.tsx
@@ -19,7 +19,6 @@
// THE SOFTWARE.
import React, {Component} from 'react';
-import PropTypes from 'prop-types';
import uniq from 'lodash.uniq';
import styled from 'styled-components';
import {createSelector} from 'reselect';
@@ -29,18 +28,44 @@ import {PanelLabel} from 'components/common/styled-components';
import Switch from 'components/common/switch';
import ColorPalette from './color-palette';
import CustomPalette from './custom-palette';
-import {COLOR_RANGES} from 'constants/color-ranges';
+import {COLOR_RANGES, ColorRange} from 'constants/color-ranges';
import {numberSort} from 'utils/data-utils';
import {reverseColorRange} from 'utils/color-utils';
import {FormattedMessage} from 'localization';
+import {ColorUI} from 'layers/layer-factory';
+import {NestedPartial} from 'reducers';
-export const ALL_TYPES = uniq(
+type ColorRangeSelectorProps = {
+ colorPaletteUI: ColorUI;
+ selectedColorRange: ColorRange;
+ onSelectColorRange: (p: ColorRange, e: MouseEvent) => void;
+ setColorPaletteUI: (newConfig: NestedPartial<ColorUI>) => void;
+};
+
+type PaletteConfigProps = {
+ label: string;
+ value: string | number | boolean;
+ config: {
+ type: string;
+ options: (string | number | boolean)[];
+ };
+ onChange: (v: string | number | boolean | object | null) => void;
+};
+
+type ColorPaletteGroupProps = {
+ reversed?: boolean;
+ selected: ColorRange;
+ colorRanges: ColorRange[];
+ onSelect: (p: ColorRange, e: MouseEvent) => void;
+};
+
+export const ALL_TYPES: string[] = uniq(
COLOR_RANGES.map(c => c.type)
.filter(ctype => ctype)
- .concat(['all', 'custom'])
+ .concat(['all', 'custom']) as string[]
);
-export const ALL_STEPS = uniq(COLOR_RANGES.map(d => d.colors.length)).sort(numberSort);
+export const ALL_STEPS: number[] = uniq(COLOR_RANGES.map(d => d.colors.length)).sort(numberSort);
const StyledColorConfig = styled.div`
padding: 12px 12px 0 12px;
@@ -88,31 +113,21 @@ const CONFIG_SETTINGS = {
}
};
-export default class ColorRangeSelect extends Component {
- static propTypes = {
- colorPaletteUI: PropTypes.object.isRequired,
- selectedColorRange: PropTypes.object.isRequired,
- onSelectColorRange: PropTypes.func.isRequired,
- setColorPaletteUI: PropTypes.func.isRequired,
- // optional
- colorRanges: PropTypes.arrayOf(PropTypes.any)
- };
-
+export default class ColorRangeSelector extends Component<ColorRangeSelectorProps> {
static defaultProps = {
- colorRanges: COLOR_RANGES,
onSelectColorRange: () => {},
setColorPaletteUI: () => {}
};
- colorRangesSelector = props => props.colorRanges;
- configTypeSelector = props => props.colorPaletteUI.colorRangeConfig.type;
- configStepSelector = props => props.colorPaletteUI.colorRangeConfig.steps;
+ configTypeSelector = (props: ColorRangeSelectorProps) =>
+ props.colorPaletteUI.colorRangeConfig.type;
+ configStepSelector = (props: ColorRangeSelectorProps) =>
+ props.colorPaletteUI.colorRangeConfig.steps;
filteredColorRange = createSelector(
- this.colorRangesSelector,
this.configTypeSelector,
this.configStepSelector,
- (colorRanges, type, steps) => {
- return colorRanges.filter(colorRange => {
+ (type, steps) => {
+ return COLOR_RANGES.filter(colorRange => {
const isType = type === 'all' || type === colorRange.type;
const isStep = Number(steps) === colorRange.colors.length;
@@ -121,30 +136,36 @@ export default class ColorRangeSelect extends Component {
}
);
- _updateConfig = ({key, value}) => {
+ _updateConfig = ({
+ key,
+ value
+ }: {
+ key: string;
+ value: string | number | boolean | object | null;
+ }) => {
this._setColorRangeConfig({[key]: value});
};
- _onSetCustomPalette = config => {
+ _onSetCustomPalette = (config: NestedPartial<ColorRange>) => {
this.props.setColorPaletteUI({
customPalette: config
});
};
- _setColorRangeConfig = newConfig => {
+ _setColorRangeConfig = (newConfig: Record<string, string | number | boolean | object | null>) => {
this.props.setColorPaletteUI({
colorRangeConfig: newConfig
});
};
- _onCustomPaletteCancel = newConfig => {
+ _onCustomPaletteCancel = () => {
this.props.setColorPaletteUI({
showSketcher: false,
colorRangeConfig: {custom: false}
});
};
- _onToggleSketcher = val => {
+ _onToggleSketcher = (val: boolean | number) => {
this.props.setColorPaletteUI({
showSketcher: val
});
@@ -173,7 +194,6 @@ export default class ColorRangeSelect extends Component {
<CustomPalette
customPalette={customPalette}
showSketcher={showSketcher}
- selected={this.props.selectedColorRange}
onApply={this.props.onSelectColorRange}
onToggleSketcher={this._onToggleSketcher}
setCustomPalette={this._onSetCustomPalette}
@@ -192,8 +212,16 @@ export default class ColorRangeSelect extends Component {
}
}
-export const PaletteConfig = ({label, value, config: {type, options}, onChange}) => (
- <StyledPaletteConfig className="color-palette__config" onClick={e => e.stopPropagation()}>
+export const PaletteConfig: React.FC<PaletteConfigProps> = ({
+ label,
+ value,
+ config: {type, options},
+ onChange
+}) => (
+ <StyledPaletteConfig
+ className="color-palette__config"
+ onClick={(e: Event) => e.stopPropagation()}
+ >
<div className="color-palette__config__label">
<PanelLabel>
<FormattedMessage id={`color.${label}`} />
@@ -211,7 +239,12 @@ export const PaletteConfig = ({label, value, config: {type, options}, onChange})
</div>
)}
{type === 'switch' && (
- <Switch checked={value} id={`${label}-toggle`} onChange={() => onChange(!value)} secondary />
+ <Switch
+ checked={value as boolean}
+ id={`${label}-toggle`}
+ onChange={() => onChange(!value)}
+ secondary
+ />
)}
</StyledPaletteConfig>
);
@@ -226,12 +259,19 @@ const StyledColorRange = styled.div.attrs({
}
`;
-export const ColorPaletteGroup = ({reversed, onSelect, selected, colorRanges}) => (
+export const ColorPaletteGroup: React.FC<ColorPaletteGroupProps> = ({
+ reversed,
+ onSelect,
+ selected,
+ colorRanges
+}) => (
<div className="color-palette__group">
{colorRanges.map((colorRange, i) => (
<StyledColorRange
key={`${colorRange.name}-${i}`}
- onClick={e => onSelect(reversed ? reverseColorRange(true, colorRange) : colorRange, e)}
+ onClick={e =>
+ onSelect(reversed ? (reverseColorRange(true, colorRange) as ColorRange) : colorRange, e)
+ }
>
<ColorPalette
colors={colorRange.colors}
diff --git a/src/components/side-panel/layer-panel/color-selector.js b/src/components/side-panel/layer-panel/color-selector.tsx
similarity index 75%
rename from src/components/side-panel/layer-panel/color-selector.js
rename to src/components/side-panel/layer-panel/color-selector.tsx
index 3494180d9..a8839d7ab 100644
--- a/src/components/side-panel/layer-panel/color-selector.js
+++ b/src/components/side-panel/layer-panel/color-selector.tsx
@@ -19,16 +19,31 @@
// THE SOFTWARE.
import React, {Component, createRef} from 'react';
-import PropTypes from 'prop-types';
import styled from 'styled-components';
import {rgbToHex} from 'utils/color-utils';
-import SingleColorPalette from 'components/side-panel/layer-panel/single-color-palette';
-import ColorRangeSelector from 'components/side-panel/layer-panel/color-range-selector';
-import ColorPalette from 'components/side-panel/layer-panel/color-palette';
+import SingleColorPalette from './single-color-palette';
+import ColorRangeSelector from './color-range-selector';
+import ColorPalette from './color-palette';
import {StyledPanelDropdown} from 'components/common/styled-components';
import onClickOutside from 'react-onclickoutside';
-
-export const ColorBlock = styled.div`
+import {ColorUI} from 'layers/layer-factory';
+import {ColorRange} from 'constants/color-ranges';
+import {NestedPartial, RGBColor} from 'reducers';
+
+type ColorSelectorProps = {
+ colorSets: {
+ selectedColor: RGBColor | ColorRange;
+ setColor: ((v: RGBColor) => void) | ((v: ColorRange) => void);
+ isRange?: boolean;
+ label?: string;
+ }[];
+ colorUI?: ColorUI;
+ inputTheme?: string;
+ disabled?: boolean;
+ setColorUI?: (newConfig: NestedPartial<ColorUI>) => void;
+};
+
+export const ColorBlock = styled.div<{color: string}>`
width: 32px;
height: 18px;
border-radius: 1px;
@@ -59,27 +74,7 @@ export const InputBoxContainer = styled.div`
}
`;
-class ColorSelector extends Component {
- static propTypes = {
- colorSets: PropTypes.arrayOf(
- PropTypes.shape({
- selectedColor: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.any), PropTypes.object]),
- setColor: PropTypes.func.isRequired,
- isRange: PropTypes.bool,
- label: PropTypes.string
- })
- ),
- colorUI: PropTypes.shape({
- customPalette: PropTypes.object,
- showSketcher: PropTypes.oneOfType([PropTypes.bool, PropTypes.number]),
- showDropdown: PropTypes.oneOfType([PropTypes.bool, PropTypes.number]),
- colorRangeConfig: PropTypes.object
- }),
- inputTheme: PropTypes.string,
- disabled: PropTypes.bool,
- setColorUI: PropTypes.func
- };
-
+class ColorSelector extends Component<ColorSelectorProps> {
static defaultProps = {
colorSets: []
};
@@ -88,13 +83,14 @@ class ColorSelector extends Component {
showDropdown: false
};
- node = createRef();
+ node = createRef<HTMLDivElement>();
handleClickOutside = e => {
if (this.props.colorUI && Number.isInteger(this.props.colorUI.showSketcher)) {
// if sketcher is open, let sketch to close itself first
return;
}
+
this._closePanelDropdown();
};
@@ -106,6 +102,7 @@ class ColorSelector extends Component {
if (this._getEditing() === false) {
return;
}
+
if (this.props.setColorUI) {
this.props.setColorUI({showDropdown: false, showSketcher: false});
} else {
@@ -113,10 +110,13 @@ class ColorSelector extends Component {
}
};
- _onSelectColor = (color, e) => {
+ _onSelectColor = (color: RGBColor | ColorRange, e: MouseEvent) => {
e.stopPropagation();
+
const editing = this._getEditing();
- if (this.props.colorSets[editing]) {
+
+ if (typeof editing === 'number' && this.props.colorSets[editing]) {
+ // @ts-ignore
this.props.colorSets[editing].setColor(color);
}
};
@@ -124,6 +124,7 @@ class ColorSelector extends Component {
_showDropdown = (e, i) => {
e.stopPropagation();
e.preventDefault();
+
if (this.props.setColorUI) {
this.props.setColorUI({showDropdown: i});
} else {
@@ -135,7 +136,8 @@ class ColorSelector extends Component {
const {colorSets, disabled, inputTheme, colorUI} = this.props;
const editing = this._getEditing();
- const currentEditing = colorSets[editing] && typeof colorSets[editing] === 'object';
+ const currentEditing =
+ typeof editing === 'number' && colorSets[editing] && typeof colorSets[editing] === 'object';
return (
<div className="color-selector" ref={this.node}>
@@ -150,7 +152,7 @@ class ColorSelector extends Component {
onMouseDown={e => this._showDropdown(e, i)}
>
{cSet.isRange ? (
- <ColorPalette colors={cSet.selectedColor.colors} />
+ <ColorPalette colors={(cSet.selectedColor as ColorRange).colors} />
) : (
<ColorBlock
className="color-selector__selector__block"
@@ -166,16 +168,16 @@ class ColorSelector extends Component {
</InputBoxContainer>
{currentEditing ? (
<StyledPanelDropdown className="color-selector__dropdown">
- {colorSets[editing].isRange ? (
+ {colorSets[editing as number].isRange ? (
<ColorRangeSelector
- selectedColorRange={colorSets[editing].selectedColor}
+ selectedColorRange={colorSets[editing as number].selectedColor as ColorRange}
onSelectColorRange={this._onSelectColor}
setColorPaletteUI={this.props.setColorUI}
- colorPaletteUI={colorUI}
+ colorPaletteUI={colorUI as ColorUI}
/>
) : (
<SingleColorPalette
- selectedColor={rgbToHex(colorSets[editing].selectedColor)}
+ selectedColor={rgbToHex(colorSets[editing as number].selectedColor as RGBColor)}
onSelectColor={this._onSelectColor}
/>
)}
diff --git a/src/components/side-panel/layer-panel/column-selector.js b/src/components/side-panel/layer-panel/column-selector.tsx
similarity index 76%
rename from src/components/side-panel/layer-panel/column-selector.js
rename to src/components/side-panel/layer-panel/column-selector.tsx
index 249d60912..05c1d12c1 100644
--- a/src/components/side-panel/layer-panel/column-selector.js
+++ b/src/components/side-panel/layer-panel/column-selector.tsx
@@ -24,6 +24,31 @@ import {FormattedMessage} from 'localization';
import {PanelLabel} from 'components/common/styled-components';
import FieldSelectorFactory from 'components/common/field-selector';
import {validateColumn} from 'reducers/vis-state-merger';
+import {LayerColumn, LayerColumns} from 'layers';
+import {Field, FieldPair} from 'utils/table-utils/kepler-table';
+
+type Pair = {
+ name: string;
+ type: string;
+ pair: FieldPair['pair'];
+};
+
+type ColumnSelectorProps = {
+ column: LayerColumn;
+ columns: LayerColumns;
+ label: string;
+ allFields: Field[];
+ onSelect: (
+ items:
+ | ReadonlyArray<string | number | boolean | object>
+ | string
+ | number
+ | boolean
+ | object
+ | null
+ ) => void;
+ fieldPairs?: Pair[] | null;
+};
const ColumnRow = styled.div`
display: flex;
@@ -43,8 +68,15 @@ const ColumnSelect = styled.div`
ColumnSelectorFactory.deps = [FieldSelectorFactory];
-function ColumnSelectorFactory(FieldSelector) {
- const ColumnSelector = ({column, columns, label, allFields, onSelect, fieldPairs}) => (
+function ColumnSelectorFactory(FieldSelector: ReturnType<typeof FieldSelectorFactory>) {
+ const ColumnSelector: React.FC<ColumnSelectorProps> = ({
+ column,
+ columns,
+ label,
+ allFields,
+ onSelect,
+ fieldPairs
+ }) => (
<ColumnRow className="layer-config__column__selector">
<ColumnName className="layer-config__column__name">
<PanelLabel>
diff --git a/src/components/side-panel/layer-panel/custom-palette.js b/src/components/side-panel/layer-panel/custom-palette.tsx
similarity index 89%
rename from src/components/side-panel/layer-panel/custom-palette.js
rename to src/components/side-panel/layer-panel/custom-palette.tsx
index 1dd10b52e..af35a3779 100644
--- a/src/components/side-panel/layer-panel/custom-palette.js
+++ b/src/components/side-panel/layer-panel/custom-palette.tsx
@@ -20,7 +20,6 @@
import React, {Component, createRef} from 'react';
import classnames from 'classnames';
-import PropTypes from 'prop-types';
import styled, {css} from 'styled-components';
import {SortableContainer, SortableElement, SortableHandle} from 'react-sortable-hoc';
import Portaled from 'components/common/portaled';
@@ -30,6 +29,17 @@ import {VertDots, Trash} from 'components/common/icons';
import ColorPalette from './color-palette';
import CustomPicker from './custom-picker';
import {arrayMove} from 'utils/data-utils';
+import {ColorRange} from 'constants/color-ranges';
+import {NestedPartial} from 'reducers';
+
+type CustomPaletteProps = {
+ customPalette: ColorRange;
+ showSketcher?: boolean | number;
+ setCustomPalette: (c: NestedPartial<ColorRange>) => void;
+ onCancel: () => void;
+ onToggleSketcher: (i: boolean | number) => void;
+ onApply: (p: ColorRange, e: MouseEvent) => void;
+};
const dragHandleActive = css`
.layer__drag-handle {
@@ -140,38 +150,27 @@ const DragHandle = SortableHandle(({className, children}) => (
<StyledDragHandle className={className}>{children}</StyledDragHandle>
));
-class CustomPalette extends Component {
- static propTypes = {
- customPalette: PropTypes.shape({
- name: PropTypes.string,
- type: PropTypes.string,
- category: PropTypes.string,
- colors: PropTypes.arrayOf(PropTypes.string)
- }),
- setCustomPalette: PropTypes.func,
- showSketcher: PropTypes.oneOfType([PropTypes.bool, PropTypes.number])
- };
-
+class CustomPalette extends Component<CustomPaletteProps> {
state = {
isSorting: false
};
- root = createRef();
+ root = createRef<HTMLDivElement>();
- _setColorPaletteUI(colors) {
+ _setColorPaletteUI(colors: string[]) {
this.props.setCustomPalette({
colors
});
}
- _onPickerUpdate = color => {
+ _onPickerUpdate = (color: {hex: string}) => {
const {colors} = this.props.customPalette;
const newColors = [...colors];
- newColors[this.props.showSketcher] = color.hex;
+ newColors[this.props.showSketcher as number] = color.hex;
this._setColorPaletteUI(newColors);
};
- _onColorDelete = index => {
+ _onColorDelete = (index: number) => {
const {colors} = this.props.customPalette;
const newColors = [...colors];
if (newColors.length > 1) {
@@ -187,7 +186,7 @@ class CustomPalette extends Component {
this._setColorPaletteUI(newColors);
};
- _onSwatchClick = index => {
+ _onSwatchClick = (index: number) => {
this.props.onToggleSketcher(index);
};
@@ -195,9 +194,10 @@ class CustomPalette extends Component {
this.props.onToggleSketcher(false);
};
- _onApply = event => {
+ _onApply = (event: MouseEvent) => {
event.stopPropagation();
event.preventDefault();
+
this.props.onCancel();
this.props.onApply(this.props.customPalette, event);
};
@@ -213,7 +213,7 @@ class CustomPalette extends Component {
this.setState({isSorting: true});
};
- _inputColorHex = (index, {target: {value}}) => {
+ _inputColorHex = (index: number, {target: {value}}) => {
const {colors} = this.props.customPalette;
const newColors = [...colors];
newColors[index] = value.toUpperCase();
@@ -277,7 +277,7 @@ class CustomPalette extends Component {
<Portaled isOpened={this.props.showSketcher !== false} left={280} top={-300}>
<CustomPicker
- color={colors[this.props.showSketcher]}
+ color={colors[this.props.showSketcher as number]}
onChange={this._onPickerUpdate}
onSwatchClose={this._onSwatchClose}
/>
diff --git a/src/components/side-panel/layer-panel/custom-picker.js b/src/components/side-panel/layer-panel/custom-picker.tsx
similarity index 88%
rename from src/components/side-panel/layer-panel/custom-picker.js
rename to src/components/side-panel/layer-panel/custom-picker.tsx
index 56bd82480..b95cd1712 100644
--- a/src/components/side-panel/layer-panel/custom-picker.js
+++ b/src/components/side-panel/layer-panel/custom-picker.tsx
@@ -19,7 +19,6 @@
// THE SOFTWARE.
import React, {Component} from 'react';
-import PropTypes from 'prop-types';
import styled, {withTheme} from 'styled-components';
import {SketchPicker} from 'react-color';
import onClickOutside from 'react-onclickoutside';
@@ -27,6 +26,15 @@ import {createSelector} from 'reselect';
// This was put in because 3rd party library react-color doesn't yet cater for customized color of child component <SketchField> which contains HEX/RGB input text box
// Issue raised: https://github.com/casesandberg/react-color/issues/631
+type CustomPickerProps = {
+ color: string;
+ theme: {
+ panelBackground: string;
+ };
+ onChange: (v: {r: number; g: number; b: number; a: number; source: string; hex: string}) => void;
+ onSwatchClose: () => void;
+};
+
const StyledPicker = styled.div`
.sketch-picker {
span {
@@ -46,14 +54,8 @@ const StyledPicker = styled.div`
const PRESET_COLORS = [];
-class CustomPicker extends Component {
- static propTypes = {
- color: PropTypes.string,
- onChange: PropTypes.func,
- onSwatchClose: PropTypes.func
- };
-
- themeSelector = props => props.theme;
+class CustomPicker extends Component<CustomPickerProps> {
+ themeSelector = (props: CustomPickerProps) => props.theme;
pickerStyleSelector = createSelector(this.themeSelector, theme => ({
picker: {
width: '200px',
@@ -63,14 +65,14 @@ class CustomPicker extends Component {
}
}));
- handleClickOutside = e => {
+ handleClickOutside = (e: Event) => {
this.props.onSwatchClose();
};
render() {
const {color, onChange} = this.props;
- /** @type {any} - TS complains this doesn't match SketchPickerStylesProps */
const pickerStyle = this.pickerStyleSelector(this.props);
+
return (
<StyledPicker>
<SketchPicker
diff --git a/src/components/side-panel/layer-panel/dataset-layer-group.js b/src/components/side-panel/layer-panel/dataset-layer-group.tsx
similarity index 54%
rename from src/components/side-panel/layer-panel/dataset-layer-group.js
rename to src/components/side-panel/layer-panel/dataset-layer-group.tsx
index e7f7d0669..795969a32 100644
--- a/src/components/side-panel/layer-panel/dataset-layer-group.js
+++ b/src/components/side-panel/layer-panel/dataset-layer-group.tsx
@@ -21,11 +21,31 @@
import React, {useMemo} from 'react';
import DatasetLayerSectionFactory from './dataset-layer-section';
+import {Datasets} from 'reducers';
+import {Layer, LayerClassesType} from 'layers';
+import * as UiStateActions from 'actions/ui-state-actions';
+import * as VisStateActions from 'actions/vis-state-actions';
+import {ActionHandler} from 'actions';
+
+type DatasetLayerGroupProps = {
+ datasets: Datasets;
+ layers: Layer[];
+ layerOrder: number[];
+ layerClasses: LayerClassesType;
+ showDeleteDataset: boolean;
+ removeDataset: ActionHandler<typeof UiStateActions.openDeleteModal>;
+ showDatasetTable: ActionHandler<typeof VisStateActions.showDatasetTable>;
+ updateTableColor: ActionHandler<typeof VisStateActions.updateTableColor>;
+ uiStateActions: typeof UiStateActions;
+ visStateActions: typeof VisStateActions;
+};
DatasetLayerGroupFactory.deps = [DatasetLayerSectionFactory];
-function DatasetLayerGroupFactory(DatasetLayerSection) {
- const DatasetLayerGroup = props => {
+function DatasetLayerGroupFactory(
+ DatasetLayerSection: ReturnType<typeof DatasetLayerSectionFactory>
+) {
+ const DatasetLayerGroup: React.FC<DatasetLayerGroupProps> = props => {
const {
datasets,
showDatasetTable,
@@ -44,29 +64,33 @@ function DatasetLayerGroupFactory(DatasetLayerSection) {
// Global layer order will contain the correct order of layers
// We just empty the positions in layers array (for each dataset)
// where the layer doesn't belong to a dataset and set it to null
- const datasetLayers = layers.map(layer =>
- layer.config.dataId === dataset.id ? layer : null
- );
+ const datasetLayers = layers
+ .map(layer => (layer.config.dataId === dataset.id ? layer : null))
+ .filter(layer => !!layer);
return {dataset, datasetLayers};
});
}, [datasets, layers]);
- return datasetLayerSectionData.map(dlsData => (
- <DatasetLayerSection
- key={dlsData.dataset.id}
- dataset={dlsData.dataset}
- layers={dlsData.datasetLayers}
- showDatasetTable={showDatasetTable}
- updateTableColor={updateTableColor}
- showDeleteDataset={showDeleteDataset}
- removeDataset={removeDataset}
- layerOrder={layerOrder}
- layerClasses={layerClasses}
- uiStateActions={uiStateActions}
- visStateActions={visStateActions}
- />
- ));
+ return (
+ <>
+ {datasetLayerSectionData.map(dlsData => (
+ <DatasetLayerSection
+ key={dlsData.dataset.id}
+ dataset={dlsData.dataset}
+ layers={dlsData.datasetLayers as Layer[]}
+ showDatasetTable={showDatasetTable}
+ updateTableColor={updateTableColor}
+ showDeleteDataset={showDeleteDataset}
+ removeDataset={removeDataset}
+ layerOrder={layerOrder}
+ layerClasses={layerClasses}
+ uiStateActions={uiStateActions}
+ visStateActions={visStateActions}
+ />
+ ))}
+ </>
+ );
};
return DatasetLayerGroup;
diff --git a/src/components/side-panel/layer-panel/dataset-layer-section.js b/src/components/side-panel/layer-panel/dataset-layer-section.tsx
similarity index 72%
rename from src/components/side-panel/layer-panel/dataset-layer-section.js
rename to src/components/side-panel/layer-panel/dataset-layer-section.tsx
index 20f6010b8..5a886529f 100644
--- a/src/components/side-panel/layer-panel/dataset-layer-section.js
+++ b/src/components/side-panel/layer-panel/dataset-layer-section.tsx
@@ -23,6 +23,24 @@ import styled from 'styled-components';
import SourceDataCatalogFactory from '../common/source-data-catalog';
import LayerListFactory from './layer-list';
+import {Layer, LayerClassesType} from 'layers';
+import KeplerTable from 'utils/table-utils/kepler-table';
+import * as UiStateActions from 'actions/ui-state-actions';
+import * as VisStateActions from 'actions/vis-state-actions';
+import {ActionHandler} from 'actions';
+
+type DatasetLayerSectionProps = {
+ dataset: KeplerTable;
+ layers: Layer[];
+ layerOrder: number[];
+ layerClasses: LayerClassesType;
+ showDeleteDataset: boolean;
+ showDatasetTable: ActionHandler<typeof VisStateActions.showDatasetTable>;
+ updateTableColor: ActionHandler<typeof VisStateActions.updateTableColor>;
+ removeDataset: ActionHandler<typeof UiStateActions.openDeleteModal>;
+ uiStateActions: typeof UiStateActions;
+ visStateActions: typeof VisStateActions;
+};
const DatasetLayerSectionWrapper = styled.div.attrs({
className: 'dataset-layer-section'
@@ -32,8 +50,11 @@ const DatasetLayerSectionWrapper = styled.div.attrs({
DatasetLayerSectionFactory.deps = [SourceDataCatalogFactory, LayerListFactory];
-function DatasetLayerSectionFactory(SourceDataCatalog, LayerList) {
- const DatasetLayerSection = props => {
+function DatasetLayerSectionFactory(
+ SourceDataCatalog: ReturnType<typeof SourceDataCatalogFactory>,
+ LayerList: ReturnType<typeof LayerListFactory>
+) {
+ const DatasetLayerSection: React.FC<DatasetLayerSectionProps> = props => {
const {
dataset,
showDatasetTable,
diff --git a/src/components/side-panel/layer-panel/dataset-section.js b/src/components/side-panel/layer-panel/dataset-section.tsx
similarity index 74%
rename from src/components/side-panel/layer-panel/dataset-section.js
rename to src/components/side-panel/layer-panel/dataset-section.tsx
index 65aad7828..6f6f54131 100644
--- a/src/components/side-panel/layer-panel/dataset-section.js
+++ b/src/components/side-panel/layer-panel/dataset-section.tsx
@@ -25,8 +25,28 @@ import {Add} from 'components/common/icons';
import {Button} from 'components/common/styled-components';
import SourceDataCatalogFactory from '../common/source-data-catalog';
+import {Datasets} from 'reducers';
+import * as UiStateActions from 'actions/ui-state-actions';
+import * as VisStateActions from 'actions/vis-state-actions';
+import {ActionHandler} from 'actions';
-const StyledDatasetTitle = styled.div`
+type AddDataButtonProps = {
+ onClick: ActionHandler<typeof UiStateActions.toggleModal>;
+ isInactive: boolean;
+};
+
+type DatasetSectionProps = {
+ datasets: Datasets;
+ defaultDataset: string;
+ showDatasetList: boolean;
+ showDeleteDataset: boolean;
+ showDatasetTable: ActionHandler<typeof VisStateActions.showDatasetTable>;
+ updateTableColor: ActionHandler<typeof VisStateActions.updateTableColor>;
+ removeDataset: ActionHandler<typeof UiStateActions.openDeleteModal>;
+ showAddDataModal: ActionHandler<typeof UiStateActions.toggleModal>;
+};
+
+const StyledDatasetTitle = styled.div<{showDatasetList: boolean}>`
line-height: ${props => props.theme.sidePanelTitleLineHeight};
font-weight: 400;
letter-spacing: 1.25px;
@@ -45,7 +65,7 @@ const StyledDatasetSection = styled.div`
`;
export function AddDataButtonFactory() {
- const AddDataButton = ({onClick, isInactive}) => (
+ const AddDataButton: React.FC<AddDataButtonProps> = ({onClick, isInactive}) => (
<Button
className="add-data-button"
onClick={onClick}
@@ -63,8 +83,11 @@ export function AddDataButtonFactory() {
DatasetSectionFactory.deps = [SourceDataCatalogFactory, AddDataButtonFactory];
-function DatasetSectionFactory(SourceDataCatalog, AddDataButton) {
- const DatasetSection = props => {
+function DatasetSectionFactory(
+ SourceDataCatalog: ReturnType<typeof SourceDataCatalogFactory>,
+ AddDataButton: ReturnType<typeof AddDataButtonFactory>
+) {
+ const DatasetSection: React.FC<DatasetSectionProps> = props => {
const {
datasets,
showDatasetTable,
@@ -76,6 +99,7 @@ function DatasetSectionFactory(SourceDataCatalog, AddDataButton) {
defaultDataset
} = props;
const datasetCount = Object.keys(datasets).length;
+
return (
<StyledDatasetSection>
<StyledDatasetTitle showDatasetList={showDatasetList}>
diff --git a/src/components/side-panel/layer-panel/dimension-scale-selector.js b/src/components/side-panel/layer-panel/dimension-scale-selector.tsx
similarity index 82%
rename from src/components/side-panel/layer-panel/dimension-scale-selector.js
rename to src/components/side-panel/layer-panel/dimension-scale-selector.tsx
index 588747fc4..1a8add227 100644
--- a/src/components/side-panel/layer-panel/dimension-scale-selector.js
+++ b/src/components/side-panel/layer-panel/dimension-scale-selector.tsx
@@ -24,7 +24,23 @@ import ItemSelector from 'components/common/item-selector/item-selector';
import {FormattedMessage} from 'localization';
import {camelize} from 'utils/utils';
-const DimensionScaleSelector = ({label, onSelect, options, scaleType, disabled = false}) => {
+type DimensionScaleSelectorProps = {
+ label: string;
+ onSelect: (
+ val: readonly (string | number | boolean | object)[] | string | number | boolean | object | null
+ ) => void;
+ options: string[];
+ scaleType?: string;
+ disabled?: boolean;
+};
+
+const DimensionScaleSelector: React.FC<DimensionScaleSelectorProps> = ({
+ label,
+ onSelect,
+ options,
+ scaleType,
+ disabled = false
+}) => {
return (
<SidePanelSection>
<PanelLabel>
diff --git a/src/components/side-panel/layer-panel/layer-column-config.js b/src/components/side-panel/layer-panel/layer-column-config.tsx
similarity index 83%
rename from src/components/side-panel/layer-panel/layer-column-config.js
rename to src/components/side-panel/layer-panel/layer-column-config.tsx
index 43e0b95e6..6876cfbbc 100644
--- a/src/components/side-panel/layer-panel/layer-column-config.js
+++ b/src/components/side-panel/layer-panel/layer-column-config.tsx
@@ -19,11 +19,24 @@
// THE SOFTWARE.
import React, {useCallback, useMemo} from 'react';
-import PropTypes from 'prop-types';
import styled from 'styled-components';
import {FormattedMessage} from 'localization';
import {PanelLabel, SidePanelSection} from 'components/common/styled-components';
import ColumnSelectorFactory from './column-selector';
+import {ColumnPairs} from 'layers/base-layer';
+import {Layer, LayerColumns, LayerBaseConfig} from 'layers';
+import {Field, FieldPair} from 'utils/table-utils/kepler-table';
+
+type LayerColumnConfigProps = {
+ columnPairs?: ColumnPairs | null;
+ fieldPairs?: FieldPair[];
+ columns: LayerColumns;
+ columnLabels?: Record<string, string>;
+ fields: Field[];
+ updateLayerConfig: (newConfig: Partial<LayerBaseConfig>) => void;
+ assignColumn: Layer['assignColumn'];
+ assignColumnPairs: Layer['assignColumnPairs'];
+};
const TopRow = styled.div`
display: flex;
@@ -32,8 +45,8 @@ const TopRow = styled.div`
LayerColumnConfigFactory.deps = [ColumnSelectorFactory];
-function LayerColumnConfigFactory(ColumnSelector) {
- const LayerColumnConfig = ({
+function LayerColumnConfigFactory(ColumnSelector: ReturnType<typeof ColumnSelectorFactory>) {
+ const LayerColumnConfig: React.FC<LayerColumnConfigProps> = ({
columnPairs,
fieldPairs,
columns,
@@ -96,17 +109,6 @@ function LayerColumnConfigFactory(ColumnSelector) {
);
};
- LayerColumnConfig.propTypes = {
- columns: PropTypes.object.isRequired,
- fields: PropTypes.arrayOf(PropTypes.any).isRequired,
- assignColumnPairs: PropTypes.func.isRequired,
- assignColumn: PropTypes.func.isRequired,
- updateLayerConfig: PropTypes.func.isRequired,
- columnPairs: PropTypes.object,
- fieldPairs: PropTypes.arrayOf(PropTypes.any),
- columnLabels: PropTypes.object
- };
-
return LayerColumnConfig;
}
diff --git a/src/components/side-panel/layer-panel/layer-config-group.js b/src/components/side-panel/layer-panel/layer-config-group.tsx
similarity index 84%
rename from src/components/side-panel/layer-panel/layer-config-group.js
rename to src/components/side-panel/layer-panel/layer-config-group.tsx
index 3e24b59d0..787851646 100644
--- a/src/components/side-panel/layer-panel/layer-config-group.js
+++ b/src/components/side-panel/layer-panel/layer-config-group.tsx
@@ -26,6 +26,23 @@ import {FormattedMessage} from 'react-intl';
import Switch from 'components/common/switch';
import InfoHelperFactory from 'components/common/info-helper';
import {VertThreeDots} from 'components/common/icons';
+import {Layer, LayerVisConfig} from 'layers';
+
+type LayerConfigGroupLabelProps = {
+ label?: string;
+ description?: string;
+};
+
+type LayerConfigGroupProps = {
+ layer?: Layer;
+ label: string;
+ property?: string;
+ description?: string;
+ collapsible?: boolean;
+ expanded?: boolean;
+ disabled?: boolean;
+ onChange?: (newVisConfig: Partial<LayerVisConfig>) => void;
+};
export const StyledLayerConfigGroupAction = styled.div`
display: flex;
@@ -102,7 +119,7 @@ const ConfigGroupContent = styled.div`
LayerConfigGroupLabelFactory.deps = [InfoHelperFactory];
-export function LayerConfigGroupLabelFactory(InfoHelper) {
+export function LayerConfigGroupLabelFactory(InfoHelper: ReturnType<typeof InfoHelperFactory>) {
const StyledLayerConfigGroupLabel = styled.div`
border-left: ${props => props.theme.layerConfigGroupLabelBorderLeft} solid
${props => props.theme.labelColor};
@@ -123,7 +140,7 @@ export function LayerConfigGroupLabelFactory(InfoHelper) {
}
`;
- const LayerConfigGroupLabel = ({label, description}) => (
+ const LayerConfigGroupLabel: React.FC<LayerConfigGroupLabelProps> = ({label, description}) => (
<StyledLayerConfigGroupLabel className="layer-config-group__label">
<span>
<FormattedMessage id={label || 'misc.empty'} defaultMessage={label} />
@@ -137,13 +154,15 @@ export function LayerConfigGroupLabelFactory(InfoHelper) {
LayerConfigGroupFactory.deps = [LayerConfigGroupLabelFactory];
-function LayerConfigGroupFactory(LayerConfigGroupLabel) {
- class LayerConfigGroup extends Component {
+function LayerConfigGroupFactory(
+ LayerConfigGroupLabel: ReturnType<typeof LayerConfigGroupLabelFactory>
+): React.ComponentType<LayerConfigGroupProps> {
+ class LayerConfigGroup extends Component<LayerConfigGroupProps> {
static defaultProps = {
collapsible: false,
expanded: false,
onChange: () => {},
- description: null,
+ description: '',
disabled: false
};
@@ -184,9 +203,9 @@ function LayerConfigGroupFactory(LayerConfigGroupLabel) {
<StyledLayerConfigGroupAction className="layer-config-group__action">
{property ? (
<Switch
- checked={layer.config.visConfig[property]}
- id={`${layer.id}-${property}`}
- onChange={() => onChange({[property]: !layer.config.visConfig[property]})}
+ checked={layer?.config.visConfig[property]}
+ id={`${layer?.id}-${property}`}
+ onChange={() => onChange?.({[property]: !layer?.config.visConfig[property]})}
/>
) : null}
{collapsible ? <VertThreeDots height="18px" /> : null}
@@ -194,7 +213,7 @@ function LayerConfigGroupFactory(LayerConfigGroupLabel) {
</StyledConfigGroupHeader>
<ConfigGroupContent
className={classnames('layer-config-group__content', {
- disabled: property && !layer.config.visConfig[property]
+ disabled: property && !layer?.config.visConfig[property]
})}
>
{children}
diff --git a/src/components/side-panel/layer-panel/layer-configurator.js b/src/components/side-panel/layer-panel/layer-configurator.tsx
similarity index 87%
rename from src/components/side-panel/layer-panel/layer-configurator.js
rename to src/components/side-panel/layer-panel/layer-configurator.tsx
index 98f56c097..3bd41bb4a 100644
--- a/src/components/side-panel/layer-panel/layer-configurator.js
+++ b/src/components/side-panel/layer-panel/layer-configurator.tsx
@@ -19,8 +19,7 @@
// THE SOFTWARE.
/* eslint-disable complexity */
-import React, {Component, Fragment} from 'react';
-import PropTypes from 'prop-types';
+import React, {Component, Fragment, MouseEventHandler} from 'react';
import styled from 'styled-components';
import {FormattedMessage} from 'localization';
@@ -42,6 +41,82 @@ import {capitalizeFirstLetter} from 'utils/utils';
import {CHANNEL_SCALE_SUPPORTED_FIELDS} from 'constants/default-settings';
import {LAYER_TYPES} from 'layers/types';
+import {Layer, LayerBaseConfig, LayerVisConfig} from 'layers';
+import {Datasets, NestedPartial, RGBColor} from 'reducers';
+import {ColorUI} from 'layers/layer-factory';
+import {VisualChannel} from 'layers/base-layer';
+import AggregationLayer from 'layers/aggregation-layer';
+import {Field} from 'utils/table-utils/kepler-table';
+import {toggleModal} from 'actions/ui-state-actions';
+import {ColorRange} from 'constants/color-ranges';
+import {ActionHandler} from 'actions';
+
+type LayerConfiguratorProps = {
+ layer: Layer;
+ datasets: Datasets;
+ layerTypeOptions?: {
+ id: string;
+ label: string;
+ icon: any; //
+ requireData: any; //
+ }[];
+ openModal: ActionHandler<typeof toggleModal>;
+ updateLayerConfig: (newConfig: Partial<LayerBaseConfig>) => void;
+ updateLayerType: (newType: string) => void;
+ updateLayerVisConfig: (newVisConfig: Partial<LayerVisConfig>) => void;
+ updateLayerVisualChannelConfig: (newConfig: Partial<LayerBaseConfig>, channel: string) => void;
+ updateLayerColorUI: (prop: string, newConfig: NestedPartial<ColorUI>) => void;
+ updateLayerTextLabel: (idx: number | 'all', prop: string, value: any) => void;
+};
+
+type LayerColorSelectorProps = {
+ layer: Layer;
+ onChange: (v: Record<string, RGBColor>) => void;
+ selectedColor?: RGBColor;
+ property?: string;
+ setColorUI: (prop: string, newConfig: NestedPartial<ColorUI>) => void;
+};
+
+type ArcLayerColorSelectorProps = {
+ layer: Layer;
+ onChangeConfig: (v: {color: RGBColor}) => void;
+ onChangeVisConfig: (v: {targetColor: RGBColor}) => void;
+ property?: string;
+ setColorUI: (prop: string, newConfig: NestedPartial<ColorUI>) => void;
+};
+
+type LayerColorRangeSelectorProps = {
+ layer: Layer;
+ onChange: (v: Record<string, ColorRange>) => void;
+ property?: string;
+ setColorUI: (prop: string, newConfig: NestedPartial<ColorUI>) => void;
+};
+
+type ChannelByValueSelectorProps = {
+ layer: Layer;
+ channel: VisualChannel;
+ onChange: (
+ val: Record<
+ string,
+ string | number | boolean | object | readonly (string | number | boolean | object)[] | null
+ >,
+ key: string
+ ) => void;
+ fields: Field[];
+ description: string;
+};
+
+type AggregationSelectorProps = {
+ channel: VisualChannel;
+ layer: AggregationLayer;
+ onChange: (
+ val: Record<
+ string,
+ string | number | boolean | object | readonly (string | number | boolean | object)[] | null
+ >,
+ key: string
+ ) => void;
+};
const StyledLayerConfigurator = styled.div.attrs({
className: 'layer-panel__config'
@@ -59,27 +134,27 @@ const StyledLayerVisualConfigurator = styled.div.attrs({
margin-top: 12px;
`;
-export const getLayerFields = (datasets, layer) =>
- layer.config && datasets[layer.config.dataId] ? datasets[layer.config.dataId].fields : [];
+export const getLayerFields = (datasets: Datasets, layer: Layer) =>
+ layer.config?.dataId && datasets[layer.config.dataId] ? datasets[layer.config.dataId].fields : [];
-export const getLayerDataset = (datasets, layer) =>
- layer.config && datasets[layer.config.dataId] ? datasets[layer.config.dataId] : null;
+export const getLayerDataset = (datasets: Datasets, layer: Layer) =>
+ layer.config?.dataId && datasets[layer.config.dataId] ? datasets[layer.config.dataId] : null;
-export const getLayerConfiguratorProps = props => ({
+export const getLayerConfiguratorProps = (props: LayerConfiguratorProps) => ({
layer: props.layer,
fields: getLayerFields(props.datasets, props.layer),
onChange: props.updateLayerConfig,
setColorUI: props.updateLayerColorUI
});
-export const getVisConfiguratorProps = props => ({
+export const getVisConfiguratorProps = (props: LayerConfiguratorProps) => ({
layer: props.layer,
fields: getLayerFields(props.datasets, props.layer),
onChange: props.updateLayerVisConfig,
setColorUI: props.updateLayerColorUI
});
-export const getLayerChannelConfigProps = props => ({
+export const getLayerChannelConfigProps = (props: LayerConfiguratorProps) => ({
layer: props.layer,
fields: getLayerFields(props.datasets, props.layer),
onChange: props.updateLayerVisualChannelConfig
@@ -97,28 +172,16 @@ LayerConfiguratorFactory.deps = [
];
export default function LayerConfiguratorFactory(
- SourceDataSelector,
- VisConfigSlider,
- TextLabelPanel,
- LayerConfigGroup,
- ChannelByValueSelector,
- LayerColumnConfig,
- LayerTypeSelector,
- VisConfigSwitch
-) {
- class LayerConfigurator extends Component {
- static propTypes = {
- layer: PropTypes.object.isRequired,
- datasets: PropTypes.object.isRequired,
- layerTypeOptions: PropTypes.arrayOf(PropTypes.any).isRequired,
- openModal: PropTypes.func.isRequired,
- updateLayerConfig: PropTypes.func.isRequired,
- updateLayerType: PropTypes.func.isRequired,
- updateLayerVisConfig: PropTypes.func.isRequired,
- updateLayerVisualChannelConfig: PropTypes.func.isRequired,
- updateLayerColorUI: PropTypes.func.isRequired
- };
-
+ SourceDataSelector: ReturnType<typeof SourceDataSelectorFactory>,
+ VisConfigSlider: ReturnType<typeof VisConfigSliderFactory>,
+ TextLabelPanel: ReturnType<typeof TextLabelPanelFactory>,
+ LayerConfigGroup: ReturnType<typeof LayerConfigGroupFactory>,
+ ChannelByValueSelector: ReturnType<typeof ChannelByValueSelectorFactory>,
+ LayerColumnConfig: ReturnType<typeof LayerColumnConfigFactory>,
+ LayerTypeSelector: ReturnType<typeof LayerTypeSelectorFactory>,
+ VisConfigSwitch: ReturnType<typeof VisConfigSwitchFactory>
+): React.ComponentType<LayerConfiguratorProps> {
+ class LayerConfigurator extends Component<LayerConfiguratorProps> {
_renderPointLayerConfig(props) {
return this._renderScatterplotLayerConfig(props);
}
@@ -221,8 +284,6 @@ export default function LayerConfiguratorFactory(
fields={visConfiguratorProps.fields}
updateLayerTextLabel={this.props.updateLayerTextLabel}
textLabel={layer.config.textLabel}
- colorPalette={visConfiguratorProps.colorPalette}
- setColorPaletteUI={visConfiguratorProps.setColorPaletteUI}
/>
</StyledLayerVisualConfigurator>
);
@@ -240,7 +301,10 @@ export default function LayerConfiguratorFactory(
<LayerConfigGroup label={'layer.color'} collapsible>
<LayerColorRangeSelector {...visConfiguratorProps} />
<ConfigGroupCollapsibleContent>
- <AggrScaleSelector {...layerConfiguratorProps} channel={layer.visualChannels.color} />
+ <AggregationScaleSelector
+ {...layerConfiguratorProps}
+ channel={layer.visualChannels.color}
+ />
<ChannelByValueSelector
channel={layer.visualChannels.color}
{...layerChannelConfigProps}
@@ -328,7 +392,10 @@ export default function LayerConfiguratorFactory(
<LayerConfigGroup label={'layer.color'} collapsible>
<LayerColorRangeSelector {...visConfiguratorProps} />
<ConfigGroupCollapsibleContent>
- <AggrScaleSelector {...layerConfiguratorProps} channel={layer.visualChannels.color} />
+ <AggregationScaleSelector
+ {...layerConfiguratorProps}
+ channel={layer.visualChannels.color}
+ />
<ChannelByValueSelector
channel={layer.visualChannels.color}
{...layerChannelConfigProps}
@@ -379,7 +446,7 @@ export default function LayerConfiguratorFactory(
description={elevationByDescription}
disabled={!enable3d}
/>
- <AggrScaleSelector
+ <AggregationScaleSelector
{...layerConfiguratorProps}
channel={layer.visualChannels.size}
/>
@@ -963,7 +1030,8 @@ export default function LayerConfiguratorFactory(
datasets={datasets}
id={layer.id}
dataId={config.dataId}
- onSelect={value => updateLayerConfig({dataId: value})}
+ // @ts-ignore
+ onSelect={(value: string) => updateLayerConfig({dataId: value})}
/>
)}
<LayerColumnConfig
@@ -971,14 +1039,15 @@ export default function LayerConfiguratorFactory(
columns={layer.config.columns}
assignColumnPairs={layer.assignColumnPairs.bind(layer)}
assignColumn={layer.assignColumn.bind(layer)}
+ // @ts-ignore
columnLabels={layer.columnLabels}
fields={fields}
fieldPairs={fieldPairs}
updateLayerConfig={updateLayerConfig}
- updateLayerType={this.props.updateLayerType}
/>
</LayerConfigGroup>
- {this[renderTemplate] &&
+ {renderTemplate &&
+ this[renderTemplate] &&
this[renderTemplate]({
layer,
dataset,
@@ -1003,7 +1072,7 @@ const StyledHowToButton = styled.div`
top: -4px;
`;
-export const HowToButton = ({onClick}) => (
+export const HowToButton = ({onClick}: {onClick: MouseEventHandler}) => (
<StyledHowToButton>
<Button link small onClick={onClick}>
<FormattedMessage id={'layerConfiguration.howTo'} />
@@ -1014,17 +1083,16 @@ export const HowToButton = ({onClick}) => (
export const LayerColorSelector = ({
layer,
onChange,
- label,
selectedColor,
property = 'color',
setColorUI
-}) => (
+}: LayerColorSelectorProps) => (
<SidePanelSection>
<ColorSelector
colorSets={[
{
selectedColor: selectedColor || layer.config.color,
- setColor: rgbValue => onChange({[property]: rgbValue})
+ setColor: (rgbValue: RGBColor) => onChange({[property]: rgbValue})
}
]}
colorUI={layer.config.colorUI[property]}
@@ -1039,18 +1107,18 @@ export const ArcLayerColorSelector = ({
onChangeVisConfig,
property = 'color',
setColorUI
-}) => (
+}: ArcLayerColorSelectorProps) => (
<SidePanelSection>
<ColorSelector
colorSets={[
{
selectedColor: layer.config.color,
- setColor: rgbValue => onChangeConfig({color: rgbValue}),
+ setColor: (rgbValue: RGBColor) => onChangeConfig({color: rgbValue}),
label: 'Source'
},
{
selectedColor: layer.config.visConfig.targetColor || layer.config.color,
- setColor: rgbValue => onChangeVisConfig({targetColor: rgbValue}),
+ setColor: (rgbValue: RGBColor) => onChangeVisConfig({targetColor: rgbValue}),
label: 'Target'
}
]}
@@ -1060,14 +1128,19 @@ export const ArcLayerColorSelector = ({
</SidePanelSection>
);
-export const LayerColorRangeSelector = ({layer, onChange, property = 'colorRange', setColorUI}) => (
+export const LayerColorRangeSelector = ({
+ layer,
+ onChange,
+ property = 'colorRange',
+ setColorUI
+}: LayerColorRangeSelectorProps) => (
<SidePanelSection>
<ColorSelector
colorSets={[
{
selectedColor: layer.config.visConfig[property],
isRange: true,
- setColor: colorRange => onChange({[property]: colorRange})
+ setColor: (colorRange: ColorRange) => onChange({[property]: colorRange})
}
]}
colorUI={layer.config.colorUI[property]}
@@ -1077,15 +1150,22 @@ export const LayerColorRangeSelector = ({layer, onChange, property = 'colorRange
);
ChannelByValueSelectorFactory.deps = [VisConfigByFieldSelectorFactory];
-export function ChannelByValueSelectorFactory(VisConfigByFieldSelector) {
- const ChannelByValueSelector = ({layer, channel, onChange, fields, description}) => {
+
+export function ChannelByValueSelectorFactory(
+ VisConfigByFieldSelector: ReturnType<typeof VisConfigByFieldSelectorFactory>
+) {
+ const ChannelByValueSelector = ({
+ layer,
+ channel,
+ onChange,
+ fields,
+ description
+ }: ChannelByValueSelectorProps) => {
const {
channelScaleType,
- domain,
field,
key,
property,
- range,
scale,
defaultMeasure,
supportedFieldTypes
@@ -1101,13 +1181,11 @@ export function ChannelByValueSelectorFactory(VisConfigByFieldSelector) {
<VisConfigByFieldSelector
channel={channel.key}
description={description || defaultDescription}
- domain={layer.config[domain]}
fields={supportedFields}
id={layer.id}
key={`${key}-channel-selector`}
property={property}
placeholder={defaultMeasure || 'placeholder.selectField'}
- range={layer.config.visConfig[range]}
scaleOptions={scaleOptions}
scaleType={scale ? layer.config[scale] : null}
selectedField={layer.config[field]}
@@ -1121,7 +1199,7 @@ export function ChannelByValueSelectorFactory(VisConfigByFieldSelector) {
return ChannelByValueSelector;
}
-export const AggrScaleSelector = ({channel, layer, onChange}) => {
+export const AggregationScaleSelector = ({channel, layer, onChange}: AggregationSelectorProps) => {
const {scale, key} = channel;
const scaleOptions = layer.getScaleOptions(key);
@@ -1135,7 +1213,7 @@ export const AggrScaleSelector = ({channel, layer, onChange}) => {
) : null;
};
-export const AggregationTypeSelector = ({layer, channel, onChange}) => {
+export const AggregationTypeSelector = ({channel, layer, onChange}: AggregationSelectorProps) => {
const {field, aggregation, key} = channel;
const selectedField = layer.config[field];
const {visConfig} = layer.config;
@@ -1149,7 +1227,7 @@ export const AggregationTypeSelector = ({layer, channel, onChange}) => {
<FormattedMessage id={'layer.aggregateBy'} values={{field: selectedField.name}} />
</PanelLabel>
<ItemSelector
- selectedItems={visConfig[aggregation]}
+ selectedItems={visConfig[aggregation as string]}
options={aggregationOptions}
multiSelect={false}
searchable={false}
@@ -1158,7 +1236,7 @@ export const AggregationTypeSelector = ({layer, channel, onChange}) => {
{
visConfig: {
...layer.config.visConfig,
- [aggregation]: value
+ [aggregation as string]: value
}
},
channel.key
diff --git a/src/components/side-panel/layer-panel/layer-list.d.ts b/src/components/side-panel/layer-panel/layer-list.d.ts
deleted file mode 100644
index e79a01515..000000000
--- a/src/components/side-panel/layer-panel/layer-list.d.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import React from 'react';
-import {Layer, LayerClassesType} from 'layers';
-import {Datasets} from 'reducers/vis-state-updaters';
-import * as VisStateActions from 'actions/vis-state-actions';
-import * as UIStateActions from 'actions/ui-state-actions';
-
-export type LayerListProps = {
- datasets: Datasets;
- layerClasses: LayerClassesType;
- layers: Layer[];
- layerOrder: number[];
- uiStateActions: typeof UIStateActions;
- visStateActions: typeof VisStateActions;
- isSortable?: Boolean;
-};
-
-export default function LayerListFactory(
- LayerPanel: React.Component
-): React.Component<LayerListProps>;
diff --git a/src/components/side-panel/layer-panel/layer-list.js b/src/components/side-panel/layer-panel/layer-list.tsx
similarity index 91%
rename from src/components/side-panel/layer-panel/layer-list.js
rename to src/components/side-panel/layer-panel/layer-list.tsx
index 2e1a557f2..f24ba85e9 100644
--- a/src/components/side-panel/layer-panel/layer-list.js
+++ b/src/components/side-panel/layer-panel/layer-list.tsx
@@ -24,6 +24,21 @@ import styled from 'styled-components';
import classnames from 'classnames';
import {SortableContainer, SortableElement} from 'react-sortable-hoc';
import LayerPanelFactory from './layer-panel';
+import {Datasets} from 'reducers';
+import {Layer, LayerClassesType} from 'layers';
+import * as UiStateActions from 'actions/ui-state-actions';
+import * as VisStateActions from 'actions/vis-state-actions';
+
+type LayerListProps = {
+ datasets: Datasets;
+ layers: Layer[];
+ layerOrder: number[];
+ layerClasses: LayerClassesType;
+ isSortable?: boolean;
+ uiStateActions: typeof UiStateActions;
+ visStateActions: typeof VisStateActions;
+};
+
// make sure the element is always visible while is being dragged
// item being dragged is appended in body, here to reset its global style
const SortableStyledItem = styled.div`
@@ -48,8 +63,10 @@ const SortableStyledItem = styled.div`
}
}
`;
+
LayerListFactory.deps = [LayerPanelFactory];
-function LayerListFactory(LayerPanel) {
+
+function LayerListFactory(LayerPanel: ReturnType<typeof LayerPanelFactory>) {
// By wrapping layer panel using a sortable element we don't have to implement the drag and drop logic into the panel itself;
// Developers can provide any layer panel implementation and it will still be sortable
const SortableItem = SortableElement(({children, isSorting}) => {
@@ -59,10 +76,12 @@ function LayerListFactory(LayerPanel) {
</SortableStyledItem>
);
});
+
const WrappedSortableContainer = SortableContainer(({children}) => {
return <div>{children}</div>;
});
- const LayerList = props => {
+
+ const LayerList: React.FC<LayerListProps> = props => {
const {
layers,
datasets,
@@ -140,7 +159,6 @@ function LayerListFactory(LayerPanel) {
<LayerPanel
{...panelProps}
{...layerActions}
- sortData={layerIdx}
key={layers[layerIdx].id}
idx={layerIdx}
layer={layers[layerIdx]}
@@ -158,7 +176,6 @@ function LayerListFactory(LayerPanel) {
<LayerPanel
{...panelProps}
{...layerActions}
- sortData={layerIdx}
key={layers[layerIdx].id}
idx={layerIdx}
layer={layers[layerIdx]}
diff --git a/src/components/side-panel/layer-panel/layer-panel-header.js b/src/components/side-panel/layer-panel/layer-panel-header.tsx
similarity index 82%
rename from src/components/side-panel/layer-panel/layer-panel-header.js
rename to src/components/side-panel/layer-panel/layer-panel-header.tsx
index 495a04bec..b70661478 100644
--- a/src/components/side-panel/layer-panel/layer-panel-header.js
+++ b/src/components/side-panel/layer-panel/layer-panel-header.tsx
@@ -18,8 +18,7 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-import React, {useState} from 'react';
-import PropTypes from 'prop-types';
+import React, {useState, ComponentType, MouseEventHandler} from 'react';
import classnames from 'classnames';
import styled from 'styled-components';
import {SortableHandle} from 'react-sortable-hoc';
@@ -28,24 +27,37 @@ import {Copy, ArrowDown, EyeSeen, EyeUnseen, Trash, VertDots} from 'components/c
import {InlineInput, StyledPanelHeader} from 'components/common/styled-components';
import {FormattedMessage} from 'localization';
+import {RGBColor} from 'reducers';
+import {BaseProps} from 'components/common/icons/base';
-const propTypes = {
- // required
- layerId: PropTypes.string.isRequired,
- isVisible: PropTypes.bool.isRequired,
- onToggleVisibility: PropTypes.func.isRequired,
- onUpdateLayerLabel: PropTypes.func.isRequired,
- onToggleEnableConfig: PropTypes.func.isRequired,
- onRemoveLayer: PropTypes.func.isRequired,
- onDuplicateLayer: PropTypes.func.isRequired,
- isConfigActive: PropTypes.bool.isRequired,
-
- // optional
- showRemoveLayer: PropTypes.bool,
- label: PropTypes.string,
- layerType: PropTypes.string,
- isDragNDropEnabled: PropTypes.bool,
- labelRCGColorValues: PropTypes.arrayOf(PropTypes.number)
+type LayerLabelEditorProps = {
+ layerId: string;
+ label?: string;
+ onEdit: (e) => void;
+};
+
+type LayerTitleSectionProps = {
+ layerType?: string | null;
+ layerId: string;
+ label?: string;
+ onUpdateLayerLabel: (e) => void;
+};
+
+type LayerPanelHeaderProps = {
+ layerId: string;
+ isVisible: boolean;
+ onToggleVisibility: MouseEventHandler;
+ onUpdateLayerLabel: (e) => void; //
+ onToggleEnableConfig: MouseEventHandler;
+ onRemoveLayer: MouseEventHandler;
+ onDuplicateLayer: MouseEventHandler;
+ isConfigActive: boolean;
+ showRemoveLayer?: boolean;
+ label?: string;
+ layerType?: string | null;
+ isDragNDropEnabled?: boolean;
+ labelRCGColorValues?: RGBColor | null;
+ actionIcons?: Record<string, ComponentType<Partial<BaseProps>>>;
};
export const defaultProps = {
@@ -104,12 +116,12 @@ export const DragHandle = SortableHandle(({className, children}) => (
<StyledDragHandle className={className}>{children}</StyledDragHandle>
));
-export const LayerLabelEditor = ({layerId, label, onEdit}) => (
+export const LayerLabelEditor: React.FC<LayerLabelEditorProps> = ({layerId, label, onEdit}) => (
<InlineInput
type="text"
className="layer__title__editor"
value={label}
- onClick={e => {
+ onClick={(e: MouseEvent) => {
e.stopPropagation();
}}
onChange={onEdit}
@@ -129,7 +141,12 @@ export function LayerTitleSectionFactory() {
text-transform: capitalize;
}
`;
- const LayerTitleSection = ({layerType, layerId, label, onUpdateLayerLabel}) => (
+ const LayerTitleSection: React.FC<LayerTitleSectionProps> = ({
+ layerType,
+ layerId,
+ label,
+ onUpdateLayerLabel
+ }) => (
<StyledLayerTitleSection className="layer__title">
<div>
<LayerLabelEditor layerId={layerId} label={label} onEdit={onUpdateLayerLabel} />
@@ -143,6 +160,7 @@ export function LayerTitleSectionFactory() {
}
LayerPanelHeaderFactory.deps = [LayerTitleSectionFactory, PanelHeaderActionFactory];
+
const defaultActionIcons = {
remove: Trash,
visible: EyeSeen,
@@ -150,8 +168,12 @@ const defaultActionIcons = {
enableConfig: ArrowDown,
duplicate: Copy
};
-function LayerPanelHeaderFactory(LayerTitleSection, PanelHeaderAction) {
- const LayerPanelHeader = ({
+
+function LayerPanelHeaderFactory(
+ LayerTitleSection: ReturnType<typeof LayerTitleSectionFactory>,
+ PanelHeaderAction: ReturnType<typeof PanelHeaderActionFactory>
+) {
+ const LayerPanelHeader: React.FC<LayerPanelHeaderProps> = ({
isConfigActive,
isDragNDropEnabled,
isVisible,
@@ -172,6 +194,7 @@ function LayerPanelHeaderFactory(LayerTitleSection, PanelHeaderAction) {
setOpen(!isOpen);
onToggleEnableConfig(e);
};
+
return (
<StyledLayerPanelHeader
className={classnames('layer-panel__header', {
@@ -235,7 +258,6 @@ function LayerPanelHeaderFactory(LayerTitleSection, PanelHeaderAction) {
);
};
- LayerPanelHeader.propTypes = propTypes;
LayerPanelHeader.defaultProps = defaultProps;
return LayerPanelHeader;
diff --git a/src/components/side-panel/layer-panel/layer-panel.js b/src/components/side-panel/layer-panel/layer-panel.tsx
similarity index 67%
rename from src/components/side-panel/layer-panel/layer-panel.js
rename to src/components/side-panel/layer-panel/layer-panel.tsx
index 56b684969..377e9de0a 100644
--- a/src/components/side-panel/layer-panel/layer-panel.js
+++ b/src/components/side-panel/layer-panel/layer-panel.tsx
@@ -18,12 +18,45 @@
// 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, MouseEventHandler, TouchEventHandler} from 'react';
import styled from 'styled-components';
-import PropTypes from 'prop-types';
import LayerConfiguratorFactory from './layer-configurator';
import LayerPanelHeaderFactory from './layer-panel-header';
+import {Datasets, NestedPartial} from 'reducers';
+import {Layer, LayerBaseConfig, LayerVisConfig} from 'layers';
+import {toggleModal} from 'actions/ui-state-actions';
+import * as VisStateActions from 'actions/vis-state-actions';
+import {ColorUI} from 'layers/layer-factory';
+import {ActionHandler} from 'actions';
+
+type LayerPanelProps = {
+ className?: string;
+ style?: string;
+ onMouseDown?: MouseEventHandler;
+ onTouchStart?: TouchEventHandler;
+ layer: Layer;
+ datasets: Datasets;
+ idx: number;
+ layerTypeOptions?: {
+ id: string;
+ label: string;
+ icon: any; //
+ requireData: any; //
+ }[];
+ isDraggable?: boolean;
+ openModal: ActionHandler<typeof toggleModal>;
+ layerColorUIChange: ActionHandler<typeof VisStateActions.layerColorUIChange>;
+ layerConfigChange: ActionHandler<typeof VisStateActions.layerConfigChange>;
+ layerVisualChannelConfigChange: ActionHandler<
+ typeof VisStateActions.layerVisualChannelConfigChange
+ >;
+ layerTypeChange: ActionHandler<typeof VisStateActions.layerTypeChange>;
+ layerVisConfigChange: ActionHandler<typeof VisStateActions.layerVisConfigChange>;
+ layerTextLabelChange: ActionHandler<typeof VisStateActions.layerTextLabelChange>;
+ removeLayer: ActionHandler<typeof VisStateActions.removeLayer>;
+ duplicateLayer: ActionHandler<typeof VisStateActions.duplicateLayer>;
+};
const PanelWrapper = styled.div`
font-size: 12px;
@@ -38,49 +71,33 @@ const PanelWrapper = styled.div`
LayerPanelFactory.deps = [LayerConfiguratorFactory, LayerPanelHeaderFactory];
-function LayerPanelFactory(LayerConfigurator, LayerPanelHeader) {
- class LayerPanel extends Component {
- static propTypes = {
- layer: PropTypes.object.isRequired,
- datasets: PropTypes.object.isRequired,
- idx: PropTypes.number.isRequired,
- layerConfigChange: PropTypes.func.isRequired,
- layerTypeChange: PropTypes.func.isRequired,
- openModal: PropTypes.func.isRequired,
- removeLayer: PropTypes.func.isRequired,
- duplicateLayer: PropTypes.func.isRequired,
- onCloseConfig: PropTypes.func,
- layerTypeOptions: PropTypes.arrayOf(PropTypes.any),
- layerVisConfigChange: PropTypes.func.isRequired,
- layerVisualChannelConfigChange: PropTypes.func.isRequired,
- layerColorUIChange: PropTypes.func.isRequired,
- setLayerAnimationTime: PropTypes.func,
- updateLayerAnimationSpeed: PropTypes.func,
- isDraggable: PropTypes.bool
- };
-
- updateLayerConfig = newProp => {
+function LayerPanelFactory(
+ LayerConfigurator: ReturnType<typeof LayerConfiguratorFactory>,
+ LayerPanelHeader: ReturnType<typeof LayerPanelHeaderFactory>
+): React.ComponentType<LayerPanelProps> {
+ class LayerPanel extends Component<LayerPanelProps> {
+ updateLayerConfig = (newProp: Partial<LayerBaseConfig>) => {
this.props.layerConfigChange(this.props.layer, newProp);
};
- updateLayerType = newType => {
+ updateLayerType = (newType: string) => {
this.props.layerTypeChange(this.props.layer, newType);
};
- updateLayerVisConfig = newVisConfig => {
+ updateLayerVisConfig = (newVisConfig: Partial<LayerVisConfig>) => {
this.props.layerVisConfigChange(this.props.layer, newVisConfig);
};
- updateLayerColorUI = (...args) => {
+ updateLayerColorUI = (...args: [string, NestedPartial<ColorUI>]) => {
this.props.layerColorUIChange(this.props.layer, ...args);
};
- updateLayerTextLabel = (...args) => {
+ updateLayerTextLabel = (...args: [number | 'all', string, any]) => {
this.props.layerTextLabelChange(this.props.layer, ...args);
};
- updateLayerVisualChannelConfig = (newConfig, channel, scaleKey) => {
- this.props.layerVisualChannelConfigChange(this.props.layer, newConfig, channel, scaleKey);
+ updateLayerVisualChannelConfig = (newConfig: Partial<LayerBaseConfig>, channel: string) => {
+ this.props.layerVisualChannelConfigChange(this.props.layer, newConfig, channel);
};
_updateLayerLabel = ({target: {value}}) => {
diff --git a/src/components/side-panel/layer-panel/layer-type-dropdown-list.js b/src/components/side-panel/layer-panel/layer-type-dropdown-list.tsx
similarity index 84%
rename from src/components/side-panel/layer-panel/layer-type-dropdown-list.js
rename to src/components/side-panel/layer-panel/layer-type-dropdown-list.tsx
index e61bf4d76..1dbb96b1a 100644
--- a/src/components/side-panel/layer-panel/layer-type-dropdown-list.js
+++ b/src/components/side-panel/layer-panel/layer-type-dropdown-list.tsx
@@ -18,11 +18,24 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-import React, {useCallback} from 'react';
+import React, {ComponentType, useCallback} from 'react';
import styled from 'styled-components';
import classNames from 'classnames';
import {classList} from '../../common/item-selector/dropdown-list';
+type ListItem = {
+ id: string;
+ disabled: boolean;
+};
+
+type LayerTypeDropdownListProps = {
+ options: ListItem[];
+ selectedItems: ListItem[];
+ selectionIndex: number | null;
+ onOptionSelected: (opt: string, e: Event) => void;
+ customListItemComponent: ComponentType<{value: ListItem; isTile: boolean}>;
+};
+
const DropdownListWrapper = styled.div`
${props => props.theme.dropdownList};
background-color: ${props => props.theme.dropdownListBgd};
@@ -62,7 +75,7 @@ const StyledDropdownListItem = styled.div`
`;
export function LayerTypeDropdownListFactory() {
- const LayerTypeDropdownList = ({
+ const LayerTypeDropdownList: React.FC<LayerTypeDropdownListProps> = ({
onOptionSelected,
options,
selectedItems,
@@ -89,8 +102,8 @@ export function LayerTypeDropdownListFactory() {
disabled: value.disabled
})}
key={`${value.id}_${i}`}
- onMouseDown={e => onSelectOption(e, value)}
- onClick={e => onSelectOption(e, value)}
+ onMouseDown={(e: MouseEvent) => onSelectOption(e, value)}
+ onClick={(e: MouseEvent) => onSelectOption(e, value)}
>
<Component value={value} isTile />
</StyledDropdownListItem>
diff --git a/src/components/side-panel/layer-panel/layer-type-list-item.js b/src/components/side-panel/layer-panel/layer-type-list-item.tsx
similarity index 89%
rename from src/components/side-panel/layer-panel/layer-type-list-item.js
rename to src/components/side-panel/layer-panel/layer-type-list-item.tsx
index aed786cf1..625069134 100644
--- a/src/components/side-panel/layer-panel/layer-type-list-item.js
+++ b/src/components/side-panel/layer-panel/layer-type-list-item.tsx
@@ -18,11 +18,20 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-import React from 'react';
+import React, {ComponentType} from 'react';
import styled from 'styled-components';
import {CLOUDFRONT} from 'constants/default-settings';
import classNames from 'classnames';
import {FormattedMessage} from 'localization';
+import {BaseProps} from 'components/common/icons/base';
+
+type LayerTypeListItemProps = {
+ value: {
+ icon: ComponentType<Partial<BaseProps>>;
+ label: string;
+ };
+ isTile: boolean;
+};
const ITEM_SIZE = {
large: 50,
@@ -59,7 +68,7 @@ const StyledListItem = styled.div`
`;
export function LayerTypeListItemFactory() {
- const LayerTypeListItem = ({value, isTile}) => (
+ const LayerTypeListItem: React.FC<LayerTypeListItemProps> = ({value, isTile}) => (
<StyledListItem
className={classNames('layer-type-selector__item__inner', {
list: !isTile
diff --git a/src/components/side-panel/layer-panel/layer-type-selector.js b/src/components/side-panel/layer-panel/layer-type-selector.tsx
similarity index 77%
rename from src/components/side-panel/layer-panel/layer-type-selector.js
rename to src/components/side-panel/layer-panel/layer-type-selector.tsx
index f786fdf35..218c675d9 100644
--- a/src/components/side-panel/layer-panel/layer-type-selector.js
+++ b/src/components/side-panel/layer-panel/layer-type-selector.tsx
@@ -19,7 +19,6 @@
// THE SOFTWARE.
import React, {useMemo} from 'react';
-import PropTypes from 'prop-types';
import styled, {withTheme} from 'styled-components';
import LayerTypeDropdownListFactory from './layer-type-dropdown-list';
@@ -27,10 +26,29 @@ import LayerTypeListItemFactory from './layer-type-list-item';
import ItemSelector from 'components/common/item-selector/item-selector';
import {SidePanelSection} from 'components/common/styled-components';
+import {Layer} from 'layers';
+import {Datasets} from 'reducers';
-const propTypes = {
- layer: PropTypes.object.isRequired,
- onSelect: PropTypes.func.isRequired
+type Option = {
+ id: string;
+ label: string;
+ icon: any; //
+ requireData: any; //
+};
+
+type LayerTypeSelectorProps = {
+ layer: Layer;
+ datasets: Datasets;
+ layerTypeOptions: Option[];
+ onSelect: (
+ items:
+ | readonly (string | number | boolean | object)[]
+ | string
+ | number
+ | boolean
+ | object
+ | null
+ ) => void;
};
const StyledLayerTypeSelector = styled.div`
@@ -41,11 +59,19 @@ const StyledLayerTypeSelector = styled.div`
LayerTypeSelectorFactory.deps = [LayerTypeListItemFactory, LayerTypeDropdownListFactory];
-const getDisplayOption = op => op.label;
-const getOptionValue = op => op.id;
+const getDisplayOption = (op: Option) => op.label;
+const getOptionValue = (op: Option) => op.id;
-function LayerTypeSelectorFactory(LayerTypeListItem, LayerTypeDropdownList) {
- const LayerTypeSelector = ({layer, layerTypeOptions, onSelect, datasets}) => {
+function LayerTypeSelectorFactory(
+ LayerTypeListItem: ReturnType<typeof LayerTypeListItemFactory>,
+ LayerTypeDropdownList: ReturnType<typeof LayerTypeDropdownListFactory>
+) {
+ const LayerTypeSelector: React.FC<LayerTypeSelectorProps> = ({
+ layer,
+ layerTypeOptions,
+ onSelect,
+ datasets
+ }) => {
const hasData = useMemo(() => Boolean(Object.keys(datasets).length), [datasets]);
const typeOptions = useMemo(
() =>
@@ -81,8 +107,6 @@ function LayerTypeSelectorFactory(LayerTypeListItem, LayerTypeDropdownList) {
);
};
- LayerTypeSelector.propTypes = propTypes;
-
return withTheme(LayerTypeSelector);
}
diff --git a/src/components/side-panel/layer-panel/panel-view-list-toggle.js b/src/components/side-panel/layer-panel/panel-view-list-toggle.tsx
similarity index 88%
rename from src/components/side-panel/layer-panel/panel-view-list-toggle.js
rename to src/components/side-panel/layer-panel/panel-view-list-toggle.tsx
index 508ec68dc..7f4608a7c 100644
--- a/src/components/side-panel/layer-panel/panel-view-list-toggle.js
+++ b/src/components/side-panel/layer-panel/panel-view-list-toggle.tsx
@@ -24,6 +24,12 @@ import OrderByList from 'components/common/icons/order-by-list';
import OrderByDataset from 'components/common/icons/order-by-dataset';
import {Tooltip} from 'components/common/styled-components';
import {FormattedMessage} from 'localization';
+import {LayerPanelListView} from 'reducers/ui-state-updaters';
+
+type PanelViewListToggleProps = {
+ layerPanelListViewMode: LayerPanelListView;
+ toggleLayerPanelListView: (view: string) => void;
+};
const PanelViewListToggleContainer = styled.div.attrs({
className: 'panel-view-list-toggle'
@@ -88,11 +94,11 @@ const TOGGLE_OPTIONS = [
PanelViewListToggleFactory.deps = [ToggleOptionFactory];
-function PanelViewListToggleFactory(ToggleOption) {
- const PanelViewListToggle = props => {
+function PanelViewListToggleFactory(ToggleOption: ReturnType<typeof ToggleOptionFactory>) {
+ const PanelViewListToggle: React.FC<PanelViewListToggleProps> = props => {
const {layerPanelListViewMode, toggleLayerPanelListView} = props;
- const toggleListView = listView => toggleLayerPanelListView(listView);
+ const toggleListView = (listView: string) => toggleLayerPanelListView(listView);
const options = useMemo(
() => TOGGLE_OPTIONS.map(opt => ({...opt, isActive: layerPanelListViewMode === opt.value})),
[layerPanelListViewMode]
diff --git a/src/components/side-panel/layer-panel/single-color-palette.js b/src/components/side-panel/layer-panel/single-color-palette.tsx
similarity index 89%
rename from src/components/side-panel/layer-panel/single-color-palette.js
rename to src/components/side-panel/layer-panel/single-color-palette.tsx
index 0eaa55859..2ec6d6c75 100644
--- a/src/components/side-panel/layer-panel/single-color-palette.js
+++ b/src/components/side-panel/layer-panel/single-color-palette.tsx
@@ -19,17 +19,18 @@
// THE SOFTWARE.
import React from 'react';
-import PropTypes from 'prop-types';
import {range} from 'd3-array';
import styled from 'styled-components';
import {hexToRgb} from 'utils/color-utils';
import {ColorsByTheme, Themes} from 'constants/color-palette';
+import {RGBColor} from 'reducers';
+import {ColorRange} from 'constants/color-ranges';
-const propTypes = {
- onSelectColor: PropTypes.func.isRequired,
+type SingleColorPaletteProps = {
+ onSelectColor: (color: RGBColor | ColorRange, e: MouseEvent) => void;
// hex value
- selectedColor: PropTypes.string.isRequired
+ selectedColor: string;
};
const PALETTE_HEIGHT = '8px';
@@ -60,7 +61,7 @@ const StyledColorBlock = styled.div`
border-style: solid;
`;
-const SingleColorPalette = ({selectedColor, onSelectColor}) => (
+const SingleColorPalette: React.FC<SingleColorPaletteProps> = ({selectedColor, onSelectColor}) => (
<StyledColorPalette className="single-color-palette">
{Themes.map((theme, col) => (
<StyledColorColumn key={theme} className="single-color-palette__column">
@@ -84,6 +85,4 @@ const SingleColorPalette = ({selectedColor, onSelectColor}) => (
</StyledColorPalette>
);
-SingleColorPalette.propTypes = propTypes;
-
export default SingleColorPalette;
diff --git a/src/components/side-panel/layer-panel/text-label-panel.js b/src/components/side-panel/layer-panel/text-label-panel.tsx
similarity index 85%
rename from src/components/side-panel/layer-panel/text-label-panel.js
rename to src/components/side-panel/layer-panel/text-label-panel.tsx
index 2c23280a5..d2f134afc 100644
--- a/src/components/side-panel/layer-panel/text-label-panel.js
+++ b/src/components/side-panel/layer-panel/text-label-panel.tsx
@@ -19,7 +19,6 @@
// THE SOFTWARE.
import React, {Component} from 'react';
-import PropTypes from 'prop-types';
import {FormattedMessage} from 'localization';
import {
@@ -38,27 +37,35 @@ import LayerConfigGroupFactory, {
} from './layer-config-group';
import RangeSliderFactory from 'components/common/range-slider';
-import {LAYER_TEXT_CONFIGS} from 'layers/layer-factory';
+import {LayerTextLabel, LAYER_TEXT_CONFIGS} from 'layers/layer-factory';
import FieldSelectorFactory from '../../common/field-selector';
+import {Field} from 'utils/table-utils/kepler-table';
+import {RGBColor} from 'reducers';
+
+type TextLabelPanelProps = {
+ fields: Field[];
+ textLabel: LayerTextLabel[];
+ updateLayerTextLabel: (idx: number | 'all', prop: string, value: any) => void;
+};
TextLabelPanelFactory.deps = [RangeSliderFactory, LayerConfigGroupFactory, FieldSelectorFactory];
-function TextLabelPanelFactory(RangeSlider, LayerConfigGroup, FieldSelector) {
- class TextLabelPanel extends Component {
- static propTypes = {
- fields: PropTypes.arrayOf(PropTypes.object),
- textLabel: PropTypes.arrayOf(PropTypes.object),
- updateLayerTextLabel: PropTypes.func.isRequired
- };
+function TextLabelPanelFactory(
+ RangeSlider: ReturnType<typeof RangeSliderFactory>,
+ LayerConfigGroup: ReturnType<typeof LayerConfigGroupFactory>,
+ FieldSelector: ReturnType<typeof FieldSelectorFactory>
+): React.ComponentType<TextLabelPanelProps> {
+ class TextLabelPanel extends Component<TextLabelPanelProps> {
render() {
const {updateLayerTextLabel, textLabel, fields} = this.props;
- const currentFields = textLabel.map(tl => tl.field && tl.field.name).filter(d => d);
+ const currentFields = textLabel.map(tl => tl.field && tl.field.name).filter(d => !!d);
+
return (
<LayerConfigGroup label={'panel.text.label'} collapsible>
<ConfigGroupCollapsibleHeader>
<FieldSelector
fields={fields}
- value={currentFields}
+ value={currentFields as string[]}
onSelect={selected => updateLayerTextLabel('all', 'fields', selected)}
multiSelect
/>
@@ -85,7 +92,7 @@ function TextLabelPanelFactory(RangeSlider, LayerConfigGroup, FieldSelector) {
<RangeSlider
{...LAYER_TEXT_CONFIGS.fontSize}
value1={tl.size}
- isRange={false}
+ isRanged={false}
onChange={v => updateLayerTextLabel(idx, 'size', v[1])}
/>
</SidePanelSection>
@@ -97,7 +104,7 @@ function TextLabelPanelFactory(RangeSlider, LayerConfigGroup, FieldSelector) {
colorSets={[
{
selectedColor: tl.color,
- setColor: v => updateLayerTextLabel(idx, 'color', v)
+ setColor: (v: RGBColor) => updateLayerTextLabel(idx, 'color', v)
}
]}
/>
@@ -129,7 +136,7 @@ function TextLabelPanelFactory(RangeSlider, LayerConfigGroup, FieldSelector) {
</div>
))}
<SidePanelSection>
- <Button link onClick={val => updateLayerTextLabel(textLabel.length)}>
+ <Button link onClick={() => updateLayerTextLabel(textLabel.length, '', null)}>
<Add height="12px" />
<FormattedMessage id="panel.text.addMoreLabel" />
</Button>
diff --git a/src/components/side-panel/layer-panel/vis-config-by-field-selector.js b/src/components/side-panel/layer-panel/vis-config-by-field-selector.tsx
similarity index 72%
rename from src/components/side-panel/layer-panel/vis-config-by-field-selector.js
rename to src/components/side-panel/layer-panel/vis-config-by-field-selector.tsx
index ebac0601c..af468e5cc 100644
--- a/src/components/side-panel/layer-panel/vis-config-by-field-selector.js
+++ b/src/components/side-panel/layer-panel/vis-config-by-field-selector.tsx
@@ -19,36 +19,51 @@
// THE SOFTWARE.
import React, {Component} from 'react';
-import PropTypes from 'prop-types';
-import {FormattedMessage, injectIntl} from 'react-intl';
+import {FormattedMessage, injectIntl, WrappedComponentProps} from 'react-intl';
import {PanelLabel, PanelLabelWrapper, SidePanelSection} from 'components/common/styled-components';
-import InfoHelperFacotry from 'components/common/info-helper';
+import InfoHelperFactory from 'components/common/info-helper';
import DimensionScaleSelector from './dimension-scale-selector';
import {camelize} from 'utils/utils';
import FieldSelectorFactory from '../../common/field-selector';
+import {Field} from 'utils/table-utils/kepler-table';
-VisConfigByFieldSelectorFactory.deps = [InfoHelperFacotry, FieldSelectorFactory];
-function VisConfigByFieldSelectorFactory(InfoHelper, FieldSelector) {
- class VisConfigByFieldSelector extends Component {
- static propTypes = {
- channel: PropTypes.string.isRequired,
- fields: PropTypes.arrayOf(PropTypes.any).isRequired,
- id: PropTypes.string.isRequired,
- property: PropTypes.string.isRequired,
- showScale: PropTypes.bool.isRequired,
- updateField: PropTypes.func.isRequired,
- updateScale: PropTypes.func.isRequired,
+type VisConfigByFieldSelectorProps = {
+ channel: string;
+ fields: Field[];
+ id: string;
+ property: string;
+ showScale: boolean;
+ updateField: (
+ val: readonly (string | number | boolean | object)[] | string | number | boolean | object | null
+ ) => void;
+ updateScale: (
+ val: readonly (string | number | boolean | object)[] | string | number | boolean | object | null
+ ) => void;
+ scaleType?: string;
+ selectedField?: Field;
+ description?: string;
+ label?: string;
+ placeholder?: string;
+ scaleOptions: string[];
+} & WrappedComponentProps;
- // optional
- scaleType: PropTypes.string,
- selectedField: PropTypes.object,
- description: PropTypes.string,
- label: PropTypes.string,
- placeholder: PropTypes.string
- };
+VisConfigByFieldSelectorFactory.deps = [InfoHelperFactory, FieldSelectorFactory];
- _updateVisByField = val => {
+function VisConfigByFieldSelectorFactory(
+ InfoHelper: ReturnType<typeof InfoHelperFactory>,
+ FieldSelector: ReturnType<typeof FieldSelectorFactory>
+) {
+ class VisConfigByFieldSelector extends Component<VisConfigByFieldSelectorProps> {
+ _updateVisByField = (
+ val:
+ | readonly (string | number | boolean | object)[]
+ | string
+ | number
+ | boolean
+ | object
+ | null
+ ) => {
this.props.updateField(val);
};
diff --git a/src/components/side-panel/layer-panel/vis-config-slider.js b/src/components/side-panel/layer-panel/vis-config-slider.tsx
similarity index 85%
rename from src/components/side-panel/layer-panel/vis-config-slider.js
rename to src/components/side-panel/layer-panel/vis-config-slider.tsx
index df76386ad..006c9962b 100644
--- a/src/components/side-panel/layer-panel/vis-config-slider.js
+++ b/src/components/side-panel/layer-panel/vis-config-slider.tsx
@@ -19,7 +19,6 @@
// THE SOFTWARE.
import React, {useState, useCallback, useEffect, useRef} from 'react';
-import PropTypes from 'prop-types';
import styled from 'styled-components';
import {PanelLabel, SidePanelSection} from 'components/common/styled-components';
@@ -29,6 +28,32 @@ import KeyEvent from 'constants/keyevent';
import {Checkbox} from 'components';
import {clamp} from 'utils/data-utils';
import {isInRange} from 'utils/filter-utils';
+import {Layer, LayerBaseConfig} from 'layers';
+
+type LazyInputProps = {
+ value: string | [string, string];
+ name: string;
+ onChange: (n: string | [string, string], v?: string | [string, string]) => void;
+};
+
+type CustomInputProps = {
+ value: string | [string, string];
+ isRanged: boolean;
+ onChangeCustomInput: (v: [string, string]) => void;
+};
+
+type VisConfigSliderProps = {
+ layer: Layer;
+ property: string;
+ onChange: (v: Record<string, number | string | number[] | string[]>) => void;
+ label?: string | ((c: LayerBaseConfig) => string);
+ range: [number, number];
+ step?: number;
+ isRanged: boolean;
+ disabled?: boolean;
+ inputTheme?: string;
+ allowCustomValue?: boolean;
+};
const InputWrapper = styled.div`
display: flex;
@@ -63,7 +88,7 @@ const RangeInput = styled.input`
margin-top: 5px;
`;
-const LazyInput = ({value, onChange, name}) => {
+const LazyInput: React.FC<LazyInputProps> = ({value, onChange, name}) => {
const [stateValue, setValue] = useState(value);
const inputRef = useRef(null);
useEffect(() => {
@@ -104,7 +129,7 @@ const LazyInput = ({value, onChange, name}) => {
);
};
-const CustomInput = ({isRanged, value, onChangeCustomInput}) => {
+const CustomInput: React.FC<CustomInputProps> = ({isRanged, value, onChangeCustomInput}) => {
const onChangeInput = useCallback(
(name, v) => {
if (isRanged) onChangeCustomInput(name === 'value0' ? [v, value[1]] : [value[0], v]);
@@ -135,22 +160,10 @@ const CustomInput = ({isRanged, value, onChangeCustomInput}) => {
);
};
-const propTypes = {
- layer: PropTypes.object.isRequired,
- property: PropTypes.string.isRequired,
- onChange: PropTypes.func.isRequired,
- label: PropTypes.oneOfType([PropTypes.string, PropTypes.bool, PropTypes.func]),
- range: PropTypes.arrayOf(PropTypes.number).isRequired,
- step: PropTypes.number,
- isRanged: PropTypes.bool,
- disabled: PropTypes.bool,
- inputTheme: PropTypes.bool
-};
-
VisConfigSliderFactory.deps = [RangeSliderFactory];
-export default function VisConfigSliderFactory(RangeSlider) {
- const VisConfigSlider = ({
+export default function VisConfigSliderFactory(RangeSlider: ReturnType<typeof RangeSliderFactory>) {
+ const VisConfigSlider: React.FC<VisConfigSliderProps> = ({
layer: {config},
property,
label,
@@ -220,7 +233,5 @@ export default function VisConfigSliderFactory(RangeSlider) {
);
};
- VisConfigSlider.propTypes = propTypes;
-
return VisConfigSlider;
}
diff --git a/src/components/side-panel/layer-panel/vis-config-switch.js b/src/components/side-panel/layer-panel/vis-config-switch.tsx
similarity index 82%
rename from src/components/side-panel/layer-panel/vis-config-switch.js
rename to src/components/side-panel/layer-panel/vis-config-switch.tsx
index c3fccb2ff..0214d9128 100644
--- a/src/components/side-panel/layer-panel/vis-config-switch.js
+++ b/src/components/side-panel/layer-panel/vis-config-switch.tsx
@@ -19,21 +19,21 @@
// THE SOFTWARE.
import React from 'react';
-import PropTypes from 'prop-types';
import styled from 'styled-components';
-import InfoHelperFacotry from 'components/common/info-helper';
+import InfoHelperFactory from 'components/common/info-helper';
import Switch from 'components/common/switch';
import {SidePanelSection, PanelLabel} from 'components/common/styled-components';
import {capitalizeFirstLetter} from 'utils/utils';
import {FormattedMessage} from 'localization';
+import {Layer} from 'layers';
-const propTypes = {
- layer: PropTypes.object.isRequired,
- property: PropTypes.string.isRequired,
- onChange: PropTypes.func.isRequired,
- label: PropTypes.oneOfType([PropTypes.string, PropTypes.bool, PropTypes.func]),
- description: PropTypes.string,
- disabled: PropTypes.bool
+type VisConfigSwitchProps = {
+ layer: Layer;
+ property: string;
+ onChange: (v: Record<string, boolean>) => void;
+ label?: string;
+ description?: string;
+ disabled?: boolean;
};
const StyledVisConfigSwitch = styled.div`
@@ -45,9 +45,9 @@ const StyledVisConfigSwitch = styled.div`
}
`;
-VisConfigSwitchFactory.deps = [InfoHelperFacotry];
-function VisConfigSwitchFactory(InfoHelper) {
- const VisConfigSwitch = ({
+VisConfigSwitchFactory.deps = [InfoHelperFactory];
+function VisConfigSwitchFactory(InfoHelper: ReturnType<typeof InfoHelperFactory>) {
+ const VisConfigSwitch: React.FC<VisConfigSwitchProps> = ({
layer: {id, config},
property,
onChange,
@@ -80,7 +80,6 @@ function VisConfigSwitchFactory(InfoHelper) {
</SidePanelSection>
);
- VisConfigSwitch.propTypes = propTypes;
return VisConfigSwitch;
}
export default VisConfigSwitchFactory;
diff --git a/src/constants/color-ranges.ts b/src/constants/color-ranges.ts
index eaa5f0252..7e9f11928 100644
--- a/src/constants/color-ranges.ts
+++ b/src/constants/color-ranges.ts
@@ -27,9 +27,9 @@ export type ColorMap = [string | number | null, HexColor][];
export type ColorLegends = {[key: string]: string};
export type ColorRange = {
- name: string;
- type: string;
- category: string;
+ name?: string;
+ type?: string;
+ category?: string;
colors: HexColor[];
reversed?: boolean;
colorMap?: ColorMap;
diff --git a/src/layers/aggregation-layer.ts b/src/layers/aggregation-layer.ts
index 630fa7aec..8c446c916 100644
--- a/src/layers/aggregation-layer.ts
+++ b/src/layers/aggregation-layer.ts
@@ -164,6 +164,7 @@ export default class AggregationLayer extends Layer {
const {range, field, defaultMeasure, aggregation} = channel;
const fieldConfig = this.config[field];
const label = this.visConfigSettings[range].label;
+
return {
label: typeof label === 'function' ? label(this.config) : label,
measure:
@@ -316,7 +317,7 @@ export default class AggregationLayer extends Layer {
};
}
- getDefaultDeckLayerProps(opts) {
+ getDefaultDeckLayerProps(opts): any {
const baseProp = super.getDefaultDeckLayerProps(opts);
return {
...baseProp,
diff --git a/src/layers/base-layer.ts b/src/layers/base-layer.ts
index 03778c4dd..f71e3d396 100644
--- a/src/layers/base-layer.ts
+++ b/src/layers/base-layer.ts
@@ -57,7 +57,7 @@ import {getSampleData} from 'utils/table-utils/data-container-utils';
import {hexToRgb, getColorGroupByName, reverseColorRange} from 'utils/color-utils';
-import {RGBColor, RGBAColor, MapState, Filter, Datasets, ValueOf} from 'reducers';
+import {RGBColor, RGBAColor, MapState, Filter, Datasets, ValueOf, NestedPartial} from 'reducers';
import {LayerTextLabel, ColorUI} from './layer-factory';
import {KeplerTable} from '../utils';
import {DataContainerInterface} from 'utils/table-utils/data-container-interface';
@@ -710,7 +710,7 @@ class Layer {
return this;
}
- updateLayerColorUI(prop: string, newConfig: Partial<ColorUI>): Layer {
+ updateLayerColorUI(prop: string, newConfig: NestedPartial<ColorUI>): Layer {
const {colorUI: previous, visConfig} = this.config;
if (!isPlainObject(newConfig) || typeof prop !== 'string') {
diff --git a/src/layers/layer-factory.ts b/src/layers/layer-factory.ts
index 5af3eb522..869ee97a0 100644
--- a/src/layers/layer-factory.ts
+++ b/src/layers/layer-factory.ts
@@ -48,9 +48,9 @@ export type ColorUI = {
// customPalette in edit
customPalette: ColorRange;
// show color sketcher modal
- showSketcher: boolean;
+ showSketcher: boolean | number;
// show color range selection panel
- showDropdown: boolean;
+ showDropdown: boolean | number;
// color range selector config
colorRangeConfig: {
type: string;
diff --git a/src/reducers/types.ts b/src/reducers/types.ts
index b0aca9094..e74059cc2 100644
--- a/src/reducers/types.ts
+++ b/src/reducers/types.ts
@@ -12,3 +12,7 @@ export type Merge<A, B> = {[K in keyof A]: K extends keyof B ? B[K] : A[K]} & B
export type Entries<T> = {
[K in keyof T]: [K, T[K]];
}[keyof T][];
+
+export type NestedPartial<T> = {
+ [P in keyof T]?: NestedPartial<T[P]>;
+};