Kepler.gl is a powerful open source geospatial analysis tool for large-scale data sets.
[Feat] Add list toggle to filters (#2115)
Igor Dykhtafb829922c3d5
diff --git a/examples/demo-app/src/app.js b/examples/demo-app/src/app.jsindex aa4573dc5..d9df43b1e 100644--- a/examples/demo-app/src/app.js+++ b/examples/demo-app/src/app.js@@ -179,14 +179,14 @@ class App extends Component {}_loadSampleData() {- // this._loadPointData();- // this._loadGeojsonData();- this._loadTripGeoJson();+ this._loadPointData();+ this._loadGeojsonData();+ // this._loadTripGeoJson();// this._loadIconData();// this._loadH3HexagonData();// this._loadS2Data();// this._loadScenegraphLayer();- this._loadGpsData();+ // this._loadGpsData();}_loadPointData() {@@ -200,8 +200,8 @@ class App extends Component {data: sampleTripData},options: {- centerMap: true,- readOnly: false+ // centerMap: true,+ keepExistingConfig: true},config: sampleTripDataConfig})diff --git a/src/actions/src/action-types.ts b/src/actions/src/action-types.tsindex 4bb8b9767..7751ca97b 100644--- a/src/actions/src/action-types.ts+++ b/src/actions/src/action-types.ts@@ -145,7 +145,7 @@ const ActionTypes = {ADD_NOTIFICATION: `${ACTION_PREFIX}ADD_NOTIFICATION`,REMOVE_NOTIFICATION: `${ACTION_PREFIX}REMOVE_NOTIFICATION`,SET_LOCALE: `${ACTION_PREFIX}SET_LOCALE`,- TOGGLE_LAYER_PANEL_LIST_VIEW: `${ACTION_PREFIX}TOGGLE_LAYER_PANEL_LIST_VIEW`,+ TOGGLE_PANEL_LIST_VIEW: `${ACTION_PREFIX}TOGGLE_PANEL_LIST_VIEW`,// uiState > export imageSET_EXPORT_IMAGE_SETTING: `${ACTION_PREFIX}SET_EXPORT_IMAGE_SETTING`,diff --git a/src/actions/src/ui-state-actions.ts b/src/actions/src/ui-state-actions.tsindex 9a0579689..dde6421b3 100644--- a/src/actions/src/ui-state-actions.ts+++ b/src/actions/src/ui-state-actions.ts@@ -453,24 +453,30 @@ export const setLocale: (}));-/** TOGGLE_LAYER_PANEL_LIST_VIEW */-export type ToggleLayerPanelListViewAction = {- payload: string;+/** TOGGLE_PANEL_LIST_VIEW */+export type TogglePanelListViewAction = {+ payload: {+ panelId: string;+ listView: string;+ };};+/*** Toggle layer panel list view* @memberof uiStateActions- * @param listView layer panel listView value. Can be 'list' or 'sortByDataset'+ * @param payload+ * @param payload.panelId panel id.+ * @param payload.listView layer panel listView value. Can be 'list' or 'sortByDataset'* @public*/-export const toggleLayerPanelListView: (- listView: ToggleLayerPanelListViewAction['payload']+export const togglePanelListView: (+ payload: TogglePanelListViewAction['payload']) => Merge<- ToggleLayerPanelListViewAction,- {type: typeof ActionTypes.TOGGLE_LAYER_PANEL_LIST_VIEW}+ TogglePanelListViewAction,+ {type: typeof ActionTypes.TOGGLE_PANEL_LIST_VIEW}> = createAction(- ActionTypes.TOGGLE_LAYER_PANEL_LIST_VIEW,- (listView: ToggleLayerPanelListViewAction['payload']) => ({payload: listView})+ ActionTypes.TOGGLE_PANEL_LIST_VIEW,+ (payload: TogglePanelListViewAction['payload']) => ({payload}));/**diff --git a/src/components/src/index.ts b/src/components/src/index.tsindex 0d80fe4d5..49442dafd 100644--- a/src/components/src/index.ts+++ b/src/components/src/index.ts@@ -87,7 +87,7 @@ export {} from './side-panel/layer-panel/dataset-section';export {default as DatasetLayerSectionFactory} from './side-panel/layer-panel/dataset-layer-section';export {default as DatasetLayerGroupFactory} from './side-panel/layer-panel/dataset-layer-group';-export {default as PanelViewListToggleFactory} from './side-panel/layer-panel/panel-view-list-toggle';+export {default as PanelViewListToggleFactory} from './side-panel/panel-view-list-toggle';export {default as AddLayerButtonFactory} from './side-panel/layer-panel/add-layer-button';export {default as LayerListFactory} from './side-panel/layer-panel/layer-list';export {default as CustomPicker} from './side-panel/layer-panel/custom-picker';@@ -101,6 +101,7 @@ export {default as DatasetTagFactory} from './side-panel/common/dataset-tag';export {default as FilterManagerFactory} from './side-panel/filter-manager';export {default as FilterPanelFactory} from './side-panel/filter-panel/filter-panel';+export {default as AddFilterButtonFactory} from './side-panel/filter-panel/add-filter-button';export {default as InteractionManagerFactory} from './side-panel/interaction-manager';export {default as BrushConfigFactory} from './side-panel/interaction-panel/brush-config';@@ -249,6 +250,17 @@ export type {StyledExportSectionProps} from './common';+export type {CollapseButtonProps} from './side-panel/side-bar';+export type {PanelTabProps} from './side-panel/panel-tab';+export type {MapStyleSelectorProps} from './side-panel/map-style-panel/map-style-selector';+export type {LayerGroupSelectorProps} from './side-panel/map-style-panel/map-layer-selector';+export type {MapManagerProps} from './side-panel/map-manager';+export type {SourceDataSelectorProps} from './side-panel/common/types';+export type {DatasetTitleProps} from './side-panel/common/dataset-title';+export type {SourceDataCatalogProps} from './side-panel/common/source-data-catalog';+export type {DatasetInfoProps} from './side-panel/common/dataset-info';+export type {DatasetTagProps} from './side-panel/common/dataset-tag';+export type {CustomPanelsProps} from './side-panel/custom-panel';export type {LayerTypeListItemType} from './side-panel/layer-panel/layer-type-list-item';export {diff --git a/src/components/src/side-panel.tsx b/src/components/src/side-panel.tsxindex 3008461f5..cbeef7701 100644--- a/src/components/src/side-panel.tsx+++ b/src/components/src/side-panel.tsx@@ -19,7 +19,6 @@// THE SOFTWARE.import React, {useCallback, useMemo} from 'react';-import {FormattedMessage} from '@kepler.gl/localization';import {EXPORT_DATA_ID,@@ -43,7 +42,6 @@ import FilterManagerFactory from './side-panel/filter-manager';import InteractionManagerFactory from './side-panel/interaction-manager';import MapManagerFactory from './side-panel/map-manager';import CustomPanelsFactory from './side-panel/custom-panel';-import PanelTitleFactory from './side-panel/panel-title';import styled from 'styled-components';import get from 'lodash.get';@@ -67,7 +65,6 @@ SidePanelFactory.deps = [SidebarFactory,PanelHeaderFactory,PanelToggleFactory,- PanelTitleFactory,LayerManagerFactory,FilterManagerFactory,InteractionManagerFactory,@@ -82,7 +79,6 @@ export default function SidePanelFactory(Sidebar: ReturnType<typeof SidebarFactory>,PanelHeader: ReturnType<typeof PanelHeaderFactory>,PanelToggle: ReturnType<typeof PanelToggleFactory>,- PanelTitle: ReturnType<typeof PanelTitleFactory>,LayerManager: ReturnType<typeof LayerManagerFactory>,FilterManager: ReturnType<typeof FilterManagerFactory>,InteractionManager: ReturnType<typeof InteractionManagerFactory>,@@ -223,11 +219,6 @@ export default function SidePanelFactory(/><StyledSidePanelContent className="side-panel__content"><div className="side-panel__content__inner">- {currentPanel?.id !== 'layer' ? (- <PanelTitle className="side-panel__content__title">- <FormattedMessage id={currentPanel?.label} />- </PanelTitle>- ) : null}{PanelComponent ? (<PanelComponentdatasets={datasets}@@ -249,10 +240,20 @@ export default function SidePanelFactory(uiStateActions={uiStateActions}visStateActions={visStateActions}panelMetadata={currentPanel}- layerPanelListView={currentPanel?.id === 'layer' && uiState.layerPanelListView}+ panelListView={+ currentPanel?.id === 'layer'+ ? uiState.layerPanelListView+ : currentPanel?.id === 'filter'+ ? uiState.filterPanelListView+ : null+ }/>) : null}- <CustomPanels {...customPanelProps} activeSidePanel={activeSidePanel} />+ <CustomPanels+ {...customPanelProps}+ activeSidePanel={activeSidePanel}+ updateTableColor={onUpdateTableColor}+ /></div></StyledSidePanelContent></Sidebar>diff --git a/src/components/src/side-panel/add-by-dataset-button.tsx b/src/components/src/side-panel/add-by-dataset-button.tsxnew file mode 100644index 000000000..9bc09b1c4--- /dev/null+++ b/src/components/src/side-panel/add-by-dataset-button.tsx@@ -0,0 +1,200 @@+// Copyright (c) 2023 Uber Technologies, Inc.+//+// Permission is hereby granted, free of charge, to any person obtaining a copy+// of this software and associated documentation files (the "Software"), to deal+// in the Software without restriction, including without limitation the rights+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell+// copies of the Software, and to permit persons to whom the Software is+// furnished to do so, subject to the following conditions:+//+// The above copyright notice and this permission notice shall be included in+// all copies or substantial portions of the Software.+//+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN+// THE SOFTWARE.++import React, {useCallback, useMemo, useState} from 'react';+import styled from 'styled-components';+import {FormattedMessage} from '@kepler.gl/localization';+import {Datasets} from '@kepler.gl/table';++import Tippy from '@tippyjs/react';+import {Add} from '../common/icons';+import {Button} from '../common/styled-components';+import {DatasetSquare} from '../..';+import Typeahead from '../common/item-selector/typeahead';+import Accessor from '../common/item-selector/accessor';+import {useIntl} from 'react-intl';++const DropdownContainer = styled.div.attrs({+ className: 'add-layer-menu-dropdown'+})`+ .list-selector {+ border-top: 1px solid ${props => props.theme.secondaryInputBorderColor};+ width: 100%;+ /* disable scrolling, currently set to 280px internally */+ max-height: unset;+ }+ .list__item > div {+ display: flex;+ flex-direction: row;+ justify-content: flex-start;+ line-height: 18px;+ padding: 0;+ svg {+ margin-right: 10px;+ }+ }+`;++const DropdownMenu = styled.div.attrs({+ className: 'dropdown-menu'+})`+ display: flex;+ flex-direction: column;+ min-width: 240px;+ max-width: 240px;+ position: absolute;+ top: 100%;+ left: -53px;+ z-index: 5;+`;++const ListItemWrapper = styled.div.attrs({+ className: 'dropdown-menu-list-item-wrapper'+})`+ display: flex;+ color: ${props => props.theme.textColor};+ font-size: 11px;+ letter-spacing: 0.2px;+ overflow: auto;+ .dataset-color {+ flex-shrink: 0;+ margin-top: 3px;+ }+ .dataset-name {+ white-space: nowrap;+ overflow: hidden;+ text-overflow: ellipsis;+ }+`;++const TYPEAHEAD_CLASS = 'typeahead';+const TYPEAHEAD_INPUT_CLASS = 'typeahead__input';++export type AddByDatasetButtonProps = {+ datasets: Datasets;+ onAdd: (dataId: string) => void;+ width: string;+ buttonIntlId: string;+ inactive?: boolean;+ className?: string;+};++const ListItem = ({value}) => (+ <ListItemWrapper>+ <DatasetSquare className="dataset-color" backgroundColor={value.color} />+ <div className="dataset-name" title={value.label}>+ {value.label}+ </div>+ </ListItemWrapper>+);++const AddByDatasetButton: React.FC<AddByDatasetButtonProps> = ({+ datasets,+ onAdd,+ buttonIntlId,+ width,+ className,+ inactive+}) => {+ const [tippyInstance, setTippyInstance] = useState();++ const options = useMemo(() => {+ return Object.values(datasets).map(ds => ({+ label: ds.label,+ value: ds.id,+ color: ds.color+ }));+ }, [datasets]);++ const onClickBtn = useCallback(() => {+ if (options.length === 1) {+ onAdd(options[0].value);+ }++ return;+ }, [options, onAdd]);++ const onOptionSelected = useCallback(+ option => {+ onAdd(option.value);+ if (tippyInstance) {+ // @ts-ignore+ tippyInstance.hide();+ }+ },+ [onAdd, tippyInstance]+ );++ const intl = useIntl();++ const buttonRendered = (+ <Button+ tabIndex={-1}+ className={className || 'add-by-dataset-button'}+ width={width}+ onClick={onClickBtn}+ disabled={!options.length || inactive}+ >+ <Add height="12px" />+ <FormattedMessage id={buttonIntlId} />+ </Button>+ );++ return options.length === 1 ? (+ buttonRendered+ ) : (+ <Tippy+ trigger="click"+ arrow={false}+ interactive+ placement="bottom"+ appendTo="parent"+ // @ts-ignore+ onCreate={setTippyInstance}+ duration={0}+ content={+ <DropdownMenu>+ <DropdownContainer>+ <Typeahead+ className={TYPEAHEAD_CLASS}+ customClasses={{+ results: 'list-selector',+ input: TYPEAHEAD_INPUT_CLASS,+ listItem: 'list__item'+ }}+ placeholder={intl ? intl.formatMessage({id: 'placeholder.search'}) : 'Search'}+ selectedItems={null}+ options={options}+ displayOption={Accessor.generateOptionToStringFor('label')}+ filterOption={'label'}+ searchable+ onOptionSelected={onOptionSelected}+ customListItemComponent={ListItem}+ />+ </DropdownContainer>+ </DropdownMenu>+ }+ >+ {buttonRendered}+ </Tippy>+ );+};++export default AddByDatasetButton;diff --git a/src/components/src/side-panel/common/dataset-info.tsx b/src/components/src/side-panel/common/dataset-info.tsxindex d08edaab8..5392a27a6 100644--- a/src/components/src/side-panel/common/dataset-info.tsx+++ b/src/components/src/side-panel/common/dataset-info.tsx@@ -22,10 +22,18 @@ import React from 'react';import styled from 'styled-components';import {format} from 'd3-format';import {FormattedMessage} from '@kepler.gl/localization';-import {DatasetInfoProps} from './types';+import {DataContainerInterface} from '@kepler.gl/utils';const numFormat = format(',');+type MiniDataset = {+ dataContainer: DataContainerInterface;+};++export type DatasetInfoProps = {+ dataset: MiniDataset;+};+const StyledDataRowCount = styled.div`font-size: 11px;color: ${props => props.theme.subtextColor};@@ -33,7 +41,7 @@ const StyledDataRowCount = styled.div``;export default function DatasetInfoFactory() {- const DatasetInfo = ({dataset}: DatasetInfoProps) => (+ const DatasetInfo: React.FC<DatasetInfoProps> = ({dataset}: DatasetInfoProps) => (<StyledDataRowCount className="source-data-rows"><FormattedMessageid={'datasetInfo.rowCount'}diff --git a/src/components/src/side-panel/common/dataset-tag.tsx b/src/components/src/side-panel/common/dataset-tag.tsxindex 3e2cd0c48..866d0f069 100644--- a/src/components/src/side-panel/common/dataset-tag.tsx+++ b/src/components/src/side-panel/common/dataset-tag.tsx@@ -22,7 +22,11 @@ import React from 'react';import {FormattedMessage} from '@kepler.gl/localization';import styled from 'styled-components';import {DatasetSquare, Tooltip} from '../..';-import {DatasetTagProps, UpdateTableColorTypes} from './types';+import {UpdateTableColorTypes} from './types';+import {RGBColor} from '@kepler.gl/types';+import {VisStateActions, ActionHandler} from '@kepler.gl/actions';++function nop(_) {}const DatasetTagWrapper = styled.div`display: flex;@@ -57,8 +61,27 @@ const UpdateTableColor = ({children, id}: UpdateTableColorTypes) => (</DatasetColorPicker>);+type MiniDataset = {+ id: string;+ color: RGBColor;+ label?: string;+};++export type DatasetTagProps = {+ id?: string;+ dataset: MiniDataset;+ updateTableColor?: ActionHandler<typeof VisStateActions.updateTableColor>;+ onClick?: React.MouseEventHandler<HTMLDivElement>;+ onClickSquare?: React.MouseEventHandler<HTMLDivElement>;+};+export default function DatasetTagFactory(): React.FC<DatasetTagProps> {- const DatasetTag = ({onClick, onClickSquare, dataset, updateTableColor, id}: DatasetTagProps) => (+ const DatasetTag = ({+ onClick = nop,+ onClickSquare = nop,+ dataset,+ updateTableColor+ }: DatasetTagProps) => (<DatasetTagWrapper className="source-data-tag"><UpdateTableColor id={dataset.id}><DatasetSquare@@ -66,10 +89,10 @@ export default function DatasetTagFactory(): React.FC<DatasetTagProps> {backgroundColor={dataset.color}onClick={onClickSquare}data-tip- data-for={`update-color-${id}`}+ data-for={`update-color-${dataset.id}`}/>{updateTableColor ? (- <Tooltip id={`update-color-${id}`} effect="solid">+ <Tooltip id={`update-color-${dataset.id}`} effect="solid"><span><FormattedMessage id={'Update color'} /></span>diff --git a/src/components/src/side-panel/common/dataset-title.tsx b/src/components/src/side-panel/common/dataset-title.tsxindex f6b54b0cc..6a4a2235c 100644--- a/src/components/src/side-panel/common/dataset-title.tsx+++ b/src/components/src/side-panel/common/dataset-title.tsx@@ -18,7 +18,7 @@// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN// THE SOFTWARE.-import React, {createRef, MouseEvent, PureComponent} from 'react';+import React, {useCallback, useRef, useState} from 'react';import styled from 'styled-components';import {FormattedMessage} from '@kepler.gl/localization';@@ -29,12 +29,9 @@ import DatasetTagFactory from './dataset-tag';import CustomPicker from '../layer-panel/custom-picker';import {Portaled} from '../..';import {rgbToHex} from '@kepler.gl/utils';-import {- StyledDatasetTitleProps,- DatasetTitleProps,- RemoveDatasetProps,- ShowDataTableProps-} from './types';+import {openDeleteModal, VisStateActions, ActionHandler} from '@kepler.gl/actions';+import {RGBColor} from '@kepler.gl/types';+import {StyledDatasetTitleProps, RemoveDatasetProps, ShowDataTableProps} from './types';const StyledDatasetTitle = styled.div<StyledDatasetTitleProps>`color: ${props => props.theme.textColor};@@ -68,6 +65,21 @@ const DataTagAction = styled.div`opacity: 0;`;+type MiniDataset = {+ id: string;+ color: RGBColor;+ label?: string;+};++export type DatasetTitleProps = {+ dataset: MiniDataset;+ showDeleteDataset: boolean;+ onTitleClick?: () => void;+ showDatasetTable?: ActionHandler<typeof VisStateActions.showDatasetTable>;+ updateTableColor: ActionHandler<typeof VisStateActions.updateTableColor>;+ removeDataset?: ActionHandler<typeof openDeleteModal>;+};+const ShowDataTable = ({id, showDatasetTable}: ShowDataTableProps) => (<DataTagAction className="dataset-action show-data-table" data-tip data-for={`data-table-${id}`}><Table@@ -110,83 +122,83 @@ DatasetTitleFactory.deps = [DatasetTagFactory];export default function DatasetTitleFactory(DatasetTag: ReturnType<typeof DatasetTagFactory>-): React.ComponentType<DatasetTitleProps> {- class DatasetTitle extends PureComponent<DatasetTitleProps> {- state = {- displayColorPicker: false- };-- _handleClick = () => {- this.setState({displayColorPicker: !this.state.displayColorPicker});- };-- _handleClosePicker = () => {- this.setState({displayColorPicker: false});- };-- root = createRef<HTMLDivElement>();-- _onClickTitle = (e: MouseEvent) => {- e.stopPropagation();- if (typeof this.props.onTitleClick === 'function') {- this.props.onTitleClick();- } else if (typeof this.props.showDatasetTable === 'function') {- this.props.showDatasetTable(this.props.dataset.id);- }- };-- render() {- const {- showDatasetTable,- showDeleteDataset,- onTitleClick,- removeDataset,- dataset,- updateTableColor- } = this.props;-- return (- <div className="custom-palette-panel" ref={this.root}>- <StyledDatasetTitle- className="source-data-title"- clickable={Boolean(showDatasetTable || onTitleClick)}+): React.FC<DatasetTitleProps> {+ const DatasetTitle: React.FC<DatasetTitleProps> = ({+ showDatasetTable,+ showDeleteDataset,+ onTitleClick,+ removeDataset,+ dataset,+ updateTableColor+ }) => {+ const [displayColorPicker, setDisplayColorPicker] = useState(false);+ const root = useRef(null);+ const datasetId = dataset.id;+ const _handleClick = useCallback(() => {+ setDisplayColorPicker(!displayColorPicker);+ }, [setDisplayColorPicker, displayColorPicker]);++ const _handleClosePicker = useCallback(() => {+ setDisplayColorPicker(false);+ }, [setDisplayColorPicker]);+ const _handleCustomPicker = useCallback(+ (color: {rgb: Record<string, number>}) => {+ updateTableColor(datasetId, [color.rgb.r, color.rgb.g, color.rgb.b]);+ },+ [updateTableColor, datasetId]+ );++ const _onClickTitle = useCallback(+ (e: React.MouseEvent<HTMLDivElement>) => {+ e.stopPropagation();+ if (typeof onTitleClick === 'function') {+ onTitleClick();+ } else if (typeof showDatasetTable === 'function') {+ showDatasetTable(datasetId);+ }+ },+ [onTitleClick, showDatasetTable, datasetId]+ );++ return (+ <div className="custom-palette-panel" ref={root}>+ <StyledDatasetTitle+ className="source-data-title"+ clickable={Boolean(showDatasetTable || onTitleClick)}+ >+ <DatasetTag+ dataset={dataset}+ onClick={_onClickTitle}+ updateTableColor={updateTableColor}+ onClickSquare={_handleClick}+ />+ <Portaled+ isOpened={displayColorPicker !== false}+ left={110}+ top={-50}+ onClose={_handleClosePicker}>- <DatasetTag- dataset={dataset}- onClick={this._onClickTitle}- updateTableColor={updateTableColor}- onClickSquare={this._handleClick}+ <CustomPicker+ color={rgbToHex(dataset.color)}+ onChange={_handleCustomPicker}+ onSwatchClose={_handleClosePicker}/>- <Portaled- isOpened={this.state.displayColorPicker !== false}- left={110}- top={-50}- onClose={this._handleClosePicker}- >- <CustomPicker- color={rgbToHex(dataset.color)}- onChange={(color: {rgb: Record<string, number>}) =>- updateTableColor(dataset.id, [color.rgb.r, color.rgb.g, color.rgb.b])- }- onSwatchClose={this._handleClosePicker}- />- </Portaled>- {showDatasetTable ? (- <CenterFlexbox className="source-data-arrow">- <ArrowRight height="12px" />- </CenterFlexbox>- ) : null}- {showDatasetTable ? (- <ShowDataTable id={dataset.id} showDatasetTable={showDatasetTable} />- ) : null}- {showDeleteDataset ? (- <RemoveDataset datasetKey={dataset.id} removeDataset={removeDataset} />- ) : null}- </StyledDatasetTitle>- </div>- );- }- }+ </Portaled>+ {showDatasetTable ? (+ <CenterFlexbox className="source-data-arrow">+ <ArrowRight height="12px" />+ </CenterFlexbox>+ ) : null}+ {showDatasetTable ? (+ <ShowDataTable id={datasetId} showDatasetTable={showDatasetTable} />+ ) : null}+ {showDeleteDataset ? (+ <RemoveDataset datasetKey={datasetId} removeDataset={removeDataset} />+ ) : null}+ </StyledDatasetTitle>+ </div>+ );+ };return DatasetTitle;}diff --git a/src/components/src/side-panel/common/source-data-catalog.tsx b/src/components/src/side-panel/common/source-data-catalog.tsxindex bdc9da06e..c6d123b22 100644--- a/src/components/src/side-panel/common/source-data-catalog.tsx+++ b/src/components/src/side-panel/common/source-data-catalog.tsx@@ -21,22 +21,45 @@import React from 'react';import styled from 'styled-components';+import {openDeleteModal, VisStateActions, ActionHandler} from '@kepler.gl/actions';+import {DataContainerInterface} from '@kepler.gl/utils';+import {RGBColor} from '@kepler.gl/types';+import {SidePanelSection} from '../../common/styled-components';import DatasetTitleFactory from './dataset-title';import DatasetInfoFactory from './dataset-info';-import {SourceDataCatalogProps} from './types';const SourceDataCatalogWrapper = styled.div`transition: ${props => props.theme.transition};`;+type MiniDataset = {+ id: string;+ color: RGBColor;+ label?: string;+ dataContainer: DataContainerInterface;+};++type MiniDatasets = {+ [key: string]: MiniDataset;+};++export type SourceDataCatalogProps = {+ datasets: MiniDatasets;+ showDeleteDataset?: boolean;+ onTitleClick?: () => void;+ showDatasetTable?: ActionHandler<typeof VisStateActions.showDatasetTable>;+ updateTableColor: ActionHandler<typeof VisStateActions.updateTableColor>;+ removeDataset?: ActionHandler<typeof openDeleteModal>;+};+SourceDataCatalogFactory.deps = [DatasetTitleFactory, DatasetInfoFactory];function SourceDataCatalogFactory(DatasetTitle: ReturnType<typeof DatasetTitleFactory>,DatasetInfo: ReturnType<typeof DatasetInfoFactory>) {- const SourceDataCatalog = ({+ const SourceDataCatalog: React.FC<SourceDataCatalogProps> = ({datasets,showDatasetTable,removeDataset,diff --git a/src/components/src/side-panel/common/types.ts b/src/components/src/side-panel/common/types.tsindex b4ad640e0..274c50991 100644--- a/src/components/src/side-panel/common/types.ts+++ b/src/components/src/side-panel/common/types.ts@@ -1,10 +1,13 @@-import React, {MouseEvent} from 'react';+import React from 'react';import {openDeleteModal, VisStateActions, ActionHandler} from '@kepler.gl/actions';import {RGBColor} from '@kepler.gl/types';-import KeplerTable, {Datasets} from '@kepler.gl/table';+import KeplerTable from '@kepler.gl/table';-export type DatasetInfoProps = {- dataset: KeplerTable;+export type PanelMeta = {+ id: string;+ label: string;+ iconComponent: React.ElementType;+ onClick: null;};export type UpdateTableColorTypes = {@@ -12,14 +15,6 @@ export type UpdateTableColorTypes = {children: React.ReactNode;};-export type DatasetTagProps = {- id?: string;- dataset: KeplerTable;- updateTableColor?: ActionHandler<typeof VisStateActions.updateTableColor>;- onClick?: (e: MouseEvent) => void;- onClickSquare?: (e: MouseEvent) => void;-};-export type ShowDataTableProps = {id: string;showDatasetTable?: ActionHandler<typeof VisStateActions.showDatasetTable>;@@ -34,24 +29,6 @@ export type StyledDatasetTitleProps = {clickable: boolean;};-export type DatasetTitleProps = {- dataset: KeplerTable;- showDeleteDataset: boolean;- onTitleClick?: () => void;- showDatasetTable?: ActionHandler<typeof VisStateActions.showDatasetTable>;- updateTableColor: ActionHandler<typeof VisStateActions.updateTableColor>;- removeDataset?: ActionHandler<typeof openDeleteModal>;-};--export type SourceDataCatalogProps = {- datasets: Datasets;- showDeleteDataset?: boolean;- onTitleClick?: () => void;- showDatasetTable?: ActionHandler<typeof VisStateActions.showDatasetTable>;- updateTableColor: ActionHandler<typeof VisStateActions.updateTableColor>;- removeDataset?: ActionHandler<typeof openDeleteModal>;-};-export type DatasetItemProps = {value: KeplerTable;};diff --git a/src/components/src/side-panel/custom-panel.tsx b/src/components/src/side-panel/custom-panel.tsxindex dd2f0b730..d60ece4bb 100644--- a/src/components/src/side-panel/custom-panel.tsx+++ b/src/components/src/side-panel/custom-panel.tsx@@ -19,10 +19,16 @@// THE SOFTWARE.import React from 'react';+import {SidePanelItem} from '../types';++export type CustomPanelsProps<P> = {+ panels: SidePanelItem[];+ getProps?: (props: SidePanelItem) => P;+};// This is a dummy component that can be replaced to inject more side panel sub panels into the side bar-function CustomPanelsFactory() {- const CustomPanels = props => {+function CustomPanelsFactory<P>() {+ const CustomPanels: React.FC<CustomPanelsProps<P>> = props => {return <div />;};@@ -41,7 +47,7 @@ function CustomPanelsFactory() {// }],// prop selector from side panel props- getProps: sidePanelProps => ({})+ getProps: (sidePanelProps: SidePanelItem) => ({} as P)};return CustomPanels;diff --git a/src/components/src/side-panel/filter-manager.tsx b/src/components/src/side-panel/filter-manager.tsxindex fe677d719..d59eabb96 100644--- a/src/components/src/side-panel/filter-manager.tsx+++ b/src/components/src/side-panel/filter-manager.tsx@@ -19,112 +19,260 @@// THE SOFTWARE.import React, {useCallback, useMemo} from 'react';-import {FormattedMessage} from '@kepler.gl/localization';-import {Button, SidePanelDivider, SidePanelSection} from '../common/styled-components';-import {Add} from '../common/icons';+import {useIntl} from 'react-intl';+import {SidePanelDivider, SidePanelSection} from '../common/styled-components';import SourceDataCatalogFactory from './common/source-data-catalog';import FilterPanelFactory from './filter-panel/filter-panel';-import {FILTER_VIEW_TYPES} from '@kepler.gl/constants';+import {FILTER_VIEW_TYPES, PANEL_VIEW_TOGGLES} from '@kepler.gl/constants';import {Filter} from '@kepler.gl/types';import {Layer} from '@kepler.gl/layers';import {isSideFilter} from '@kepler.gl/utils';-import {VisStateActions, ActionHandler} from '@kepler.gl/actions';+import {VisStateActions, ActionHandler, UIStateActions} from '@kepler.gl/actions';import {Datasets} from '@kepler.gl/table';+import PanelViewListToggleFactory from './panel-view-list-toggle';+import PanelTitleFactory from './panel-title';+import AddFilterButtonFactory from './filter-panel/add-filter-button';+import DatasetSectionFactory from './layer-panel/dataset-section';+import {PanelMeta} from './common/types';+type FilterManagerProps = {filters: Filter[];datasets: Datasets;layers: Layer[];showDatasetTable: ActionHandler<typeof VisStateActions.showDatasetTable>;updateTableColor: ActionHandler<typeof VisStateActions.updateTableColor>;+ removeDataset: ActionHandler<typeof VisStateActions.removeDataset>;+ showAddDataModal: () => void;++ panelMetadata: PanelMeta;+ panelListView: string;+ visStateActions: typeof VisStateActions;+ uiStateActions: typeof UIStateActions;+};++type FilterListProps = {+ filters: Filter[];+ datasets: Datasets;+ layers: Layer[];+ filtersByIndex: {+ filter: Filter;+ idx: number;+ }[];+ isAnyFilterAnimating: boolean;visStateActions: typeof VisStateActions;};-FilterManagerFactory.deps = [SourceDataCatalogFactory, FilterPanelFactory];+FilterManagerFactory.deps = [+ DatasetSectionFactory,+ FilterPanelFactory,+ PanelTitleFactory,+ AddFilterButtonFactory,+ PanelViewListToggleFactory,+ SourceDataCatalogFactory+];function FilterManagerFactory(- SourceDataCatalog: ReturnType<typeof SourceDataCatalogFactory>,- FilterPanel: ReturnType<typeof FilterPanelFactory>+ DatasetSection: ReturnType<typeof DatasetSectionFactory>,+ FilterPanel: ReturnType<typeof FilterPanelFactory>,+ PanelTitle: ReturnType<typeof PanelTitleFactory>,+ AddFilterButton: ReturnType<typeof AddFilterButtonFactory>,+ PanelViewListToggle: ReturnType<typeof PanelViewListToggleFactory>,+ SourceDataCatalog: ReturnType<typeof SourceDataCatalogFactory>) {- const FilterManager = ({- filters = [],+ const FilterList = ({+ filtersByIndex,+ filters,datasets,layers,- showDatasetTable,- updateTableColor,+ isAnyFilterAnimating,visStateActions- }: FilterManagerProps) => {+ }: FilterListProps) => {const {- addFilter,removeFilter,setFilter,toggleFilterAnimation,toggleFilterFeature,setFilterView} = visStateActions;- const isAnyFilterAnimating = filters.some(f => f.isAnimating);- const hadEmptyFilter = filters.some(f => !f.name);- const hadDataset = Object.keys(datasets).length;- const onClickAddFilter = useCallback(() => {- const defaultDataset = (Object.keys(datasets).length && Object.keys(datasets)[0]) || null;- addFilter(defaultDataset);- }, [datasets, addFilter]);- // render last added filter first- const reversedIndex = useMemo(() => {- return new Array(filters.length)- .fill(0)- .map((d, i) => i)- .reverse();- }, [filters.length]);const filterPanelCallbacks = useMemo(() => {- return new Array(filters.length).fill(0).map((d, idx) => ({- removeFilter: () => removeFilter(idx),- toggleFilterView: () =>- setFilterView(- idx,- isSideFilter(filters[idx]) ? FILTER_VIEW_TYPES.enlarged : FILTER_VIEW_TYPES.side- ),- toggleAnimation: () => toggleFilterAnimation(idx),- toggleFilterFeature: () => toggleFilterFeature(idx)- }));- }, [filters, removeFilter, setFilterView, toggleFilterAnimation, toggleFilterFeature]);+ return filtersByIndex.reduce(+ (accu, {filter, idx}) => ({+ ...accu,+ [filter.id]: {+ removeFilter: () => removeFilter(idx),+ toggleFilterView: () =>+ setFilterView(+ idx,+ isSideFilter(filter) ? FILTER_VIEW_TYPES.enlarged : FILTER_VIEW_TYPES.side+ ),+ toggleAnimation: () => toggleFilterAnimation(idx),+ toggleFilterFeature: () => toggleFilterFeature(idx)+ }+ }),+ {}+ );+ }, [filtersByIndex, removeFilter, setFilterView, toggleFilterAnimation, toggleFilterFeature]);return (- <div className="filter-manager">+ <SidePanelSection>+ {[...filtersByIndex].reverse().map(({filter, idx}) => (+ <FilterPanel+ key={`${filter.id}-${idx}`}+ idx={idx}+ filters={filters}+ filter={filter}+ datasets={datasets}+ layers={layers}+ isAnyFilterAnimating={isAnyFilterAnimating}+ removeFilter={filterPanelCallbacks[filter.id].removeFilter}+ enlargeFilter={filterPanelCallbacks[filter.id].toggleFilterView}+ toggleAnimation={filterPanelCallbacks[filter.id].toggleAnimation}+ toggleFilterFeature={filterPanelCallbacks[filter.id].toggleFilterFeature}+ setFilter={setFilter}+ />+ ))}+ </SidePanelSection>+ );+ };++ const DatasetFilterSection = ({+ filtersByIndex,+ filters,+ dataset,+ datasets,+ layers,+ isAnyFilterAnimating,+ visStateActions,+ showDatasetTable,+ updateTableColor,+ removeDataset,+ showDeleteDataset+ }) => {+ const datasetCatalog = useMemo(() => {+ return {[dataset.id]: dataset};+ }, [dataset]);++ return (+ <><SourceDataCatalog- datasets={datasets}+ datasets={datasetCatalog}showDatasetTable={showDatasetTable}updateTableColor={updateTableColor}+ removeDataset={removeDataset}+ showDeleteDataset={showDeleteDataset}+ />+ <FilterList+ filtersByIndex={filtersByIndex}+ filters={filters}+ datasets={datasets}+ layers={layers}+ isAnyFilterAnimating={isAnyFilterAnimating}+ visStateActions={visStateActions}+ />+ </>+ );+ };++ const FilterManager: React.FC<FilterManagerProps> = ({+ filters = [],+ datasets,+ layers,+ showDatasetTable,+ updateTableColor,+ removeDataset,+ showAddDataModal,+ panelMetadata,+ panelListView,+ visStateActions,+ uiStateActions+ }) => {+ const {addFilter} = visStateActions;+ const {togglePanelListView} = uiStateActions;+ const isAnyFilterAnimating = filters.some(f => f.isAnimating);+ const onClickAddFilter = useCallback(dataset => addFilter(dataset), [addFilter]);+ const isSortByDatasetMode = panelListView === PANEL_VIEW_TOGGLES.byDataset;+ const filtersByIndex = useMemo(+ () =>+ filters.map((f, idx) => ({+ filter: f,+ idx+ })),+ [filters]+ );+ const filtersByDatasets = useMemo(+ () =>+ Object.keys(datasets).reduce(+ (accu, dataId) => ({+ ...accu,+ // if synced filter, show it unfder its the first dataset+ [dataId]: filtersByIndex.filter(+ fidx => fidx.filter.dataId && fidx.filter.dataId[0] === dataId+ )+ }),+ {}+ ),+ [datasets, filtersByIndex]+ );+ const _TogglePanelListView = useCallback(+ listView => {+ togglePanelListView({panelId: 'filter', listView});+ },+ [togglePanelListView]+ );++ const intl = useIntl();+ const filterListProps = {+ datasets,+ filters,+ layers,+ isAnyFilterAnimating,+ visStateActions+ };++ const sourceDataCatalogProps = {+ showDatasetTable,+ updateTableColor,+ removeDataset,+ showDeleteDataset: true+ };++ return (+ <div className="filter-manager">+ <SidePanelSection>+ <PanelViewListToggle togglePanelListView={_TogglePanelListView} mode={panelListView} />+ </SidePanelSection>+ <DatasetSection+ datasets={datasets}+ {...sourceDataCatalogProps}+ showDatasetList={!isSortByDatasetMode}+ showAddDataModal={showAddDataModal}/><SidePanelDivider /><SidePanelSection>- {reversedIndex.map(idx => (- <FilterPanel- key={`${filters[idx].id}-${idx}`}- idx={idx}- filters={filters}- filter={filters[idx]}- datasets={datasets}- layers={layers}- isAnyFilterAnimating={isAnyFilterAnimating}- removeFilter={filterPanelCallbacks[idx].removeFilter}- enlargeFilter={filterPanelCallbacks[idx].toggleFilterView}- toggleAnimation={filterPanelCallbacks[idx].toggleAnimation}- toggleFilterFeature={filterPanelCallbacks[idx].toggleFilterFeature}- setFilter={setFilter}- />- ))}+ <PanelTitle+ className="filter-manager-title"+ title={intl.formatMessage({id: panelMetadata.label})}+ >+ <AddFilterButton datasets={datasets} onAdd={onClickAddFilter} />+ </PanelTitle>+ </SidePanelSection>+ <SidePanelSection>+ {isSortByDatasetMode ? (+ Object.keys(filtersByDatasets).map(dataId => (+ <DatasetFilterSection+ key={dataId}+ filtersByIndex={filtersByDatasets[dataId]}+ dataset={datasets[dataId]}+ {...filterListProps}+ {...sourceDataCatalogProps}+ />+ ))+ ) : (+ <FilterList filtersByIndex={filtersByIndex} {...filterListProps} />+ )}</SidePanelSection>- <Button- className="add-filter-button"- inactive={hadEmptyFilter || !hadDataset}- width="105px"- onClick={onClickAddFilter}- >- <Add height="12px" />- <FormattedMessage id={'filterManager.addFilter'} />- </Button></div>);};diff --git a/src/components/src/side-panel/filter-panel/add-filter-button.tsx b/src/components/src/side-panel/filter-panel/add-filter-button.tsxnew file mode 100644index 000000000..1c78df3a0--- /dev/null+++ b/src/components/src/side-panel/filter-panel/add-filter-button.tsx@@ -0,0 +1,46 @@+// Copyright (c) 2023 Uber Technologies, Inc.+//+// Permission is hereby granted, free of charge, to any person obtaining a copy+// of this software and associated documentation files (the "Software"), to deal+// in the Software without restriction, including without limitation the rights+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell+// copies of the Software, and to permit persons to whom the Software is+// furnished to do so, subject to the following conditions:+//+// The above copyright notice and this permission notice shall be included in+// all copies or substantial portions of the Software.+//+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN+// THE SOFTWARE.++import React from 'react';+import {Datasets} from '@kepler.gl/table';+import AddByDatasetButton from '../add-by-dataset-button';++export type AddFilterButtonProps = {+ datasets: Datasets;+ onAdd: (dataId: string) => void;+};++function AddFilterButtonFactory() {+ const AddFilterButton: React.FC<AddFilterButtonProps> = ({datasets, onAdd}) => {+ return (+ <AddByDatasetButton+ datasets={datasets}+ className="add-filter-button"+ width="105px"+ onAdd={onAdd}+ buttonIntlId="filterManager.addFilter"+ />+ );+ };++ return AddFilterButton;+}++export default AddFilterButtonFactory;diff --git a/src/components/src/side-panel/interaction-manager.tsx b/src/components/src/side-panel/interaction-manager.tsxindex d907ea468..eb78b1f2f 100644--- a/src/components/src/side-panel/interaction-manager.tsx+++ b/src/components/src/side-panel/interaction-manager.tsx@@ -19,29 +19,44 @@// THE SOFTWARE.import React from 'react';+import {useIntl} from 'react-intl';+import {InteractionConfig} from '@kepler.gl/types';-import InteractionPanelFactory from './interaction-panel/interaction-panel';import {VisStateActions} from '@kepler.gl/actions';import {Datasets} from '@kepler.gl/table';+import InteractionPanelFactory from './interaction-panel/interaction-panel';+import PanelTitleFactory from './panel-title';++import {PanelMeta} from './common/types';+type InteractionManagerProps = {interactionConfig: InteractionConfig;datasets: Datasets;visStateActions: typeof VisStateActions;+ panelMetadata: PanelMeta;};-InteractionManagerFactory.deps = [InteractionPanelFactory];+InteractionManagerFactory.deps = [InteractionPanelFactory, PanelTitleFactory];-function InteractionManagerFactory(InteractionPanel: ReturnType<typeof InteractionPanelFactory>) {+function InteractionManagerFactory(+ InteractionPanel: ReturnType<typeof InteractionPanelFactory>,+ PanelTitle: ReturnType<typeof PanelTitleFactory>+) {const InteractionManager: React.FC<InteractionManagerProps> = ({interactionConfig,datasets,- visStateActions+ visStateActions,+ panelMetadata}) => {const {interactionConfigChange: onConfigChange} = visStateActions;-+ const intl = useIntl();return (<div className="interaction-manager">+ <PanelTitle+ className="interaction-manager-title"+ title={intl.formatMessage({id: panelMetadata.label})}+ />{Object.keys(interactionConfig).map(key => (<InteractionPaneldatasets={datasets}diff --git a/src/components/src/side-panel/interaction-panel/interaction-panel.tsx b/src/components/src/side-panel/interaction-panel/interaction-panel.tsxindex d475564b3..6193f6aa1 100644--- a/src/components/src/side-panel/interaction-panel/interaction-panel.tsx+++ b/src/components/src/side-panel/interaction-panel/interaction-panel.tsx@@ -21,7 +21,7 @@import React, {useState, ComponentType, ReactElement, useCallback} from 'react';import styled from 'styled-components';import Switch from '../../common/switch';-+import PanelTitleFactory from '../panel-title';import BrushConfigFactory from './brush-config';import TooltipConfigFactory from './tooltip-config';import {Datasets} from '@kepler.gl/table';@@ -50,7 +50,7 @@ const StyledInteractionPanel = styled.div`padding-bottom: 6px;`;-InteractionPanelFactory.deps = [TooltipConfigFactory, BrushConfigFactory];+InteractionPanelFactory.deps = [TooltipConfigFactory, BrushConfigFactory, PanelTitleFactory];const INTERACTION_CONFIG_ICONS: {[key: string]: React.ElementType} = {tooltip: Messages,@@ -61,7 +61,8 @@ const INTERACTION_CONFIG_ICONS: {[key: string]: React.ElementType} = {function InteractionPanelFactory(TooltipConfig: ReturnType<typeof TooltipConfigFactory>,- BrushConfig: ReturnType<typeof BrushConfigFactory>+ BrushConfig: ReturnType<typeof BrushConfigFactory>,+ PanelTitle: ReturnType<typeof PanelTitleFactory>): ComponentType<InteractionPanelProps> {const InteractionPanel: React.FC<InteractionPanelProps> = ({config,diff --git a/src/components/src/side-panel/layer-manager.tsx b/src/components/src/side-panel/layer-manager.tsxindex 258b23378..e6c5c0019 100644--- a/src/components/src/side-panel/layer-manager.tsx+++ b/src/components/src/side-panel/layer-manager.tsx@@ -22,11 +22,10 @@ import React, {Component, useCallback} from 'react';import {injectIntl, WrappedComponentProps} from 'react-intl';import {FormattedMessage} from '@kepler.gl/localization';-import styled from 'styled-components';import LayerListFactory from './layer-panel/layer-list';import DatasetLayerGroupFactory from './layer-panel/dataset-layer-group';-import PanelViewListToggleFactory from './layer-panel/panel-view-list-toggle';+import PanelViewListToggleFactory from './panel-view-list-toggle';import PanelTitleFactory from './panel-title';import DatasetSectionFactory from './layer-panel/dataset-section';import AddLayerButtonFactory from './layer-panel/add-layer-button';@@ -34,10 +33,11 @@ import AddLayerButtonFactory from './layer-panel/add-layer-button';import ItemSelector from '../common/item-selector/item-selector';import {PanelLabel, SidePanelDivider, SidePanelSection} from '../common/styled-components';-import {LAYER_BLENDINGS, OVERLAY_BLENDINGS} from '@kepler.gl/constants';+import {LAYER_BLENDINGS, OVERLAY_BLENDINGS, PANEL_VIEW_TOGGLES} from '@kepler.gl/constants';import {Layer, LayerClassesType} from '@kepler.gl/layers';import {UIStateActions, VisStateActions, ActionHandler} from '@kepler.gl/actions';import {SidePanelItem} from '../types';+import {PanelListView} from '@kepler.gl/types';import {Datasets} from '@kepler.gl/table';type LayerBlendingSelectorProps = {@@ -63,19 +63,10 @@ type LayerManagerProps = {removeDataset: ActionHandler<typeof UIStateActions.openDeleteModal>;showDatasetTable: ActionHandler<typeof VisStateActions.showDatasetTable>;updateTableColor: ActionHandler<typeof VisStateActions.updateTableColor>;- layerPanelListView: string;+ panelListView: PanelListView;panelMetadata: SidePanelItem;} & WrappedComponentProps;-const LayerHeader = styled.div.attrs({- className: 'layer-manager-header'-})`- display: flex;- justify-content: space-between;- align-items: flex-start;- margin-top: 16px;-`;-const LayerBlendingSelector = React.memo(({layerBlending, updateLayerBlending, intl}: LayerBlendingSelectorProps) => {const labeledLayerBlendings = Object.keys(LAYER_BLENDINGS).reduce(@@ -160,14 +151,14 @@ function LayerManagerFactory(AddLayerButton: ReturnType<typeof AddLayerButtonFactory>) {class LayerManager extends Component<LayerManagerProps> {- _addEmptyNewLayer = (dataset: string) => {+ _addLayer = (dataset: string) => {const {visStateActions} = this.props;visStateActions.addLayer(undefined, dataset);};- _toggleLayerPanelListView = (listView: string) => {+ _togglePanelListView = (listView: string) => {const {uiStateActions} = this.props;- uiStateActions.toggleLayerPanelListView(listView);+ uiStateActions.togglePanelListView({panelId: 'layer', listView});};render() {@@ -182,19 +173,18 @@ function LayerManagerFactory(removeDataset,uiStateActions,visStateActions,- layerPanelListView,+ panelListView,panelMetadata} = this.props;- const defaultDataset = Object.keys(datasets)[0];- const isSortByDatasetMode = layerPanelListView === 'sortByDataset';+ const isSortByDatasetMode = panelListView === PANEL_VIEW_TOGGLES.byDataset;return (<div className="layer-manager"><SidePanelSection><PanelViewListToggle- toggleLayerPanelListView={this._toggleLayerPanelListView}- layerPanelListViewMode={layerPanelListView}+ togglePanelListView={this._togglePanelListView}+ mode={panelListView}/></SidePanelSection><DatasetSection@@ -205,22 +195,15 @@ function LayerManagerFactory(showDeleteDatasetshowDatasetList={!isSortByDatasetMode}showAddDataModal={showAddDataModal}- defaultDataset={defaultDataset}/><SidePanelDivider /><SidePanelSection>- <LayerHeader>- <PanelTitle className="layer-manager-title">- <FormattedMessage id={panelMetadata.label} />- </PanelTitle>- <AddLayerButton- datasets={datasets}- typeaheadPlaceholder="Search datasets"- intl={intl}- onOptionSelected={this._addEmptyNewLayer}- disabled={!defaultDataset}- />- </LayerHeader>+ <PanelTitle+ className="layer-manager-title"+ title={intl.formatMessage({id: panelMetadata.label})}+ >+ <AddLayerButton datasets={datasets} onAdd={this._addLayer} />+ </PanelTitle></SidePanelSection><SidePanelSection>{isSortByDatasetMode ? (diff --git a/src/components/src/side-panel/layer-panel/add-layer-button.tsx b/src/components/src/side-panel/layer-panel/add-layer-button.tsxindex 368886cba..894952c91 100644--- a/src/components/src/side-panel/layer-panel/add-layer-button.tsx+++ b/src/components/src/side-panel/layer-panel/add-layer-button.tsx@@ -18,194 +18,28 @@// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN// THE SOFTWARE.-import React, {useCallback, useMemo, useState} from 'react';-import styled from 'styled-components';-import {FormattedMessage} from '@kepler.gl/localization';-import {WrappedComponentProps} from 'react-intl';--import Tippy from '@tippyjs/react';-import {Add} from '../../common/icons';-import {Button} from '../../common/styled-components';-import {DatasetSquare} from '../..';-import Typeahead from '../../common/item-selector/typeahead';-import Accessor from '../../common/item-selector/accessor';+import React from 'react';+import AddByDatasetButton from '../add-by-dataset-button';import {Datasets} from '@kepler.gl/table';-import {RGBColor} from '@kepler.gl/types';-type AddLayerButtonProps = {+export type AddLayerButtonProps = {datasets: Datasets;- onOptionSelected: (opt: string) => void;- typeaheadPlaceholder?: string;- disabled?: boolean;-} & WrappedComponentProps;--const DropdownContainer = styled.div.attrs({- className: 'add-layer-menu-dropdown'-})`- .list-selector {- border-top: 1px solid ${props => props.theme.secondaryInputBorderColor};- width: 100%;- /* disable scrolling, currently set to 280px internally */- max-height: unset;- }-- .list__item > div {- display: flex;- flex-direction: row;- justify-content: flex-start;- line-height: 18px;- padding: 0;-- svg {- margin-right: 10px;- }- }-`;--const AddLayerMenu = styled.div.attrs({- className: 'add-layer-menu'-})`- display: flex;- flex-direction: column;- min-width: 240px;- max-width: 240px;- position: absolute;- top: 100%;- left: -53px;- z-index: 5;-`;--const ListItemWrapper = styled.div.attrs({- className: 'add-layer-menu-list-item-wrapper'-})`- display: flex;- color: ${props => props.theme.textColor};- font-size: 11px;- letter-spacing: 0.2px;- overflow: auto;-- .dataset-color {- flex-shrink: 0;- margin-top: 3px;- }-- .dataset-name {- white-space: nowrap;- overflow: hidden;- text-overflow: ellipsis;- }-`;--const TYPEAHEAD_CLASS = 'typeahead';-const TYPEAHEAD_INPUT_CLASS = 'typeahead__input';+ onAdd: (dataId: string) => void;+};function AddLayerButtonFactory() {- const ListItem = ({value}) => (- <ListItemWrapper>- <DatasetSquare className="dataset-color" backgroundColor={value.color} />- <div className="dataset-name" title={value.label}>- {value.label}- </div>- </ListItemWrapper>- );-- const AddLayerButton: React.FC<AddLayerButtonProps> = props => {- const {datasets, onOptionSelected, typeaheadPlaceholder, intl, disabled} = props;- const [showAddLayerDropdown, setShowAddLayerDropdown] = useState(false);-- const toggleAddLayerDropdown = useCallback(() => {- setShowAddLayerDropdown(!showAddLayerDropdown);- }, [showAddLayerDropdown, setShowAddLayerDropdown]);-- const _onBlur = useCallback(() => {- setShowAddLayerDropdown(false);- }, []);-- const toggleSelectedOption = useCallback(- (option: {label: string; value: string; color: RGBColor}) => {- onOptionSelected(option.value);- _onBlur();- },- [onOptionSelected, _onBlur]- );-- const onButtonBlur = useCallback(- event => {- if (- [TYPEAHEAD_CLASS, TYPEAHEAD_INPUT_CLASS].every(- cls => !event?.relatedTarget?.classList.contains(cls)- )- ) {- _onBlur();- }- },- [_onBlur]- );-- const onSearchBlur = useCallback(() => {- _onBlur();- }, [_onBlur]);-- const options = useMemo(() => {- return Object.values(datasets).map(ds => ({- label: ds.label,- value: ds.id,- color: ds.color- }));- }, [datasets]);-+ const AddLayerButton: React.FC<AddLayerButtonProps> = ({datasets, onAdd}) => {return (- <Tippy- visible={showAddLayerDropdown}- arrow={false}- interactive- placement="bottom"- appendTo="parent"- duration={0}- content={- <AddLayerMenu>- <DropdownContainer>- <Typeahead- onBlur={onSearchBlur}- className={TYPEAHEAD_CLASS}- customClasses={{- results: 'list-selector',- input: TYPEAHEAD_INPUT_CLASS,- listItem: 'list__item'- }}- placeholder={- typeaheadPlaceholder || intl- ? intl.formatMessage({id: 'placeholder.search'})- : 'Search'- }- selectedItems={null}- options={options}- displayOption={Accessor.generateOptionToStringFor('label')}- filterOption={'label'}- searchable- onOptionSelected={toggleSelectedOption}- customListItemComponent={ListItem}- />- </DropdownContainer>- </AddLayerMenu>- }- >- <Button- tabIndex={-1}- onBlur={onButtonBlur}- className="add-layer-button"- width="105px"- onClick={toggleAddLayerDropdown}- disabled={disabled}- >- <Add height="12px" />- <FormattedMessage id={'layerManager.addLayer'} />- </Button>- </Tippy>+ <AddByDatasetButton+ datasets={datasets}+ className="add-layer-button"+ width="110px"+ onAdd={onAdd}+ buttonIntlId="layerManager.addLayer"+ />);};return AddLayerButton;}-export default AddLayerButtonFactory;diff --git a/src/components/src/side-panel/layer-panel/dataset-layer-group.tsx b/src/components/src/side-panel/layer-panel/dataset-layer-group.tsxindex 12ce04621..7d11da1fb 100644--- a/src/components/src/side-panel/layer-panel/dataset-layer-group.tsx+++ b/src/components/src/side-panel/layer-panel/dataset-layer-group.tsx@@ -23,7 +23,7 @@ import React, {useMemo} from 'react';import DatasetLayerSectionFactory from './dataset-layer-section';import {Layer, LayerClassesType} from '@kepler.gl/layers';import {UIStateActions, VisStateActions, ActionHandler} from '@kepler.gl/actions';-import {Datasets} from '@kepler.gl/table';+import {KeplerTable, Datasets} from '@kepler.gl/table';type DatasetLayerGroupProps = {datasets: Datasets;@@ -58,7 +58,7 @@ function DatasetLayerGroupFactory(} = props;const datasetLayerSectionData = useMemo(() => {- return Object.values(datasets).map(dataset => {+ return Object.values(datasets).map((dataset: KeplerTable) => {// 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@@ -77,6 +77,7 @@ function DatasetLayerGroupFactory(key={dlsData.dataset.id}dataset={dlsData.dataset}layers={dlsData.datasetLayers as Layer[]}+ datasets={datasets}showDatasetTable={showDatasetTable}updateTableColor={updateTableColor}showDeleteDataset={showDeleteDataset}diff --git a/src/components/src/side-panel/layer-panel/dataset-layer-section.tsx b/src/components/src/side-panel/layer-panel/dataset-layer-section.tsxindex e004ddbca..9f05400b3 100644--- a/src/components/src/side-panel/layer-panel/dataset-layer-section.tsx+++ b/src/components/src/side-panel/layer-panel/dataset-layer-section.tsx@@ -25,9 +25,10 @@ import SourceDataCatalogFactory from '../common/source-data-catalog';import LayerListFactory from './layer-list';import {Layer, LayerClassesType} from '@kepler.gl/layers';import {UIStateActions, ActionHandler, VisStateActions} from '@kepler.gl/actions';-import {KeplerTable} from '@kepler.gl/table';+import {KeplerTable, Datasets} from '@kepler.gl/table';type DatasetLayerSectionProps = {+ datasets: Datasets;dataset: KeplerTable;layers: Layer[];layerOrder: number[];@@ -55,6 +56,7 @@ function DatasetLayerSectionFactory(const DatasetLayerSection: React.FC<DatasetLayerSectionProps> = props => {const {dataset,+ datasets,showDatasetTable,layers,updateTableColor,@@ -66,14 +68,14 @@ function DatasetLayerSectionFactory(visStateActions} = props;- const datasets = useMemo(() => {+ const datasetCatalog = useMemo(() => {return {[dataset.id]: dataset};}, [dataset]);return (<DatasetLayerSectionWrapper><SourceDataCatalog- datasets={datasets}+ datasets={datasetCatalog}showDatasetTable={showDatasetTable}updateTableColor={updateTableColor}removeDataset={removeDataset}diff --git a/src/components/src/side-panel/layer-panel/dataset-section.tsx b/src/components/src/side-panel/layer-panel/dataset-section.tsxindex 5a91c9b55..3e2b48894 100644--- a/src/components/src/side-panel/layer-panel/dataset-section.tsx+++ b/src/components/src/side-panel/layer-panel/dataset-section.tsx@@ -35,16 +35,15 @@ type AddDataButtonProps = {type DatasetSectionProps = {datasets: Datasets;- defaultDataset: string;- showDatasetList: boolean;- showDeleteDataset: boolean;+ showDatasetList?: boolean;+ showDeleteDataset?: boolean;showDatasetTable: ActionHandler<typeof VisStateActions.showDatasetTable>;updateTableColor: ActionHandler<typeof VisStateActions.updateTableColor>;removeDataset: ActionHandler<typeof UIStateActions.openDeleteModal>;showAddDataModal: () => void;};-const StyledDatasetTitle = styled.div<{showDatasetList: boolean}>`+const StyledDatasetTitle = styled.div<{showDatasetList?: boolean}>`line-height: ${props => props.theme.sidePanelTitleLineHeight};font-weight: 400;letter-spacing: 1.25px;@@ -93,16 +92,15 @@ function DatasetSectionFactory(showDeleteDataset,removeDataset,showDatasetList,- showAddDataModal,- defaultDataset+ showAddDataModal} = props;const datasetCount = Object.keys(datasets).length;return (<StyledDatasetSection><StyledDatasetTitle showDatasetList={showDatasetList}>- <span>Datasets ({datasetCount})</span>- <AddDataButton onClick={showAddDataModal} isInactive={!defaultDataset} />+ <span>Datasets{datasetCount ? `(${datasetCount})` : ''}</span>+ <AddDataButton onClick={showAddDataModal} isInactive={!datasetCount} /></StyledDatasetTitle>{showDatasetList && (<SourceDataCatalogdiff --git a/src/components/src/side-panel/map-manager.tsx b/src/components/src/side-panel/map-manager.tsxindex c255c692f..3f2ed0c4e 100644--- a/src/components/src/side-panel/map-manager.tsx+++ b/src/components/src/side-panel/map-manager.tsx@@ -23,8 +23,10 @@ import React, {Component} from 'react';import {Button, SidePanelSection} from '../common/styled-components';import MapStyleSelectorFactory from './map-style-panel/map-style-selector';import LayerGroupSelectorFactory from './map-style-panel/map-layer-selector';+import PanelTitleFactory from '../side-panel/panel-title';import {Add} from '../common/icons';+import {PanelMeta} from './common/types';import ColorSelector from './layer-panel/color-selector';import {createSelector} from 'reselect';import {injectIntl, WrappedComponentProps} from 'react-intl';@@ -32,17 +34,19 @@ import {FormattedMessage} from '@kepler.gl/localization';import {MapStyle} from '@kepler.gl/reducers';import {MapStyleActions} from '@kepler.gl/actions';-type MapManagerProps = {+export type MapManagerProps = {mapStyle: MapStyle;mapStyleActions: typeof MapStyleActions;showAddMapStyleModal: () => void;+ panelMetadata: PanelMeta;} & WrappedComponentProps;-MapManagerFactory.deps = [MapStyleSelectorFactory, LayerGroupSelectorFactory];+MapManagerFactory.deps = [MapStyleSelectorFactory, LayerGroupSelectorFactory, PanelTitleFactory];function MapManagerFactory(MapStyleSelector: ReturnType<typeof MapStyleSelectorFactory>,- LayerGroupSelector: ReturnType<typeof LayerGroupSelectorFactory>+ LayerGroupSelector: ReturnType<typeof LayerGroupSelectorFactory>,+ PanelTitle: ReturnType<typeof PanelTitleFactory>) {class MapManager extends Component<MapManagerProps> {state = {@@ -64,7 +68,7 @@ function MapManagerFactory(};render() {- const {mapStyle, intl, mapStyleActions, showAddMapStyleModal} = this.props;+ const {mapStyle, intl, mapStyleActions, showAddMapStyleModal, panelMetadata} = this.props;const currentStyle = mapStyle.mapStyles[mapStyle.styleType] || {};const editableLayers = (currentStyle.layerGroups || []).map(lg => lg.slug);const hasBuildingLayer = mapStyle.visibleLayerGroups['3d building'];@@ -85,6 +89,15 @@ function MapManagerFactory(return (<div className="map-style-panel">+ <PanelTitle+ className="filter-manager-title"+ title={intl.formatMessage({id: panelMetadata.label})}+ >+ <Button className="add-map-style-button" onClick={showAddMapStyleModal}>+ <Add height="12px" />+ <FormattedMessage id={'mapManager.addMapStyle'} />+ </Button>+ </PanelTitle><div><MapStyleSelectormapStyle={mapStyle}@@ -103,10 +116,6 @@ function MapManagerFactory(<SidePanelSection><ColorSelector colorSets={colorSets} disabled={!hasBuildingLayer} /></SidePanelSection>- <Button className="add-map-style-button" onClick={showAddMapStyleModal} secondary>- <Add height="12px" />- <FormattedMessage id={'mapManager.addMapStyle'} />- </Button></div></div>);diff --git a/src/components/src/side-panel/map-style-panel/map-layer-selector.tsx b/src/components/src/side-panel/map-style-panel/map-layer-selector.tsxindex c3c9827bb..f839f5149 100644--- a/src/components/src/side-panel/map-style-panel/map-layer-selector.tsx+++ b/src/components/src/side-panel/map-style-panel/map-layer-selector.tsx@@ -62,7 +62,7 @@ const LayerLabel = styled(PanelLabelBold)<LayerLabelProps>`color: ${props => (props.active ? props.theme.textColor : props.theme.labelColor)};`;-type LayerGroupSelectorProps = {+export type LayerGroupSelectorProps = {layers: VisibleLayerGroups;editableLayers: string[];onChange: (payload: {diff --git a/src/components/src/side-panel/map-style-panel/map-style-selector.tsx b/src/components/src/side-panel/map-style-panel/map-style-selector.tsxindex 7ecc24329..8743e0f36 100644--- a/src/components/src/side-panel/map-style-panel/map-style-selector.tsx+++ b/src/components/src/side-panel/map-style-panel/map-style-selector.tsx@@ -63,7 +63,7 @@ const StyledMapDropdown = styled(StyledPanelHeader)`}`;-type MapStyleSelectorProps = {+export type MapStyleSelectorProps = {mapStyle: MapStyle;onChange: (payload: string) => void;toggleActive: () => void;diff --git a/src/components/src/side-panel/panel-tab.tsx b/src/components/src/side-panel/panel-tab.tsxindex 3caa264e8..41d0ea513 100644--- a/src/components/src/side-panel/panel-tab.tsx+++ b/src/components/src/side-panel/panel-tab.tsx@@ -34,10 +34,10 @@ export type PanelItem = {iconComponent: React.ComponentType<Partial<BaseProps>>;};-type PanelTabProps = {+export type PanelTabProps = {isActive: boolean;panel: PanelItem;- onClick: () => void;+ onClick: (e: React.MouseEvent<HTMLDivElement>) => void;};export const StyledPanelTab = styled.div.attrs({diff --git a/src/components/src/side-panel/panel-title.tsx b/src/components/src/side-panel/panel-title.tsxindex 8fce0575c..69ec82fbb 100644--- a/src/components/src/side-panel/panel-title.tsx+++ b/src/components/src/side-panel/panel-title.tsx@@ -18,10 +18,11 @@// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN// THE SOFTWARE.+import React from 'react';import styled from 'styled-components';import classnames from 'classnames';-const PanelTitleFactory = () => styled.div.attrs(props => ({+const StyledPanelTitle = styled.div.attrs(props => ({className: classnames('panel-title', props.className)}))`color: ${props => props.theme.titleTextColor};@@ -29,7 +30,32 @@ const PanelTitleFactory = () => styled.div.attrs(props => ({line-height: ${props => props.theme.sidePanelTitleLineHeight};font-weight: 400;letter-spacing: 1.25px;- margin-bottom: 14px;`;+const PanelHeaderRow = styled.div.attrs({+ className: 'layer-manager-header'+})`+ display: flex;+ justify-content: space-between;+ align-items: center;+ margin-top: 16px;+ margin-bottom: 32px;+`;++export type PanelTitleProps = {+ title: string;+ className?: string;+};++const PanelTitleFactory = () => {+ const PanelTitle: React.FC<PanelTitleProps> = ({title, className, children}) => (+ <PanelHeaderRow>+ <StyledPanelTitle className={className || 'panel-title'}>{title}</StyledPanelTitle>+ {children}+ </PanelHeaderRow>+ );++ return PanelTitle;+};+export default PanelTitleFactory;diff --git a/src/components/src/side-panel/layer-panel/panel-view-list-toggle.tsx b/src/components/src/side-panel/panel-view-list-toggle.tsxsimilarity index 74%rename from src/components/src/side-panel/layer-panel/panel-view-list-toggle.tsxrename to src/components/src/side-panel/panel-view-list-toggle.tsxindex e65858290..9bbcd3c98 100644--- a/src/components/src/side-panel/layer-panel/panel-view-list-toggle.tsx+++ b/src/components/src/side-panel/panel-view-list-toggle.tsx@@ -20,14 +20,12 @@import React, {useMemo} from 'react';import styled from 'styled-components';-import OrderByList from '../../common/icons/order-by-list';-import OrderByDataset from '../../common/icons/order-by-dataset';-import {Tooltip} from '../../common/styled-components';+import OrderByList from '../common/icons/order-by-list';+import OrderByDataset from '../common/icons/order-by-dataset';+import {Tooltip} from '../common/styled-components';import {FormattedMessage} from '@kepler.gl/localization';-import {- ActionHandler,- toggleLayerPanelListView as _toggleLayerPanelListView-} from '@kepler.gl/actions';+import {PanelListView} from '@kepler.gl/types';+import {PANEL_VIEW_TOGGLES} from '@kepler.gl/constants';type ToggleOptionProps = {isActive: boolean;@@ -36,8 +34,8 @@ type ToggleOptionProps = {};type PanelViewListToggleProps = {- layerPanelListViewMode: string;- toggleLayerPanelListView: ActionHandler<typeof _toggleLayerPanelListView>;+ mode: PanelListView;+ togglePanelListView: (view: string) => void;};const PanelViewListToggleContainer = styled.div.attrs({@@ -56,13 +54,10 @@ const PanelViewListToggleWrapper = styled.div.attrs({export const StyledToggleOption = styled.div.attrs({className: 'layer-panel-toggle-option'})<{active: boolean}>`- color: ${props =>- props.active- ? props.theme.layerPanelToggleOptionColorActive- : props.theme.layerPanelToggleOptionColor};+ color: ${props => (props.active ? props.theme.subtextColorActive : props.theme.panelTabColor)};:hover {cursor: pointer;- color: ${props => props.theme.layerPanelToggleOptionColorActive};+ color: ${props => props.theme.subtextColorActive};}`;@@ -88,29 +83,26 @@ function ToggleOptionFactory() {const TOGGLE_OPTIONS = [{- id: 'list',+ id: PANEL_VIEW_TOGGLES.list,iconComponent: OrderByList,- value: 'list',- label: 'List'+ label: 'sidebar.panelViewToggle.list'},{- id: 'sort-by-dataset',+ id: PANEL_VIEW_TOGGLES.byDataset,iconComponent: OrderByDataset,- value: 'sortByDataset',- label: 'Sort by dataset'+ label: 'sidebar.panelViewToggle.byDataset'}];PanelViewListToggleFactory.deps = [ToggleOptionFactory];function PanelViewListToggleFactory(ToggleOption: ReturnType<typeof ToggleOptionFactory>) {- const PanelViewListToggle: React.FC<PanelViewListToggleProps> = props => {- const {layerPanelListViewMode, toggleLayerPanelListView} = props;+ const PanelViewListToggle: React.FC<PanelViewListToggleProps> = ({mode, togglePanelListView}) => {+ const toggleListView = listView => togglePanelListView(listView);- const toggleListView = (listView: string) => toggleLayerPanelListView(listView);const options = useMemo(- () => TOGGLE_OPTIONS.map(opt => ({...opt, isActive: layerPanelListViewMode === opt.value})),- [layerPanelListViewMode]+ () => TOGGLE_OPTIONS.map(opt => ({...opt, isActive: mode === opt.id})),+ [mode]);return (@@ -119,7 +111,7 @@ function PanelViewListToggleFactory(ToggleOption: ReturnType<typeof ToggleOption{options.map(opt => (<ToggleOptionkey={opt.id}- onClick={() => toggleListView(opt.value)}+ onClick={() => toggleListView(opt.id)}option={opt}isActive={opt.isActive}/>diff --git a/src/components/src/side-panel/side-bar.tsx b/src/components/src/side-panel/side-bar.tsxindex 85a993ee1..18feacc2b 100644--- a/src/components/src/side-panel/side-bar.tsx+++ b/src/components/src/side-panel/side-bar.tsx@@ -22,16 +22,16 @@ import React, {Component} from 'react';import styled from 'styled-components';import {ArrowRight} from '../common/icons';-type CollapseButtonProps = {+export type CollapseButtonProps = {isOpen: boolean;- onClick: () => void;+ onClick: (e: React.MouseEvent<HTMLDivElement>) => void;};type SideBarProps = {width: number;isOpen: boolean;minifiedWidth: number;- onOpenOrClose: (v: {isOpen: boolean}) => void;+ onOpenOrClose: (arg: {isOpen: boolean}) => void;};const StyledSidePanelContainer = styled.div<{width: number}>`diff --git a/src/constants/src/default-settings.ts b/src/constants/src/default-settings.tsindex 420b104bb..b7943aa80 100644--- a/src/constants/src/default-settings.ts+++ b/src/constants/src/default-settings.ts@@ -177,6 +177,11 @@ export const SIDEBAR_PANELS = [}];+export const PANEL_VIEW_TOGGLES = keyMirror({+ list: null,+ byDataset: null+});+// backward compatibilityexport const PANELS = SIDEBAR_PANELS;diff --git a/src/localization/src/translations/en.ts b/src/localization/src/translations/en.tsindex 7dc3e6cb2..b208ae301 100644--- a/src/localization/src/translations/en.ts+++ b/src/localization/src/translations/en.ts@@ -81,6 +81,10 @@ export default {filter: 'Filters',interaction: 'Interactions',basemap: 'Base map'+ },+ panelViewToggle: {+ list: 'View List',+ byDataset: 'View by Dataset'}},layer: {diff --git a/src/reducers/src/ui-state-updaters.ts b/src/reducers/src/ui-state-updaters.tsindex 31a3da442..1150c5628 100644--- a/src/reducers/src/ui-state-updaters.ts+++ b/src/reducers/src/ui-state-updaters.ts@@ -262,7 +262,8 @@ export const INITIAL_UI_STATE: UiState = {loadFiles: DEFAULT_LOAD_FILES,// Locale of the UIlocale: LOCALE_CODES.en,- layerPanelListView: 'list'+ layerPanelListView: 'list',+ filterPanelListView: 'list'};/* Updaters */@@ -828,14 +829,21 @@ export const setLocaleUpdater = (* @returns nextState* @public*/-export const toggleLayerPanelListViewUpdater = (+export const togglePanelListViewUpdater = (state: UiState,- {payload: listView}: UIStateActions.ToggleLayerPanelListViewAction+ {payload: {panelId, listView}}: UIStateActions.TogglePanelListViewAction): UiState => {- return listView === state.layerPanelListView- ? state- : {- ...state,- layerPanelListView: listView- };+ const stateProp =+ panelId === 'layer'+ ? 'layerPanelListView'+ : panelId === 'filter'+ ? 'filterPanelListView'+ : null;+ if (!stateProp || state[stateProp] === listView) {+ return state;+ }+ return {+ ...state,+ [stateProp]: listView+ };};diff --git a/src/reducers/src/ui-state.ts b/src/reducers/src/ui-state.tsindex add8069b1..519ffe8c7 100644--- a/src/reducers/src/ui-state.ts+++ b/src/reducers/src/ui-state.ts@@ -59,7 +59,7 @@ const actionHandler = {[ActionTypes.TOGGLE_SPLIT_MAP]: uiStateUpdaters.toggleSplitMapUpdater,[ActionTypes.SHOW_DATASET_TABLE]: uiStateUpdaters.showDatasetTableUpdater,[ActionTypes.SET_LOCALE]: uiStateUpdaters.setLocaleUpdater,- [ActionTypes.TOGGLE_LAYER_PANEL_LIST_VIEW]: uiStateUpdaters.toggleLayerPanelListViewUpdater+ [ActionTypes.TOGGLE_PANEL_LIST_VIEW]: uiStateUpdaters.togglePanelListViewUpdater};/* Reducer */diff --git a/src/types/reducers.d.ts b/src/types/reducers.d.tsindex dad5eebc1..f3f0c03c0 100644--- a/src/types/reducers.d.ts+++ b/src/types/reducers.d.ts@@ -359,6 +359,8 @@ export type Notifications = {export type Locale = string;+export type PanelListView = string;+export type UiState = {readOnly: boolean;activeSidePanel: string;@@ -379,7 +381,10 @@ export type UiState = {loadFiles: LoadFiles;// Locale of the UIlocale: Locale;- layerPanelListView: string;+ // view layers by list or dataset+ layerPanelListView: PanelListView;+ // view filters by list or dataset+ filterPanelListView: PanelListView;};/** Width of viewport */diff --git a/test/browser/components/injector-test.js b/test/browser/components/injector-test.jsindex 2e7e6a7ca..ba493adad 100644--- a/test/browser/components/injector-test.js+++ b/test/browser/components/injector-test.js@@ -55,7 +55,7 @@ test('Components -> injector -> injectComponents', t => {const wrapper = mount(<Provider store={store}>- <KeplerGl id="foo" />+ <KeplerGl id="foo" mapboxApiAccessToken="smoothie_and_milkshake" /></Provider>);diff --git a/test/browser/components/side-panel/filter-manager-test.js b/test/browser/components/side-panel/filter-manager-test.jsindex 6b41e3271..622da8606 100644--- a/test/browser/components/side-panel/filter-manager-test.js+++ b/test/browser/components/side-panel/filter-manager-test.js@@ -29,7 +29,8 @@ import {Button,FilterPanelHeaderFactory,NewFilterPanelFactory,- appInjector+ appInjector,+ AddFilterButtonFactory} from '@kepler.gl/components';import {mountWithTheme, IntlWrapper} from 'test/helpers/component-utils';import {keplerGlReducerCore as keplerGlReducer} from '@kepler.gl/reducers';@@ -45,9 +46,11 @@ const FilterPanel = appInjector.get(FilterPanelFactory);const NewFilterPanel = appInjector.get(NewFilterPanelFactory);const FilterPanelHeader = appInjector.get(FilterPanelHeaderFactory);const FieldSelector = appInjector.get(FieldSelectorFactory);+const AddFilterButton = appInjector.get(AddFilterButtonFactory);// mock stateimport {StateWFilters, InitialState, applyActions, csvInfo} from 'test/helpers/mock-state';+import {clickItemSelectList} from '../../../helpers/component-utils';const nop = () => {};// default props from initial state@@ -56,6 +59,13 @@ const defaultProps = {datasets: {},layers: [],showDatasetTable: nop,+ updateTableColor: nop,+ removeDataset: nop,+ showAddDataModal: nop,+ panelMetadata: {+ label: 'sidebar.panels.filter'+ },+ panelListView: 'list',visStateActions: {addFilter: nop,setFilter: nop,@@ -63,23 +73,18 @@ const defaultProps = {enlargeFilter: nop,toggleAnimation: nop,toggleFilterFeature: nop+ },+ uiStateActions: {+ togglePanelListView: nop}};// componentsconst filterManagerProps = {+ ...defaultProps,filters: StateWFilters.visState.filters,datasets: StateWFilters.visState.datasets,- layers: StateWFilters.visState.layers,- showDatasetTable: nop,- visStateActions: {- addFilter: nop,- setFilter: nop,- removeFilter: nop,- enlargeFilter: nop,- toggleAnimation: nop,- toggleFilterFeature: nop- }+ layers: StateWFilters.visState.layers};test('Components -> FilterManager.mount -> no prop', t => {@@ -95,15 +100,7 @@ test('Components -> FilterManager.mount -> no prop', t => {t.ok(wrapper.find('.filter-manager').length === 1, 'should render Filter Manager');t.ok(wrapper.find(SourceDataCatalog).length === 1, 'should render SourceDataCatalog');- t.ok(wrapper.find(Button).length === 1, 'should render add filter button');- t.equal(- wrapper- .find(Button)- .at(0)- .props().inactive,- true,- 'inactive should be true'- );+ t.equal(wrapper.find(AddFilterButton).length, 1, 'should render add filter button');t.end();});@@ -125,11 +122,11 @@ test('Components -> FilterManager.mount -> with prop', t => {<FilterManager {...newProps} /></IntlWrapper>);- }, 'FilterManager should not fail without props');+ }, 'FilterManager should not fail w/ props');t.ok(wrapper.find('.filter-manager').length === 1, 'should render Filter Manager');t.ok(wrapper.find(SourceDataCatalog).length === 1, 'should render SourceDataCatalog');- t.ok(wrapper.find(Button).length === 1, 'should render add filter button');+ t.equal(wrapper.find(Button).length, 2, 'should render 2 buttons');t.ok(wrapper.find(FilterPanel).length === 2, 'should render 2 FilterPanel');// stateless component don't have a instance()@@ -140,19 +137,38 @@ test('Components -> FilterManager.mount -> with prop', t => {t.equal(filter1Props.filter, filterManagerProps.filters[1], 'should render last filter first');t.equal(filter1Props.isAnyFilterAnimating, false, 'isAnyFilterAnimating is false');- const addFilterButton = wrapper.find(Button).at(0);- // .instance();- addFilterButton.simulate('click');++ t.equal(wrapper.find('.list__item').length, 2, 'should render 2 options');+ clickItemSelectList(wrapper, 1);t.deepEqual(addFilter.args,- [[Object.keys(StateWFilters.visState.datasets)[0]]],+ [[Object.keys(StateWFilters.visState.datasets)[1]]],'Should call addFilter with 1st dataset');t.end();});+test('Components -> FilterManager.mount -> order by dataset view', t => {+ const newProps = {+ ...filterManagerProps,+ panelListView: 'byDataset'+ };+ let wrapper;+ t.doesNotThrow(() => {+ wrapper = mountWithTheme(+ <IntlWrapper>+ <FilterManager {...newProps} />+ </IntlWrapper>+ );+ }, 'FilterManager should not fail w/ props');++ t.equal(wrapper.find('DatasetFilterSection').length, 2, 'should render 2 DatasetFilterSection');++ t.end();+});+test('Components -> FilterManager.mount -> with supportedFilterTypes', t => {// load csv and geojsonconst updatedState = applyActions(keplerGlReducer, InitialState, [@@ -188,6 +204,9 @@ test('Components -> FilterManager.mount -> with supportedFilterTypes', t => {datasets: stateWithEmptyFilter.visState.datasets,layers: stateWithEmptyFilter.visState.layers,showDatasetTable: nop,+ panelMetadata: {+ label: 'sidebar.panels.filter'+ },visStateActions: {addFilter: nop,setFilter: nop,@@ -195,6 +214,9 @@ test('Components -> FilterManager.mount -> with supportedFilterTypes', t => {enlargeFilter: nop,toggleAnimation: nop,toggleFilterFeature: nop+ },+ uiStateActions: {+ togglePanelListView: nop}};diff --git a/test/browser/components/side-panel/layer-manager-test.js b/test/browser/components/side-panel/layer-manager-test.jsindex cbf00d0c5..644ebff16 100644--- a/test/browser/components/side-panel/layer-manager-test.js+++ b/test/browser/components/side-panel/layer-manager-test.js@@ -115,7 +115,7 @@ test('Components -> LayerManager -> render -> order by dataset view', t => {t.doesNotThrow(() => {wrapper = mountWithTheme(<IntlWrapper>- <LayerManager {...defaultProps} layerPanelListView="sortByDataset" />+ <LayerManager {...defaultProps} panelListView="byDataset" /></IntlWrapper>);}, 'LayerManager should not fail');