slightly better node condition editor
This commit is contained in:
1 parent
334268b5ee
commit
8a33d05ced
7 files changed
+74
-79
No files matched your search
@@ -117,7 +117,9 @@ export const ConditionNode: FC<{
|
|||||||
value={condition}
|
value={condition}
|
||||||
onChange={update => onUpdate(update as any)}
|
onChange={update => onUpdate(update as any)}
|
||||||
/>}
|
/>}
|
||||||
{!yamlMode && childrenConditions}
|
<div className={classes.conditionWrap}>
|
||||||
|
{!yamlMode && childrenConditions}
|
||||||
|
</div>
|
||||||
{!yamlMode && hasChildren && <div className={classes.addBtnContainer}>
|
{!yamlMode && hasChildren && <div className={classes.addBtnContainer}>
|
||||||
<button className={classes.addBtn} onClick={() => onAddChild()}>Add</button>
|
<button className={classes.addBtn} onClick={() => onAddChild()}>Add</button>
|
||||||
</div>}
|
</div>}
|
||||||
|
|||||||
@@ -45,7 +45,7 @@ export const TemplateEditor: Editor<TemplateCondition> = ({
|
|||||||
onChange,
|
onChange,
|
||||||
condition,
|
condition,
|
||||||
}) => {
|
}) => {
|
||||||
return <div>
|
return <>
|
||||||
<InputText label="Alias" value={condition.alias ?? getDescriptionFromAutomationNode(condition)} onChange={alias => onChange({
|
<InputText label="Alias" value={condition.alias ?? getDescriptionFromAutomationNode(condition)} onChange={alias => onChange({
|
||||||
...condition,
|
...condition,
|
||||||
alias
|
alias
|
||||||
@@ -54,7 +54,7 @@ export const TemplateEditor: Editor<TemplateCondition> = ({
|
|||||||
...condition,
|
...condition,
|
||||||
value_template
|
value_template
|
||||||
})} />
|
})} />
|
||||||
</div>
|
</>
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -62,7 +62,7 @@ export const NumericStateEditor: Editor<NumericCondition> = ({
|
|||||||
onChange,
|
onChange,
|
||||||
condition,
|
condition,
|
||||||
}) => {
|
}) => {
|
||||||
return <div>
|
return <>
|
||||||
<InputText label="Alias" value={condition.alias ?? getDescriptionFromAutomationNode(condition)} onChange={alias => onChange({
|
<InputText label="Alias" value={condition.alias ?? getDescriptionFromAutomationNode(condition)} onChange={alias => onChange({
|
||||||
...condition,
|
...condition,
|
||||||
alias
|
alias
|
||||||
@@ -98,7 +98,7 @@ export const NumericStateEditor: Editor<NumericCondition> = ({
|
|||||||
...condition,
|
...condition,
|
||||||
value_template
|
value_template
|
||||||
})} />
|
})} />
|
||||||
</div>
|
</>
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -126,7 +126,7 @@ export const StateEditor: Editor<StateCondition> = ({
|
|||||||
onChange,
|
onChange,
|
||||||
condition,
|
condition,
|
||||||
}) => {
|
}) => {
|
||||||
return <div>
|
return <>
|
||||||
<InputText label="Alias" value={condition.alias ?? getDescriptionFromAutomationNode(condition)} onChange={alias => onChange({
|
<InputText label="Alias" value={condition.alias ?? getDescriptionFromAutomationNode(condition)} onChange={alias => onChange({
|
||||||
...condition,
|
...condition,
|
||||||
alias
|
alias
|
||||||
@@ -158,14 +158,14 @@ export const StateEditor: Editor<StateCondition> = ({
|
|||||||
for: _for,
|
for: _for,
|
||||||
})}
|
})}
|
||||||
/>
|
/>
|
||||||
</div>
|
</>
|
||||||
}
|
}
|
||||||
|
|
||||||
export const TimeEditor: Editor<TimeCondition> = ({
|
export const TimeEditor: Editor<TimeCondition> = ({
|
||||||
onChange,
|
onChange,
|
||||||
condition,
|
condition,
|
||||||
}) => {
|
}) => {
|
||||||
return <div>
|
return <>
|
||||||
<InputText label="Alias" value={condition.alias ?? getDescriptionFromAutomationNode(condition)} onChange={alias => onChange({
|
<InputText label="Alias" value={condition.alias ?? getDescriptionFromAutomationNode(condition)} onChange={alias => onChange({
|
||||||
...condition,
|
...condition,
|
||||||
alias
|
alias
|
||||||
@@ -187,14 +187,14 @@ export const TimeEditor: Editor<TimeCondition> = ({
|
|||||||
})}
|
})}
|
||||||
/>
|
/>
|
||||||
<b>Weekday not support for no, use yaml for now</b> {condition.weekday}
|
<b>Weekday not support for no, use yaml for now</b> {condition.weekday}
|
||||||
</div>
|
</>
|
||||||
}
|
}
|
||||||
|
|
||||||
export const TriggerEditor: Editor<TriggerCondition> = ({
|
export const TriggerEditor: Editor<TriggerCondition> = ({
|
||||||
onChange,
|
onChange,
|
||||||
condition,
|
condition,
|
||||||
}) => {
|
}) => {
|
||||||
return <div>
|
return <>
|
||||||
<InputText label="Alias" value={condition.alias ?? getDescriptionFromAutomationNode(condition)} onChange={alias => onChange({
|
<InputText label="Alias" value={condition.alias ?? getDescriptionFromAutomationNode(condition)} onChange={alias => onChange({
|
||||||
...condition,
|
...condition,
|
||||||
alias
|
alias
|
||||||
@@ -203,14 +203,14 @@ export const TriggerEditor: Editor<TriggerCondition> = ({
|
|||||||
...condition,
|
...condition,
|
||||||
id
|
id
|
||||||
})} />
|
})} />
|
||||||
</div>
|
</>
|
||||||
}
|
}
|
||||||
|
|
||||||
export const ZoneEditor: Editor<ZoneCondition> = ({
|
export const ZoneEditor: Editor<ZoneCondition> = ({
|
||||||
onChange,
|
onChange,
|
||||||
condition,
|
condition,
|
||||||
}) => {
|
}) => {
|
||||||
return <div>
|
return <>
|
||||||
<InputText label="Alias" value={condition.alias ?? getDescriptionFromAutomationNode(condition)} onChange={alias => onChange({
|
<InputText label="Alias" value={condition.alias ?? getDescriptionFromAutomationNode(condition)} onChange={alias => onChange({
|
||||||
...condition,
|
...condition,
|
||||||
alias
|
alias
|
||||||
@@ -234,5 +234,5 @@ export const ZoneEditor: Editor<ZoneCondition> = ({
|
|||||||
state,
|
state,
|
||||||
})}
|
})}
|
||||||
/>
|
/>
|
||||||
</div>
|
</>
|
||||||
}
|
}
|
||||||
@@ -86,6 +86,9 @@ export const useStyles = createAppUseStyles<{
|
|||||||
}),
|
}),
|
||||||
icon: {},
|
icon: {},
|
||||||
deleteBtn,
|
deleteBtn,
|
||||||
|
conditionWrap: {
|
||||||
|
overflow: 'auto',
|
||||||
|
},
|
||||||
children: ({ hasChildren }) => ({
|
children: ({ hasChildren }) => ({
|
||||||
flex: 1,
|
flex: 1,
|
||||||
paddingLeft: hasChildren ? 50 : 10,
|
paddingLeft: hasChildren ? 50 : 10,
|
||||||
@@ -96,7 +99,8 @@ export const useStyles = createAppUseStyles<{
|
|||||||
border: `1px solid ${theme.secondaryAccent}`,
|
border: `1px solid ${theme.secondaryAccent}`,
|
||||||
borderBottomRightRadius: hasChildren ? 10 : 0,
|
borderBottomRightRadius: hasChildren ? 10 : 0,
|
||||||
borderBottomLeftRadius: hasChildren ? 10 : 0,
|
borderBottomLeftRadius: hasChildren ? 10 : 0,
|
||||||
minHeight: hasChildren ? undefined : '100%'
|
minHeight: hasChildren ? undefined : '100%',
|
||||||
|
overflow: 'scroll'
|
||||||
}),
|
}),
|
||||||
addBtnContainer: {
|
addBtnContainer: {
|
||||||
display: 'flex',
|
display: 'flex',
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
import { PropsWithChildren, useState } from "react";
|
import { PropsWithChildren, useState } from "react";
|
||||||
import { useToolTip } from "tooltip/context";
|
import { useToolTip } from "tooltip/context";
|
||||||
import TextField from '@mui/material/TextField';
|
import TextField from '@mui/material/TextField';
|
||||||
|
import InputWrapper from "./InputWrapper";
|
||||||
|
|
||||||
export interface Props {
|
export interface Props {
|
||||||
textBoxFor?: string;
|
textBoxFor?: string;
|
||||||
@@ -25,67 +26,35 @@ export default function InputText({
|
|||||||
}: PropsWithChildren<Props>) {
|
}: PropsWithChildren<Props>) {
|
||||||
const tooltip = useToolTip();
|
const tooltip = useToolTip();
|
||||||
const [isFocused, setIsFocused] = useState(false)
|
const [isFocused, setIsFocused] = useState(false)
|
||||||
return <TextField multiline={multiline} maxRows={maxRows} fullWidth inputMode="text" variant="filled" focused={isFocused} label={label} value={value}
|
return <InputWrapper label="">
|
||||||
onKeyDown={e => {
|
<TextField multiline={multiline} maxRows={maxRows} fullWidth inputMode="text" variant="filled" focused={isFocused} label={label} value={value}
|
||||||
if (e.key === 'Enter') {
|
onKeyDown={e => {
|
||||||
onEnter();
|
if (e.key === 'Enter') {
|
||||||
}
|
onEnter();
|
||||||
}}
|
}
|
||||||
onChange={e => {
|
}}
|
||||||
e.preventDefault();
|
onChange={e => {
|
||||||
onChange(e.target.value)
|
e.preventDefault();
|
||||||
}}
|
onChange(e.target.value)
|
||||||
onBlur={() => {
|
}}
|
||||||
setIsFocused(false)
|
onBlur={() => {
|
||||||
}}
|
setIsFocused(false)
|
||||||
onFocus={e => {
|
}}
|
||||||
setIsFocused(true)
|
onFocus={e => {
|
||||||
if (textBoxFor) {
|
setIsFocused(true)
|
||||||
tooltip.setFocus(
|
if (textBoxFor) {
|
||||||
e.target.getBoundingClientRect(),
|
tooltip.setFocus(
|
||||||
{
|
e.target.getBoundingClientRect(),
|
||||||
searchObject: textBoxFor,
|
{
|
||||||
searchText: value,
|
searchObject: textBoxFor,
|
||||||
filterObjects: additionalTooltipFilters,
|
searchText: value,
|
||||||
},
|
filterObjects: additionalTooltipFilters,
|
||||||
onChange
|
},
|
||||||
)
|
onChange
|
||||||
}
|
)
|
||||||
}}
|
}
|
||||||
>
|
}}
|
||||||
|
/>
|
||||||
{children}
|
{children}
|
||||||
</TextField>
|
</InputWrapper>
|
||||||
// return <InputWrapper label={label} labelSize={(value === '') && !isFocused ? 'normal' : 'small'}>
|
|
||||||
// <input
|
|
||||||
// className={classes.input}
|
|
||||||
// value={value}
|
|
||||||
// onKeyDown={e => {
|
|
||||||
// if (e.key === 'Enter') {
|
|
||||||
// onEnter();
|
|
||||||
// }
|
|
||||||
// }}
|
|
||||||
// onChange={e => {
|
|
||||||
// e.preventDefault();
|
|
||||||
// onChange(e.target.value)
|
|
||||||
// }}
|
|
||||||
// onBlur={e => {
|
|
||||||
// setIsFocused(false)
|
|
||||||
// }}
|
|
||||||
// onFocus={e => {
|
|
||||||
// setIsFocused(true)
|
|
||||||
// if (textBoxFor) {
|
|
||||||
// tooltip.setFocus(
|
|
||||||
// e.target.getBoundingClientRect(),
|
|
||||||
// {
|
|
||||||
// searchObject: textBoxFor,
|
|
||||||
// searchText: value,
|
|
||||||
// filterObjects: additionalTooltipFilters,
|
|
||||||
// },
|
|
||||||
// onChange
|
|
||||||
// )
|
|
||||||
// }
|
|
||||||
// }}
|
|
||||||
// />
|
|
||||||
// {children}
|
|
||||||
// </InputWrapper>
|
|
||||||
}
|
}
|
||||||
@@ -1,5 +1,22 @@
|
|||||||
.multinode-editor {
|
.multinode-editor {
|
||||||
max-width: 80vw;
|
max-width: 80vw;
|
||||||
|
min-width: 60vw;
|
||||||
|
}
|
||||||
|
|
||||||
|
.multinode-editor.mobile {
|
||||||
|
max-width: 95vw;
|
||||||
|
}
|
||||||
|
|
||||||
|
.multinode-editor .node-editor--root {
|
||||||
|
padding: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.multinode-editor .node-editor--body {
|
||||||
|
padding-bottom: 1em;
|
||||||
|
padding-top: 0.25em;
|
||||||
|
padding-left: 0.25em;
|
||||||
|
padding-right: 0.25em;
|
||||||
|
max-height: 60vh;
|
||||||
}
|
}
|
||||||
|
|
||||||
.multinode-editor--navbar {
|
.multinode-editor--navbar {
|
||||||
|
|||||||
@@ -4,11 +4,13 @@ import { NodeEditor } from 'components/NodeEditor';
|
|||||||
import { Button } from 'components/Inputs/Button';
|
import { Button } from 'components/Inputs/Button';
|
||||||
import { useMultiNodeEditorState } from "./state";
|
import { useMultiNodeEditorState } from "./state";
|
||||||
import { MultiNodeEditorProps } from "./types";
|
import { MultiNodeEditorProps } from "./types";
|
||||||
|
import useWindowSize from 'utils/useWindowSize';
|
||||||
|
|
||||||
|
|
||||||
export const MultiNodeEditor: FC<MultiNodeEditorProps> = props => {
|
export const MultiNodeEditor: FC<MultiNodeEditorProps> = props => {
|
||||||
// state
|
// state
|
||||||
const state = useMultiNodeEditorState(props)
|
const state = useMultiNodeEditorState(props);
|
||||||
|
const { isMobile } = useWindowSize();
|
||||||
// components
|
// components
|
||||||
const nextOrAddBtn = <Button
|
const nextOrAddBtn = <Button
|
||||||
onClick={state.moveForward}
|
onClick={state.moveForward}
|
||||||
@@ -33,7 +35,7 @@ export const MultiNodeEditor: FC<MultiNodeEditorProps> = props => {
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
}
|
}
|
||||||
return <div className={["multinode-editor", state.isModified ? "modded" : ''].join(' ')}>
|
return <div className={["multinode-editor", state.isModified ? "modded" : '', isMobile ? 'mobile' : ''].join(' ')}>
|
||||||
<div className="multinode-editor--navbar">
|
<div className="multinode-editor--navbar">
|
||||||
<Button onClick={state.moveBack} disabled={state.currentSlideNumber === 0}>{"<<"}</Button>
|
<Button onClick={state.moveBack} disabled={state.currentSlideNumber === 0}>{"<<"}</Button>
|
||||||
<Button onClick={state.onRemove}> Delete</Button>
|
<Button onClick={state.onRemove}> Delete</Button>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
justify-content: center;
|
justify-content: center;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
padding: 1em;
|
padding: 0.5em;
|
||||||
margin-top: 0.5em;
|
margin-top: 0.5em;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -39,6 +39,7 @@
|
|||||||
|
|
||||||
min-width: 100%;
|
min-width: 100%;
|
||||||
min-height: fit-content;
|
min-height: fit-content;
|
||||||
|
max-width: 100%;
|
||||||
}
|
}
|
||||||
|
|
||||||
.node-editor--footer {
|
.node-editor--footer {
|
||||||
|
|||||||
Reference in new issue
Block a user