cleaned up multinode stlying

This commit is contained in:
ari committed 2022-05-13 17:26:44 -04:00
1 parent 8d804add13
commit bfc95db6f6
14 files changed
+402 -69

No files matched your search

@@ -43,7 +43,6 @@ export const useStyles = createAppUseStyles<{
borderBottomRightRadius: 0,
borderBottomLeftRadius: hasChildren ? 0 : 10,
padding: 10,
maxWidth: 120,
minWidth: 30,
textOverflow: 'ellipsis',
textAlign: 'center',
@@ -58,7 +57,8 @@ export const useStyles = createAppUseStyles<{
},
modifyBtn: ({ hasChildren }) => ({
// styling
backgroundColor: theme.primary,
backgroundColor: theme.green,
color: theme.primary,
fill: theme.primaryAccent,
borderColor: theme.primaryAccent,
borderWidth: 1,
@@ -72,13 +72,12 @@ export const useStyles = createAppUseStyles<{
justifyContent: 'center',
alignItems: 'center',
padding: '0px 10px',
// position: hasChildren ? 'absolute' : 'block',
right: 1,
top: 10,
// on hover
"&:hover": {
backgroundColor: theme.primaryLight,
backgroundColor: theme.greenLight,
fill: theme.primaryAccentLight,
},
"&:hover $icon": {
@@ -94,7 +93,7 @@ export const useStyles = createAppUseStyles<{
display: 'flex',
flexDirection: 'column',
justifyContent: 'center',
border: `1px solid ${theme.primaryAccent}`,
border: `1px solid ${theme.secondaryAccent}`,
borderBottomRightRadius: hasChildren ? 10 : 0,
borderBottomLeftRadius: hasChildren ? 10 : 0,
minHeight: hasChildren ? undefined : '100%'
+1 -4
View File
@@ -59,10 +59,7 @@ export const DAGAutomationFlow: FC<Props> = ({
modalBody = <MultiNodeEditor
sequence={modalState.node}
onClose={() => setModalState(null)}
onSave={(n) => {
modalState.update(n as any);
setModalState(null);
}}
onSave={(n) => modalState.update(n as any)}
allowedTypes={['condition']}
/>
}
@@ -0,0 +1,15 @@
.multinode-editor {
max-width: 80vw;
}
.multinode-editor--navbar {
display: flex;
flex-direction: row;
justify-content: space-evenly;
align-items: center;
min-width: 20vw;
}
.multinode-editor.modded>.multinode-editor--navbar * {
border-color: var(--green-light);
}
@@ -30,7 +30,9 @@ export default {
export const Simple: ComponentStory<typeof MultiNodeEditor> = args => {
return <div className="page">
<MultiNodeEditor {...args} />
<div className="center column" style={{ paddingTop: "1em" }}>
<MultiNodeEditor {...args} />
</div>
</div>
}
export const InAModal: ComponentStory<typeof MultiNodeEditor> = props => {
@@ -1,3 +1,4 @@
import "./index.css";
import { FC, useState } from 'react';
import { AutomationNode, AutomationNodeMapping } from 'types/automations';
import { NodeEditor } from 'components/NodeEditor';
@@ -39,64 +40,53 @@ export interface MultiNodeEditorProps {
export const MultiNodeEditor: FC<MultiNodeEditorProps> = ({
sequence: initialState,
allowedTypes = ['action', 'condition'],
onClose = () => { },
onClose: _onClose = () => { },
onSave = () => { },
}) => {
// state
const [{ slide, state, isNodeModified, isModified, isReady }, setState] = useState({
const [{ slide, state, isModified, isReady }, setState] = useState({
slide: 0,
state: initialState,
isModified: false,
isNodeModified: false,
isReady: true,
})
// alias
const areYouSureItsModified = () => isNodeModified ?
window.confirm("You've made changes, by pressing this you will lose them!") :
true
const areYouSureItsNotReady = () => !isReady ?
window.confirm("The node is not ready, are you sure you want to move?") :
true
const areYouSureItsModified = () => !isModified ?
window.confirm("If you close this without saving, you will lose all progress!") :
true
const onClose = () => areYouSureItsModified() ?
_onClose() :
null
const onAdd = () => setState({
slide: state.length,
state: [...state, makeDefault(allowedTypes[0])],
isNodeModified: false,
isReady,
isModified: true,
});
const onRemove = () => setState({
slide: slide > 0 ? slide - 1 : 0,
state: [...state.slice(0, slide), ...state.slice(slide + 1)],
isNodeModified: false,
isReady,
isModified: true,
});
const onNodeSave = (n: AutomationNode) => setState({
slide,
state: [...state.slice(0, slide), n, ...state.slice(slide + 1)],
isNodeModified: false,
isReady,
isModified: true,
});
const onSaveAll = () => isNodeModified ?
window.alert("Please save the node data first!") :
onSave(state)
const onAllSave = (n: AutomationNode) => onSave([
...state.slice(0, slide), n, ...state.slice(slide + 1)
]);
const onNextOrAdd = () => {
if (!areYouSureItsModified()) {
return
}
if (!areYouSureItsNotReady()) {
return
}
if (slide >= state.length - 1) {
onAdd()
} else {
setState({ slide: slide + 1, state, isNodeModified, isReady, isModified, })
setState({ slide: slide + 1, state, isReady, isModified, })
}
}
const onBack = () => areYouSureItsModified() &&
areYouSureItsNotReady() &&
setState({ slide: slide - 1, state, isNodeModified, isReady, isModified, })
const onBack = () => areYouSureItsNotReady() &&
setState({ slide: slide - 1, state, isReady, isModified })
// components
const nextOrAddBtn = <Button
onClick={onNextOrAdd}
@@ -117,24 +107,15 @@ export const MultiNodeEditor: FC<MultiNodeEditorProps> = ({
{nextOrAddBtn}
</div>
<div className='column center' style={{ marginTop: '1em' }}>
<Button onClick={() => areYouSureItsModified() && onClose()}>Close</Button>
<Button onClick={onClose}>Close</Button>
<Button onClick={() => onSave(state)}>Save</Button>
</div>
</div>
}
return <>
<div style={{
display: 'flex',
flexDirection: 'row',
justifyContent: 'space-evenly',
alignItems: 'center',
minWidth: '20vw',
}}>
return <div className={["multinode-editor", isModified ? "modded" : ''].join(' ')}>
<div className="multinode-editor--navbar">
<Button onClick={onBack} disabled={slide === 0}>{"<<"}</Button>
<Button
onClick={onRemove}
>
Delete
</Button>
<Button onClick={onRemove}> Delete</Button>
{nextOrAddBtn}
</div>
<NodeEditor
@@ -142,19 +123,14 @@ export const MultiNodeEditor: FC<MultiNodeEditorProps> = ({
node={state[slide]}
allowedTypes={allowedTypes}
onClose={onClose}
onSave={onNodeSave}
onSave={onAllSave}
onFlags={
(ir, inm) => ((inm !== isNodeModified) || (ir !== isReady)) &&
setState({ slide, state, isNodeModified: inm, isReady: ir, isModified })
(ir) => (ir !== isReady) &&
setState({ slide, state, isReady: ir, isModified })
}
>
<Button onClick={onSaveAll} style={{
borderColor: isModified ? "var(--change)" : undefined,
color: isModified ? "var(--change)" : undefined,
}}>Save All</Button>
</NodeEditor>
/>
<div className='column center'>
<span>{slide + 1}/{state.length}</span>
</div>
</>
</div>
}
@@ -17,6 +17,10 @@
border-color: var(--change);
}
.node-editor--root.not-ready .node-editor--footer--save {
color: var(--error)
}
.node-editor--body-title {
display: flex;
flex-direction: row;
+11 -6
View File
@@ -27,15 +27,18 @@ export const NodeEditor: FC<Props> = ({
// state
const state = useEditorNodeState(node);
// state
// alias
const isModified = state.isModified;
const isReady = state.isReady();
const areYouSureNotReady = () => !isReady ?
window.confirm("This node is missing some values, are you sure you want to save?") :
true;
// events
onFlags(isReady, isModified);
// render
return <div className={["node-editor--root", isModified ? "modded" : ""].join(" ")}>
return <div className={["node-editor--root", isModified ? "modded" : "", !isReady ? 'not-ready' : ''].join(" ")}>
<div className="node-editor--body">
<div className="node-editor--body-title">
{allowedTypes.length > 1 ? <InputList
@@ -54,10 +57,12 @@ export const NodeEditor: FC<Props> = ({
{state.renderOptionList()}
</div>
<div className="node-editor--footer">
<Button onClick={onClose}>Close</Button>
<Button onClick={() => {
isReady && onSave(state.data)
}} disabled={!isReady}>{saveBtnCreateText ? "Create" : "Save"}</Button>
<Button className="node-editor--footer--close" onClick={onClose}>Close</Button>
<Button className="node-editor--footer--save" onClick={() => {
areYouSureNotReady() && onSave(state.data)
}} title={!isReady ? "Some fields have not been properly filled up" : ""}>
{saveBtnCreateText ? "Create" : "Save"}
</Button>
{children}
</div>
</div>