Skip to content

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

[chore] ts fixes (#2827)

Igor Dykhtaefdf2ea8d242
diff --git a/src/components/src/common/range-slider-timeline.tsx b/src/components/src/common/range-slider-timeline.tsx
index f8dad7505..8e5d1b4ab 100644
--- a/src/components/src/common/range-slider-timeline.tsx
+++ b/src/components/src/common/range-slider-timeline.tsx
@@ -22,13 +22,13 @@ const TIMELINE_MARKER_STYLE: CSSProperties = {
color: '#3D4866'
};
-const containerStyle = {
+const containerStyle: CSSProperties = {
display: 'flex',
width: '100%',
height: '24px'
};
-const iconWrapperStyle = {
+const iconWrapperStyle: CSSProperties = {
marginRight: '8px',
cursor: 'pointer'
};
diff --git a/src/components/src/index.ts b/src/components/src/index.ts
index 34523203f..30e18aa4a 100644
--- a/src/components/src/index.ts
+++ b/src/components/src/index.ts
@@ -224,6 +224,7 @@ export {default as MultiSelectFilterFactory} from './filters/multi-select-filter
export {default as RangeFilterFactory} from './filters/range-filter';
export {default as SingleSelectFilterFactory} from './filters/single-select-filter';
export {default as TimeRangeFilterPanelFactory} from './filters/filter-panels/time-range-filter-panel';
+export {default as FilterSyncedDatasetPanelFactory} from './filters/filter-panels/filter-synced-dataset-panel';
export {
default as TimeRangeFilterFactory,
timeRangeSliderFieldsSelector
diff --git a/src/components/src/map/map-control.tsx b/src/components/src/map/map-control.tsx
index 21a3522f9..494c97163 100644
--- a/src/components/src/map/map-control.tsx
+++ b/src/components/src/map/map-control.tsx
@@ -40,7 +40,6 @@ const StyledMapControl = styled.div<StyledMapControlProps>`
const LegendLogo = <KeplerGlLogo version={false} appName="kepler.gl" />;
export type MapControlProps = {
- availableLocales: ReadonlyArray<string>;
datasets: Datasets;
dragRotate: boolean;
isSplit: boolean;
@@ -65,6 +64,7 @@ export type MapControlProps = {
onLayerVisConfigChange: (oldLayer: Layer, newVisConfig: Partial<LayerVisConfig>) => void;
top: number;
onSetLocale: typeof UIStateActions.setLocale;
+ availableLocales: string[];
locale: string;
logoComponent?: React.FC | React.ReactNode;
isExport?: boolean;
diff --git a/src/reducers/src/layer-utils.ts b/src/reducers/src/layer-utils.ts
index 3ee5397d7..443d74c38 100644
--- a/src/reducers/src/layer-utils.ts
+++ b/src/reducers/src/layer-utils.ts
@@ -342,7 +342,10 @@ export type ComputeDeckLayersProps = {
};
};
-export function bindLayerCallbacks(layerCallbacks: LayerCallbacks = {}, idx: number) {
+export function bindLayerCallbacks(
+ layerCallbacks: LayerCallbacks = {},
+ idx: number
+): Record<string, (idx: number, val: any) => void> {
return Object.keys(layerCallbacks).reduce(
(accu, key) => ({
...accu,
diff --git a/src/reducers/src/vis-state-updaters.ts b/src/reducers/src/vis-state-updaters.ts
index c8648e128..0dbdc09f7 100644
--- a/src/reducers/src/vis-state-updaters.ts
+++ b/src/reducers/src/vis-state-updaters.ts
@@ -3399,9 +3399,9 @@ export function setTimeFilterTimelineModeUpdater<S extends VisState>(
return adjustAnimationConfigWithFilter(newState, filterIdx);
}
-function adjustAnimationConfigWithFilter(state, filterIdx) {
+function adjustAnimationConfigWithFilter<S extends VisState>(state: S, filterIdx: number): S {
const filter = state.filters[filterIdx];
- if (filter.syncedWithLayerTimeline) {
+ if ((filter as TimeRangeFilter).syncedWithLayerTimeline) {
const timelineValue = getTimelineValueFromFilter(filter);
const value = state.animationConfig.timeSteps
? snapToMarks(timelineValue, state.animationConfig.timeSteps)
diff --git a/src/table/src/index.ts b/src/table/src/index.ts
index c147f730d..464188128 100644
--- a/src/table/src/index.ts
+++ b/src/table/src/index.ts
@@ -12,6 +12,6 @@ export {
maybeToDate
} from './kepler-table';
/* eslint-disable prettier/prettier */
-export type {GpuFilter, Datasets} from './kepler-table';
+export type {FilterProps, GpuFilter, Datasets, BooleanFieldFilterProps} from './kepler-table';
export * from './gpu-filter-utils';
export * from './dataset-utils';
diff --git a/src/utils/src/data-scale-utils.ts b/src/utils/src/data-scale-utils.ts
index 8ff5aef7f..35cb2420c 100644
--- a/src/utils/src/data-scale-utils.ts
+++ b/src/utils/src/data-scale-utils.ts
@@ -1,12 +1,14 @@
// SPDX-License-Identifier: MIT
// Copyright contributors to the kepler.gl project
+import {bisectLeft, quantileSorted as d3Quantile, extent} from 'd3-array';
+import moment from 'moment';
+
import {notNullorUndefined} from '@kepler.gl/common-utils';
import {ALL_FIELD_TYPES, ColorMap, ColorRange, SCALE_FUNC, SCALE_TYPES} from '@kepler.gl/constants';
import {Layer, VisualChannel, VisualChannelDomain} from '@kepler.gl/layers';
import {HexColor, MapState} from '@kepler.gl/types';
-import {bisectLeft, quantileSorted as d3Quantile, extent} from 'd3-array';
-import moment from 'moment';
+
import {isRgbColor, rgbToHex} from './color-utils';
import {DataContainerInterface} from './data-container-interface';
import {formatNumber, reverseFormatNumber, unique} from './data-utils';
diff --git a/src/utils/src/plot.ts b/src/utils/src/plot.ts
index 614820d73..59db003e6 100644
--- a/src/utils/src/plot.ts
+++ b/src/utils/src/plot.ts
@@ -28,7 +28,6 @@ import {
PLOT_TYPES,
AggregationTypes
} from '@kepler.gl/constants';
-import {VisState} from '@kepler.gl/schemas';
import {roundValToStep} from './data-utils';
import {aggregate, AGGREGATION_NAME} from './aggregation';
@@ -349,9 +348,9 @@ function getDelta(
};
}
-export function getPctChange(y, y0) {
+export function getPctChange(y: unknown, y0: unknown): number | null {
if (Number.isFinite(y) && Number.isFinite(y0) && y0 !== 0) {
- return (y - y0) / y0;
+ return ((y as number) - (y0 as number)) / (y0 as number);
}
return null;
}
@@ -446,7 +445,14 @@ export function splitSeries(series) {
return {lines, markers};
}
-export function adjustValueToAnimationWindow(state: VisState, filter: TimeRangeFilter) {
+type MinVisStateForAnimationWindow = {
+ datasets: Datasets;
+};
+
+export function adjustValueToAnimationWindow<S extends MinVisStateForAnimationWindow>(
+ state: S,
+ filter: TimeRangeFilter
+) {
const {
plotType,
value: [value0, value1],
diff --git a/src/utils/src/utils.ts b/src/utils/src/utils.ts
index d8c99513c..d4a9288f6 100644
--- a/src/utils/src/utils.ts
+++ b/src/utils/src/utils.ts
@@ -184,7 +184,7 @@ const arrayMoveMutate = (array, from, to) => {
* @param {number} to
* @returns {any[]}
*/
-export const arrayMove = (array, from, to) => {
+export const arrayMove = <T>(array: T[], from: number, to: number): T[] => {
array = array.slice();
arrayMoveMutate(array, from, to);
return array;
@@ -218,7 +218,7 @@ export function filterObjectByPredicate(obj, predicate) {
);
}
-export function isFunction(func): boolean {
+export function isFunction(func: unknown): boolean {
return typeof func === 'function';
}