From b683cbb65e4df1243708cb1dba2e001ebd35cb3d Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Tue, 16 Nov 2021 09:52:19 -0500 Subject: [PATCH] new text area + editable template --- .../ConditionEditor/childrenRender.tsx | 5 +-- .../ConditionEditor/index.stories.tsx | 1 - web/src/components/ConditionEditor/index.tsx | 1 - .../components/Inputs/InputText.stories.tsx | 2 +- web/src/components/Inputs/InputText.tsx | 30 ++++++++++------ .../Inputs/InputTextArea.stories.tsx | 24 +++++++++++++ web/src/components/Inputs/InputTextArea.tsx | 35 +++++++++++++------ .../Inputs/InputViewEdit.stories.tsx | 2 +- web/src/components/Inputs/styles.ts | 14 ++++++-- 9 files changed, 86 insertions(+), 28 deletions(-) create mode 100644 web/src/components/Inputs/InputTextArea.stories.tsx diff --git a/web/src/components/ConditionEditor/childrenRender.tsx b/web/src/components/ConditionEditor/childrenRender.tsx index 3bbf638..c967cf3 100644 --- a/web/src/components/ConditionEditor/childrenRender.tsx +++ b/web/src/components/ConditionEditor/childrenRender.tsx @@ -2,6 +2,7 @@ import { FC } from "react"; import { AutomationCondition, TemplateCondition } from "~/automations/types/conditions"; import { getDescriptionFromAutomationNode } from "~/automations/utils"; import InputText from "../Inputs/InputText"; +import InputTextArea from "../Inputs/InputTextArea"; interface Editor extends FC<{ @@ -31,12 +32,12 @@ export const TemplateEditor: Editor = ({ alias } })}/> - onChange({ + onChange({ ...condition, condition_data: { ...condition.condition_data, value_template } - })}/> + })} resizable/> } \ No newline at end of file diff --git a/web/src/components/ConditionEditor/index.stories.tsx b/web/src/components/ConditionEditor/index.stories.tsx index 9915b89..f715d9e 100644 --- a/web/src/components/ConditionEditor/index.stories.tsx +++ b/web/src/components/ConditionEditor/index.stories.tsx @@ -27,5 +27,4 @@ SimpleGraph.args = { value_template: "states('switch.light_kitchen') == 'on'" } }, - displayMode: true, } \ No newline at end of file diff --git a/web/src/components/ConditionEditor/index.tsx b/web/src/components/ConditionEditor/index.tsx index e3c066e..e5bcf1a 100644 --- a/web/src/components/ConditionEditor/index.tsx +++ b/web/src/components/ConditionEditor/index.tsx @@ -9,7 +9,6 @@ import { useStyles } from "./style"; export const ConditionEditor: FC<{ condition: AutomationCondition; - displayMode?: boolean; onDelete: (which: 'root' | number) => void; onAddChild: () => void; onUpdate: (data: AutomationCondition) => void; diff --git a/web/src/components/Inputs/InputText.stories.tsx b/web/src/components/Inputs/InputText.stories.tsx index 2a22873..4249f0c 100644 --- a/web/src/components/Inputs/InputText.stories.tsx +++ b/web/src/components/Inputs/InputText.stories.tsx @@ -4,7 +4,7 @@ import { usePageTheme } from "~/styles/page"; import InputText from "./InputText"; export default { - title: 'InputText', + title: 'Inputs/InputText', component: InputText, parameters: { actions: { argTypesRegex: '^on.*' } }, } as ComponentMeta; diff --git a/web/src/components/Inputs/InputText.tsx b/web/src/components/Inputs/InputText.tsx index 092bee6..7781a98 100644 --- a/web/src/components/Inputs/InputText.tsx +++ b/web/src/components/Inputs/InputText.tsx @@ -1,3 +1,4 @@ +import { useState } from "react"; import { useToolTip } from "~/tooltip/context"; import InputWrapper from "./InputWrapper"; import { useInputTextStyles } from "./styles"; @@ -18,7 +19,8 @@ export default function InputText({ }: Props) { const {classes} = useInputTextStyles({}); const tooltip = useToolTip(); - return + const [isFocused, setIsFocused] = useState(false) + return textBoxFor && tooltip.setFocus( - e.target.getBoundingClientRect(), - { - searchObject: textBoxFor, - searchText: value, - filterObjects: additionalTooltipFilters, - }, - onChange - )} + onBlur={e => { + setIsFocused(false) + }} + onFocus={e => { + setIsFocused(true) + if(textBoxFor) { + tooltip.setFocus( + e.target.getBoundingClientRect(), + { + searchObject: textBoxFor, + searchText: value, + filterObjects: additionalTooltipFilters, + }, + onChange + ) + } + }} /> } \ No newline at end of file diff --git a/web/src/components/Inputs/InputTextArea.stories.tsx b/web/src/components/Inputs/InputTextArea.stories.tsx new file mode 100644 index 0000000..b1b75a4 --- /dev/null +++ b/web/src/components/Inputs/InputTextArea.stories.tsx @@ -0,0 +1,24 @@ +import { ComponentMeta, ComponentStory } from "@storybook/react"; +import { useState } from "react"; +import { usePageTheme } from "~/styles/page"; +import InputTextArea from "./InputTextArea"; + +export default { + title: 'Inputs/InputTextArea', + component: InputTextArea, + parameters: { actions: { argTypesRegex: '^on.*' } }, + } as ComponentMeta; + + +const Template: ComponentStory = args => { + const {classes} = usePageTheme({}); + const [value, setValue] = useState('') + return
+ +
+} + +export const SimpleText = Template.bind({}) +SimpleText.args = { + label: "Entity ID", +} \ No newline at end of file diff --git a/web/src/components/Inputs/InputTextArea.tsx b/web/src/components/Inputs/InputTextArea.tsx index 38a9f66..b1db163 100644 --- a/web/src/components/Inputs/InputTextArea.tsx +++ b/web/src/components/Inputs/InputTextArea.tsx @@ -1,5 +1,7 @@ +import { useState } from "react"; import { useToolTip } from "~/tooltip/context"; import InputWrapper from "./InputWrapper"; +import { useInputTextAreaStyles } from "./styles"; export interface Props { textBoxFor?: string; @@ -7,6 +9,7 @@ export interface Props { value: string; onChange: (v: string) => void; additionalTooltipFilters?: Record; + resizable?: boolean; } export default function InputTextArea({ label, @@ -14,24 +17,36 @@ export default function InputTextArea({ value="", onChange, additionalTooltipFilters={}, + resizable=false, }: Props) { + const {classes} = useInputTextAreaStyles({ resizable }); const tooltip = useToolTip(); - return + const [isFocused, setIsFocused] = useState(false) + return