fixed up styling for choose

This commit is contained in:
ari committed 2022-07-12 18:47:18 -04:00
1 parent 084a3585d0
commit 0c5ef76f4b
11 files changed
+283 -61

No files matched your search

@@ -7,7 +7,7 @@ export const CIRCLE_SIZE = 40 as const;
export const DEFAULT_DIMS: DAGDims = {
trigger: {
height: NODE_HEIGHT * 3,
width: NODE_WIDTH * 4.5,
width: NODE_WIDTH * 1.5,
},
node: {
height: NODE_HEIGHT,
@@ -15,7 +15,7 @@ export const DEFAULT_DIMS: DAGDims = {
},
condition: {
height: NODE_HEIGHT * 3,
width: NODE_WIDTH * 4.5,
width: NODE_WIDTH * 1.5,
},
circle: {
height: CIRCLE_SIZE,
@@ -22,6 +22,46 @@ export const moveAlong = (
return !dims.flipped ? moveOnX : moveOnY;
};
export const moveAlongOnce = (
by: keyof DAGEntities,
startPoint: XYPosition,
dims: DAGDims,
reversed: boolean = false
): XYPosition => {
const moveOnY = {
y: startPoint.y + dims[by].height * (dims.distanceFactor.node - 1),
x: startPoint.x,
};
const moveOnX = {
x: startPoint.x + dims[by].width * (dims.distanceFactor.node - 1),
y: startPoint.y,
};
if (reversed) {
return dims.flipped ? moveOnX : moveOnY;
}
return !dims.flipped ? moveOnX : moveOnY;
};
export const moveAlongRelativeTo = (
offsetPos: XYPosition,
relatedPos: XYPosition,
dims: DAGDims,
incrementBy: keyof DAGEntities = "condition"
) =>
dims.flipped
? {
x:
relatedPos.x +
(dims.distanceFactor.node - 1) * dims[incrementBy].width,
y: offsetPos.y,
}
: {
y:
relatedPos.y +
(dims.distanceFactor.node - 1) * dims[incrementBy].height,
x: offsetPos.x,
};
export const moveFromTo = (
from: keyof DAGEntities,
to: keyof DAGEntities,
@@ -97,7 +97,7 @@ export const makeTriggerNodes: ElementMaker<AutomationTrigger> = (
state.addNode(
CollectionNodeMaker.makeElement({ id: nodeId, position }, dims, {
...dims.trigger,
color: "red",
collectionType: "trigger",
onAddNode: () => stateUpdater.basic.trigger.addNode(null),
nodes: nodes.map((node, index) => ({
enabled: node.enabled ?? true,
@@ -117,7 +117,7 @@ export const makeConditionNodes: ElementMaker<AutomationCondition> = (
state.addNode(
CollectionNodeMaker.makeElement({ id: nodeId, position }, dims, {
...dims.condition,
color: "blue",
collectionType: "condition",
hasInput: !!lastNodeId,
onAddNode: () => stateUpdater.basic.condition.addNode(null),
nodes: nodes.map((node, index) => ({
@@ -127,6 +127,7 @@ export const makeConditionNodes: ElementMaker<AutomationCondition> = (
})),
})
);
console.log("pre", { lastNodeId, stateLast: state.lastNodeId });
if (lastNodeId && state.lastNodeId) {
state.addEdge(lastNodeId, state.lastNodeId, true);
}
@@ -227,25 +228,19 @@ export const makeChooseeNodes: ElementMaker<ChooseAction> = (nodes, args) => {
) => {
let pos = offsetPos;
let lastNodeId = args.lastNodeId;
// if (condition !== null) {
// const conditionState = makeConditionNodes(condition, {
// ...args,
// position: pos,
// lastNodeId,
// nodeIndex: index,
// nodeId: `${args.nodeId}-choose-${index}-condition`,
// });
// // pos.y = conditionState.bbox[1].y;
// state.extend(conditionState);
// if (lastNodeId && conditionState.data.nodes.length > 0) {
// state.addEdge(lastNodeId, conditionState.data.nodes[0].id, true);
// }
// lastNodeId = conditionState.lastNodeId ?? lastNodeId;
// pos = {
// y: conditionState.bbox[1].y,
// x: pos.x,
// };
// }
if (condition !== null) {
const conditionState = makeConditionNodes(condition, {
...args,
position: pos,
lastNodeId,
nodeIndex: index,
nodeId: `${args.nodeId}-choose-${nodeIndex}-${index}-condition`,
});
conditionState.data.edges[0].label = `Condition #${index}`;
state.extend(conditionState);
pos = distance.moveFromTo("condition", "node", pos, args.dims);
lastNodeId = conditionState.lastNodeId;
}
const output = makeSequenceNodes(sequence, {
...args,
position: pos,
@@ -254,21 +249,19 @@ export const makeChooseeNodes: ElementMaker<ChooseAction> = (nodes, args) => {
nodeId: `${args.nodeId}-choose-${index}-sequence`,
});
if (lastNodeId && output.data.nodes.length > 0) {
state.addEdge(lastNodeId, output.data.nodes[0].id, true);
state.addEdge(
lastNodeId,
output.data.nodes[0].id,
true,
condition === null ? "else" : undefined
);
}
offsetPos = args.dims.flipped
? {
x:
output.bbox[1].x +
(args.dims.distanceFactor.node - 1) * args.dims.node.width,
y: offsetPos.y,
}
: {
y:
output.bbox[1].y +
(args.dims.distanceFactor.node - 1) * args.dims.node.height,
x: offsetPos.x,
};
offsetPos = distance.moveAlongRelativeTo(
offsetPos,
output.bbox[1],
args.dims,
condition === null ? "node" : "condition"
);
state.extend(output);
};
@@ -49,11 +49,17 @@ export class DAGElementsState {
return node;
}
public addEdge(from: string, to: string, animated: boolean = false) {
public addEdge(
from: string,
to: string,
animated: boolean = false,
label: string | undefined = undefined
) {
this.data.edges.push({
id: `${from}->${to}`,
source: from,
target: to,
label,
animated,
});
}