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