diff --git a/webapp/src/components/ConditionEditor/ConditionNodeBase.css b/webapp/src/components/ConditionEditor/ConditionNodeBase.css index f00732a..74313ce 100644 --- a/webapp/src/components/ConditionEditor/ConditionNodeBase.css +++ b/webapp/src/components/ConditionEditor/ConditionNodeBase.css @@ -49,6 +49,7 @@ .condition-node-base.is-edited>.condition-node-base--body { max-height: calc(100%-2px-1em); max-width: calc(100vw-2px-1em); + min-width: 15em; border-color: var(--mui-success-main); border-style: solid; border-width: 1px; diff --git a/webapp/src/components/ConditionEditor/ConditionNodeBase.tsx b/webapp/src/components/ConditionEditor/ConditionNodeBase.tsx index 47cc85a..8ab7374 100644 --- a/webapp/src/components/ConditionEditor/ConditionNodeBase.tsx +++ b/webapp/src/components/ConditionEditor/ConditionNodeBase.tsx @@ -56,7 +56,12 @@ export const ConditionNodeBase: FC = (props) => { } else { const Editor = getEditor(condition); childrenConditions = ( - + ); } // icons diff --git a/webapp/src/components/ConditionEditor/ConditionNodeSettings.tsx b/webapp/src/components/ConditionEditor/ConditionNodeSettings.tsx index 1da0494..b2b3754 100644 --- a/webapp/src/components/ConditionEditor/ConditionNodeSettings.tsx +++ b/webapp/src/components/ConditionEditor/ConditionNodeSettings.tsx @@ -1,6 +1,7 @@ import "./ConditionNodeSettings.css"; -import { ButtonIcon, ButtonIconProps } from "components/Icons/ButtonIcons"; +import { FC } from "react"; + import CodeOutlinedIcon from "@mui/icons-material/CodeOutlined"; import CodeOffOutlinedIcon from "@mui/icons-material/CodeOffOutlined"; import EditOutlinedIcon from "@mui/icons-material/EditOutlined"; @@ -8,7 +9,8 @@ import SaveIcon from "@mui/icons-material/Save"; import EditOffIcon from "@mui/icons-material/EditOff"; import DeleteForeverIcon from "@mui/icons-material/DeleteForever"; import SettingsApplicationsIcon from "@mui/icons-material/SettingsApplications"; -import { FC } from "react"; + +import { ButtonIcon, ButtonIconProps } from "components/Icons/ButtonIcons"; import { SpeedDial } from "components/SpeedDial"; export type ConditionNodeSettingsProps = { diff --git a/webapp/src/components/ConditionEditor/editorRender.tsx b/webapp/src/components/ConditionEditor/editorRender.tsx index 7a1e045..ed5ecd7 100644 --- a/webapp/src/components/ConditionEditor/editorRender.tsx +++ b/webapp/src/components/ConditionEditor/editorRender.tsx @@ -13,7 +13,10 @@ import { import InputNumber from "components/Inputs/InputNumber"; import InputText from "components/Inputs/InputText"; import { InputEntity } from "components/Inputs/InputEntities"; -import { ConditionNodeBase } from "./ConditionNodeBase"; +import { + ConditionNodeBase, + ConditionNodeBaseViewMode, +} from "./ConditionNodeBase"; import { genUpdateMethods } from "./nestedUpdater"; import { InputTime } from "components/Inputs/InputTime"; import InputYaml from "components/Inputs/InputYaml"; @@ -27,6 +30,7 @@ interface Editor condition: C; onChange: (condition: C) => void; ha: HAService; + initialViewMode: ConditionNodeBaseViewMode; }> {} export const getEditor = (condition: AutomationCondition): Editor => { @@ -168,6 +172,7 @@ export const NumericStateEditor: Editor = ({ export const LogicViewer: Editor = ({ condition, onChange, + initialViewMode, }) => { return ( <> @@ -178,6 +183,7 @@ export const LogicViewer: Editor = ({ condition={c} {...genUpdateMethods(condition, onChange)(i)} disableDelete={false} + initialViewMode={initialViewMode} /> ); })}