Skip to content
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

126 move layer delete trash can to the layer panel #131

Merged
merged 2 commits into from
Jul 25, 2024
Merged

126 move layer delete trash can to the layer panel #131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
409cd86
create and use separate button component in layer carrd summary
mbwatson Jul 25, 2024
d048c0d
remove delete layer button from expand panel
mbwatson Jul 25, 2024
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
33 changes: 33 additions & 0 deletions src/components/trays/layers/delete-layer-button.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
import React from 'react';
import PropTypes from 'prop-types';

import {
DeleteForever as RemoveIcon,
} from '@mui/icons-material';
import { useLayers } from '@context';
import { ActionButton } from '@components/buttons';

export const DeleteLayerButton = ({ layerId }) => {
const { removeLayer } = useLayers();

return (
<ActionButton
color="danger"
variant="outlined"
onClick={ () => removeLayer(layerId) }
sx={{
'filter': 'opacity(0.2)',
transition: 'filter 250ms',
'&:hover': {
'filter': 'opacity(1.0)',
},
}}
>
<RemoveIcon />
</ActionButton>
);
};

DeleteLayerButton.propTypes = {
layerId: PropTypes.string.isRequired
};
18 changes: 1 addition & 17 deletions src/components/trays/layers/layer-card-actions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import React from 'react';
import PropTypes from 'prop-types';
import {
Box,
Divider,
FormControl,
FormLabel,
ListItemDecorator,
Expand All @@ -14,16 +13,14 @@ import {
Stack,
} from '@mui/joy';
import {
DeleteForever as RemoveIcon,
FormatPaint as AppearanceIcon,
DataObject as MetadataIcon,
} from '@mui/icons-material';
import { useLayers, useSettings } from '@context';
import { ActionButton } from '@components/buttons';

export const LayerActions = ({ layer }) => {
const { darkMode } = useSettings();
const { removeLayer, setLayerOpacity } = useLayers();
const { setLayerOpacity } = useLayers();

return (
<Tabs defaultValue={0}>
Expand All @@ -45,19 +42,6 @@ export const LayerActions = ({ layer }) => {
Metadata
</Tab>
</TabList>

<Divider orientation="vertical" />

<ActionButton
color="warning"
onClick={ () => removeLayer(layer.id) }
sx={{
borderRadius: 0,
borderBottom: '1px solid var(--joy-palette-divider)',
}}
>
<RemoveIcon />
</ActionButton>
</Stack>

<TabPanel value={ 0 } sx={{
Expand Down
4 changes: 3 additions & 1 deletion src/components/trays/layers/layer-card.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import { useLayers } from '@context';
import { useToggleState } from '@hooks';
import { LayerActions } from './layer-card-actions';
import { ActionButton } from '@components/buttons';
import { DeleteLayerButton } from './delete-layer-button';

export const LayerCard = ({ index, layer }) => {
const {
Expand Down Expand Up @@ -66,7 +67,7 @@ export const LayerCard = ({ index, layer }) => {
<Avatar variant="outlined">
<LayerIcon size="lg" color="primary" />
</Avatar>
<Typography level="title-md">
<Typography level="title-md" sx={{ flex: 1 }}>
{layer.properties.product_name}
</Typography>
<Switch
Expand All @@ -75,6 +76,7 @@ export const LayerCard = ({ index, layer }) => {
onChange={ () => toggleLayerVisibility(layer.id) }
className="action-button"
/>
<DeleteLayerButton layerId={ layer.id }/>
</Stack>

<Stack
Expand Down