-
Notifications
You must be signed in to change notification settings - Fork 1.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[Feat] Add list toggle to filters (#2115)
- create a AddByDatasetButton - Display flter by list or dataset - Add filter button shows typeahead and dataset selection - Move add buttons to right of title to filter / base map panel Signed-off-by: Ihor Dykhta <dikhta.igor@gmail.com> Co-authored-by: Shan He <heshan0131@gmail.com>
- Loading branch information
1 parent
20fcb66
commit fb82992
Showing
36 changed files
with
901 additions
and
534 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
200 changes: 200 additions & 0 deletions
200
src/components/src/side-panel/add-by-dataset-button.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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; |
Oops, something went wrong.