nested updater
This commit is contained in:
1 parent
1ac812da60
commit
831de545a2
6 files changed
+87
-63
No files matched your search
@@ -1,6 +1,7 @@
|
||||
import { Classes } from "jss";
|
||||
import { FC } from "react";
|
||||
import { FC, useState } from "react";
|
||||
import { AutomationCondition } from "~/automations/types/conditions";
|
||||
import { CheckMarkIcon, PencilIcon } from "~/icons/icons";
|
||||
import { getEditor } from "./editorRender";
|
||||
import { useStyles } from "./style";
|
||||
import { getViewer } from "./viewRender";
|
||||
@@ -26,11 +27,18 @@ export const ConditionNode: FC<{
|
||||
onAddChild=() => {},
|
||||
children=() => {},
|
||||
}) => {
|
||||
// state
|
||||
const [internalDisplayMode, setInternalDisplayMode] = useState(true);
|
||||
// alias
|
||||
const effectiveDM = displayMode && internalDisplayMode;
|
||||
console.log({effectiveDM})
|
||||
// children
|
||||
let childrenConditions: JSX.Element;
|
||||
if (displayMode) {
|
||||
if (effectiveDM) {
|
||||
const Viewer = getViewer(condition);
|
||||
childrenConditions = <Viewer condition={condition}/>
|
||||
childrenConditions = <Viewer condition={condition} onChange={data => {
|
||||
onUpdate(data)
|
||||
}}/>
|
||||
} else {
|
||||
const Editor = getEditor(condition);
|
||||
childrenConditions = <Editor condition={condition} onChange={data => {
|
||||
@@ -53,9 +61,12 @@ export const ConditionNode: FC<{
|
||||
<button className={p.isRoot ? classes.deleteBtnRoot : classes.deleteBtn} onClick={p?.onClick}>X</button>
|
||||
|
||||
return <div className={classes.root}>
|
||||
{(showDelete || !displayMode) && <DeleteButton isRoot onClick={ () => onDelete('root')}/>}
|
||||
{(showDelete || !effectiveDM) && <DeleteButton isRoot onClick={ () => onDelete('root')}/>}
|
||||
<div className={classes.title}>
|
||||
<span className={classes.titleText}>{condition.condition.replace('_', ' ')}</span>
|
||||
<button className={classes.modifyBtn} onClick={() => setInternalDisplayMode(!effectiveDM)}>
|
||||
{effectiveDM ? <PencilIcon className={classes.icon}/> : <CheckMarkIcon className={classes.icon}/>}
|
||||
</button>
|
||||
</div>
|
||||
<div className={classes.children}>
|
||||
{childrenConditions}
|
||||
|
||||
@@ -6,6 +6,7 @@ import InputText from "../Inputs/InputText";
|
||||
import InputTextArea from "../Inputs/InputTextArea";
|
||||
import { InputEntity } from "../Inputs/InputTextBubble";
|
||||
import { ConditionNode } from "./ConditionNode";
|
||||
import { genUpdateMethods } from "./nestedUpdater";
|
||||
|
||||
|
||||
interface Editor<C extends AutomationCondition> extends FC<{
|
||||
@@ -127,50 +128,7 @@ export const LogicViewer: Editor<LogicCondition> = ({
|
||||
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
|
||||
})
|
||||
}
|
||||
}}
|
||||
{...genUpdateMethods(condition, onChange)(i)}
|
||||
/>
|
||||
} )}
|
||||
</>
|
||||
|
||||
@@ -33,8 +33,8 @@ export const ConditionEditor: FC<{
|
||||
onAddChild={onAddChild}
|
||||
showDelete
|
||||
>
|
||||
{({classes}) => <button className={classes.modifyBtn} onClick={() => setDisplayMode(!displayMode)}>
|
||||
{/* {({classes}) => <button className={classes.modifyBtn} onClick={() => setDisplayMode(!displayMode)}>
|
||||
{displayMode ? <PencilIcon className={classes.icon}/> : <CheckMarkIcon className={classes.icon}/>}
|
||||
</button>}
|
||||
</button>} */}
|
||||
</ConditionNode>
|
||||
}
|
||||
@@ -0,0 +1,49 @@
|
||||
import { AutomationCondition, LogicCondition } from "~/automations/types/conditions";
|
||||
|
||||
|
||||
export const genUpdateMethods = (condition: LogicCondition, onChange: (c: LogicCondition) => void) => (i: number) => ({
|
||||
onUpdate: (update: AutomationCondition) => 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: 'root' | number) => {
|
||||
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
|
||||
})
|
||||
}
|
||||
}
|
||||
})
|
||||
@@ -41,8 +41,8 @@ export const useStyles = createAppUseStyles<{
|
||||
background: theme.condition.primaryColor,
|
||||
border: `1px solid ${theme.primaryAccent}`,
|
||||
borderRadius: 10,
|
||||
borderTopRightRadius: hasChildren ? 10 : 0,
|
||||
borderBottomRightRadius: hasChildren ? 10 : 0,
|
||||
borderTopRightRadius: 0,
|
||||
borderBottomRightRadius: 0,
|
||||
borderBottomLeftRadius: hasChildren ? 0 : 10,
|
||||
padding: 10,
|
||||
maxWidth: 80,
|
||||
@@ -60,18 +60,19 @@ export const useStyles = createAppUseStyles<{
|
||||
// styling
|
||||
backgroundColor: theme.primary,
|
||||
fill: theme.primaryAccent,
|
||||
border: hasChildren ? 'none' : `1px solid ${theme.primaryAccent}`,
|
||||
borderRadius: 10,
|
||||
borderTopLeftRadius: hasChildren ? 10 : 0,
|
||||
borderBottomLeftRadius: hasChildren ? 10 : 0,
|
||||
borderColor: theme.primaryAccent,
|
||||
borderWidth: 1,
|
||||
borderRadius: hasChildren ? 10 : 0,
|
||||
borderTopLeftRadius: 0,
|
||||
borderBottomLeftRadius: 0,
|
||||
cursor: 'pointer',
|
||||
|
||||
// positioning
|
||||
display: 'flex',
|
||||
justifyContent: 'center',
|
||||
alignItems: 'center',
|
||||
padding: 5,
|
||||
position: hasChildren ? 'absolute' : 'block',
|
||||
padding: '0px 10px',
|
||||
// position: hasChildren ? 'absolute' : 'block',
|
||||
right: 1,
|
||||
top: 10,
|
||||
|
||||
|
||||
@@ -2,10 +2,12 @@ import { FC } from "react";
|
||||
import { AutomationCondition, LogicCondition, TemplateCondition } from "~/automations/types/conditions";
|
||||
import { getDescriptionFromAutomationNode } from "~/automations/utils";
|
||||
import { ConditionNode } from "./ConditionNode";
|
||||
import { genUpdateMethods } from "./nestedUpdater";
|
||||
|
||||
|
||||
interface Viewer<C extends AutomationCondition> extends FC<{
|
||||
condition: C,
|
||||
condition: C;
|
||||
onChange: (condition: C) => void;
|
||||
}> {}
|
||||
|
||||
export const getViewer = (condition: AutomationCondition): Viewer<any> => {
|
||||
@@ -23,17 +25,20 @@ export const getViewer = (condition: AutomationCondition): Viewer<any> => {
|
||||
export const GenericViewer: Viewer<AutomationCondition> = ({
|
||||
condition,
|
||||
}) => {
|
||||
return <div>
|
||||
return <>
|
||||
{getDescriptionFromAutomationNode(condition)}
|
||||
</div>
|
||||
</>
|
||||
}
|
||||
|
||||
export const LogicViewer: Viewer<LogicCondition> = ({
|
||||
condition,
|
||||
onChange,
|
||||
}) => {
|
||||
return <>
|
||||
{condition.condition_data.conditions.map( (condition, i) => {
|
||||
return <ConditionNode key={i} condition={condition} displayMode/>
|
||||
{condition.condition_data.conditions.map( (c, i) => {
|
||||
return <ConditionNode key={i} condition={c} displayMode
|
||||
{...genUpdateMethods(condition, onChange)(i)}
|
||||
/>
|
||||
} )}
|
||||
</>
|
||||
}
|
||||
Reference in new issue
Block a user