circle element

This commit is contained in:
ari committed 2021-12-01 15:06:31 -05:00
1 parent d848a3738b
commit 146a48b7c3
8 files changed
+152 -31

No files matched your search

@@ -1,7 +1,7 @@
import React from "react";
import { ComponentMeta, ComponentStory } from '@storybook/react';
import { DAGBoard, DAGElement, DAGNodeElm } from "./DAGBoard";
import { NODE_HEIGHT, NODE_WIDTH, ADD_HEIGHT, ADD_WIDTH, DISTANCE_FACTOR } from './constants';
import { NODE_HEIGHT, NODE_WIDTH, ADD_HEIGHT, ADD_WIDTH, DISTANCE_FACTOR, CIRCLE_SIZE } from './constants';
export default {
@@ -15,6 +15,7 @@ export default {
nodeWidth: NODE_WIDTH,
addHeight: ADD_HEIGHT,
addWidth: ADD_WIDTH,
circleSize: CIRCLE_SIZE,
distanceFactor: DISTANCE_FACTOR,
edgeChildColor: 'blue',
edgeNextColor: 'white',
@@ -54,6 +55,31 @@ Simple.args = {
p2: [1, 0],
direction: '1->2'
},
{
type: 'edge',
key: 'e2',
p1: [2, 1],
p2: [2, 3],
direction: '1->2'
},
{
type: 'circle',
key: 'c1',
loc: [2, 3]
},
{
type: 'edge',
key: 'e2',
p1: [2, 1],
p2: [2, 2],
direction: '1->2'
},
{
type: 'circle',
key: 'c1',
loc: [2, 2],
onClick: () => { }
}
])
}
+18 -1
View File
@@ -6,8 +6,15 @@ import { DAGNode } from "./DAGNode";
import { DAGEdge } from "./DAGEdge";
import { AddButton } from "./AddButton";
import { IteratorWrap } from "utils/iter";
import { DAGCircle } from "./DAGCircle";
export interface DAGCircleElm {
type: 'circle';
key: string;
loc: Point;
onClick?: () => void;
}
export interface DAGNodeElm {
type: 'node';
key: string;
@@ -25,7 +32,7 @@ export interface DAGEdgeElm {
toChild?: boolean;
onAdd?: () => void;
}
export type DAGElement = DAGEdgeElm | DAGNodeElm;
export type DAGElement = DAGEdgeElm | DAGNodeElm | DAGCircleElm;
export interface DAGBoardSettings extends DAGBoardElmDims {
edgeChildColor: string;
edgeNextColor: string;
@@ -35,6 +42,7 @@ export interface DAGBoardElmDims {
nodeWidth: number;
addHeight: number;
addWidth: number;
circleSize: number;
distanceFactor: number;
}
@@ -122,6 +130,15 @@ export function* mapDataToElements({
/>
}
break
case 'circle':
const loc = mapWithNode(elm.loc, [0, st.nodeHeight / 2 - st.circleSize / 2]);
yield <DAGCircle
key={`${elm.key}-o`}
loc={loc}
size={st.circleSize}
onClick={elm.onClick}
/>
break
default:
break
}
@@ -0,0 +1,28 @@
import React from "react";
import { ComponentMeta, ComponentStory } from '@storybook/react';
import { SVGBoard } from './Board';
import { DAGCircle } from "./DAGCircle";
export default {
title: 'DAGSvgs/DAGCircle',
component: DAGCircle,
parameters: { actions: { argTypesRegex: '^on.*' } },
args: {
size: 20,
loc: [50, 50]
}
} as ComponentMeta<typeof DAGCircle>
export const Basic: ComponentStory<typeof DAGCircle> = args => {
return <SVGBoard>
<DAGCircle
{...args}
/>
<DAGCircle
size={args.size}
loc={[args.loc[0] + args.size, args.loc[1]]}
/>
</SVGBoard>
}
@@ -0,0 +1,27 @@
// import "./DAGCircle.css";
import { Point } from "types/graphs";
import { PencilIcon } from '../Icons/index';
import { useCircleStyles } from './styles';
export interface AddProps {
onClick?: () => void;
loc: Point,
size: number,
}
export const DAGCircle = ({
loc: [x, y],
size,
onClick,
}: AddProps) => {
const { classes } = useCircleStyles({ size: size * 0.9 });
console.log({ onClick })
return <>
<foreignObject x={x} y={y} width={size} height={size}>
<div className={classes.root}>
{onClick ? <PencilIcon size={70} units="%" className={classes.icon} onClick={onClick} /> : "else"}
</div>
</foreignObject>
</>
}
@@ -5,4 +5,5 @@ export const NODE_WIDTH = 100 as const;
export const NODE_HEIGHT = 40 as const;
export const ADD_HEIGHT = 10 as const;
export const ADD_WIDTH = 10 as const;
export const CIRCLE_SIZE = 30 as const;
export const DISTANCE_FACTOR = 1.5 as const;
+20
View File
@@ -147,3 +147,23 @@ export const useNodeStyles = createAppUseStyles<{
},
}
})
export const useCircleStyles = createAppUseStyles<{ size: number }>(theme => ({
root: ({size}) => ({
backgroundColor: Color(theme.primary).set('rgb.g', 100).hex(),
borderRadius: 500,
height: size,
width: size,
cursor: "pointer",
"&:hover": {
backgroundColor: Color(theme.primary).set('rgb.g', 150).hex(),
},
fontSize: `${size * 0.4}px`,
display: 'flex',
justifyContent: 'center',
alignItems: 'center',
}),
icon: {
padding: "15%",
}
}))
+30 -28
View File
@@ -2,36 +2,38 @@ import { createAppUseStyles } from 'styles/theme';
import { AnchorHTMLAttributes, FC } from "react";
export const useIconStyles = createAppUseStyles<{size: number, color?: string}>(theme => ({
icon: ({size}) => ({
height: `${size}em`,
width: `${size}em`,
display: 'flex',
}),
svg: ({color=theme.primaryAccent}) => ({
fill: color
})
export type IconStyleProps = {
size?: number;
units?: 'em' | 'px' | '%';
color?: string;
}
export const useIconStyles = createAppUseStyles<IconStyleProps>(theme => ({
icon: ({ size, units = 'em' }) => ({
height: `${size}${units}`,
width: `${size}${units}`,
display: 'flex',
}),
svg: ({ color = theme.primaryAccent }) => ({
fill: color
})
}))
export type IconBaseProps = AnchorHTMLAttributes<HTMLAnchorElement> & {
size?: number;
color?: string;
}
export type IconBaseProps = AnchorHTMLAttributes<HTMLAnchorElement> & IconStyleProps;
export const IconBase: FC<IconBaseProps & { viewBox: string }> = ({
children,
viewBox,
size=1,
color,
className="",
...props
children,
viewBox,
size = 1,
color,
units,
className = "",
...props
}) => {
const {classes} = useIconStyles({ size, color });
return <a className={`${classes.icon} ${className}`} {...props}>
<svg className={classes.svg} version="1.1" xmlns="http://www.w3.org/2000/svg" x="0" y="0" viewBox={viewBox}>
<g>
{children}
</g>
</svg>
</a>
const { classes } = useIconStyles({ size, color, units, });
return <a className={`${classes.icon} ${className}`} {...props}>
<svg className={classes.svg} version="1.1" xmlns="http://www.w3.org/2000/svg" x="0" y="0" viewBox={viewBox}>
<g>
{children}
</g>
</svg>
</a>
}