propogated nested editor
This commit is contained in:
1 parent
2a64d06eb2
commit
6be9f1ba12
6 files changed
+75
-6
No files matched your search
@@ -14,7 +14,6 @@ export default ({
|
||||
}: EdgeProp) => {
|
||||
const [_,my] = [(x1+x2)/2, (y1+y2)/2]
|
||||
const theta = Math.atan2(y2 -y1, x2-x1) - Math.PI / 2
|
||||
console.log({theta}, Math.sin(theta))
|
||||
const cx1 = x1 - 45 * Math.sin(theta)
|
||||
const cy1 = my - 30 * Math.cos(theta)
|
||||
const cx2 = x2 + 45 * Math.sin(theta)
|
||||
|
||||
@@ -34,7 +34,6 @@ export const ConditionNode: FC<{
|
||||
} else {
|
||||
const Editor = getEditor(condition);
|
||||
childrenConditions = <Editor condition={condition} onChange={data => {
|
||||
console.log({data})
|
||||
onUpdate(data)
|
||||
}}/>
|
||||
}
|
||||
|
||||
@@ -1,8 +1,9 @@
|
||||
import { FC } from "react";
|
||||
import { AutomationCondition, TemplateCondition } from "~/automations/types/conditions";
|
||||
import { AutomationCondition, LogicCondition, TemplateCondition } from "~/automations/types/conditions";
|
||||
import { getDescriptionFromAutomationNode } from "~/automations/utils";
|
||||
import InputText from "../Inputs/InputText";
|
||||
import InputTextArea from "../Inputs/InputTextArea";
|
||||
import { ConditionNode } from "./ConditionNode";
|
||||
|
||||
|
||||
interface Editor<C extends AutomationCondition> extends FC<{
|
||||
@@ -15,6 +16,12 @@ export const getEditor = (condition: AutomationCondition): Editor<any> => {
|
||||
switch (condition.condition) {
|
||||
case 'template':
|
||||
return TemplateEditor;
|
||||
case 'and':
|
||||
return LogicViewer;
|
||||
case 'or':
|
||||
return LogicViewer;
|
||||
case 'not':
|
||||
return LogicViewer;
|
||||
default:
|
||||
return () => <div>Not Ready</div>
|
||||
}
|
||||
@@ -40,4 +47,65 @@ export const TemplateEditor: Editor<TemplateCondition> = ({
|
||||
}
|
||||
})} resizable/>
|
||||
</div>
|
||||
}
|
||||
|
||||
|
||||
export const LogicViewer: Editor<LogicCondition> = ({
|
||||
condition,
|
||||
onChange,
|
||||
}) => {
|
||||
|
||||
return <>
|
||||
{condition.condition_data.conditions.map( (c, i) => {
|
||||
return <ConditionNode
|
||||
key={i}
|
||||
condition={c}
|
||||
displayMode={false}
|
||||
onUpdate={update => onChange({
|
||||
...condition,
|
||||
condition_data: {
|
||||
...condition.condition_data,
|
||||
conditions: [
|
||||
...condition.condition_data.conditions.slice(0, i),
|
||||
update,
|
||||
...condition.condition_data.conditions.slice(i+1)
|
||||
]
|
||||
}
|
||||
})}
|
||||
onDelete={which => {
|
||||
if (which === 'root') {
|
||||
onChange({
|
||||
...condition,
|
||||
condition_data: {
|
||||
...condition.condition_data,
|
||||
conditions: condition.condition_data.conditions.slice(0, i).concat(
|
||||
condition.condition_data.conditions.slice(i+1)
|
||||
)
|
||||
}
|
||||
})
|
||||
} else {
|
||||
const data = (c as LogicCondition).condition_data;
|
||||
const update = {
|
||||
...condition.condition_data,
|
||||
conditions: [
|
||||
...condition.condition_data.conditions.slice(0, i),
|
||||
{
|
||||
...c,
|
||||
condition_data: {
|
||||
...data,
|
||||
conditions: data.conditions.slice(0, which).concat(data.conditions.concat(which+1))
|
||||
}
|
||||
},
|
||||
...condition.condition_data.conditions.slice(i+1)
|
||||
]
|
||||
}
|
||||
onChange({
|
||||
...condition,
|
||||
condition_data: update as any
|
||||
})
|
||||
}
|
||||
}}
|
||||
/>
|
||||
} )}
|
||||
</>
|
||||
}
|
||||
@@ -15,7 +15,9 @@ const Template: ComponentStory<typeof ConditionEditor> = ({condition, ...args})
|
||||
const {classes} = usePageTheme({});
|
||||
const [data, setData] = useState(condition);
|
||||
return <div className={classes.page}>
|
||||
<ConditionEditor {...args} condition={data} onUpdate={setData} />
|
||||
<ConditionEditor {...args} condition={data} onUpdate={data => {
|
||||
setData(data)
|
||||
}} />
|
||||
</div>
|
||||
}
|
||||
|
||||
|
||||
@@ -27,7 +27,9 @@ export const ConditionEditor: FC<{
|
||||
displayMode={displayMode}
|
||||
condition={condition}
|
||||
onDelete={onDelete}
|
||||
onUpdate={onUpdate}
|
||||
onUpdate={update => {
|
||||
onUpdate(update)
|
||||
}}
|
||||
onAddChild={onAddChild}
|
||||
showDelete
|
||||
>
|
||||
|
||||
@@ -31,7 +31,6 @@ export default function InputViewEdit({
|
||||
const inputRef = useRef<HTMLInputElement | null>(null);
|
||||
useEffect(() => {
|
||||
if (isEditing && inputRef.current) {
|
||||
console.log('focusing...')
|
||||
inputRef.current.focus()
|
||||
}
|
||||
}, [inputRef.current, isEditing]);
|
||||
|
||||
Reference in new issue
Block a user