added trash icon

This commit is contained in:
ari committed 2021-12-16 15:28:18 -05:00
1 parent 40db8d41d7
commit 49bb35717f
7 files changed
+73 -18

No files matched your search

+26 -9
View File
@@ -6,15 +6,28 @@ import { DAGNode } from "./DAGNode";
import { DAGEdge } from "./DAGEdge";
import { AddButton } from "./AddButton";
import { IteratorWrap } from "utils/iter";
import { DAGCircle } from "./DAGCircle";
import { DAGCircle, AddProps } from "./DAGCircle";
import { getDescriptionFromAutomationNode } from "utils/formatting";
export interface DAGCircleElm {
export type DAGCircleElm = {
type: 'circle';
loc: Point;
onClick?: ['add', () => void] | ['edit', () => void];
}
} & (
{
icon: 'add',
onAdd: () => void;
} |
{
icon: 'edit',
onEdit: () => void;
onRemove?: () => void;
} |
{
icon: 'blank',
onRemove?: () => void;
}
)
export interface DAGNodeElm {
type: 'node';
loc: Point;
@@ -138,11 +151,15 @@ export function* mapDataToElements({
break
case 'circle':
const loc = mapWithNode(elm.loc, [0, st.nodeHeight / 2 - st.circleSize / 2]);
const clickProps = elm.onClick ? (
elm.onClick[0] === 'add' ?
{ onAdd: elm.onClick[1] } :
{ onEdit: elm.onClick[1] }
) : {}
const clickProps: Partial<AddProps> = {}
if (elm.icon === 'add') {
clickProps.onAdd = elm.onAdd;
} else if (elm.icon === 'edit') {
clickProps.onEdit = elm.onEdit
clickProps.onRemove = elm.onRemove
} else {
clickProps.onRemove = elm.onRemove
}
yield <DAGCircle
key={`(${elm.loc})-o`}
loc={loc}
@@ -30,6 +30,17 @@ export const Basic: ComponentStory<typeof DAGCircle> = args => {
loc={[args.loc[0] + 2 * args.size, args.loc[1]]}
onEdit={args.onEdit}
/>
<DAGCircle
size={args.size}
loc={[args.loc[0] + 3 * args.size, args.loc[1]]}
onEdit={args.onEdit}
onRemove={args.onRemove}
/>
<DAGCircle
size={args.size}
loc={[args.loc[0] + 4 * args.size, args.loc[1]]}
onRemove={args.onRemove}
/>
</SVGBoard>
}
+4 -1
View File
@@ -1,6 +1,6 @@
// import "./DAGCircle.css";
import { Point } from "types/graphs";
import { AddIcon, PencilIcon } from '../Icons/index';
import { AddIcon, PencilIcon, TrashIcon } from '../Icons/index';
import { useCircleStyles } from './styles';
@@ -8,6 +8,7 @@ import { useCircleStyles } from './styles';
export interface AddProps {
onEdit?: () => void;
onAdd?: () => void;
onRemove?: () => void;
loc: Point,
size: number,
}
@@ -16,6 +17,7 @@ export const DAGCircle = ({
size,
onEdit,
onAdd,
onRemove,
}: AddProps) => {
const { classes } = useCircleStyles({
size: size * 0.9,
@@ -36,6 +38,7 @@ export const DAGCircle = ({
onClick={onAdd}
/>
: "else"}
{onRemove ? <TrashIcon className={classes.trashIcon} /> : <></>}
</div>
</foreignObject>
</>
+9
View File
@@ -171,5 +171,14 @@ export const useCircleStyles = createAppUseStyles<{
}),
icon: {
padding: "15%",
},
trashIcon: {
position: 'absolute',
top: 0,
left: 0,
"&:hover": {
fill: theme.secondary,
cursor: 'pointer',
}
}
}))
@@ -1,7 +1,7 @@
import { ComponentStory } from "@storybook/react";
import { usePageTheme } from "styles/page";
import { IconBase } from "./base";
import { PencilIcon, CheckMarkIcon } from ".";
import { PencilIcon, CheckMarkIcon, TrashIcon } from ".";
import { AddIcon } from './index';
export default {
@@ -16,6 +16,7 @@ export const IconList: ComponentStory<typeof IconBase> = (args) => {
<PencilIcon {...args} />
<CheckMarkIcon {...args} />
<AddIcon {...args} />
<TrashIcon {...args} />
</div>
}
IconList.args = {
+4
View File
@@ -29,3 +29,7 @@ export const AddIcon: FC<IconBaseProps> = props => <IconBase {...props} viewBox=
c5.774-0.001,10.454-4.682,10.456-10.456l0.008-56.126l56.106-0.009c5.774-0.001,10.454-4.682,10.455-10.457l0.008-54.213
c0-2.773-1.103-5.434-3.064-7.396C247.592,112.022,244.932,110.922,242.158,110.922z"/>
</IconBase>
export const TrashIcon: FC<IconBaseProps> = props => <IconBase {...props} viewBox="0 0 24 24"><path d="M 10 2 L 9 3 L 4 3 L 4 5 L 5 5 L 5 20 C 5 20.522222 5.1913289 21.05461 5.5683594 21.431641 C 5.9453899 21.808671 6.4777778 22 7 22 L 17 22 C 17.522222 22 18.05461 21.808671 18.431641 21.431641 C 18.808671 21.05461 19 20.522222 19 20 L 19 5 L 20 5 L 20 3 L 15 3 L 14 2 L 10 2 z M 7 5 L 17 5 L 17 20 L 7 20 L 7 5 z M 9 7 L 9 18 L 11 18 L 11 7 L 9 7 z M 13 7 L 13 18 L 15 18 L 15 7 L 13 7 z" />
</IconBase>
@@ -53,10 +53,19 @@ function* dealWithNested(
p2: innerStartLoc,
direction: '1->2',
}
yield {
type: 'circle',
loc: innerStartLoc,
onClick: onEdit ? ['edit', onEdit]: undefined,
if (onEdit) {
yield {
type: 'circle',
loc: innerStartLoc,
icon: 'edit',
onEdit,
}
} else {
yield {
type: 'circle',
loc: innerStartLoc,
icon: 'blank',
}
}
yield {
type: 'edge',
@@ -130,12 +139,13 @@ function* dealWithChoose(
// add new conditions
const newCondLoc = offsetPoint(
nodeLoc,
[1, node.action_data.choose.length + 3 + offset.y],
[1, node.action_data.choose.length + 2.5 + offset.y],
);
yield {
type: 'circle',
loc: newCondLoc,
onClick: ['add', () => updateData({
icon: 'add',
onAdd: () => updateData({
...node.action_data,
choose: [
...node.action_data.choose,
@@ -144,7 +154,7 @@ function* dealWithChoose(
sequence: [],
}
]
})],
}),
}
}