cleaned up styling

This commit is contained in:
ari committed 2022-05-13 17:26:44 -04:00
1 parent 2db116ad9b
commit 8d804add13
25 files changed
+259 -186

No files matched your search

+6 -13
View File
@@ -6,7 +6,6 @@ import { Handle, Position, XYPosition } from 'react-flow-renderer';
export interface DAGCircleProps {
onEdit?: () => void;
onAdd?: () => void;
onRemove?: () => void;
size: number,
@@ -28,7 +27,6 @@ export const makeFlowCircle = (
export const DAGCircle: FC<{ data: DAGCircleProps }> = ({
data: {
size,
onEdit,
onAdd,
onRemove,
backgroundColor,
@@ -38,7 +36,7 @@ export const DAGCircle: FC<{ data: DAGCircleProps }> = ({
}) => {
const { classes } = useCircleStyles({
size,
hasOnFunction: !!onEdit || !!onAdd,
hasOnFunction: !!onRemove || !!onAdd,
hasRemoveFunction: !!onRemove,
backgroundColor,
});
@@ -47,18 +45,13 @@ export const DAGCircle: FC<{ data: DAGCircleProps }> = ({
{!disableTarget && <Handle type="target" position={Position.Left} />}
<div className={classes.root}>
{
onEdit ?
<PencilIcon
onAdd ?
<AddIcon
size={70} units="%"
className={classes.icon}
onClick={onEdit}
/> : onAdd ?
<AddIcon
size={70} units="%"
className={classes.icon}
onClick={onAdd}
/>
: backgroundColor ? "" : "else"
onClick={onAdd}
/>
: (backgroundColor || onRemove) ? "" : "else"
}
{onRemove ? <TrashIcon className={classes.trashIcon} onClick={onRemove} /> : <></>}
</div>
+6 -4
View File
@@ -1,4 +1,3 @@
import Color from "chroma-js";
import { PencilIcon } from "components/Icons"
import { NodeColor } from "types/graphs";
import { useNodeStyles } from "./styles";
@@ -14,22 +13,25 @@ export interface DAGNodeProps {
color: NodeColor;
label: string;
hasInput?: boolean;
accentBackground?: boolean;
}
export const DAGNode: FC<{ data: DAGNodeProps }> = ({
data: {
label,
height,
width,
onXClick = () => { },
onXClick,
onEditClick = () => { },
color,
hasInput = false,
accentBackground = false,
},
}) => {
const { classes, theme } = useNodeStyles({
color,
nodeHeight: height,
nodeWidth: width,
accentBackground,
});
return <>
{hasInput && <Handle type="target" position={Position.Left} />}
@@ -37,7 +39,7 @@ export const DAGNode: FC<{ data: DAGNodeProps }> = ({
<div className={classes.root}>
<div className={classes.inner}>
<div className={classes.leftEdge} onClick={onXClick}>
<button className={classes.buttonDelete}>X</button>
{!!onXClick && <button className={classes.buttonDelete}>X</button>}
</div>
<div className={classes.textWrap}>
<span className={classes.text} title={label}>
@@ -48,7 +50,7 @@ export const DAGNode: FC<{ data: DAGNodeProps }> = ({
console.log('editing me', label, onEditClick, onEditClick())
}}>
<button className={classes.buttonEdit}>
<PencilIcon size={1.1} color={Color(theme.primary).set('rgb.g', 200).hex()} />
<PencilIcon size={1.1} color={theme.green} />
</button>
</div>
</div>
@@ -0,0 +1,52 @@
import { makeFlowCircle } from "./DAGCircle"
import { DAGAutomationFlowDims, FlowData } from "./types"
import { XYPosition } from 'react-flow-renderer';
export const makeAddButton = (
id: string,
position: XYPosition,
{
circleSize,
}: DAGAutomationFlowDims,
onAdd: () => void,
disableTarget: boolean = true,
) => makeFlowCircle(
id,
position,
{
size: circleSize,
onAdd,
disableSource: true,
disableTarget,
}
)
export const makeConditionPoint = (
id: string,
position: XYPosition,
{
padding,
conditionWidth,
conditionHeight,
nodeWidth,
nodeHeight,
circleSize,
distanceFactor,
}: DAGAutomationFlowDims,
totalConditions: number,
onEditClick: () => void,
) => ({
id,
type: 'dagnode',
position,
data: {
size: circleSize,
color: 'lblue',
accentBackground: true,
label: `${totalConditions} Condition${totalConditions !== 1 ? 's' : ''}`,
height: conditionHeight,
width: conditionWidth,
hasInput: true,
onEditClick,
}
})
@@ -12,16 +12,7 @@ export default {
component: DAGAutomationFlow,
parameters: { actions: { argTypesRegex: '^on.*' } },
args: {
dims: {
nodeHeight: dgconst.NODE_HEIGHT,
nodeWidth: dgconst.NODE_WIDTH,
distanceFactor: dgconst.DISTANCE_FACTOR,
circleSize: dgconst.CIRCLE_SIZE,
padding: {
x: dgconst.PADDING,
y: dgconst.PADDING,
},
}
dims: dgconst.DEFAULT_DIMS
}
} as ComponentMeta<typeof DAGAutomationFlow>
@@ -29,8 +20,8 @@ const Template: ComponentStory<typeof DAGAutomationFlow> = args => {
const [state, setState] = useState({
trigger: args.trigger,
sequence: args.sequence,
condition: args.condition,
})
console.log(state)
return <div className="page">
<DAGAutomationFlow
{...args}
@@ -40,6 +31,7 @@ const Template: ComponentStory<typeof DAGAutomationFlow> = args => {
setState({ ...state, trigger })
}}
onSequenceUpdate={sequence => setState({ ...state, sequence })}
onConditionUpdate={condition => setState({ ...state, condition })}
/>
</div>
}
@@ -47,6 +39,7 @@ const Template: ComponentStory<typeof DAGAutomationFlow> = args => {
export const Simple = Template.bind({})
Simple.args = {
...Simple.args,
condition: [],
trigger: [
{
"platform": "numeric_state",
@@ -90,6 +83,7 @@ Simple.args = {
export const Complex = Template.bind({})
Complex.args = {
...Complex.args,
condition: [],
trigger: [
{
"platform": "numeric_state",
@@ -213,7 +207,7 @@ Complex.args = {
export const EmptyStart = Template.bind({})
EmptyStart.args = {
...EmptyStart.args,
trigger: [
],
condition: [],
trigger: [],
sequence: []
}
+32 -19
View File
@@ -5,13 +5,15 @@ import { AutomationSequenceNode } from "types/automations";
import { AutomationTrigger } from 'types/automations/triggers';
import { triggerToFlow } from "./triggerConvertor";
import { DAGNode } from "./DAGNode";
import { DAGAutomationFlowDims, FlowData, ModalState } from './types';
import { DAGAutomationFlowDims, FlowData, ModalState, UpdateModalState } from './types';
import { DAGCircle } from './DAGCircle';
import { sequenceToFlow } from "./sequenceConvertor";
import { makeSequenceUpdater } from "./updater";
import { NodeEditor } from "components/NodeEditor";
import { MultiNodeEditor } from "components/MultiNodeEditors";
import { Modal } from "components/Modal";
import { AutomationCondition } from "types/automations/conditions";
import { makeConditionPoint } from "./flowDataMods";
const nodeTypes = {
'dagnode': DAGNode,
@@ -20,19 +22,23 @@ const nodeTypes = {
interface Props {
className?: string;
sequence: AutomationSequenceNode[];
trigger: AutomationTrigger[];
condition: AutomationCondition[];
sequence: AutomationSequenceNode[];
dims: DAGAutomationFlowDims;
onTriggerUpdate: (t: AutomationTrigger[]) => void;
onSequenceUpdate: (s: AutomationSequenceNode[]) => void;
onConditionUpdate: (s: AutomationCondition[]) => void;
}
export const DAGAutomationFlow: FC<Props> = ({
className,
sequence,
trigger,
condition,
sequence,
onTriggerUpdate,
onSequenceUpdate,
onConditionUpdate,
dims,
}) => {
// state
@@ -63,7 +69,14 @@ export const DAGAutomationFlow: FC<Props> = ({
}
// convert automation to flow data
const condPoint = makeConditionPoint(dims);
const condPoint = makeConditionPoint('c', {
x: dims.padding.x + dims.nodeWidth * dims.distanceFactor,
y: dims.padding.y + dims.nodeHeight * 0.25
}, dims, condition.length, makeOnEditAutomationConditions(
condition,
onConditionUpdate,
setModalState,
));
const flowData: FlowData = {
nodes: [condPoint],
edges: [],
@@ -94,7 +107,12 @@ export const DAGAutomationFlow: FC<Props> = ({
flowData,
sequence,
condPoint.id,
dims,
{
...dims, padding: {
x: condPoint.position.x - dims.nodeWidth - dims.conditionWidth,
y: dims.padding.y,
}
},
makeSequenceUpdater(sequence, onSequenceUpdate, setModalState),
);
@@ -118,18 +136,13 @@ export const DAGAutomationFlow: FC<Props> = ({
</>;
}
const makeConditionPoint = ({
padding,
nodeWidth,
nodeHeight,
circleSize,
}: DAGAutomationFlowDims) => ({
id: `c`,
type: 'dagcircle',
position: { x: padding.x + nodeWidth * 2, y: padding.y + nodeHeight * 0.25 },
data: {
size: circleSize,
backgroundColor: 'blue',
}
const makeOnEditAutomationConditions = (
conditions: AutomationCondition[],
updateConditions: (c: AutomationCondition[]) => void,
openModal: UpdateModalState,
) => () => openModal({
single: false,
node: conditions,
allowedTypes: ['condition'],
update: c => updateConditions(c as any),
})
@@ -6,6 +6,7 @@ import { ChooseAction } from 'types/automations/actions';
import { makeFlowCircle } from './DAGCircle';
import { createOnRemoveForChooseNode, SequenceUpdater } from './updater';
import { getNodeType } from 'utils/automations';
import { makeAddButton, makeConditionPoint } from './flowDataMods';
export const sequenceToFlow = (
@@ -56,13 +57,19 @@ export const sequenceToFlow = (
lasPos = position;
}
// add button
const addCircle = makeFlowCircle(
const addCircle = makeAddButton(
`${prefix}-+`,
{
x: (lasPos === null ? dims.padding.x + dims.nodeWidth * dims.distanceFactor * (sequence.length + 1) : lasPos.x) + dims.nodeWidth * dims.distanceFactor,
y: dims.padding.y + dims.circleSize / 2
x: (
lasPos === null ?
dims.padding.x + dims.nodeWidth * dims.distanceFactor * (sequence.length + 1) :
lasPos.x
) + dims.nodeWidth * dims.distanceFactor,
y: dims.padding.y + dims.circleSize / 4
},
{ onAdd: updater.addNode, size: dims.circleSize, disableSource: true, }
dims,
updater.addNode,
false,
)
flowData.nodes.push(addCircle)
addEdge(flowData, lastPointId, addCircle.id, false)
@@ -130,12 +137,11 @@ const addChooseNode = (
node.choose.forEach(({ sequence, conditions }, j) => {
const sequenceId = `${nodeId}.${j}`;
// edit/delete circle
const circle = makeFlowCircle(`${sequenceId}>cond`, {
const circle = makeFlowCircle(`${sequenceId}>delete`, {
x: position.x + dims.nodeWidth * dims.distanceFactor,
y: lastPos.y + dims.nodeHeight * dims.distanceFactor,
}, {
size: dims.circleSize * dims.distanceFactor,
onEdit: updater.makeOnEditConditionsForChooseNode(i, j),
size: dims.circleSize,
onRemove: createOnRemoveForChooseNode(
node,
d => updater.updateNode(i, d),
@@ -144,12 +150,25 @@ const addChooseNode = (
})
flowData.nodes.push(circle)
addEdge(flowData, nodeId, circle.id, true)
const condNode = makeConditionPoint(
`${sequenceId}>cond`,
{
x: circle.position.x + dims.circleSize * dims.distanceFactor,
y: circle.position.y + dims.circleSize / 8,
},
dims,
conditions.length,
updater.makeOnEditConditionsForChooseNode(i, j)
);
flowData.nodes.push(condNode)
addEdge(flowData, circle.id, condNode.id, true)
// actual sub sequence
const lastPoint = sequenceToFlow(flowData, sequence, circle.id, {
const lastPoint = sequenceToFlow(flowData, sequence, condNode.id, {
...dims,
padding: {
x: position.x - dims.nodeWidth,
y: circle.position.y,
x: condNode.position.x - (dims.nodeWidth + dims.conditionWidth),
y: condNode.position.y - dims.conditionHeight / 2,
},
}, updater.makeChildUpdaterForChooseAction(i, j), `${sequenceId}.`);
if (lastPoint.position) {
@@ -161,41 +180,40 @@ const addChooseNode = (
const totalChildren = node.choose.length;
// add button
const addCirlce = makeFlowCircle(
`${nodeId}>add`, {
x: position.x + dims.nodeWidth * dims.distanceFactor,
y: lastPos.y + dims.nodeHeight * dims.distanceFactor,
},
const addCirlce = makeAddButton(
`${nodeId}>add`,
{
size: dims.circleSize * dims.distanceFactor,
onAdd: () => updater.updateNode(i, {
...node,
choose: [
...node.choose,
{
sequence: [],
conditions: [],
}
]
}),
disableSource: true,
}
x: position.x + dims.nodeWidth * dims.distanceFactor,
y: lastPos.y + dims.nodeHeight * dims.distanceFactor,
},
dims,
() => updater.updateNode(i, {
...node,
choose: [
...node.choose,
{
sequence: [],
conditions: [],
}
]
}),
false,
);
flowData.nodes.push(addCirlce)
addEdge(flowData, nodeId, addCirlce.id, true)
// default
// else
const elseCircle = makeFlowCircle(`${nodeId}>else`, {
x: position.x + dims.nodeWidth * dims.distanceFactor,
y: lastPos.y + dims.nodeHeight * dims.distanceFactor * 2,
}, { size: dims.circleSize * dims.distanceFactor })
}, { size: dims.circleSize })
flowData.nodes.push(elseCircle)
addEdge(flowData, nodeId, elseCircle.id, true)
const lastPoint = sequenceToFlow(flowData, node.default, elseCircle.id, {
...dims,
padding: {
x: position.x - dims.nodeWidth,
y: elseCircle.position.y,
y: elseCircle.position.y - dims.circleSize / 4,
},
}, updater.makeChildUpdaterForChooseAction(i, null), `${nodeId}.${totalChildren}.`)
if (lastPoint.position) {
+12 -20
View File
@@ -1,5 +1,4 @@
import { Styles } from "jss";
import Color from 'chroma-js';
import { createAppUseStyles } from "styles/theme";
import { NodeColor } from "types/graphs";
@@ -7,6 +6,7 @@ export const useNodeStyles = createAppUseStyles<{
color: NodeColor,
nodeHeight: number,
nodeWidth: number,
accentBackground: boolean,
}>(theme => {
const edgeStyle: Styles = {
flex: '1',
@@ -41,11 +41,12 @@ export const useNodeStyles = createAppUseStyles<{
width: nodeWidth,
fontSize: 10,
}),
inner: ({ color }) => ({
inner: ({ color, accentBackground }) => ({
position: 'relative',
display: 'flex',
flexDirection: 'row',
backgroundColor: theme.secondary,
backgroundColor: !accentBackground ? theme.secondary :
color === 'lblue' ? theme.condition.primaryColorOpaque : 'none',
borderRadius: '1em',
flex: 1,
height: `100%`,
@@ -57,10 +58,11 @@ export const useNodeStyles = createAppUseStyles<{
borderTopStyle: 'solid',
borderTopLeftRadius: '10px',
borderTopRightRadius: '10px',
borderTopColor: color === 'red' ? Color(theme.secondary).set('rgb.r', 125).hex() :
color === 'blue' ? Color(theme.secondary).set('rgb.b', 125).hex() :
color === 'green' ? Color(theme.secondary).set('rgb.g', 125).hex() :
'none'
borderTopColor: color === 'red' ? theme.redAccent :
color === 'blue' ? theme.condition.primaryColor :
color === 'green' ? theme.green :
color === 'lblue' ? theme.condition.primaryAccent :
'none'
}),
textWrap: {
display: 'flex',
@@ -112,13 +114,14 @@ export const useCircleStyles = createAppUseStyles<{
backgroundColor?: string,
}>(theme => ({
root: ({ size, hasOnFunction, hasRemoveFunction, backgroundColor }) => {
const baseColor = backgroundColor ? backgroundColor : Color(theme.primary).set('rgb.g', 100).hex();
const hoverColor = (hasOnFunction && !hasRemoveFunction) ? Color(theme.primary).set('rgb.g', 150).hex() : baseColor
const baseColor = backgroundColor ? backgroundColor : theme.green;
const hoverColor = hasOnFunction ? theme.greenOpaque : baseColor
return {
backgroundColor: baseColor,
borderRadius: hasRemoveFunction ? 10 : 500,
height: size,
width: size,
color: theme.primary,
cursor: hasOnFunction ? "pointer" : 'default',
"&:hover": {
backgroundColor: hoverColor,
@@ -129,18 +132,7 @@ export const useCircleStyles = createAppUseStyles<{
alignItems: 'center',
}
},
icon: {
"&:hover": {
borderRadius: 500,
background: Color(theme.primary).set('rgb.g', 150).hex(),
}
},
trashIcon: {
padding: 1,
"&:hover": {
borderRadius: 500,
background: Color(theme.primary).set('rgb.g', 150).hex(),
cursor: 'pointer',
}
}
}))
@@ -1,20 +1,23 @@
import { AutomationTrigger } from 'types/automations/triggers';
import { DAGAutomationFlowDims, FlowData, TriggerMakerOptions } from './types';
import { makeFlowCircle } from './DAGCircle';
import { makeAddButton } from './flowDataMods';
export const triggerToFlow = (
flowData: FlowData,
trigger: AutomationTrigger[],
toPoint: string,
{
dims: DAGAutomationFlowDims,
opts: TriggerMakerOptions,
) => {
const {
distanceFactor,
nodeHeight,
nodeWidth,
circleSize,
padding,
}: DAGAutomationFlowDims,
opts: TriggerMakerOptions,
) => {
conditionHeight,
} = dims;
// convert all triggers to dag nodes
trigger.forEach((t, i) => {
const flowId = `t-${i}`;
@@ -39,19 +42,13 @@ export const triggerToFlow = (
});
// create a 'add button'
flowData.nodes.push(makeFlowCircle(
flowData.nodes.push(makeAddButton(
'trigger-add',
{
x: padding.x + nodeWidth * 0.4,
y: padding.y + nodeHeight * distanceFactor * trigger.length,
y: padding.y + conditionHeight / 2 + nodeHeight * distanceFactor * trigger.length,
},
{
size: circleSize,
backgroundColor: 'green',
onAdd: opts.onAdd,
disableSource: true,
disableTarget: true,
}
dims,
opts.onAdd
))
}
+2
View File
@@ -10,6 +10,8 @@ export type DAGAutomationFlowDims = {
padding: XYPosition;
nodeHeight: number;
nodeWidth: number;
conditionWidth: number;
conditionHeight: number;
circleSize: number;
distanceFactor: number;
}
+1 -1
View File
@@ -113,7 +113,7 @@ export const makeSequenceUpdater = (
}),
})
}
}
},
});