-
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.
[Enhancement] extract layers list to a separate component (#1665)
Signed-off-by: hodoje <nkaraklic@foursquare.com>
- Loading branch information
Showing
7 changed files
with
337 additions
and
131 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| 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>; |
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,169 @@ | ||
| // Copyright (c) 2021 Uber Technologies, Inc. | ||
| // | ||
| // Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| // of this software and associated documentation files (the "Software"), to deal | ||
| // in the Software without restriction, including without limitation the rights | ||
| // to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| // copies of the Software, and to permit persons to whom the Software is | ||
| // furnished to do so, subject to the following conditions: | ||
| // | ||
| // The above copyright notice and this permission notice shall be included in | ||
| // all copies or substantial portions of the Software. | ||
| // | ||
| // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| // AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
| // THE SOFTWARE. | ||
| import React, {useCallback, useMemo, useState} from 'react'; | ||
| import {arrayMove} from 'utils/data-utils'; | ||
| import styled from 'styled-components'; | ||
| import classnames from 'classnames'; | ||
| import {SortableContainer, SortableElement} from 'react-sortable-hoc'; | ||
| import LayerPanelFactory from './layer-panel'; | ||
| // 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` | ||
| z-index: ${props => props.theme.dropdownWrapperZ + 1}; | ||
| &.sorting { | ||
| pointer-events: none; | ||
| } | ||
| &.sorting-layers .layer-panel__header { | ||
| background-color: ${props => props.theme.panelBackgroundHover}; | ||
| font-family: ${props => props.theme.fontFamily}; | ||
| font-weight: ${props => props.theme.fontWeight}; | ||
| font-size: ${props => props.theme.fontSize}; | ||
| line-height: ${props => props.theme.lineHeight}; | ||
| *, | ||
| *:before, | ||
| *:after { | ||
| box-sizing: border-box; | ||
| } | ||
| .layer__drag-handle { | ||
| opacity: 1; | ||
| color: ${props => props.theme.textColorHl}; | ||
| } | ||
| } | ||
| `; | ||
| LayerListFactory.deps = [LayerPanelFactory]; | ||
| function LayerListFactory(LayerPanel) { | ||
| // 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}) => { | ||
| return ( | ||
| <SortableStyledItem className={classnames('sortable-layer-items', {sorting: isSorting})}> | ||
| {children} | ||
| </SortableStyledItem> | ||
| ); | ||
| }); | ||
| const WrappedSortableContainer = SortableContainer(({children}) => { | ||
| return <div>{children}</div>; | ||
| }); | ||
| const LayerList = props => { | ||
| const { | ||
| layers, | ||
| datasets, | ||
| layerOrder, | ||
| uiStateActions, | ||
| visStateActions, | ||
| layerClasses, | ||
| isSortable = true | ||
| } = props; | ||
| const {toggleModal: openModal} = uiStateActions; | ||
| const [isSorting, setIsSorting] = useState(false); | ||
| const layerTypeOptions = useMemo( | ||
| () => | ||
| Object.keys(layerClasses).map(key => { | ||
| const layer = new layerClasses[key](); | ||
| return { | ||
| id: key, | ||
| label: layer.name, | ||
| icon: layer.layerIcon, | ||
| requireData: layer.requireData | ||
| }; | ||
| }), | ||
| [layerClasses] | ||
| ); | ||
| const layerActions = { | ||
| layerColorUIChange: visStateActions.layerColorUIChange, | ||
| layerConfigChange: visStateActions.layerConfigChange, | ||
| layerVisualChannelConfigChange: visStateActions.layerVisualChannelConfigChange, | ||
| layerTypeChange: visStateActions.layerTypeChange, | ||
| layerVisConfigChange: visStateActions.layerVisConfigChange, | ||
| layerTextLabelChange: visStateActions.layerTextLabelChange, | ||
| removeLayer: visStateActions.removeLayer, | ||
| duplicateLayer: visStateActions.duplicateLayer | ||
| }; | ||
| const panelProps = { | ||
| datasets, | ||
| openModal, | ||
| layerTypeOptions | ||
| }; | ||
| const _handleSort = useCallback( | ||
| ({oldIndex, newIndex}) => { | ||
| visStateActions.reorderLayer(arrayMove(props.layerOrder, oldIndex, newIndex)); | ||
| setIsSorting(false); | ||
| }, | ||
| [props.layerOrder, visStateActions] | ||
| ); | ||
| const _onSortStart = useCallback(() => { | ||
| setIsSorting(true); | ||
| }, []); | ||
| const _updateBeforeSortStart = useCallback(() => { | ||
| ({index}) => { | ||
| const layerIdx = layerOrder[index]; | ||
| if (layers[layerIdx].config.isConfigActive) { | ||
| visStateActions.layerConfigChange(layers[layerIdx], {isConfigActive: false}); | ||
| } | ||
| }; | ||
| }, [layers, layerOrder, visStateActions]); | ||
| return isSortable ? ( | ||
| <WrappedSortableContainer | ||
| onSortEnd={_handleSort} | ||
| onSortStart={_onSortStart} | ||
| updateBeforeSortStart={_updateBeforeSortStart} | ||
| lockAxis="y" | ||
| helperClass="sorting-layers" | ||
| useDragHandle | ||
| > | ||
| {layerOrder.map( | ||
| (layerIdx, index) => | ||
| layers[layerIdx] && | ||
| !layers[layerIdx].config.hidden && ( | ||
| <SortableItem key={`layer-${layerIdx}`} index={index} isSorting={isSorting}> | ||
| <LayerPanel | ||
| {...panelProps} | ||
| {...layerActions} | ||
| sortData={layerIdx} | ||
| key={layers[layerIdx].id} | ||
| idx={layerIdx} | ||
| layer={layers[layerIdx]} | ||
| /> | ||
| </SortableItem> | ||
| ) | ||
| )} | ||
| </WrappedSortableContainer> | ||
| ) : ( | ||
| <> | ||
| {layerOrder.map( | ||
| (layerIdx, index) => | ||
| layers[layerIdx] && | ||
| !layers[layerIdx].config.hidden && ( | ||
| <LayerPanel | ||
| {...panelProps} | ||
| {...layerActions} | ||
| sortData={layerIdx} | ||
| key={layers[layerIdx].id} | ||
| idx={layerIdx} | ||
| layer={layers[layerIdx]} | ||
| /> | ||
| ) | ||
| )} | ||
| </> | ||
| ); | ||
| }; | ||
| return LayerList; | ||
| } | ||
| export default LayerListFactory; |
Oops, something went wrong.