cleaned up options styles

This commit is contained in:
ari committed 2022-06-29 16:34:59 -04:00
1 parent 4d9afbe26b
commit 0088dd8448
11 files changed
+106 -104

No files matched your search

@@ -1,3 +1,7 @@
.condition-node--settings {
width: 3em;
}
.condition-node--settings--icons {
display: inline-block;
max-width: 5em;
@@ -15,4 +19,16 @@
.condition-node--settings button.Mui-disabled {
cursor: not-allowed;
}
.condition-node--settings .speed-dial--button {
max-width: 4em;
max-height: 4em;
height: 4em;
width: 4em;
}
.condition-node--settings .speed-dial--button:hover button {
background-color: var(--secondary-accent);
}
@@ -1,19 +0,0 @@
.condition-node--settings.mobile {
width: 3em;
}
.condition-node--settings.mobile .speed-dial--button {
max-width: 4em;
max-height: 4em;
height: 4em;
width: 4em;
}
.condition-node--settings.mobile .speed-dial--button:hover button {
background-color: var(--secondary-accent);
}
.condition-node--settings.mobile .speed-dial--list.open {
top: 3.5em;
/* left: 0.5em; */
}
@@ -1,5 +1,4 @@
import "./ConditionNodeSettings.css";
import "./ConditionNodeSettings.mobile.css";
import { ButtonIcon, ButtonIconProps } from "components/Icons/ButtonIcons";
import CodeOutlinedIcon from "@mui/icons-material/CodeOutlined";
@@ -64,38 +63,26 @@ export const ConditionNodeSettings: FC<ConditionNodeSettingsProps> = (
});
}
// render
if (isMobile) {
return (
<div
className={[
"condition-node--settings mobile",
props.isEdited ? "edited" : "",
].join(" ")}
return (
<div
className={[
"condition-node--settings mobile",
props.isEdited ? "edited" : "",
].join(" ")}
>
<SpeedDial
icon={
<ButtonIcon
icon={<SettingsApplicationsIcon />}
color={props.isEdited ? "success" : "default"}
/>
}
direction="left"
>
<SpeedDial
icon={
<ButtonIcon
icon={<SettingsApplicationsIcon />}
color={props.isEdited ? "success" : "default"}
/>
}
direction="column"
>
{buttons.map((opt, i) => (
<ButtonIcon key={i} {...opt} />
))}
</SpeedDial>
</div>
);
} else {
return (
<div className="condition-node--settings--wrap">
<div className="condition-node--settings--icons">
{buttons.map((opt, i) => (
<ButtonIcon key={i} {...opt} />
))}
</div>
</div>
);
}
{buttons.map((opt, i) => (
<ButtonIcon key={i} {...opt} />
))}
</SpeedDial>
</div>
);
};
+28 -1
View File
@@ -1,6 +1,10 @@
import { FC } from "react";
import { DAGAutomationFlowDims } from "components/DAGFlow/types";
import {
DAGAutomationFlowDims,
UpdateModalState,
} from "components/DAGFlow/types";
import { Node, XYPosition } from "react-flow-renderer";
import { AutomationCondition } from "types/automations/conditions";
export const convertToFlowNode =
<D extends {}>(Component: FC<D>): FC<{ data: D }> =>
@@ -23,3 +27,26 @@ export const createToNodeMakerFunction =
position,
data: convert(data, dims),
});
export const makeOnEditAutomationConditions =
(
conditions: AutomationCondition[],
updateConditions: (c: AutomationCondition[]) => void,
openModal: UpdateModalState
) =>
() =>
openModal({
single: true,
node: {
condition: "and",
conditions,
},
allowedTypes: ["condition"],
update: (c: AutomationCondition) => {
if (c.condition === "and") {
updateConditions(c.conditions);
} else {
updateConditions([c]);
}
},
});
+1 -15
View File
@@ -18,7 +18,7 @@ import { NodeEditor } from "components/NodeEditor";
import { MultiNodeEditor } from "components/MultiNodeEditors";
import { Modal } from "components/Modal";
import { AutomationCondition } from "types/automations/conditions";
import { convertToFlowNode } from "./helpers";
import { convertToFlowNode, makeOnEditAutomationConditions } from "./helpers";
import { DAGErrorNode } from "./DAGErrorNode";
import { useHA } from "haService";
import { getDescriptionFromAutomationNode } from "utils/formatting";
@@ -29,20 +29,6 @@ const nodeTypes = {
dagcircle: DAGCircle,
};
const makeOnEditAutomationConditions =
(
conditions: AutomationCondition[],
updateConditions: (c: AutomationCondition[]) => void,
openModal: UpdateModalState
) =>
() =>
openModal({
single: false,
node: conditions,
allowedTypes: ["condition"],
update: (c) => updateConditions(c as any),
});
export interface DAGAutomationFlowProps {
className?: string;
trigger: AutomationTrigger[];
+18 -20
View File
@@ -5,6 +5,7 @@ import { UpdateModalState } from "./types";
import { getNodeType } from "../../utils/automations";
import { DAGNodeOnMoveEvents } from "./DAGNode";
import { cleanUpUndefined } from "components/NodeEditor/OptionManager/OptionManager";
import { makeOnEditAutomationConditions } from "./helpers";
export type SequenceUpdater = ReturnType<typeof makeSequenceUpdater>;
@@ -91,26 +92,23 @@ export const makeSequenceUpdater = (
});
},
makeOnEditConditionsForChooseNode(i: number, j: number) {
return () => {
const node = sequence[i] as ChooseAction;
return openModal({
single: false,
node: node.choose[j].conditions,
allowedTypes: ["condition"],
update: (conditions) =>
this.updateNode(i, {
...node,
choose: [
...node.choose.slice(0, j),
{
sequence: node.choose[j].sequence,
conditions: conditions as AutomationCondition[],
},
...node.choose.slice(j + 1),
],
}),
});
};
const node = sequence[i] as ChooseAction;
return makeOnEditAutomationConditions(
node.choose[j].conditions,
(conditions) =>
this.updateNode(i, {
...node,
choose: [
...node.choose.slice(0, j),
{
sequence: node.choose[j].sequence,
conditions: conditions as AutomationCondition[],
},
...node.choose.slice(j + 1),
],
}),
openModal
);
},
makeOnEditForBadNode(i: number) {
const node = sequence[i];
+6 -1
View File
@@ -41,7 +41,7 @@
}
.node-editor--body {
overflow: overlay;
overflow: hidden;
padding-left: 1%;
padding-right: 1%;
@@ -50,6 +50,11 @@
max-width: 100%;
}
.node-editor--body--options {
overflow: auto;
max-height: 60vh;
}
.node-editor--footer {
bottom: 0;
left: 0;
+3 -1
View File
@@ -96,7 +96,9 @@ export const NodeEditor: FC<NodeEditorProps> = ({
/>
</div>
</div>
{state.renderOptionList()}
<div className="node-editor--body--options">
{state.renderOptionList()}
</div>
</div>
<div className="node-editor--footer">
<Button
@@ -16,6 +16,6 @@
@media (max-width: 450px) {
.service-editor--targets>div {
max-width: 38vw;
max-width: 90%;
}
}
+8 -9
View File
@@ -18,6 +18,7 @@
.speed-dial--list.close {
width: 0;
opacity: 0;
display: none;
}
.speed-dial--list {
@@ -29,17 +30,15 @@
border-radius: 10px;
}
.speed-dial--list.row {
.speed-dial--list.open {
display: flex;
flex-direction: row;
top: 0;
left: 2em;
}
.speed-dial--list.column {
display: flex;
flex-direction: column;
gap: 0.25em;
top: 2em;
left: 0.25em;
.speed-dial--list.right {
left: 2em
}
.speed-dial--list.left {
right: 3em
}
+4 -3
View File
@@ -1,16 +1,17 @@
import "./index.css";
import { FC, ReactNode, useState } from "react";
import { FC, ReactNode, useRef, useState } from "react";
import ClickAwayListener from "@mui/material/ClickAwayListener";
export type SpeedDialProps = {
icon: ReactNode;
className?: string;
children: ReactNode;
direction?: "row" | "column";
direction?: "left" | "right";
};
export const SpeedDial: FC<SpeedDialProps> = (props) => {
const [open, setOpen] = useState(false);
const direction = props.direction ?? "right";
return (
<ClickAwayListener onClickAway={() => setOpen(false)}>
<div
@@ -26,7 +27,7 @@ export const SpeedDial: FC<SpeedDialProps> = (props) => {
className={[
"speed-dial--list",
open ? "open" : "close",
props.direction ?? "row",
direction,
].join(" ")}
>
{props.children}