nested updater

This commit is contained in:
Ari Sosnovsky committed 2021-11-16 21:17:22 -05:00
1 parent 1ac812da60
commit 831de545a2
6 files changed
+87 -63

No files matched your search

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