diff --git a/web/package.json b/web/package.json index fcd5b68..01442dd 100644 --- a/web/package.json +++ b/web/package.json @@ -9,6 +9,7 @@ "devDependencies": { "@parcel/transformer-sass": "^2.0.0", "@parcel/transformer-yaml": "^2.0.0", + "@testing-library/jest-dom": "^5.15.0", "@types/jest": "^27.0.2", "@types/js-yaml": "^4.0.4", "@types/node": "^16.11.6", @@ -17,8 +18,8 @@ "@types/react-router-dom": "^5.3.2", "concurrently": "^6.3.0", "husky": "^7.0.4", + "instead": "^1.0.3", "jest": "^27.3.1", - "jest-dom": "^4.0.0", "jest-extended": "^1.1.0", "prettier": "^2.4.1", "react-test-renderer": "^17.0.2", diff --git a/web/src/automation/types/condition.ts b/web/src/automation/types/condition.ts index 376df33..bf81452 100644 --- a/web/src/automation/types/condition.ts +++ b/web/src/automation/types/condition.ts @@ -46,7 +46,6 @@ export interface GenericCondition extends BaseCondition { condition: string; } export type AutomationCondition = - | string // <-- this is the same as "TemplateCondition" | LogicCondition | NumericCondition | StateCondition diff --git a/web/src/components/AutomationDAG/DAGEdge.tsx b/web/src/components/AutomationDAG/DAGEdge.tsx new file mode 100644 index 0000000..5ab2ca1 --- /dev/null +++ b/web/src/components/AutomationDAG/DAGEdge.tsx @@ -0,0 +1,37 @@ +import { NODE_HEIGHT, NODE_WIDTH } from "./constants" +import { EdgeDirection, Point } from "./types" + + + +export interface EdgeProp { + p1: Point, + p2: Point, + direction: EdgeDirection, +} +export default ({p1, p2, direction}: EdgeProp) => { + const [x1,y1] = [p1[0] + NODE_WIDTH, p1[1]+NODE_HEIGHT/2] + const [x2,y2] = [p2[0], p2[1]+NODE_HEIGHT/2] + const [mx,my] = [(x1+x2)/2, (y1+y2)/2] + const theta = Math.atan2(y2 -y1, x2-x1) -Math.PI / 2 + const cx1 = x1 + NODE_WIDTH + const cy1 = my - 30 * Math.cos(theta) + const cx2 = x2 - NODE_WIDTH + const cy2 = my + 30 * Math.cos(theta) + + return <> + + + 2') ? + "url(#arrow)" : '' + } + markerEnd={ + (direction === '1->2' || direction === '1<->2') ? + "url(#arrow)" : '' + } + /> + +} diff --git a/web/src/components/AutomationDAG/DAGNode.tsx b/web/src/components/AutomationDAG/DAGNode.tsx new file mode 100644 index 0000000..0e88784 --- /dev/null +++ b/web/src/components/AutomationDAG/DAGNode.tsx @@ -0,0 +1,33 @@ +import { NODE_HEIGHT, NODE_WIDTH } from "./constants" +import { Node } from "./types" + + + +export interface NodeProp extends Node { + height?: number; + width?: number; + isOpen?: boolean; + onXClick?: () => void; + onOpenClick?: () => void; +} +export default ({ + loc: [x,y], + text, + height=NODE_HEIGHT, + width=NODE_WIDTH, + onXClick=() => {}, + onOpenClick=() => {}, + isOpen=false, +}: NodeProp) => +
+
+
+
X
+
+
{text}
+
+
{isOpen ? "▲" : "▼"}
+
+
+
+
\ No newline at end of file diff --git a/web/src/components/AutomationDAG/constants.ts b/web/src/components/AutomationDAG/constants.ts new file mode 100644 index 0000000..11de4a5 --- /dev/null +++ b/web/src/components/AutomationDAG/constants.ts @@ -0,0 +1,7 @@ + + + +export const NODE_WIDTH = 50 as const; +export const NODE_HEIGHT = 25 as const; +export const GRAPH_HEIGHT = 300 as const; +export const GRAPH_WIDTH = 300 as const; \ No newline at end of file diff --git a/web/src/components/AutomationDAG/index.tsx b/web/src/components/AutomationDAG/index.tsx new file mode 100644 index 0000000..79901ff --- /dev/null +++ b/web/src/components/AutomationDAG/index.tsx @@ -0,0 +1,60 @@ +import { useEffect, useState } from "react" +import { GRAPH_HEIGHT, GRAPH_WIDTH, NODE_WIDTH } from "./constants"; +import DAGEdge from "./DAGEdge"; +import DAGNode from "./DAGNode"; +import { DAG, Point } from "./types"; +import { normalizeDAG } from "./utils"; + +const randomWalk = ([x,y]:Point) : Point => [ + Math.round(Math.max(0, Math.min(x + (Math.random() < 0.5 ? -1 : 1)* 10*Math.random(), 300))), + Math.round(Math.max(0, Math.min(y + (Math.random() < 0.5 ? -1 : 1)* 10*Math.random(), 300))), +] + +export interface Props extends DAG { + +} +export default function AutomationDAG({ + ...dag +}: Props) { + // const [mx, my] = [10, 100]; + // const [points, setPoints] = useState>([ + // [10+1.25*NODE_WIDTH, 25], + // [10+2*NODE_WIDTH, 100], + // [25+1.5*NODE_WIDTH, 170], + // [25+2*NODE_WIDTH, 170], + // ]) + + // useEffect(()=>{ + // window.setTimeout(() => { + // setPoints(points.map(randomWalk)) + // },1000) + // }); + + const {nodes, edges} = normalizeDAG(dag); + return
+ + + + + + + + {nodes.map((node, i) => <> + + )} + {edges.map(({from, to, direction}) => <> + + )} + +
+} \ No newline at end of file diff --git a/web/src/components/AutomationDAG/types.ts b/web/src/components/AutomationDAG/types.ts new file mode 100644 index 0000000..56087da --- /dev/null +++ b/web/src/components/AutomationDAG/types.ts @@ -0,0 +1,17 @@ + + +export type Point = [number, number]; +export interface Node { + loc: Point; + text: string; +} +export interface Edge { + from: number; + to: number; + direction: '1->2' | '1<->2' | '1<-2'; +} +export type EdgeDirection = Edge['direction']; +export interface DAG { + nodes: Array; + edges: Array; +} \ No newline at end of file diff --git a/web/src/components/AutomationDAG/utils.spec.ts b/web/src/components/AutomationDAG/utils.spec.ts new file mode 100644 index 0000000..df472c3 --- /dev/null +++ b/web/src/components/AutomationDAG/utils.spec.ts @@ -0,0 +1,16 @@ + +import { GRAPH_HEIGHT, GRAPH_WIDTH, NODE_HEIGHT, NODE_WIDTH } from "./constants"; +import {clip} from "./utils"; + +test('it clips overflowing values', () => { + expect(clip([GRAPH_WIDTH, GRAPH_HEIGHT])).toEqual([ + GRAPH_WIDTH-NODE_WIDTH, + GRAPH_HEIGHT-NODE_HEIGHT + ]) + expect(clip([-10, -10])).toEqual([ + 0, 0 + ]) + expect(clip([0, 0])).toEqual([ + 0, 0 + ]) +}) \ No newline at end of file diff --git a/web/src/components/AutomationDAG/utils.ts b/web/src/components/AutomationDAG/utils.ts new file mode 100644 index 0000000..4e4d8ea --- /dev/null +++ b/web/src/components/AutomationDAG/utils.ts @@ -0,0 +1,29 @@ + +import { GRAPH_HEIGHT, GRAPH_WIDTH, NODE_HEIGHT, NODE_WIDTH } from "./constants"; +import {DAG, Point} from "./types"; + + +export const clip = (p: Point) : Point => { + const [x,y] = p.map(c => Math.max(0, c)); + return [Math.min(GRAPH_WIDTH-NODE_WIDTH, x), Math.min(GRAPH_HEIGHT-NODE_HEIGHT, y)] +} +export interface NormalizedDag extends DAG { + // overflow: boolean; +} +export const normalizeDAG = (dag: DAG): NormalizedDag => { + // let overflow: bo + const nodes = dag.nodes.map(n => ({ + ...n, + loc: clip(n.loc), + })); + // dag.edges.forEach(edge => { + // const n1 = nodes[edge.from]; + // const n2 = nodes[edge.to]; + // n2.loc[0] = Math.max(n2.loc[0], n1.loc[0] + 1.25*NODE_WIDTH) + // }) + + return { + nodes, + edges: dag.edges, + } +} \ No newline at end of file diff --git a/web/src/components/AutomationEditor/ConditionNode.tsx b/web/src/components/AutomationEditor/ConditionNode.tsx new file mode 100644 index 0000000..36f6293 --- /dev/null +++ b/web/src/components/AutomationEditor/ConditionNode.tsx @@ -0,0 +1,20 @@ +import { useState } from "react"; +import { AutomationCondition } from "../../automation/types/condition"; +import InputList from "../InputList"; + + + +export interface Props { + condition: AutomationCondition +} +export default function ConditionNode({ + condition +}: Props) { + + return
+ {/* */} +
+} \ No newline at end of file diff --git a/web/src/components/AutomationEditor/ScriptNode.tsx b/web/src/components/AutomationEditor/ScriptNode.tsx index d3f2b72..97a78ad 100644 --- a/web/src/components/AutomationEditor/ScriptNode.tsx +++ b/web/src/components/AutomationEditor/ScriptNode.tsx @@ -1,7 +1,7 @@ import StateManager from "../../automation/StateManager"; import { AutomationAction } from "../../automation/types"; import { determineNodeTypes, getNameFromAction } from "../../automation/utils"; -import AutomationNode from "../Node"; +import AutomationNode from "../AutomationNode"; export interface Props { diff --git a/web/src/components/AutomationEditor/index.tsx b/web/src/components/AutomationEditor/index.tsx index 1fd7f55..70656f9 100644 --- a/web/src/components/AutomationEditor/index.tsx +++ b/web/src/components/AutomationEditor/index.tsx @@ -1,7 +1,7 @@ import { useState } from "react"; import * as types from "../../automation/types"; import { getNameFromAction } from "../../automation/utils"; -import AutomationNode from "../Node"; +import AutomationNode from "../AutomationNode"; import NewNodeModal from "./NewNodeModal"; import ScriptNode from "./ScriptNode"; diff --git a/web/src/components/Node/index.tsx b/web/src/components/AutomationNode/index.tsx similarity index 100% rename from web/src/components/Node/index.tsx rename to web/src/components/AutomationNode/index.tsx diff --git a/web/src/components/InputYaml.tsx b/web/src/components/InputYaml.tsx index b26773f..81c8005 100644 --- a/web/src/components/InputYaml.tsx +++ b/web/src/components/InputYaml.tsx @@ -23,7 +23,7 @@ export default function InputYaml({ delayId.current = null; } delayId.current = window.setTimeout(() => { - onChange(yaml.load(update)) + onChange(yaml.load(update) as any) }, 1000); } return diff --git a/web/src/pages/Home.tsx b/web/src/pages/Home.tsx index dbaf21b..ba031c6 100644 --- a/web/src/pages/Home.tsx +++ b/web/src/pages/Home.tsx @@ -1,10 +1,28 @@ +import AutomationDAG from "../components/AutomationDAG"; import AutomationEditor from "../components/AutomationEditor"; import sample from "../sample/auto_01.yaml"; export function Home() { return (
-
2', + }, + { + from: 0, to: 2, + direction: '1->2', + }, + ]} + /> + {/*
-
+
*/}
); } diff --git a/web/src/router.tsx b/web/src/router.tsx index 3d4becf..1e4f775 100644 --- a/web/src/router.tsx +++ b/web/src/router.tsx @@ -19,11 +19,6 @@ export default function App() { - {/* {}} - onCreate={()=>{}} - /> */} diff --git a/web/src/sample/auto_01.yaml b/web/src/sample/auto_01.yaml index cf93fc7..d1b70c4 100644 --- a/web/src/sample/auto_01.yaml +++ b/web/src/sample/auto_01.yaml @@ -6,7 +6,15 @@ trigger: device_id: bad6b55ae91b7ced810fd5310c0a0fce entity_id: binary_sensor.door_balcony domain: binary_sensor -condition: [] +condition: + - condition: and + conditions: + - condition: not + conditions: + - condition: template + value_template: "{{ states('switch.plug_out_bug_lamp') == 'unavailable' }}" + - condition: time + after: "10:00:00" action: - choose: - conditions: diff --git a/web/src/setupTests.ts b/web/src/setupTests.ts index 3aba8d7..f97b82f 100644 --- a/web/src/setupTests.ts +++ b/web/src/setupTests.ts @@ -1,3 +1,2 @@ import 'jest-extended' -import 'jest-dom/extend-expect' -import 'react-testing-library/cleanup-after-each' \ No newline at end of file +import '@testing-library/jest-dom' \ No newline at end of file diff --git a/web/src/styles/components/AutomationDAG.scss b/web/src/styles/components/AutomationDAG.scss new file mode 100644 index 0000000..f8bfc7c --- /dev/null +++ b/web/src/styles/components/AutomationDAG.scss @@ -0,0 +1,69 @@ +.automation-dag { + height: 99%; + width: 99%; + border: 1px solid $secondary-accent; + svg { + height: 100%; + width: 100%; + padding: 0; + margin: 0; + } + + .edge { + stroke: $secondary-accent; + } + #arrow > path { + fill: $secondary-accent; + } + + &--node { + display: flex; + flex-direction: row; + background-color: $secondary; + border-radius: 1em; + height: 100%; + max-height: 100%; + max-width: 100%; + width: 100%; + font-size: 0.5em; + + &-inner { + display: flex; + flex-direction: row; + flex: 1; + + &-text { + flex: 2; + display: flex; + text-align: center; + justify-content: center; + align-items: center; + } + &-edge { + flex: 1; + display: flex; + flex-direction: column; + flex-wrap: nowrap; + border-radius: 1em; + + justify-content: space-around; + align-items: center; + + &.left { + border-left: 1px $secondary-accent solid; + border-top-right-radius: 0; + border-bottom-right-radius: 0; + } + &.right { + border-right: 1px $secondary-accent solid; + border-top-left-radius: 0; + border-bottom-left-radius: 0; + } + &:hover { + background-color: $primary-accent; + cursor: pointer; + } + } + } + } +} diff --git a/web/src/styles/components/index.scss b/web/src/styles/components/index.scss index 4bf61ca..20e923f 100644 --- a/web/src/styles/components/index.scss +++ b/web/src/styles/components/index.scss @@ -2,6 +2,7 @@ @import "./AutomationEditor.scss"; @import "./NewNodeModal.scss"; @import "./InputWrapper.scss"; +@import "./AutomationDAG.scss"; * { transition: all 200ms ease-in; diff --git a/web/src/styles/pages/index.scss b/web/src/styles/pages/index.scss index 197e52b..638258a 100644 --- a/web/src/styles/pages/index.scss +++ b/web/src/styles/pages/index.scss @@ -6,6 +6,8 @@ overflow: hidden; font-size: 16px; color: $font-color-primary; + max-width: 100vw; + max-height: 100vh; display: flex; flex-direction: column; diff --git a/web/yarn.lock b/web/yarn.lock index 121027a..1bafc46 100644 --- a/web/yarn.lock +++ b/web/yarn.lock @@ -280,6 +280,14 @@ "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-syntax-flow" "^7.14.5" +"@babel/runtime-corejs3@^7.10.2": + version "7.16.0" + resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.16.0.tgz#58a7fb00e6948508f12f53a303993e8b6e2f6c70" + integrity sha512-Oi2qwQ21X7/d9gn3WiwkDTJmq3TQtYNz89lRnoFy8VeZpWlsyXvzSwiRrRZ8cXluvSwqKxqHJ6dBd9Rv+p0ZGQ== + dependencies: + core-js-pure "^3.19.0" + regenerator-runtime "^0.13.4" + "@babel/runtime@^7.1.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.13": version "7.15.4" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.15.4.tgz#fd17d16bfdf878e6dd02d19753a39fa8a8d9c84a" @@ -287,6 +295,13 @@ dependencies: regenerator-runtime "^0.13.4" +"@babel/runtime@^7.10.2", "@babel/runtime@^7.9.2": + version "7.16.0" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.16.0.tgz#e27b977f2e2088ba24748bf99b5e1dece64e4f0b" + integrity sha512-Nht8L0O8YCktmsDV6FqFue7vQLRx3Hb0B37lS5y0jDRqRxlBG4wIJHnf9/bgSE2UyipKFA01YtS+npRdTWBUyw== + dependencies: + regenerator-runtime "^0.13.4" + "@babel/template@^7.15.4", "@babel/template@^7.3.3": version "7.15.4" resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.15.4.tgz#51898d35dcf3faa670c4ee6afcfd517ee139f194" @@ -1238,6 +1253,21 @@ resolved "https://registry.yarnpkg.com/@swc/helpers/-/helpers-0.2.13.tgz#95d69aaed0998040d455832efbe1342ed79d0809" integrity sha512-HxfZHtTgDlME7fH+KIwBrm1B1+2iB3UpbcSbPCZzDAHxZ3z+qfjflHverm33sXrdyQYx4s3J7r6ot76433mwEg== +"@testing-library/jest-dom@^5.15.0": + version "5.15.0" + resolved "https://registry.yarnpkg.com/@testing-library/jest-dom/-/jest-dom-5.15.0.tgz#4f5295dbc476a14aec3b07176434b3d51aae5da7" + integrity sha512-lOMuQidnL1tWHLEWIhL6UvSZC1Qt3OkNe1khvi2h6xFiqpe5O8arYs46OU0qyUGq0cSTbroQyMktYNXu3a7sAA== + dependencies: + "@babel/runtime" "^7.9.2" + "@types/testing-library__jest-dom" "^5.9.1" + aria-query "^4.2.2" + chalk "^3.0.0" + css "^3.0.0" + css.escape "^1.5.1" + dom-accessibility-api "^0.5.6" + lodash "^4.17.15" + redent "^3.0.0" + "@tootallnate/once@1": version "1.1.2" resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82" @@ -1319,7 +1349,7 @@ dependencies: "@types/istanbul-lib-report" "*" -"@types/jest@^27.0.2": +"@types/jest@*", "@types/jest@^27.0.2": version "27.0.2" resolved "https://registry.yarnpkg.com/@types/jest/-/jest-27.0.2.tgz#ac383c4d4aaddd29bbf2b916d8d105c304a5fcd7" integrity sha512-4dRxkS/AFX0c5XW6IPMNOydLn2tEhNhJV7DnYK+0bjoJZ+QTmfucBlihX7aoEsh/ocYtkLC73UbnBXBXIxsULA== @@ -1395,6 +1425,13 @@ resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.1.tgz#20f18294f797f2209b5f65c8e3b5c8e8261d127c" integrity sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw== +"@types/testing-library__jest-dom@^5.9.1": + version "5.14.1" + resolved "https://registry.yarnpkg.com/@types/testing-library__jest-dom/-/testing-library__jest-dom-5.14.1.tgz#014162a5cee6571819d48e999980694e2f657c3c" + integrity sha512-Gk9vaXfbzc5zCXI9eYE9BI5BNHEp4D3FWjgqBE/ePGYElLAP+KvxBcsdkwfIVvezs605oiyd/VrpiHe3Oeg+Aw== + dependencies: + "@types/jest" "*" + "@types/yargs-parser@*": version "20.2.1" resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-20.2.1.tgz#3b9ce2489919d9e4fea439b76916abc34b2df129" @@ -1553,6 +1590,14 @@ argparse@^2.0.1: resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38" integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q== +aria-query@^4.2.2: + version "4.2.2" + resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-4.2.2.tgz#0d2ca6c9aceb56b8977e9fed6aed7e15bbd2f83b" + integrity sha512-o/HelwhuKpTj/frsOsbNLNgnNGVIFsVP/SW2BSF14gVl7kAfMOJ6/8wUAUvG1R1NHKrfG+2sHZTu0yauT1qBrA== + dependencies: + "@babel/runtime" "^7.10.2" + "@babel/runtime-corejs3" "^7.10.2" + array-equal@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93" @@ -1620,6 +1665,11 @@ asynckit@^0.4.0: resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" integrity sha1-x57Zf380y48robyXkLzDZkdLS3k= +atob@^2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" + integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg== + available-typed-arrays@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7" @@ -1961,6 +2011,14 @@ chalk@^2.0.0, chalk@^2.3.0, chalk@^2.4.1, chalk@^2.4.2: escape-string-regexp "^1.0.5" supports-color "^5.3.0" +chalk@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4" + integrity sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg== + dependencies: + ansi-styles "^4.1.0" + supports-color "^7.1.0" + chalk@^4.0.0, chalk@^4.1.0: version "4.1.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" @@ -2160,6 +2218,11 @@ convert-source-map@^1.4.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0: dependencies: safe-buffer "~5.1.1" +core-js-pure@^3.19.0: + version "3.19.1" + resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.19.1.tgz#edffc1fc7634000a55ba05e95b3f0fe9587a5aa4" + integrity sha512-Q0Knr8Es84vtv62ei6/6jXH/7izKmOrtrxH9WJTHLCMAVeU+8TF8z8Nr08CsH4Ot0oJKzBzJJL9SJBYIv7WlfQ== + core-js@^3.2.1: version "3.19.0" resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.19.0.tgz#9e40098a9bc326c7e81b486abbd5e12b9d275176" @@ -2310,6 +2373,20 @@ css-what@^5.0.0: resolved "https://registry.yarnpkg.com/css-what/-/css-what-5.1.0.tgz#3f7b707aadf633baf62c2ceb8579b545bb40f7fe" integrity sha512-arSMRWIIFY0hV8pIxZMEfmMI47Wj3R/aWpZDDxWYCPEiOMv6tfOrnpDtgxBYPEQD4V0Y/958+1TdC3iWTFcUPw== +css.escape@^1.5.1: + version "1.5.1" + resolved "https://registry.yarnpkg.com/css.escape/-/css.escape-1.5.1.tgz#42e27d4fa04ae32f931a4b4d4191fa9cddee97cb" + integrity sha1-QuJ9T6BK4y+TGktNQZH6nN3ul8s= + +css@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/css/-/css-3.0.0.tgz#4447a4d58fdd03367c516ca9f64ae365cee4aa5d" + integrity sha512-DG9pFfwOrzc+hawpmqX/dHYHJG+Bsdb0klhyi1sDneOgGOXy9wQIC8hzyVp1e4NRYDBdxcylvywPkkXCHAzTyQ== + dependencies: + inherits "^2.0.4" + source-map "^0.6.1" + source-map-resolve "^0.6.0" + cssesc@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee" @@ -2450,6 +2527,11 @@ decimal.js@^10.2.1: resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.3.1.tgz#d8c3a444a9c6774ba60ca6ad7261c3a94fd5e783" integrity sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ== +decode-uri-component@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545" + integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU= + dedent@^0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c" @@ -2533,6 +2615,11 @@ dir-glob@^3.0.1: dependencies: path-type "^4.0.0" +dom-accessibility-api@^0.5.6: + version "0.5.10" + resolved "https://registry.yarnpkg.com/dom-accessibility-api/-/dom-accessibility-api-0.5.10.tgz#caa6d08f60388d0bb4539dd75fe458a9a1d0014c" + integrity sha512-Xu9mD0UjrJisTmv7lmVSDMagQcU9R5hwAbxsaAE/35XPnPLJobbuREfV/rraiSaEj/UOvgrzQs66zyTWTlyd+g== + dom-serializer@^1.0.1: version "1.3.2" resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.3.2.tgz#6206437d32ceefaec7161803230c7a20bc1b4d91" @@ -3405,6 +3492,11 @@ imurmurhash@^0.1.4: resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" integrity sha1-khi5srkoojixPcT7a21XbyMUU+o= +indent-string@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251" + integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg== + indexes-of@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607" @@ -3423,6 +3515,11 @@ inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.3, resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== +instead@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/instead/-/instead-1.0.3.tgz#e27bcc9b977e9c3fbf6880d28451ac1afe7542b2" + integrity sha512-7EUe8+ZmvERjdLwrEc1/CdErN8n8XYdF/uI+n8aLbs6Uf/wyqUXyFrCQ8HYADBFaz4+IqGiPVSTInpkMwqrXuw== + internal-slot@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.3.tgz#7347e307deeea2faac2ac6205d4bc7d34967f59c" @@ -3842,11 +3939,6 @@ jest-docblock@^27.0.6: dependencies: detect-newline "^3.0.0" -jest-dom@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/jest-dom/-/jest-dom-4.0.0.tgz#94eba3cbc6576e7bd6821867c92d176de28920eb" - integrity sha512-gBxYZlZB1Jgvf2gP2pRfjjUWF8woGBHj/g5rAQgFPB/0K2atGuhVcPO+BItyjWeKg9zM+dokgcMOH01vrWVMFA== - jest-each@^27.3.1: version "27.3.1" resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-27.3.1.tgz#14c56bb4f18dd18dc6bdd853919b5f16a17761ff" @@ -4554,6 +4646,11 @@ mimic-fn@^2.1.0: resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== +min-indent@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869" + integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg== + mini-create-react-context@^0.4.0: version "0.4.1" resolved "https://registry.yarnpkg.com/mini-create-react-context/-/mini-create-react-context-0.4.1.tgz#072171561bfdc922da08a60c2197a497cc2d1d5e" @@ -5621,6 +5718,14 @@ readdirp@~3.6.0: dependencies: picomatch "^2.2.1" +redent@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/redent/-/redent-3.0.0.tgz#e557b7998316bb53c9f1f56fa626352c6963059f" + integrity sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg== + dependencies: + indent-string "^4.0.0" + strip-indent "^3.0.0" + regenerator-runtime@^0.13.4, regenerator-runtime@^0.13.7: version "0.13.9" resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz#8925742a98ffd90814988d7566ad30ca3b263b52" @@ -5910,6 +6015,14 @@ source-map-js@^0.6.2: resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-0.6.2.tgz#0bb5de631b41cfbda6cfba8bd05a80efdfd2385e" integrity sha512-/3GptzWzu0+0MBQFrDKzw/DvvMTUORvgY6k6jd/VS6iCR4RDTKWH6v6WPwQoUO8667uQEf9Oe38DxAYWY5F/Ug== +source-map-resolve@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.6.0.tgz#3d9df87e236b53f16d01e58150fc7711138e5ed2" + integrity sha512-KXBr9d/fO/bWo97NXsPIAW1bFSBOuCnjbNTBMO7N59hsv5i9yzRDfcYwwt0l04+VqnKC+EwzvJZIP/qkuMgR/w== + dependencies: + atob "^2.1.2" + decode-uri-component "^0.2.0" + source-map-support@^0.5.6, source-map-support@~0.5.20: version "0.5.20" resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.20.tgz#12166089f8f5e5e8c56926b377633392dd2cb6c9" @@ -6086,6 +6199,13 @@ strip-final-newline@^2.0.0: resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad" integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA== +strip-indent@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-3.0.0.tgz#c32e1cee940b6b3432c771bc2c54bcce73cd3001" + integrity sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ== + dependencies: + min-indent "^1.0.0" + stylehacks@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-5.0.1.tgz#323ec554198520986806388c7fdaebc38d2c06fb"