- refactorted icons
- condition box view and editor
This commit is contained in:
1 parent
df272e138c
commit
fed45e1d78
15 files changed
+235
-58
No files matched your search
@@ -0,0 +1,42 @@
|
||||
import { FC } from "react";
|
||||
import { AutomationCondition, TemplateCondition } from "~/automations/types/conditions";
|
||||
import { getDescriptionFromAutomationNode } from "~/automations/utils";
|
||||
import InputText from "../Inputs/InputText";
|
||||
|
||||
|
||||
interface Editor<C extends AutomationCondition> extends FC<{
|
||||
condition: C,
|
||||
onChange: (condition: C) => void;
|
||||
}> {}
|
||||
|
||||
|
||||
export const getEditor = (condition: AutomationCondition): Editor<any> => {
|
||||
switch (condition.condition) {
|
||||
case 'template':
|
||||
return TemplateEditor;
|
||||
default:
|
||||
return () => <div>Not Ready</div>
|
||||
}
|
||||
}
|
||||
|
||||
export const TemplateEditor: Editor<TemplateCondition> = ({
|
||||
onChange,
|
||||
condition,
|
||||
}) => {
|
||||
return <div>
|
||||
<InputText label="Alias" value={condition.condition_data.alias ?? getDescriptionFromAutomationNode(condition)} onChange={alias => onChange({
|
||||
...condition,
|
||||
condition_data: {
|
||||
...condition.condition_data,
|
||||
alias
|
||||
}
|
||||
})}/>
|
||||
<InputText label="Template" value={condition.condition_data.value_template} onChange={value_template => onChange({
|
||||
...condition,
|
||||
condition_data: {
|
||||
...condition.condition_data,
|
||||
value_template
|
||||
}
|
||||
})}/>
|
||||
</div>
|
||||
}
|
||||
Whitespace-only changes.
@@ -1,4 +1,5 @@
|
||||
import { ComponentMeta, ComponentStory } from "@storybook/react";
|
||||
import { useState } from "react";
|
||||
import { usePageTheme } from "~/styles/page";
|
||||
import { ConditionEditor } from ".";
|
||||
|
||||
@@ -9,10 +10,11 @@ export default {
|
||||
} as ComponentMeta<typeof ConditionEditor>;
|
||||
|
||||
|
||||
const Template: ComponentStory<typeof ConditionEditor> = args => {
|
||||
const Template: ComponentStory<typeof ConditionEditor> = ({condition, ...args}) => {
|
||||
const {classes} = usePageTheme({});
|
||||
const [data, setData] = useState(condition);
|
||||
return <div className={classes.page}>
|
||||
<ConditionEditor {...args} />
|
||||
<ConditionEditor {...args} condition={data} onUpdate={setData} />
|
||||
</div>
|
||||
}
|
||||
|
||||
@@ -24,5 +26,6 @@ SimpleGraph.args = {
|
||||
condition_data: {
|
||||
value_template: "states('switch.light_kitchen') == 'on'"
|
||||
}
|
||||
}
|
||||
},
|
||||
displayMode: true,
|
||||
}
|
||||
@@ -1,34 +1,47 @@
|
||||
import { FC } from "react";
|
||||
import { FC, useState } from "react";
|
||||
import { AutomationCondition } from "~/automations/types/conditions";
|
||||
import { getDescriptionFromAutomationNode } from "~/automations/utils";
|
||||
import { CheckMarkIcon, PencilIcon } from "~/icons/icons";
|
||||
import { getEditor } from "./childrenRender";
|
||||
import { useStyles } from "./style";
|
||||
|
||||
|
||||
|
||||
export const ConditionEditor: FC<{
|
||||
condition: AutomationCondition;
|
||||
displayMode?: boolean;
|
||||
onDelete: (which: 'root' | number) => void;
|
||||
onAddChild: () => void;
|
||||
onUpdate: (data: AutomationCondition) => void;
|
||||
}> = ({
|
||||
condition,
|
||||
onDelete,
|
||||
onUpdate,
|
||||
// onAddChild,
|
||||
}) => {
|
||||
// alias
|
||||
let children = getDescriptionFromAutomationNode(condition);
|
||||
// state
|
||||
const [displayMode, setDisplayMode] = useState(true);
|
||||
|
||||
// children
|
||||
let children: any = 'n/a'
|
||||
if (displayMode) {
|
||||
children = getDescriptionFromAutomationNode(condition);
|
||||
} else {
|
||||
const Editor = getEditor(condition);
|
||||
children = <Editor condition={condition} onChange={data => {
|
||||
console.log({data})
|
||||
onUpdate(data)
|
||||
}}/>
|
||||
}
|
||||
// styles
|
||||
let hasChildren = false;
|
||||
if (condition.condition === "not") {
|
||||
children = "not"
|
||||
hasChildren = true
|
||||
} else if (condition.condition ==='and') {
|
||||
children = "and"
|
||||
hasChildren = true
|
||||
} else if (condition.condition ==='or') {
|
||||
children = "or"
|
||||
hasChildren = true
|
||||
}
|
||||
|
||||
// styles
|
||||
const {classes} = useStyles({ hasChildren });
|
||||
|
||||
// components
|
||||
@@ -43,5 +56,8 @@ export const ConditionEditor: FC<{
|
||||
<div className={classes.children}>
|
||||
{children}
|
||||
</div>
|
||||
<button className={classes.modifyBtn} onClick={() => setDisplayMode(!displayMode)}>
|
||||
{displayMode ? <PencilIcon className={classes.icon}/> : <CheckMarkIcon className={classes.icon}/>}
|
||||
</button>
|
||||
</div>
|
||||
}
|
||||
@@ -1,4 +1,5 @@
|
||||
import { Styles } from "jss";
|
||||
import Color from 'chroma-js';
|
||||
import { createAppUseStyles } from "~/styles/theme";
|
||||
|
||||
export const useStyles = createAppUseStyles<{
|
||||
@@ -45,6 +46,25 @@ export const useStyles = createAppUseStyles<{
|
||||
left: -35,
|
||||
top: 10,
|
||||
},
|
||||
modifyBtn: {
|
||||
backgroundColor: theme.primary,
|
||||
fill: theme.primaryAccent,
|
||||
border: `1px solid ${theme.primaryAccent}`,
|
||||
borderRadius: 10,
|
||||
borderTopLeftRadius: 0,
|
||||
borderBottomLeftRadius: 0,
|
||||
cursor: 'pointer',
|
||||
"&:hover": {
|
||||
backgroundColor: Color(theme.primary).brighten().hex(),
|
||||
fill: Color(theme.primaryAccent).brighten().hex(),
|
||||
},
|
||||
"&:hover $icon": {
|
||||
transform: "rotate(90deg)"
|
||||
}
|
||||
},
|
||||
icon: {
|
||||
transition: "200ms ease-out"
|
||||
},
|
||||
deleteBtn,
|
||||
children: ({}) => ({
|
||||
flex: 1,
|
||||
@@ -54,9 +74,9 @@ export const useStyles = createAppUseStyles<{
|
||||
justifyContent: 'center',
|
||||
alignItems: 'center',
|
||||
border: `1px solid ${theme.primaryAccent}`,
|
||||
borderRadius: 10,
|
||||
borderTopLeftRadius: 0,
|
||||
borderBottomLeftRadius: 0,
|
||||
// borderRadius: 10,
|
||||
// borderTopLeftRadius: 0,
|
||||
// borderBottomLeftRadius: 0,
|
||||
})
|
||||
}
|
||||
})
|
||||
@@ -0,0 +1,24 @@
|
||||
import { ComponentMeta, ComponentStory } from "@storybook/react";
|
||||
import { useState } from "react";
|
||||
import { usePageTheme } from "~/styles/page";
|
||||
import InputViewEdit from "./InputViewEdit";
|
||||
|
||||
export default {
|
||||
title: 'InputViewEdit',
|
||||
component: InputViewEdit,
|
||||
parameters: { actions: { argTypesRegex: '^on.*' } },
|
||||
} as ComponentMeta<typeof InputViewEdit>;
|
||||
|
||||
|
||||
const Template: ComponentStory<typeof InputViewEdit> = args => {
|
||||
const {classes} = usePageTheme({});
|
||||
const [value, setValue] = useState('')
|
||||
return <div className={classes.page}>
|
||||
<InputViewEdit {...args} value={value} onChange={setValue}/>
|
||||
</div>
|
||||
}
|
||||
|
||||
export const SimpleText = Template.bind({})
|
||||
SimpleText.args = {
|
||||
label: "Entity ID",
|
||||
}
|
||||
@@ -1,8 +1,8 @@
|
||||
import { useRef, useState, useEffect, HTMLProps } from "react";
|
||||
import CheckMarkIcon from "~/icons/checkmark";
|
||||
import PencilIcon from "~/icons/pencil";
|
||||
import {CheckMarkIcon, PencilIcon} from "~/icons/icons";
|
||||
import { useToolTip } from "~/tooltip/context";
|
||||
import InputWrapper from "./InputWrapper";
|
||||
import { useInputViewEditStyles } from "./styles";
|
||||
|
||||
export interface Props {
|
||||
textBoxFor?: string;
|
||||
@@ -18,29 +18,32 @@ export default function InputViewEdit({
|
||||
value="",
|
||||
onChange,
|
||||
additionalTooltipFilters={},
|
||||
useTextArea=false,
|
||||
}: Props) {
|
||||
// state
|
||||
const tooltip = useToolTip();
|
||||
const [isEditing, setIsEditing] = useState(false);
|
||||
// alias for on calls
|
||||
const onChangeWrapped = (t: string) => {
|
||||
onChange(t);
|
||||
setIsEditing(false);
|
||||
}
|
||||
// ref to grab focus when editing
|
||||
const inputRef = useRef<HTMLInputElement | null>(null);
|
||||
useEffect(() => {
|
||||
if (isEditing && inputRef.current) {
|
||||
console.log('focusing...')
|
||||
inputRef.current.focus()
|
||||
}
|
||||
}, [inputRef.current, isEditing]);
|
||||
|
||||
const Text = useTextArea ? (p: HTMLProps<any>) => <textarea {...p}/> : (p: HTMLProps<any>) => <input {...p}/>;
|
||||
|
||||
// styles
|
||||
const {classes} = useInputViewEditStyles({ isEditing });
|
||||
return <InputWrapper label={label}>
|
||||
{isEditing ? <Text
|
||||
{isEditing ? <input
|
||||
ref={inputRef}
|
||||
value={value}
|
||||
onChange={(e:any) => {
|
||||
onChangeWrapped(e.target.value)
|
||||
onChange(e.target.value)
|
||||
}}
|
||||
onFocus={(e: any) => textBoxFor && tooltip.setFocus(
|
||||
e.target.getBoundingClientRect(),
|
||||
@@ -51,10 +54,10 @@ export default function InputViewEdit({
|
||||
},
|
||||
onChangeWrapped
|
||||
)}
|
||||
/>:<div className="input-view">
|
||||
/>:<div className={classes.inputView}>
|
||||
{value}
|
||||
</div>}
|
||||
<PencilIcon onClick={() => setIsEditing(!isEditing)} className={`icon pencil ${isEditing ? 'opened' : ''}`}/>
|
||||
<CheckMarkIcon onClick={() => setIsEditing(!isEditing)} className={`icon checkmark ${isEditing ? 'opened' : ''}`}/>
|
||||
<PencilIcon onClick={() => setIsEditing(!isEditing)} className={classes.pencil}/>
|
||||
<CheckMarkIcon onClick={() => setIsEditing(!isEditing)} className={classes.checkmark}/>
|
||||
</InputWrapper>
|
||||
}
|
||||
@@ -51,4 +51,19 @@ export const useInputWrapperStyles = createAppUseStyles<{
|
||||
|
||||
export const useInputTextStyles = createAppUseStyles<{}>(theme => ({
|
||||
...commonInputStyle(theme),
|
||||
}));
|
||||
|
||||
export const useInputViewEditStyles = createAppUseStyles<{
|
||||
isEditing: boolean;
|
||||
}>(theme => ({
|
||||
...commonInputStyle(theme),
|
||||
inputView: {
|
||||
|
||||
},
|
||||
checkmark: {
|
||||
|
||||
},
|
||||
pencil: {
|
||||
|
||||
}
|
||||
}));
|
||||
Reference in new issue
Block a user