- 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
@@ -1,5 +1,6 @@
|
||||
{
|
||||
"dependencies": {
|
||||
"chroma-js": "^2.1.2",
|
||||
"color": "^4.0.1",
|
||||
"js-yaml": "^4.1.0",
|
||||
"jss": "^10.8.2",
|
||||
@@ -19,6 +20,7 @@
|
||||
"@storybook/addon-links": "^6.3.12",
|
||||
"@storybook/react": "^6.3.12",
|
||||
"@testing-library/jest-dom": "^5.15.0",
|
||||
"@types/chroma-js": "^2.1.3",
|
||||
"@types/color": "^3.0.2",
|
||||
"@types/jest": "^27.0.2",
|
||||
"@types/js-yaml": "^4.0.4",
|
||||
|
||||
@@ -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: {
|
||||
|
||||
}
|
||||
}));
|
||||
@@ -0,0 +1,28 @@
|
||||
import { AnchorHTMLAttributes, FC } from "react";
|
||||
import { createAppUseStyles } from "~/styles/theme";
|
||||
|
||||
|
||||
|
||||
export const useIconStyles = createAppUseStyles(theme => ({
|
||||
icon: {
|
||||
height: '1em',
|
||||
width: '1em',
|
||||
display: 'flex',
|
||||
},
|
||||
svg: {
|
||||
fill: theme.primaryAccent
|
||||
}
|
||||
}))
|
||||
|
||||
export const IconBase: FC<AnchorHTMLAttributes<HTMLAnchorElement> & {
|
||||
viewBox: string;
|
||||
}> = ({children, viewBox, className="", ...props}) => {
|
||||
const {classes} = useIconStyles({});
|
||||
return <a className={`${classes.icon} ${className}`} {...props}>
|
||||
<svg className={classes.svg} version="1.1" xmlns="http://www.w3.org/2000/svg" x="0" y="0" viewBox={viewBox}>
|
||||
<g>
|
||||
{children}
|
||||
</g>
|
||||
</svg>
|
||||
</a>
|
||||
}
|
||||
@@ -1,12 +0,0 @@
|
||||
|
||||
|
||||
import { AnchorHTMLAttributes } from "react";
|
||||
|
||||
|
||||
export default function CheckMarkIcon(props: AnchorHTMLAttributes<HTMLAnchorElement>) {
|
||||
return <a className="icon" {...props}>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
|
||||
<path d="M20.285 2l-11.285 11.567-5.286-5.011-3.714 3.716 9 8.728 15-15.285z"/>
|
||||
</svg>
|
||||
</a>
|
||||
}
|
||||
@@ -0,0 +1,18 @@
|
||||
import { usePageTheme } from "~/styles/page";
|
||||
import {PencilIcon, CheckMarkIcon} from "./icons";
|
||||
|
||||
export default {
|
||||
title: 'Icons',
|
||||
};
|
||||
|
||||
|
||||
const Template = () => {
|
||||
const {classes} = usePageTheme({});
|
||||
return <div className={classes.page}>
|
||||
<PencilIcon/>
|
||||
<CheckMarkIcon/>
|
||||
</div>
|
||||
}
|
||||
|
||||
export const IconList = Template.bind({})
|
||||
// SimpleText.args = {}
|
||||
@@ -0,0 +1,21 @@
|
||||
import { AnchorHTMLAttributes, FC } from "react";
|
||||
import { IconBase } from "./IconBase";
|
||||
|
||||
|
||||
export const PencilIcon: FC<AnchorHTMLAttributes<HTMLAnchorElement>> = props => <IconBase {...props} viewBox="0 0 512 512">
|
||||
<path d="M358.752,51.159L70.113,339.798l102.063,102.064L455.088,158.95L512,0.282L358.752,51.159z M172.176,419.287
|
||||
l-79.488-79.489L349.536,82.949l0.069,11.622l22.52-0.089l0.089,22.667l22.625,0.048l-0.048,22.691l22.467-0.271l0.27,22.847
|
||||
l11.538-0.068L172.176,419.287z M442.648,146.351l-9.345,0.055l-0.27-22.946l-22.244,0.269l0.048-22.464l-22.721-0.048
|
||||
l-0.091-22.764l-22.551,0.089l-0.068-11.463l1.963-1.963l75.812-25.169l4.761,23.811l22.704,4.541L442.648,146.351z
|
||||
M461.506,50.195l-3.062-15.313l27.457-9.116l-9.808,27.346L461.506,50.195z"/>
|
||||
|
||||
<rect x="37.686" y="394.032" transform="matrix(-0.7071 -0.7071 0.7071 -0.7071 -97.0284 763.8365)" width="143.992" height="15.962"/>
|
||||
<path d="M10.388,399.522c-13.851,13.852-13.851,36.391,0,50.244l51.546,51.545c6.711,6.711,15.632,10.406,25.122,10.406
|
||||
s18.412-3.696,25.122-10.406l37.073-37.073L47.462,362.45L10.388,399.522z M100.891,490.025
|
||||
c-3.695,3.696-8.608,5.731-13.834,5.731s-10.139-2.036-13.834-5.731L21.676,438.48c-7.629-7.628-7.629-20.042,0-27.67
|
||||
l25.785-25.785l79.215,79.216L100.891,490.025z"/>
|
||||
</IconBase>;
|
||||
|
||||
export const CheckMarkIcon: FC<AnchorHTMLAttributes<HTMLAnchorElement>> = props => <IconBase {...props} viewBox="0 0 24 24">
|
||||
<path d="M20.285 2l-11.285 11.567-5.286-5.011-3.714 3.716 9 8.728 15-15.285z"/>
|
||||
</IconBase>;
|
||||
@@ -1,22 +0,0 @@
|
||||
import { AnchorHTMLAttributes } from "react";
|
||||
|
||||
|
||||
export default function PencilIcon(props: AnchorHTMLAttributes<HTMLAnchorElement>) {
|
||||
return <a className="icon" {...props}>
|
||||
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" viewBox="0 0 512 512">
|
||||
<g>
|
||||
<path d="M358.752,51.159L70.113,339.798l102.063,102.064L455.088,158.95L512,0.282L358.752,51.159z M172.176,419.287
|
||||
l-79.488-79.489L349.536,82.949l0.069,11.622l22.52-0.089l0.089,22.667l22.625,0.048l-0.048,22.691l22.467-0.271l0.27,22.847
|
||||
l11.538-0.068L172.176,419.287z M442.648,146.351l-9.345,0.055l-0.27-22.946l-22.244,0.269l0.048-22.464l-22.721-0.048
|
||||
l-0.091-22.764l-22.551,0.089l-0.068-11.463l1.963-1.963l75.812-25.169l4.761,23.811l22.704,4.541L442.648,146.351z
|
||||
M461.506,50.195l-3.062-15.313l27.457-9.116l-9.808,27.346L461.506,50.195z"/>
|
||||
|
||||
<rect x="37.686" y="394.032" transform="matrix(-0.7071 -0.7071 0.7071 -0.7071 -97.0284 763.8365)" width="143.992" height="15.962"/>
|
||||
<path d="M10.388,399.522c-13.851,13.852-13.851,36.391,0,50.244l51.546,51.545c6.711,6.711,15.632,10.406,25.122,10.406
|
||||
s18.412-3.696,25.122-10.406l37.073-37.073L47.462,362.45L10.388,399.522z M100.891,490.025
|
||||
c-3.695,3.696-8.608,5.731-13.834,5.731s-10.139-2.036-13.834-5.731L21.676,438.48c-7.629-7.628-7.629-20.042,0-27.67
|
||||
l25.785-25.785l79.215,79.216L100.891,490.025z"/>
|
||||
</g>
|
||||
</svg>
|
||||
</a>
|
||||
}
|
||||
@@ -3080,6 +3080,11 @@
|
||||
resolved "https://registry.yarnpkg.com/@types/braces/-/braces-3.0.1.tgz#5a284d193cfc61abb2e5a50d36ebbc50d942a32b"
|
||||
integrity sha512-+euflG6ygo4bn0JHtn4pYqcXwRtLvElQ7/nnjDu7iYG56H0+OhCd7d6Ug0IE3WcFpZozBKW2+80FUbv5QGk5AQ==
|
||||
|
||||
"@types/chroma-js@^2.1.3":
|
||||
version "2.1.3"
|
||||
resolved "https://registry.yarnpkg.com/@types/chroma-js/-/chroma-js-2.1.3.tgz#0b03d737ff28fad10eb884e0c6cedd5ffdc4ba0a"
|
||||
integrity sha512-1xGPhoSGY1CPmXLCBcjVZSQinFjL26vlR8ZqprsBWiFyED4JacJJ9zHhh5aaUXqbY9B37mKQ73nlydVAXmr1+g==
|
||||
|
||||
"@types/color-convert@*", "@types/color-convert@^2.0.0":
|
||||
version "2.0.0"
|
||||
resolved "https://registry.yarnpkg.com/@types/color-convert/-/color-convert-2.0.0.tgz#8f5ee6b9e863dcbee5703f5a517ffb13d3ea4e22"
|
||||
@@ -4797,6 +4802,13 @@ chownr@^2.0.0:
|
||||
resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece"
|
||||
integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==
|
||||
|
||||
chroma-js@^2.1.2:
|
||||
version "2.1.2"
|
||||
resolved "https://registry.yarnpkg.com/chroma-js/-/chroma-js-2.1.2.tgz#1075cb9ae25bcb2017c109394168b5cf3aa500ec"
|
||||
integrity sha512-ri/ouYDWuxfus3UcaMxC1Tfp3IE9K5iQzxc2hSxbBRVNQFut1UuGAsZmiAf2mOUubzGJwgMSv9lHg+XqLaz1QQ==
|
||||
dependencies:
|
||||
cross-env "^6.0.3"
|
||||
|
||||
chrome-trace-event@^1.0.2:
|
||||
version "1.0.3"
|
||||
resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac"
|
||||
@@ -5283,6 +5295,13 @@ create-react-context@0.3.0:
|
||||
gud "^1.0.0"
|
||||
warning "^4.0.3"
|
||||
|
||||
cross-env@^6.0.3:
|
||||
version "6.0.3"
|
||||
resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-6.0.3.tgz#4256b71e49b3a40637a0ce70768a6ef5c72ae941"
|
||||
integrity sha512-+KqxF6LCvfhWvADcDPqo64yVIB31gv/jQulX2NGzKS/g3GEVz6/pt4wjHFtFWsHMddebWD/sDthJemzM4MaAag==
|
||||
dependencies:
|
||||
cross-spawn "^7.0.0"
|
||||
|
||||
cross-spawn@7.0.3, cross-spawn@^7.0.0, cross-spawn@^7.0.3:
|
||||
version "7.0.3"
|
||||
resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
|
||||
|
||||
Reference in new issue
Block a user