From 7d111c853ba4a3f16285d79fa14a651f14c3fedc Mon Sep 17 00:00:00 2001 From: Ari Date: Mon, 30 May 2022 15:14:47 -0400 Subject: [PATCH] slight improvement on condition editor for mobile --- webapp/src/components/ConditionEditor/ConditionNode.tsx | 4 +++- webapp/src/components/ConditionEditor/style.ts | 7 ++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/webapp/src/components/ConditionEditor/ConditionNode.tsx b/webapp/src/components/ConditionEditor/ConditionNode.tsx index c9bc476..8281272 100644 --- a/webapp/src/components/ConditionEditor/ConditionNode.tsx +++ b/webapp/src/components/ConditionEditor/ConditionNode.tsx @@ -8,6 +8,7 @@ import InputYaml from "components/Inputs/InputYaml"; import { getEditor } from "./editorRender"; import { useStyles } from "./style"; import { getViewer } from "./viewRender"; +import useWindowSize from "utils/useWindowSize"; @@ -31,6 +32,7 @@ export const ConditionNode: FC<{ // state const [internalDisplayMode, setInternalDisplayMode] = useState(displayMode); const [yamlMode, setYamlMode] = useState(false); + const { isMobile } = useWindowSize(); // alias const effectiveDM = internalDisplayMode || yamlMode; // effect @@ -76,7 +78,7 @@ export const ConditionNode: FC<{ } else if (condition.condition === 'or') { hasChildren = true } - const { classes } = useStyles({ hasChildren }); + const { classes } = useStyles({ hasChildren, isMobile }); // components const DeleteButton = (p: { onClick?: () => void, isRoot?: boolean }) => diff --git a/webapp/src/components/ConditionEditor/style.ts b/webapp/src/components/ConditionEditor/style.ts index 69bcdb0..6ceebde 100644 --- a/webapp/src/components/ConditionEditor/style.ts +++ b/webapp/src/components/ConditionEditor/style.ts @@ -2,7 +2,8 @@ import { Styles } from "jss"; import { createAppUseStyles } from "styles/theme"; export const useStyles = createAppUseStyles<{ - hasChildren: boolean + hasChildren: boolean, + isMobile: boolean, }>(theme => { const deleteBtn: Styles = { borderRadius: '10px', @@ -20,12 +21,12 @@ export const useStyles = createAppUseStyles<{ } } return { - root: ({ hasChildren }) => ({ + root: ({ hasChildren, isMobile }) => ({ background: theme.primary, padding: 0, position: 'relative', display: 'flex', - flexDirection: hasChildren ? 'column' : 'row', + flexDirection: isMobile ? 'column' : hasChildren ? 'column' : 'row', }), title: ({ hasChildren }) => ({ display: 'flex',