feat(explore): ColumnSelectControl with drag-and-drop #13210
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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,55 @@ | ||
| /** | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
| import React, { ReactNode } from 'react'; | ||
| import { useDrag } from 'react-dnd'; | ||
| import { styled } from '@superset-ui/core'; | ||
| import { DatasourcePanelDndItem } from './types'; | ||
|
|
||
| const DatasourceItemContainer = styled.div` | ||
| display: flex; | ||
| align-items: center; | ||
| width: 100%; | ||
| height: ${({ theme }) => theme.gridUnit * 6}px; | ||
| cursor: pointer; | ||
|
|
||
| :hover { | ||
| background-color: ${({ theme }) => theme.colors.grayscale.light2}; | ||
| } | ||
| `; | ||
|
|
||
| interface DatasourcePanelDragWrapperProps extends DatasourcePanelDndItem { | ||
| children?: ReactNode; | ||
| } | ||
|
|
||
| export default function DatasourcePanelDragWrapper( | ||
| props: DatasourcePanelDragWrapperProps, | ||
| ) { | ||
| const [, drag] = useDrag({ | ||
| item: { | ||
| metricOrColumnName: props.metricOrColumnName, | ||
| type: props.type, | ||
| }, | ||
| }); | ||
|
|
||
| return ( | ||
| <DatasourceItemContainer ref={drag}> | ||
| {props.children} | ||
| </DatasourceItemContainer> | ||
| ); | ||
| } |
This file contains hidden or 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,30 @@ | ||||||||||
| /** | ||||||||||
| * Licensed to the Apache Software Foundation (ASF) under one | ||||||||||
| * or more contributor license agreements. See the NOTICE file | ||||||||||
| * distributed with this work for additional information | ||||||||||
| * regarding copyright ownership. The ASF licenses this file | ||||||||||
| * to you under the Apache License, Version 2.0 (the | ||||||||||
| * "License"); you may not use this file except in compliance | ||||||||||
| * with the License. You may obtain a copy of the License at | ||||||||||
| * | ||||||||||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||||||||||
| * | ||||||||||
| * Unless required by applicable law or agreed to in writing, | ||||||||||
| * software distributed under the License is distributed on an | ||||||||||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||||||||||
| * KIND, either express or implied. See the License for the | ||||||||||
| * specific language governing permissions and limitations | ||||||||||
| * under the License. | ||||||||||
| */ | ||||||||||
| export enum DatasourcePanelDndType { | ||||||||||
| // todo: The new `metric` conflicts with the existing metric type | ||||||||||
| METRIC = 'datasource-panel-metric', | ||||||||||
| COLUMN = 'column', | ||||||||||
| } | ||||||||||
|
|
||||||||||
| export interface DatasourcePanelDndItem { | ||||||||||
| metricOrColumnName: string; | ||||||||||
| type: | ||||||||||
| | typeof DatasourcePanelDndType.METRIC | ||||||||||
| | typeof DatasourcePanelDndType.COLUMN; | ||||||||||
|
||||||||||
| type: | |
| | typeof DatasourcePanelDndType.METRIC | |
| | typeof DatasourcePanelDndType.COLUMN; | |
| type: DatasourcePanelDndType; |
This file contains hidden or 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
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What do you think about using a
cursor: moveinstead of default here?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
sorry, what is
cursor: moveon this?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I mean that here we could use
cursor: moveto indicate that the label is draggableThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
All right, I will add indicator style on this component and drop component.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The style
pointer: moveon the datasource panel looks strange. the UI behavior we can ask @mihir174move.mp4