Skip to content

[Maps] highlight combine layer background when creating layer group #143909

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nreese merged 4 commits into from
Oct 26, 2022
Merged

[Maps] highlight combine layer background when creating layer group #143909

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c61a484
[Maps] highlight combine layer background when creating layer group
nreese Oct 24, 2022
b71b025
tslint fixes
nreese Oct 25, 2022
7ca96d7
eslint fixes
nreese Oct 25, 2022
ea18317
Merge branch 'main' into layer_group_combine_color
kibanamachine Oct 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions ...s/public/connected_components/right_side_controls/layer_control/layer_toc/_layer_toc.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@
cursor: alias !important;
}

.mapLayerToc-droppable-isCombining {
background-color: $euiColorEmptyShade !important;
}

.mapLayerToc-droppable-isDragging * {
cursor: ns-resize !important;
}
4 changes: 4 additions & 0 deletions ...aps/public/connected_components/right_side_controls/layer_control/layer_toc/layer_toc.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,10 @@ export class LayerTOC extends Component<Props> {
dragHandleProps={draggableProvided.dragHandleProps}
isDragging={draggableSnapshot.isDragging}
isDraggingOver={droppableSnapshot.isDraggingOver}
isCombineLayer={
this.state.combineLayer !== null &&
this.state.combineLayer.getId() === layer.getId()
}
/>
);
}}
Expand Down
5 changes: 5 additions & 0 deletions ...onnected_components/right_side_controls/layer_control/layer_toc/toc_entry/_toc_entry.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,11 @@
pointer-events: none !important;
}

.mapTocEntry-isCombineLayer {
transition: background-color $euiAnimSpeedExtraSlow ease;
background-color: transparentize($euiColorSuccess, .75);
}

.mapTocEntry-isSelected {
background-color: tintOrShade($euiColorLightShade, 60%, 20%);
}
Expand Down
2 changes: 2 additions & 0 deletions .../connected_components/right_side_controls/layer_control/layer_toc/toc_entry/toc_entry.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ export interface OwnProps {
dragHandleProps?: DraggableProvidedDragHandleProps;
isDragging?: boolean;
isDraggingOver?: boolean;
isCombineLayer?: boolean;
}

type Props = ReduxStateProps & ReduxDispatchProps & OwnProps;
Expand Down Expand Up @@ -314,6 +315,7 @@ export class TOCEntry extends Component<Props, State> {
const classes = classNames('mapTocEntry', {
'mapTocEntry-isDragging': this.props.isDragging,
'mapTocEntry-isDraggingOver': this.props.isDraggingOver,
'mapTocEntry-isCombineLayer': this.props.isCombineLayer,
'mapTocEntry-isSelected':
this.props.layer.isPreviewLayer() ||
(this.props.selectedLayer && this.props.selectedLayer.getId() === this.props.layer.getId()),
Expand Down