From a7cafda8a7d620cbda8f0cfa8138a727e3db8e48 Mon Sep 17 00:00:00 2001
From: knilink <esurllink@gmail.com>
Date: Sun, 12 Jul 2020 21:27:46 +1000
Subject: [PATCH 1/3] tmp

---
 .gitignore                             |    4 +-
 package.json                           |   31 +-
 public/favicon.ico                     |  Bin 3870 -> 3150 bytes
 public/index.html                      |   23 +-
 public/logo192.png                     |  Bin 0 -> 5347 bytes
 public/logo512.png                     |  Bin 0 -> 9664 bytes
 public/manifest.json                   |   12 +-
 public/robots.txt                      |    3 +
 src/App.jsx                            |  118 --
 src/App.test.tsx                       |    9 +
 src/App.tsx                            |  177 +++
 src/Editor/{index.jsx => Editor.tsx}   |   25 +-
 src/Editor/JsonEditor.jsx              |   39 -
 src/Editor/JsonEditor.tsx              |   83 ++
 src/Editor/SchemaEditor.tsx            |   94 ++
 src/FormBuilderContext.tsx             |   95 ++
 src/InlineEditor.jsx                   |   77 -
 src/InlineEditor.tsx                   |  158 ++
 src/{JsonEditor.jsx => JsonEditor.tsx} |   45 +-
 src/Tree/Menu.jsx                      |   71 -
 src/Tree/Menu.tsx                      |  165 ++
 src/Tree/Tree.jsx                      |  172 ---
 src/Tree/Tree.tsx                      |  114 ++
 src/Tree/TreeNodeTitle.jsx             |   69 -
 src/Tree/TreeNodeTitle.tsx             |  149 ++
 src/index.tsx                          |   17 +
 src/serviceWorker.ts                   |  139 ++
 src/setupTests.ts                      |    5 +
 src/utils.ts                           |  365 +++++
 src/views/FormView.jsx                 |   48 -
 src/views/FormView.tsx                 |   25 +
 src/views/InlineEditTemplate.tsx       |   88 ++
 src/views/SchemaView.jsx               |   20 -
 src/views/SchemaView.tsx               |    9 +
 tsconfig.json                          |   19 +
 yarn.lock                              | 1908 +++++++++++++-----------
 36 files changed, 2827 insertions(+), 1549 deletions(-)
 create mode 100644 public/logo192.png
 create mode 100644 public/logo512.png
 create mode 100644 public/robots.txt
 delete mode 100644 src/App.jsx
 create mode 100644 src/App.test.tsx
 create mode 100644 src/App.tsx
 rename src/Editor/{index.jsx => Editor.tsx} (78%)
 delete mode 100644 src/Editor/JsonEditor.jsx
 create mode 100644 src/Editor/JsonEditor.tsx
 create mode 100644 src/Editor/SchemaEditor.tsx
 create mode 100644 src/FormBuilderContext.tsx
 delete mode 100644 src/InlineEditor.jsx
 create mode 100644 src/InlineEditor.tsx
 rename src/{JsonEditor.jsx => JsonEditor.tsx} (69%)
 delete mode 100644 src/Tree/Menu.jsx
 create mode 100644 src/Tree/Menu.tsx
 delete mode 100644 src/Tree/Tree.jsx
 create mode 100644 src/Tree/Tree.tsx
 delete mode 100644 src/Tree/TreeNodeTitle.jsx
 create mode 100644 src/Tree/TreeNodeTitle.tsx
 create mode 100644 src/index.tsx
 create mode 100644 src/serviceWorker.ts
 create mode 100644 src/setupTests.ts
 create mode 100644 src/utils.ts
 delete mode 100644 src/views/FormView.jsx
 create mode 100644 src/views/FormView.tsx
 create mode 100644 src/views/InlineEditTemplate.tsx
 delete mode 100644 src/views/SchemaView.jsx
 create mode 100644 src/views/SchemaView.tsx
 create mode 100644 tsconfig.json

diff --git a/.gitignore b/.gitignore
index ea7e65f..92ad9b9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,9 @@
-# See https://help.github.com/ignore-files/ for more about ignoring files.
+# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
 
 # dependencies
 /node_modules
+/.pnp
+.pnp.js
 
 # testing
 /coverage
diff --git a/package.json b/package.json
index cb2b5d0..b44e8a3 100644
--- a/package.json
+++ b/package.json
@@ -3,16 +3,25 @@
   "version": "0.0.0",
   "private": true,
   "dependencies": {
-    "@ant-design/icons": "^4.2.2",
-    "@rjsf/core": "^2.3.0",
-    "antd": "^4.6.3",
+    "@ant-design/icons": "^4.1.0",
+    "@gravel-form/antd": "^0.0.4",
+    "@gravel-form/core-rc": "^0.0.3",
+    "@testing-library/jest-dom": "^4.2.4",
+    "@testing-library/react": "^9.3.2",
+    "@testing-library/user-event": "^7.1.2",
+    "@types/jest": "^24.0.0",
+    "@types/json-schema": "^7.0.5",
+    "@types/lodash": "^4.14.151",
+    "@types/node": "^12.0.0",
+    "@types/react": "^16.9.0",
+    "@types/react-dom": "^16.9.0",
+    "antd": "^4.4.1",
+    "lodash": "^4.17.15",
     "react": "^16.13.1",
     "react-dom": "^16.13.1",
-    "react-redux": "^7.2.1",
-    "react-scripts": "^3.4.3",
+    "react-scripts": "^3.4.1",
     "redux": "^4.0.5",
-    "redux-persist": "^6.0.0",
-    "redux-undo": "^1.0.1"
+    "typescript": "~3.7.2"
   },
   "scripts": {
     "start": "react-scripts start",
@@ -37,10 +46,10 @@
     ]
   },
   "devDependencies": {
-    "gh-pages": "^3.1.0",
-    "husky": "^4.3.0",
-    "prettier": "^2.1.1",
-    "pretty-quick": "^3.0.0"
+    "gh-pages": "^2.2.0",
+    "husky": "^4.2.5",
+    "prettier": "^2.0.5",
+    "pretty-quick": "^2.0.1"
   },
   "husky": {
     "hooks": {
diff --git a/public/favicon.ico b/public/favicon.ico
index a11777cc471a4344702741ab1c8a588998b1311a..bcd5dfd67cd0361b78123e95c2dd96031f27f743 100644
GIT binary patch
literal 3150
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
MDeX2GIKR{Qf5okjU;qFB

literal 3870
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
baj7?x%VD!5Cxk2YbYLNVeiXvvpMCWYo=by@

diff --git a/public/index.html b/public/index.html
index d147874..6a9f8c2 100644
--- a/public/index.html
+++ b/public/index.html
@@ -1,15 +1,17 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <meta name="theme-color" content="#000000">
+    <meta charset="utf-8" />
+    <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <meta name="theme-color" content="#000000" />
+    <meta name="description" content="Web site created using create-react-app" />
+    <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
     <!--
-      manifest.json provides metadata used when your web app is added to the
-      homescreen on Android. See https://developers.google.com/web/fundamentals/engage-and-retain/web-app-manifest/
+      manifest.json provides metadata used when your web app is installed on a
+      user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
     -->
-    <link rel="manifest" href="%PUBLIC_URL%/manifest.json">
-    <link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico">
+    <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
     <!--
       Notice the use of %PUBLIC_URL% in the tags above.
       It will be replaced with the URL of the `public` folder during the build.
@@ -19,13 +21,10 @@
       work correctly both with client-side routing and a non-root public URL.
       Learn how to configure a non-root public URL by running `npm run build`.
     -->
-    <title>React Jsonschema Formbuilder</title>
-    <link rel="stylesheet" id="theme" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css">
+    <title>React App</title>
   </head>
   <body>
-    <noscript>
-      You need to enable JavaScript to run this app.
-    </noscript>
+    <noscript>You need to enable JavaScript to run this app.</noscript>
     <div id="root"></div>
     <!--
       This HTML file is a template.
diff --git a/public/logo192.png b/public/logo192.png
new file mode 100644
index 0000000000000000000000000000000000000000..fc44b0a3796c0e0a64c3d858ca038bd4570465d9
GIT binary patch
literal 5347
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
X@eDJUQo;Ye2mwlRs<JiGX2Jghdw)}T

literal 0
HcmV?d00001

diff --git a/public/logo512.png b/public/logo512.png
new file mode 100644
index 0000000000000000000000000000000000000000..a4e47a6545bc15971f8f63fba70e4013df88a664
GIT binary patch
literal 9664
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
b{|{}U^kRn2wo}j7|0ATu<;8xA7zX}7|B6mN

literal 0
HcmV?d00001

diff --git a/public/manifest.json b/public/manifest.json
index ef19ec2..080d6c7 100644
--- a/public/manifest.json
+++ b/public/manifest.json
@@ -6,9 +6,19 @@
       "src": "favicon.ico",
       "sizes": "64x64 32x32 24x24 16x16",
       "type": "image/x-icon"
+    },
+    {
+      "src": "logo192.png",
+      "type": "image/png",
+      "sizes": "192x192"
+    },
+    {
+      "src": "logo512.png",
+      "type": "image/png",
+      "sizes": "512x512"
     }
   ],
-  "start_url": "./index.html",
+  "start_url": ".",
   "display": "standalone",
   "theme_color": "#000000",
   "background_color": "#ffffff"
diff --git a/public/robots.txt b/public/robots.txt
new file mode 100644
index 0000000..e9e57dc
--- /dev/null
+++ b/public/robots.txt
@@ -0,0 +1,3 @@
+# https://www.robotstxt.org/robotstxt.html
+User-agent: *
+Disallow:
diff --git a/src/App.jsx b/src/App.jsx
deleted file mode 100644
index 34726c8..0000000
--- a/src/App.jsx
+++ /dev/null
@@ -1,118 +0,0 @@
-import React, { Component } from 'react';
-import { Provider, connect } from 'react-redux';
-import { store, persistor } from './store';
-import { PersistGate } from 'redux-persist/integration/react';
-import './css';
-import { Layout, Tabs, Card } from 'antd';
-import Tree from './Tree';
-import { FormView, SchemaView, UiSchemaView, FormDataView } from './views';
-import NodeEditor from './Editor';
-import Toolbar from './Toolbar';
-import Settings from './Settings';
-const { Header, Sider, Content } = Layout;
-const { TabPane } = Tabs;
-
-class App extends Component {
-  state = {
-    collapsed: false,
-  };
-  toggle = () => {
-    this.setState({
-      collapsed: !this.state.collapsed,
-    });
-  };
-  render() {
-    const { settings } = this.props;
-    return (
-      <Layout>
-        <Sider
-          trigger={null}
-          collapsible
-          collapsed={this.state.collapsed}
-          width={settings.leftSiderWidth}
-          style={{
-            background: '#fff',
-            padding: 0,
-            overflow: 'auto',
-            boxShadow: '0 2px 3px 0 rgba(0, 0, 0, 0.2), 0 2px 3px 0 rgba(0, 0, 0, 0.2)',
-            height: '100vh',
-            position: 'fixed',
-            left: 0,
-          }}
-        >
-          <Tabs defaultActiveKey="0" size="small" type="card">
-            <TabPane tab="Editor" style={{ padding: '8px' }} key="0">
-              <Tree />
-            </TabPane>
-            <TabPane tab="Settings" style={{ padding: '8px' }} key="1">
-              <Settings />
-            </TabPane>
-          </Tabs>
-        </Sider>
-        <Layout style={{ marginLeft: settings.leftSiderWidth }}>
-          <Header style={{ background: '#fff', padding: 0 }}>
-            <Toolbar />
-          </Header>
-          <Content style={{ minHeight: 280, padding: '12px 8px' }}>
-            <Card
-              bordered={false}
-              style={{ width: settings.formWidth, margin: '12px 8px', display: 'inline-block', verticalAlign: 'top' }}
-            >
-              <FormView />
-            </Card>
-            {(settings.subViews || []).map((a) => {
-              const style = { margin: '12px 8px', width: 400, display: 'inline-block', verticalAlign: 'top' };
-              switch (a) {
-                case 'schema':
-                  return (
-                    <Card key="schema" title="Schema" style={style}>
-                      <SchemaView />
-                    </Card>
-                  );
-                case 'uiSchema':
-                  return (
-                    <Card key="uiSchema" title="Ui Schema" style={style}>
-                      <UiSchemaView />
-                    </Card>
-                  );
-                case 'formData':
-                  return (
-                    <Card key="formData" title="Form Data" style={style}>
-                      <FormDataView />
-                    </Card>
-                  );
-                default:
-                  return <div key="null" />;
-              }
-            })}
-          </Content>
-        </Layout>
-        <Sider
-          width={this.props.activeNodeKey ? settings.rightSiderWidth : 0}
-          style={{
-            overflow: 'auto',
-            background: '#fff',
-            boxShadow: '0 2px 3px 0 rgba(0, 0, 0, 0.2), 0 2px 3px 0 rgba(0, 0, 0, 0.2)',
-            position: 'fixed',
-            height: '100vh',
-            right: 0,
-          }}
-        >
-          <NodeEditor />
-        </Sider>
-      </Layout>
-    );
-  }
-}
-
-const AppContainer = connect(({ activeNodeKey, settings }) => ({
-  activeNodeKey,
-  settings,
-}))(App);
-export default () => (
-  <Provider store={store}>
-    <PersistGate loading={null} persistor={persistor}>
-      <AppContainer />
-    </PersistGate>
-  </Provider>
-);
diff --git a/src/App.test.tsx b/src/App.test.tsx
new file mode 100644
index 0000000..4db7ebc
--- /dev/null
+++ b/src/App.test.tsx
@@ -0,0 +1,9 @@
+import React from 'react';
+import { render } from '@testing-library/react';
+import App from './App';
+
+test('renders learn react link', () => {
+  const { getByText } = render(<App />);
+  const linkElement = getByText(/learn react/i);
+  expect(linkElement).toBeInTheDocument();
+});
diff --git a/src/App.tsx b/src/App.tsx
new file mode 100644
index 0000000..f76d1e2
--- /dev/null
+++ b/src/App.tsx
@@ -0,0 +1,177 @@
+import * as React from 'react';
+// import { PersistGate } from 'redux-persist/integration/react';
+import './css';
+import { Layout, Tabs, Card } from 'antd';
+import { FormSchemaTree } from './Tree/Tree';
+// import { FormView, SchemaView, UiSchemaView, FormDataView } from './views';
+import { FormView } from './views/FormView';
+import { SchemaView } from './views/SchemaView';
+import { Editor } from './Editor/Editor';
+// import Toolbar from './Toolbar';
+// import Settings from './Settings';
+import { Provider, SettingsContext, FormBuilderContext } from './FormBuilderContext';
+
+const { Header, Sider, Content } = Layout;
+const { TabPane } = Tabs;
+
+const App: React.FC<{}> = () => {
+  // const { settings } = this.props;
+  const { settings } = React.useContext(SettingsContext);
+  const { selectedNodePath } = React.useContext(FormBuilderContext);
+  return (
+    <Layout>
+      <Sider
+        trigger={null}
+        collapsible
+        collapsed={false /* this.state.collapsed */}
+        width={settings.leftSiderWidth}
+        style={{
+          background: '#fff',
+          padding: 0,
+          overflow: 'auto',
+          boxShadow: '0 2px 3px 0 rgba(0, 0, 0, 0.2), 0 2px 3px 0 rgba(0, 0, 0, 0.2)',
+          height: '100vh',
+          position: 'fixed',
+          left: 0,
+        }}
+      >
+        <Tabs defaultActiveKey="0" size="small" type="card">
+          <TabPane tab="Editor" style={{ padding: '8px' }} key="0">
+            <FormSchemaTree />
+          </TabPane>
+          <TabPane tab="Settings" style={{ padding: '8px' }} key="1">
+            {/* <Settings /> */}
+          </TabPane>
+        </Tabs>
+      </Sider>
+      <Layout style={{ marginLeft: settings.leftSiderWidth }}>
+        <Header style={{ background: '#fff', padding: 0 }}>{/* <Toolbar /> */}</Header>
+        <Content style={{ minHeight: 280, padding: '12px 8px' }}>
+          <Card
+            bordered={false}
+            style={{
+              width: settings.formWidth,
+              margin: '12px 8px',
+              display: 'inline-block',
+              verticalAlign: 'top',
+            }}
+          >
+            <FormView />
+          </Card>
+          {(settings.subViews || []).map((a) => {
+            const style = { margin: '12px 8px', width: 400, display: 'inline-block', verticalAlign: 'top' };
+            switch (a) {
+              case 'schema':
+                return (
+                  <Card key="schema" title="Schema" style={style}>
+                    <SchemaView />
+                  </Card>
+                );
+              case 'uiSchema':
+                return (
+                  <Card key="uiSchema" title="Ui Schema" style={style}>
+                    {/* <UiSchemaView /> */}
+                  </Card>
+                );
+              case 'formData':
+                return (
+                  <Card key="formData" title="Form Data" style={style}>
+                    {/* <FormDataView /> */}
+                  </Card>
+                );
+              default:
+                return <div key="null" />;
+            }
+          })}
+        </Content>
+      </Layout>
+      <Sider
+        width={selectedNodePath ? settings.rightSiderWidth : 0}
+        style={{
+          overflow: 'auto',
+          background: '#fff',
+          boxShadow: '0 2px 3px 0 rgba(0, 0, 0, 0.2), 0 2px 3px 0 rgba(0, 0, 0, 0.2)',
+          position: 'fixed',
+          height: '100vh',
+          right: 0,
+        }}
+      >
+        <Editor />
+      </Sider>
+    </Layout>
+  );
+};
+
+export default () => (
+  <Provider
+    defaultSchema={{
+      title: 'A registration form',
+      description: 'A simple form example.',
+      type: 'object',
+      required: ['firstName', 'lastName'],
+      properties: {
+        firstName: {
+          type: 'string',
+          title: 'First name',
+        },
+        lastName: {
+          type: 'string',
+          title: 'Last name',
+        },
+        age: {
+          type: 'integer',
+          title: 'Age',
+          description: '(earthian year)',
+        },
+        bio: {
+          type: 'string',
+          title: 'Bio',
+        },
+        password: {
+          type: 'string',
+          title: 'Password',
+          minLength: 3,
+        },
+        telephone: {
+          type: 'string',
+          title: 'Telephone',
+          minLength: 10,
+        },
+        foo: {
+          type: 'object',
+          properties: {
+            bar: { type: 'string' },
+          },
+        },
+      },
+    }}
+    defaultExtraProps={{
+      row: { justify: 'space-between' },
+      properties: {
+        firstName: { col: { span: 11 } },
+        lastName: { col: { span: 11 } },
+        gender: {
+          component: 'RadioGroup',
+          labels: ['%E2%99%82', '%E2%99%80'].map(decodeURIComponent),
+        },
+        bio: {
+          component: 'TextArea',
+          props: {
+            placeholder: 'Roundhouse kicking asses since 1940',
+          },
+        },
+        password: {
+          component: 'Password',
+        },
+        dof: {
+          component: 'DatePicker',
+        },
+        term: {
+          formItem: { label: null },
+        },
+      },
+    }}
+  >
+    <App />
+  </Provider>
+);
diff --git a/src/Editor/index.jsx b/src/Editor/Editor.tsx
similarity index 78%
rename from src/Editor/index.jsx
rename to src/Editor/Editor.tsx
index f65b0f2..5c7e532 100644
--- a/src/Editor/index.jsx
+++ b/src/Editor/Editor.tsx
@@ -1,14 +1,28 @@
-import React from 'react';
-import { connect } from 'react-redux';
+import * as React from 'react';
 import { Tabs } from 'antd';
-import JsonEditor from './JsonEditor';
-import BasicEditor from './BasicEditor';
+import { NodeJsonEditor } from './JsonEditor';
+import { SchemaEditor } from './SchemaEditor';
 
 const { getNode } = require('../core');
 const { TabPane } = Tabs;
 
-const editorList = [BasicEditor, JsonEditor];
+// const editorList = [NodeJsonEditor];
 
+export const Editor: React.FC = () => {
+  const Editor = NodeJsonEditor;
+  return (
+    <Tabs defaultActiveKey={'schema'} type="card">
+      <TabPane tab={'Schema'} key={'schema'} style={{ padding: '0px 16px' }}>
+        <SchemaEditor />
+      </TabPane>
+      <TabPane tab={'Json'} key={'json'} style={{ padding: '0px 16px' }}>
+        <Editor />
+      </TabPane>
+    </Tabs>
+  );
+};
+
+/*
 class Editor extends React.Component {
   updateUiOptions = (uiOptionsUpdate) => {
     const { uiSchema = {}, key } = this.props.node;
@@ -65,3 +79,4 @@ export default connect(
       }),
   })
 )(Editor);
+*/
diff --git a/src/Editor/JsonEditor.jsx b/src/Editor/JsonEditor.jsx
deleted file mode 100644
index 7727f92..0000000
--- a/src/Editor/JsonEditor.jsx
+++ /dev/null
@@ -1,39 +0,0 @@
-import React from 'react';
-import JsonEditor from '../JsonEditor';
-import { Input } from 'antd';
-
-export default class NodeJsonEditor extends React.Component {
-  static get key() {
-    return 'json-editor';
-  }
-  static get name() {
-    return 'Json';
-  }
-  static filter(node) {
-    return true;
-  }
-
-  constructor(props) {
-    super(props);
-    const { schema, uiSchema } = props;
-    this.state = {
-      schemaJsonString: JSON.stringify(schema, null, 2),
-      uiSchemaJsonString: JSON.stringify(schema, null, 2),
-      schema,
-      uiSchema,
-    };
-  }
-
-  render() {
-    const { node, updateNode } = this.props;
-    const { schema, uiSchema } = node;
-    const { properties, items, additionalItems, ...rschema } = schema;
-    return (
-      <div>
-        <Input value={node.name} onChange={(e) => updateNode({ name: e.target.value })} />
-        <JsonEditor value={rschema} onChange={(schema) => updateNode({ schema })} autoSize />
-        <JsonEditor value={uiSchema} onChange={(uiSchema) => updateNode({ uiSchema })} autoSize />
-      </div>
-    );
-  }
-}
diff --git a/src/Editor/JsonEditor.tsx b/src/Editor/JsonEditor.tsx
new file mode 100644
index 0000000..8d0ddcb
--- /dev/null
+++ b/src/Editor/JsonEditor.tsx
@@ -0,0 +1,83 @@
+import React from 'react';
+import JsonEditor from '../JsonEditor';
+import { FormBuilderContext } from '../FormBuilderContext';
+import { Input } from 'antd';
+import { replaceSchemaNode, renameSchemaNode, replaceExtraPropsNode } from '../utils';
+import { JSONSchema7Definition } from 'json-schema';
+
+export const NodeJsonEditor: React.FC = () => {
+  const {
+    selectedNodePath,
+    setSelectedNodePath,
+
+    schema,
+    selectedSchema,
+    setSchema,
+
+    extraProps,
+    selectedExtraProps,
+    setExtraProps,
+  } = React.useContext(FormBuilderContext);
+
+  if (!selectedNodePath || !selectedSchema) return null;
+  return (
+    <>
+      <Input
+        value={selectedNodePath[selectedNodePath.length - 1]}
+        onChange={(e) => {
+          const value = e.target.value;
+          setSelectedNodePath([...selectedNodePath.slice(0, -1), value]);
+          setSchema(renameSchemaNode(schema, selectedNodePath, value));
+        }}
+      />
+      <JsonEditor
+        value={selectedSchema}
+        onChange={(newNode) => setSchema(replaceSchemaNode(schema, selectedNodePath, newNode as JSONSchema7Definition))}
+        autoSize
+      />
+      <JsonEditor
+        value={selectedExtraProps}
+        onChange={(newNode) => setExtraProps(replaceExtraPropsNode(extraProps, selectedNodePath, newNode))}
+        autoSize
+      />
+    </>
+  );
+};
+
+/*
+export default class NodeJsonEditor extends React.Component {
+  static get key() {
+    return 'json-editor';
+  }
+  static get name() {
+    return 'Json';
+  }
+  static filter(node) {
+    return true;
+  }
+
+  constructor(props) {
+    super(props);
+    const { schema, uiSchema } = props;
+    this.state = {
+      schemaJsonString: JSON.stringify(schema, null, 2),
+      uiSchemaJsonString: JSON.stringify(schema, null, 2),
+      schema,
+      uiSchema,
+    };
+  }
+
+  render() {
+    const { node, updateNode } = this.props;
+    const { schema, uiSchema } = node;
+    const { properties, items, additionalItems, ...rschema } = schema;
+    return (
+      <div>
+        <Input value={node.name} onChange={(e) => updateNode({ name: e.target.value })} />
+        <JsonEditor value={rschema} onChange={(schema) => updateNode({ schema })} autoSize />
+        <JsonEditor value={uiSchema} onChange={(uiSchema) => updateNode({ uiSchema })} autoSize />
+      </div>
+    );
+  }
+}
+*/
diff --git a/src/Editor/SchemaEditor.tsx b/src/Editor/SchemaEditor.tsx
new file mode 100644
index 0000000..8de1198
--- /dev/null
+++ b/src/Editor/SchemaEditor.tsx
@@ -0,0 +1,94 @@
+import * as React from 'react';
+import { JSONSchema7 } from 'json-schema';
+import { Input, List, Divider, Button, Menu, Dropdown } from 'antd';
+import { EditOutlined, CaretDownOutlined, CloseOutlined, PlusOutlined } from '@ant-design/icons';
+import { FormBuilderContext } from '../FormBuilderContext';
+import { replaceSchemaNode } from '../utils';
+
+interface ISchemaEditor {
+  schema: JSONSchema7;
+  onUpdate: (schema: JSONSchema7) => void;
+}
+
+const editors: {
+  key: string;
+  title: string;
+  setDefault: (schema: JSONSchema7) => JSONSchema7;
+  handleRemove: (schema: JSONSchema7) => JSONSchema7;
+  Component: React.FC<ISchemaEditor>;
+}[] = [
+  {
+    key: 'title',
+    title: 'Title',
+    setDefault: (schema) => ({ ...schema, title: '' }),
+    handleRemove: (schema) => {
+      const { title, ...rest } = schema;
+      return rest;
+    },
+    Component: ({ schema, onUpdate }) => {
+      return <Input value={schema.title} onChange={(e) => onUpdate({ ...schema, title: e.target.value })} />;
+    },
+  },
+  {
+    key: 'description',
+    title: 'Description',
+    setDefault: (schema) => ({ ...schema, description: '' }),
+    handleRemove: (schema) => {
+      const { description, ...rest } = schema;
+      return rest;
+    },
+    Component: ({ schema, onUpdate }) => {
+      return (
+        <Input value={schema.description} onChange={(e) => onUpdate({ ...schema, description: e.target.value })} />
+      );
+    },
+  },
+];
+
+export const SchemaEditor: React.FC = () => {
+  const { selectedSchema, selectedNodePath, schema, setSchema } = React.useContext(FormBuilderContext);
+
+  if (!selectedNodePath || !selectedSchema || typeof selectedSchema === 'boolean') return null;
+
+  const handleUpdate = (newSchemaNode: JSONSchema7) => {
+    setSchema(replaceSchemaNode(schema, selectedNodePath, newSchemaNode));
+  };
+
+  const activeEditor = editors.filter(({ key }) => Object.hasOwnProperty.call(selectedSchema, key));
+  const inactiveEditor = editors
+    .filter(({ key }) => !Object.hasOwnProperty.call(selectedSchema, key))
+    .map(({ key, title, setDefault }) => (
+      <Menu.Item key={key} onClick={() => handleUpdate(setDefault(selectedSchema))}>
+        {title}
+      </Menu.Item>
+    ));
+
+  return (
+    <List
+      itemLayout="horizontal"
+      dataSource={[
+        ...activeEditor.map(({ key, Component, title, handleRemove }) => (
+          <List.Item
+            key={key}
+            actions={[
+              <Button
+                onClick={() => handleUpdate(handleRemove(selectedSchema))}
+                size="small"
+                shape="circle"
+                icon={<CloseOutlined />}
+              />,
+            ]}
+          >
+            <List.Item.Meta title={title} description={<Component schema={selectedSchema} onUpdate={handleUpdate} />} />
+          </List.Item>
+        )),
+        <List.Item key={'button'}>
+          <Dropdown trigger={['click']} overlay={<Menu>{inactiveEditor}</Menu>}>
+            <Button style={{ width: '100%' }} type="primary" icon={<PlusOutlined />} />
+          </Dropdown>
+        </List.Item>,
+      ]}
+      renderItem={(a) => a}
+    />
+  );
+};
diff --git a/src/FormBuilderContext.tsx b/src/FormBuilderContext.tsx
new file mode 100644
index 0000000..ce249ae
--- /dev/null
+++ b/src/FormBuilderContext.tsx
@@ -0,0 +1,95 @@
+import * as React from 'react';
+import { Dispatch, SetStateAction } from 'react';
+import get from 'lodash/get';
+import { JSONSchema7, JSONSchema7Definition } from 'json-schema';
+import { MiddlewareProps } from '@gravel-form/antd';
+import { SchemaPath, getSchemaByPath } from './utils';
+
+interface ISettings {
+  formWidth: number;
+  leftSiderWidth: number;
+  rightSiderWidth: number;
+  isInlineMode: boolean;
+  isLiveValidate: boolean;
+  subViews: ('schema' | 'uiSchema' | 'formData')[];
+}
+
+export interface SettingsContext {
+  settings: ISettings;
+  setSettings: Dispatch<SetStateAction<ISettings>>;
+}
+
+export interface IFormBuilderContext {
+  schema: JSONSchema7;
+  selectedSchema: JSONSchema7Definition | null;
+  setSchema: Dispatch<SetStateAction<JSONSchema7>>;
+  extraProps: any;
+  selectedExtraProps: any;
+  setExtraProps: Dispatch<SetStateAction<any>>;
+  selectedNodePath: SchemaPath | null;
+  setSelectedNodePath: Dispatch<SetStateAction<SchemaPath | null>>;
+}
+
+export const FormBuilderContext = React.createContext<IFormBuilderContext>({
+  schema: {},
+  selectedSchema: null,
+  setSchema: () => {},
+  extraProps: {},
+  selectedExtraProps: {},
+  setExtraProps: () => {},
+  selectedNodePath: null,
+  setSelectedNodePath: () => {},
+});
+
+const defaultSettings: ISettings = {
+  leftSiderWidth: 300,
+  rightSiderWidth: 360,
+  formWidth: 600,
+  isInlineMode: true,
+  subViews: ['schema', 'uiSchema', 'formData'],
+  isLiveValidate: false,
+};
+
+export const SettingsContext = React.createContext<SettingsContext>({
+  settings: defaultSettings,
+  setSettings: () => {},
+});
+
+export const Provider: React.FC<{ defaultSchema: JSONSchema7; defaultExtraProps: any }> = ({
+  defaultSchema,
+  defaultExtraProps,
+  children,
+}) => {
+  const [schema, setSchema] = React.useState(defaultSchema);
+  const [extraProps, setExtraProps] = React.useState(defaultExtraProps);
+  const [settings, setSettings] = React.useState(defaultSettings);
+  const [selectedNodePath, setSelectedNodePath] = React.useState<SchemaPath | null>(['properties', 'bio']);
+  const selectedSchema = React.useMemo(() => (selectedNodePath && getSchemaByPath(schema, selectedNodePath)) || null, [
+    schema,
+    selectedNodePath,
+  ]);
+
+  const selectedExtraProps = React.useMemo(() => (selectedNodePath && get(extraProps, selectedNodePath)) || null, [
+    extraProps,
+    selectedNodePath,
+  ]);
+
+  return (
+    <SettingsContext.Provider value={{ settings, setSettings }}>
+      <FormBuilderContext.Provider
+        value={{
+          schema,
+          setSchema,
+          extraProps,
+          setExtraProps,
+          selectedNodePath,
+          setSelectedNodePath,
+          selectedSchema,
+          selectedExtraProps,
+        }}
+      >
+        {children}
+      </FormBuilderContext.Provider>
+    </SettingsContext.Provider>
+  );
+};
diff --git a/src/InlineEditor.jsx b/src/InlineEditor.jsx
deleted file mode 100644
index 8768453..0000000
--- a/src/InlineEditor.jsx
+++ /dev/null
@@ -1,77 +0,0 @@
-import React, { Component } from 'react';
-import { Input } from 'antd';
-import { EditOutlined } from '@ant-design/icons';
-
-export default class InlineEditor extends Component {
-  constructor(props) {
-    super(props);
-    this.state = {
-      editing: false,
-      value: this.props.value,
-    };
-  }
-
-  componentWillReceiveProps(nextProps) {
-    this.setState({ value: nextProps.value });
-  }
-
-  onChange = (e) => {
-    this.setState({ value: e.target.value });
-  };
-  onCompleteEditing = () => {
-    this.setState({ editing: false });
-    const newValue = this.state.value.trim();
-    if (newValue !== this.props.value) {
-      this.props.onChange && this.props.onChange(newValue);
-    }
-  };
-  onStartEditing = (e) => {
-    e.stopPropagation();
-    e.preventDefault();
-    this.setState({ editing: true }, () => this.input && this.input.focus());
-  };
-
-  onCancelEditing = () => {
-    this.setState({
-      editing: false,
-      value: this.props.value,
-    });
-  };
-
-  renderEditing() {
-    return (
-      <Input
-        ref={(r) => (this.input = r)}
-        value={this.state.value}
-        onBlur={this.onCompleteEditing}
-        onChange={this.onChange}
-        onKeyUp={(e) => {
-          e.preventDefault();
-          e.stopPropagation();
-          if (e.keyCode === 13) {
-            this.onCompleteEditing();
-          } else if (e.keyCode === 27) {
-            this.onCancelEditing();
-          }
-        }}
-      />
-    );
-  }
-
-  renderView() {
-    return (
-      <span>
-        {this.props.children}
-        <EditOutlined onClick={this.onStartEditing} />
-      </span>
-    );
-  }
-
-  render() {
-    if (this.state.editing) {
-      return this.renderEditing();
-    } else {
-      return this.renderView();
-    }
-  }
-}
diff --git a/src/InlineEditor.tsx b/src/InlineEditor.tsx
new file mode 100644
index 0000000..7346dc2
--- /dev/null
+++ b/src/InlineEditor.tsx
@@ -0,0 +1,158 @@
+import * as React from 'react';
+import Input, { InputProps } from 'antd/lib/input';
+import { EditOutlined } from '@ant-design/icons';
+
+export const InlineEditor: React.FC<
+  Omit<InputProps, 'value' | 'onChange'> & { value?: string; onChange: (value?: string) => void; icon?: boolean }
+> = ({ children, onChange, value, icon, ...props }) => {
+  const [editing, setEditing] = React.useState(false);
+  const [editingValue, setEditingValue] = React.useState(value);
+  const [mouseOver, setMouseOver] = React.useState(false);
+  const inputRef = React.useRef<Input>(null);
+  const handleStartEditing = React.useCallback<React.MouseEventHandler>(
+    (e) => {
+      e.preventDefault();
+      e.stopPropagation();
+      setEditingValue(value);
+      setEditing(true);
+      setMouseOver(false);
+    },
+    [setEditing, inputRef, value]
+  );
+
+  React.useEffect(() => {
+    if (editing) {
+      inputRef.current?.focus();
+    }
+  }, [inputRef, editing]);
+
+  const handleCompleteEditing = React.useCallback(() => {
+    setEditing(false);
+    let newValue = editingValue && editingValue.trim();
+    if (newValue !== value) {
+      onChange && onChange(newValue);
+    }
+  }, [setEditing, editingValue, value, onChange]);
+
+  const handleCancelEditing = React.useCallback(() => {
+    setEditing(false);
+  }, [value]);
+
+  const handleChange = React.useCallback<React.ChangeEventHandler<HTMLInputElement>>((e) => {
+    setEditingValue(e.target.value);
+  }, []);
+
+  if (editing) {
+    return (
+      <Input
+        ref={inputRef}
+        value={editingValue}
+        onBlur={handleCompleteEditing}
+        onChange={handleChange}
+        onKeyUp={(e) => {
+          e.preventDefault();
+          e.stopPropagation();
+          if (e.keyCode === 13) {
+            handleCompleteEditing();
+          } else if (e.keyCode === 27) {
+            handleCancelEditing();
+          }
+        }}
+        {...props}
+      />
+    );
+  } else if (icon) {
+    return (
+      <>
+        {children}
+        <EditOutlined onClick={handleStartEditing} />
+      </>
+    );
+  } else {
+    return (
+      <span
+        onMouseOver={() => setMouseOver(true)}
+        onMouseLeave={() => setMouseOver(false)}
+        onClick={handleStartEditing}
+        style={mouseOver ? { textDecoration: 'underline', cursor: 'pointer' } : undefined}
+      >
+        {children}
+      </span>
+    );
+  }
+};
+/*
+   export default class InlineEditor extends Component {
+   constructor(props) {
+   super(props);
+   this.state = {
+   editing: false,
+   value: this.props.value,
+   };
+   }
+
+   componentWillReceiveProps(nextProps) {
+   this.setState({ value: nextProps.value });
+   }
+
+   onChange = (e) => {
+   this.setState({ value: e.target.value });
+   };
+   onCompleteEditing = () => {
+   this.setState({ editing: false });
+   const newValue = this.state.value.trim();
+   if (newValue !== this.props.value) {
+   this.props.onChange && this.props.onChange(newValue);
+   }
+   };
+   onStartEditing = (e) => {
+   e.stopPropagation();
+   e.preventDefault();
+   this.setState({ editing: true }, () => this.input && this.input.focus());
+   };
+
+   onCancelEditing = () => {
+   this.setState({
+   editing: false,
+   value: this.props.value,
+   });
+   };
+
+   renderEditing() {
+   return (
+   <Input
+   ref={(r) => (this.input = r)}
+   value={this.state.value}
+   onBlur={this.onCompleteEditing}
+   onChange={this.onChange}
+   onKeyUp={(e) => {
+   e.preventDefault();
+   e.stopPropagation();
+   if (e.keyCode === 13) {
+   this.onCompleteEditing();
+   } else if (e.keyCode === 27) {
+   this.onCancelEditing();
+   }
+   }}
+   />
+   );
+   }
+
+   renderView() {
+   return (
+   <span>
+   {this.props.children}
+   <EditOutlined onClick={this.onStartEditing} />
+   </span>
+   );
+   }
+
+   render() {
+   if (this.state.editing) {
+   return this.renderEditing();
+   } else {
+   return this.renderView();
+   }
+   }
+   }
+ */
diff --git a/src/JsonEditor.jsx b/src/JsonEditor.tsx
similarity index 69%
rename from src/JsonEditor.jsx
rename to src/JsonEditor.tsx
index aa6af21..95e5aae 100644
--- a/src/JsonEditor.jsx
+++ b/src/JsonEditor.tsx
@@ -1,7 +1,47 @@
-import React from 'react';
+import * as React from 'react';
 import { Input, Alert } from 'antd';
+import { TextAreaProps } from 'antd/lib/input';
+
 const { TextArea } = Input;
-function shallowEqual(objA, objB) {
+
+const JsonEditor: React.FC<{ value: any } & Omit<TextAreaProps, 'value'>> = (props) => {
+  const { value, onChange } = props;
+  const stringValueRead = React.useMemo(() => JSON.stringify(value, null, 2), [value]);
+  const [stringValue, setStringValue] = React.useState<string>('');
+  const [error, setError] = React.useState<Error | null>(null);
+  const [focus, setFocus] = React.useState<boolean>(false);
+
+  const handleChange: React.ChangeEventHandler<HTMLTextAreaElement> = (e) => {
+    const value = e.target.value;
+    setStringValue(value);
+    try {
+      const obj = value ? JSON.parse(value) : null;
+      setError(null);
+      obj && onChange && onChange(obj);
+    } catch (error) {
+      setError(error);
+    }
+  };
+  return (
+    <TextArea
+      {...props}
+      value={focus ? stringValue : stringValueRead}
+      onChange={handleChange}
+      onFocus={() => {
+        setFocus(true);
+        setStringValue(stringValueRead);
+      }}
+      onBlur={() => {
+        setFocus(false);
+      }}
+    />
+  );
+};
+
+export default JsonEditor;
+
+/*
+function shallowEqual(objA: object, objB: object) {
   if (objA === objB) {
     return true;
   }
@@ -119,3 +159,4 @@ export default class JsonEditor extends React.Component {
     );
   }
 }
+*/
diff --git a/src/Tree/Menu.jsx b/src/Tree/Menu.jsx
deleted file mode 100644
index 6181d6c..0000000
--- a/src/Tree/Menu.jsx
+++ /dev/null
@@ -1,71 +0,0 @@
-import React from 'react';
-import { connect } from 'react-redux';
-import { Menu } from 'antd';
-const { SubMenu, Item } = Menu;
-
-function nameGen(name, occupied) {
-  let n = 1;
-  let newName = name;
-  while (occupied && occupied.includes(newName)) {
-    newName = name + '_' + n;
-    n += 1;
-  }
-  return newName;
-}
-
-class AddItemMenu extends React.Component {
-  onAddNode = (node2add) => {
-    const { addNode } = this.props;
-    const name = nameGen(
-      node2add.name,
-      this.props.node.children.map((a) => a.name)
-    );
-    addNode({ ...node2add, name });
-  };
-  render() {
-    const {
-      menu: { children: menuTree },
-      menuOpenKeys,
-      menuOpenChange,
-    } = this.props;
-    return (
-      <Menu mode="inline" theme="dark" openKeys={menuOpenKeys} onOpenChange={menuOpenChange}>
-        {menuTree.map((a) =>
-          a.schema && a.schema.type === 'object' && a.children && a.children.length ? (
-            <SubMenu key={a.key} title={a.schema.title || a.name}>
-              {a.children.map((b) => (
-                <Item key={b.key} onClick={() => this.onAddNode(b)}>
-                  {b.schema.title || b.name}
-                </Item>
-              ))}
-            </SubMenu>
-          ) : (
-            <Item key={a.key} onClick={() => this.onAddNode(a)}>
-              {a.schema.title || a.name}
-            </Item>
-          )
-        )}
-      </Menu>
-    );
-  }
-}
-
-export default connect(
-  ({ menu, menuOpenKeys }) => ({ menu, menuOpenKeys }),
-  (dispatch, { node }) => ({
-    addNode: (node2add) =>
-      dispatch({
-        type: 'TREE_ADD_NODE',
-        payload: {
-          targetNodeKey: node.key,
-          position: 0,
-          node2add,
-        },
-      }),
-    menuOpenChange: (keys) =>
-      dispatch({
-        type: 'MENU_OPEN_KEYS_SET',
-        payload: keys,
-      }),
-  })
-)(AddItemMenu);
diff --git a/src/Tree/Menu.tsx b/src/Tree/Menu.tsx
new file mode 100644
index 0000000..74a9b8c
--- /dev/null
+++ b/src/Tree/Menu.tsx
@@ -0,0 +1,165 @@
+import * as React from 'react';
+// import { connect } from 'react-redux';
+import { Menu } from 'antd';
+import { JSONSchema7, JSONSchema7Definition } from 'json-schema';
+import { FormBuilderContext } from '../FormBuilderContext';
+import { addSchemaNode, addExtraPropsNode } from '../utils';
+const { SubMenu, Item } = Menu;
+
+function nameGen(name: string, occupied: string[]) {
+  let n = 1;
+  let newName = name;
+  while (occupied && occupied.includes(newName)) {
+    newName = name + '_' + n;
+    n += 1;
+  }
+  return newName;
+}
+
+const menueSchema: JSONSchema7 = {
+  type: 'object',
+  title: 'Basic',
+  properties: {
+    text: { type: 'string', title: 'Text' },
+    textarea: { type: 'string', title: 'Text Area' },
+    date: { type: 'string', title: 'Date' },
+    time: { type: 'string', title: 'Timel' },
+    password: { type: 'string', title: 'Password' },
+    number: { type: 'number', title: 'Number' },
+    rate: { type: 'number', title: 'Rate' },
+    slider: { type: 'integer', minimum: 0, maximum: 100, title: 'Slider' },
+    select: {
+      type: 'string',
+      enum: ['foo', 'bar', 'baz'],
+      title: 'Select',
+    },
+    radioGroup: {
+      type: 'string',
+      enum: ['foo', 'bar', 'baz'],
+      title: 'Radio Group',
+    },
+    checkbox: { type: 'boolean', title: 'Checkbox' },
+    switch: { type: 'boolean', title: 'Switch' },
+    checkboxGroup: {
+      type: 'array',
+      items: {
+        type: 'string',
+        enum: ['foo', 'bar', 'baz'],
+      },
+      uniqueItems: true,
+      title: 'Checkbox Group',
+    },
+  },
+};
+
+const menuExtraProps = {
+  properties: {
+    textarea: { component: 'TextArea' },
+    password: { component: 'Password' },
+    date: { component: 'DatePicker' },
+    time: { component: 'TimePicker' },
+    rate: { component: 'Rate' },
+    slider: { component: 'Slider' },
+    radioGroup: { component: 'RadioGroup' },
+    switch: { component: 'Switch' },
+  },
+};
+
+export const AddItemMenu: React.FC<{ schemaPath: (string | number)[] }> = ({ schemaPath }) => {
+  const { schema, setSchema, selectedSchema, extraProps, setExtraProps } = React.useContext(FormBuilderContext);
+
+  const handleAddNode = (key: string, newSchemaNode: JSONSchema7Definition, newExtraPropsNode: any) => {
+    if (typeof selectedSchema === 'boolean' || !selectedSchema?.properties) return;
+    const properties = selectedSchema?.properties || {};
+
+    const childrenNames = Object.keys(properties);
+    const name = nameGen(key, childrenNames);
+
+    /*const newSchema = addSchemaNode(
+      schema,
+      newSchemaNode,
+      [...schemaPath, 'properties', childrenNames[childrenNames.length - 1]],
+      name
+
+    );*/
+  };
+
+  const { properties } = menueSchema;
+
+  if (!properties) return null;
+
+  return (
+    <Menu mode="inline" theme="dark">
+      {Object.keys(properties).map((key) => {
+        const itemSchema = properties[key];
+        const itemExtraProps = (menuExtraProps.properties as any)[key];
+        if (typeof itemSchema === 'boolean') return null;
+
+        return (
+          <Item key={key} onClick={() => handleAddNode(key, itemSchema, itemExtraProps)}>
+            {itemSchema.title || key}
+          </Item>
+        );
+      })}
+    </Menu>
+  );
+};
+
+/*
+class AddItemMenu extends React.Component {
+  onAddNode = (node2add) => {
+    const { addNode } = this.props;
+    const name = nameGen(
+      node2add.name,
+      this.props.node.children.map((a) => a.name)
+    );
+    addNode({ ...node2add, name });
+  };
+  render() {
+    const {
+      menu: { children: menuTree },
+      menuOpenKeys,
+      menuOpenChange,
+    } = this.props;
+    return (
+      <Menu mode="inline" theme="dark" openKeys={menuOpenKeys} onOpenChange={menuOpenChange}>
+        {menuTree.map((a) =>
+          a.schema && a.schema.type === 'object' && a.children && a.children.length ? (
+            <SubMenu key={a.key} title={a.schema.title || a.name}>
+              {a.children.map((b) => (
+                <Item key={b.key} onClick={() => this.onAddNode(b)}>
+                  {b.schema.title || b.name}
+                </Item>
+              ))}
+            </SubMenu>
+          ) : (
+            <Item key={a.key} onClick={() => this.onAddNode(a)}>
+              {a.schema.title || a.name}
+            </Item>
+          )
+        )}
+      </Menu>
+    );
+  }
+}
+
+export default connect(
+  ({ menu, menuOpenKeys }) => ({ menu, menuOpenKeys }),
+  (dispatch, { node }) => ({
+    addNode: (node2add) =>
+      dispatch({
+        type: 'TREE_ADD_NODE',
+        payload: {
+          targetNodeKey: node.key,
+          position: 0,
+          node2add,
+        },
+      }),
+    menuOpenChange: (keys) =>
+      dispatch({
+        type: 'MENU_OPEN_KEYS_SET',
+        payload: keys,
+      }),
+  })
+)(AddItemMenu);
+*/
diff --git a/src/Tree/Tree.jsx b/src/Tree/Tree.jsx
deleted file mode 100644
index ea6a1f0..0000000
--- a/src/Tree/Tree.jsx
+++ /dev/null
@@ -1,172 +0,0 @@
-import React, { Component } from 'react';
-import { connect } from 'react-redux';
-import { Tree, Input } from 'antd';
-import TreeNodeTitle from './TreeNodeTitle';
-const { TreeNode } = Tree;
-const { Search } = Input;
-
-class Demo extends Component {
-  constructor(props) {
-    super(props);
-    this.state = {
-      expandedKeys: ['root'],
-      searchValue: '',
-      searchExpanded: [],
-    };
-  }
-
-  componentWillReceiveProps(nextProps) {
-    if (nextProps.activeNodeKey && nextProps.activeNodeKey !== this.props.activeNodeKey) {
-      let path = nextProps.activeNodeKey.split('.');
-      let expandedKeys = [...this.state.expandedKeys];
-      const n = path.length;
-      for (var i = 1; i < n; i++) {
-        path[i] = path[i - 1] + '.' + path[i];
-        if (!expandedKeys.includes(path[i - 1])) {
-          expandedKeys.push(path[i - 1]);
-        }
-      }
-      this.setState({
-        expandedKeys,
-      });
-    }
-  }
-
-  onDrop = (info) => {
-    const dropKey = info.node.props.eventKey;
-    const dragKey = info.dragNode.props.eventKey;
-    const dropPos = info.node.props.pos.split('-');
-    const dropPosition = info.dropPosition - Number(dropPos[dropPos.length - 1]);
-    this.props.moveNode(dragKey, dropKey, dropPosition);
-  };
-
-  onExpand = (expandedKeys) => {
-    this.setState({
-      expandedKeys,
-    });
-  };
-
-  onChange = (e) => {
-    const { expandedKeys } = this.state;
-    const searchValue = e.target.value.trim().toLowerCase();
-    if (!searchValue) {
-      this.setState({
-        searchValue,
-        searchExpanded: [],
-      });
-      return;
-    }
-
-    let newSearchExpanded = [];
-    const loop = (data) => {
-      if (!data) return;
-      for (const item of data) {
-        if (item.name.toLowerCase().includes(searchValue)) {
-          let parents = item.key.split('.');
-          const n = parents.length;
-          for (let i = 1; i < n; i++) {
-            if (!(expandedKeys.includes(parents[i - 1]) || newSearchExpanded.includes(parents[i - 1]))) {
-              newSearchExpanded.push(parents[i - 1]);
-            }
-            parents[i] = parents[i - 1] + '.' + parents[i];
-          }
-        }
-        loop(item.children);
-      }
-    };
-    loop(this.props.tree);
-    this.setState({
-      searchValue,
-      searchExpanded: newSearchExpanded,
-    });
-  };
-
-  onBlur = () => {
-    this.setState({
-      expandedKeys: [...this.state.expandedKeys, ...this.state.searchExpanded],
-      searchExpanded: [],
-    });
-  };
-
-  render() {
-    const { tree, setActiveNode, activeNodeKey } = this.props;
-    const { searchValue, expandedKeys, searchExpanded } = this.state;
-    const loop = (data) =>
-      data.map((item) => {
-        if (item.children && item.children.length) {
-          return (
-            <TreeNode
-              key={item.key}
-              title={<TreeNodeTitle node={item} searchValue={searchValue} />}
-              isLeaf={item.isLeaf}
-            >
-              {loop(item.children)}
-            </TreeNode>
-          );
-        }
-        return (
-          <TreeNode
-            key={item.key}
-            title={<TreeNodeTitle node={item} searchValue={searchValue} />}
-            isLeaf={item.isLeaf}
-          />
-        );
-      });
-    const children = loop(tree);
-    return (
-      <div>
-        <Search placeholder="Search" onChange={this.onChange} onBlur={this.onBlur} />
-        <Tree
-          className="form-builder-draggable-tree"
-          expandedKeys={searchExpanded.length ? [...expandedKeys, ...searchExpanded] : expandedKeys}
-          selectedKeys={[activeNodeKey]}
-          draggable
-          onDragEnter={this.onDragEnter}
-          onDrop={this.onDrop}
-          onExpand={this.onExpand}
-          onSelect={([selected]) => setActiveNode(selected)}
-          blockNode
-        >
-          {children}
-        </Tree>
-      </div>
-    );
-  }
-}
-
-export default connect(
-  ({ tree: { present }, activeNodeKey }) => ({
-    tree: present,
-    activeNodeKey,
-  }),
-  (dispatch) => ({
-    moveNode: (source, target, position) =>
-      dispatch({
-        type: 'TREE_MOVE_NODE',
-        payload: {
-          source,
-          target,
-          position,
-        },
-      }),
-    removeNode: (target) =>
-      dispatch({
-        type: 'TREE_REMOVE_NODE',
-        payload: target,
-      }),
-    setActiveNode: (selectedKey) =>
-      dispatch({
-        type: 'ACTIVE_NODE_KEY_SET',
-        payload: selectedKey,
-      }),
-    updateNodeTitle: (target, name) =>
-      dispatch({
-        type: 'TREE_UPDATE_NODE',
-        payload: {
-          target: target,
-          node: { name },
-          updateMode: 1,
-        },
-      }),
-  })
-)(Demo);
diff --git a/src/Tree/Tree.tsx b/src/Tree/Tree.tsx
new file mode 100644
index 0000000..e6d1a64
--- /dev/null
+++ b/src/Tree/Tree.tsx
@@ -0,0 +1,114 @@
+import * as React from 'react';
+import { flatMap } from 'lodash';
+import { Tree, Input } from 'antd';
+import { TreeProps } from 'antd/lib/tree';
+import { DataNode } from 'rc-tree/lib/interface';
+import { INode, path2key, key2path, moveSchemaNode } from '../utils';
+import { FormBuilderContext } from '../FormBuilderContext';
+import { compose, MiddlewareProps } from '@gravel-form/core-rc';
+import { Middleware } from '@gravel-form/core-rc/lib/compose';
+import { JSONSchema7Definition } from 'json-schema';
+
+import { TreeNodeTitle } from './TreeNodeTitle';
+const { TreeNode } = Tree;
+const { Search } = Input;
+
+function isClassComponent<T>(Component: React.ComponentType<T>): Component is React.ComponentClass<T> {
+  return Component.prototype && Component.prototype.isReactComponent;
+}
+
+interface TreeMiddlewareProps extends Pick<MiddlewareProps, 'schema' | 'schemaPath'> {
+  parent: TreeMiddlewareProps | null;
+  composed: TreeNodeMiddleware;
+}
+
+type TreeNodeMiddleware = Middleware<Parameters<(props: TreeMiddlewareProps) => void>, DataNode[]>;
+
+const propertiesMw: TreeNodeMiddleware = (next, props): DataNode[] => {
+  const { schema, schemaPath, composed } = props;
+  if (typeof schema === 'boolean' || (schema.type && schema.type !== 'object') || !schema.properties)
+    return next(props);
+  const properties = schema.properties;
+
+  return flatMap(Object.keys(properties), (key) => {
+    const childProps: TreeMiddlewareProps = {
+      ...props,
+      schema: properties[key],
+      schemaPath: [...schemaPath, 'properties', key],
+      parent: props,
+    };
+    return composed(() => [], childProps);
+  });
+};
+
+const treeNodeMw: TreeNodeMiddleware = (next, props): DataNode[] => {
+  const { schema, schemaPath } = props;
+  if (typeof schema === 'boolean') return next(props);
+  // const name = schemaPath.length ? schemaPath[schemaPath.length - 1] : 'root';
+
+  if (schema.properties) {
+    return [
+      {
+        key: path2key(schemaPath),
+        title: <TreeNodeTitle path={schemaPath} />,
+        isLeaf: false,
+        children: next(props),
+      },
+    ];
+  }
+  return [
+    {
+      key: path2key(schemaPath),
+      title: <TreeNodeTitle path={schemaPath} isLeaf={schema.type !== 'object' && schema.type !== 'array'} />,
+      isLeaf: schema.type !== 'object' && schema.type !== 'array',
+    },
+  ];
+};
+
+const composed = compose([treeNodeMw, propertiesMw]);
+
+export const FormSchemaTree: React.FC = () => {
+  const [expandedKeys, setExpandedKeys] = React.useState<React.Key[]>(['']);
+  const [searchValue, setSearchValue] = React.useState('');
+
+  const { schema, extraProps, setSchema, selectedNodePath, setSelectedNodePath } = React.useContext(FormBuilderContext);
+
+  const handleDrop: TreeProps['onDrop'] = React.useCallback(
+    (info) => {
+      const dropKey = info.node.key;
+      const dragKey = info.dragNode.key;
+      // const dropPos = info.node.pos.split('-');
+      // const dropPosition = info.dropPosition - +dropPos[dropPos.length - 1];
+      const src = key2path(dragKey);
+      const dst = key2path(dropKey);
+      if (src && dst) {
+        setSchema(moveSchemaNode(schema, src, dst, info.dropPosition));
+      }
+    },
+    [schema]
+  );
+
+  const handleExpand: TreeProps['onExpand'] = setExpandedKeys;
+
+  const handleBlur = () => {};
+
+  const treeChildren = composed(() => [], { schema, schemaPath: [], composed, parent: null });
+
+  return (
+    <>
+      <Search placeholder="Search" onChange={(e) => setSearchValue(e.target.value)} onBlur={handleBlur} />
+      <Tree
+        className="form-builder-draggable-tree"
+        // expandedKeys={searchExpanded.length ? [...expandedKeys, ...searchExpanded] : expandedKeys}
+        expandedKeys={expandedKeys}
+        selectedKeys={selectedNodePath ? [path2key(selectedNodePath)] : []}
+        draggable
+        treeData={treeChildren}
+        onDrop={handleDrop}
+        onExpand={handleExpand}
+        onSelect={([selectedKey]) => setSelectedNodePath((selectedKey && key2path(selectedKey.toString())) || null)}
+        blockNode
+      />
+    </>
+  );
+};
diff --git a/src/Tree/TreeNodeTitle.jsx b/src/Tree/TreeNodeTitle.jsx
deleted file mode 100644
index 6022f46..0000000
--- a/src/Tree/TreeNodeTitle.jsx
+++ /dev/null
@@ -1,69 +0,0 @@
-import React, { PureComponent } from 'react';
-import { connect } from 'react-redux';
-import { Popconfirm } from 'antd';
-import { PlusCircleOutlined, CloseCircleFilled } from '@ant-design/icons';
-import InlineEditor from '../InlineEditor';
-import { Dropdown } from 'antd';
-import AddItemMenu from './Menu';
-
-class TreeNodeTitle extends PureComponent {
-  render() {
-    const { node, removeNode, updateNodeName, searchValue } = this.props;
-    const { name, key } = node;
-    const isLeaf = node.isLeaf;
-    const isRoot = node.name === node.key;
-    const isArray = node.schema.type === 'array';
-    const indexBefore = node.name.toLowerCase().indexOf(searchValue);
-    const indexAfter = indexBefore + searchValue.length;
-    return (
-      <span style={{ display: 'block' }}>
-        {searchValue && indexBefore >= 0 ? (
-          <InlineEditor value={node.name} onChange={(name) => updateNodeName(key, name)}>
-            {name.slice(0, indexBefore)}
-            <span style={{ color: '#f50' }}>{name.slice(indexBefore, indexAfter)}</span>
-            {name.slice(indexAfter)}
-          </InlineEditor>
-        ) : (
-          <InlineEditor value={node.name} onChange={(name) => updateNodeName(key, name)}>
-            {name}
-          </InlineEditor>
-        )}
-        <span className="pull-right">
-          {!(isLeaf || isArray) ? (
-            <span className="form-builder-add-item-menu" onClick={(e) => e.stopPropagation()}>
-              <Dropdown placement="bottomLeft" trigger={['click']} overlay={<AddItemMenu node={node} />}>
-                <PlusCircleOutlined />
-              </Dropdown>
-            </span>
-          ) : null}
-          {!isRoot ? (
-            <span className="tree-node-delete" onClick={(e) => e.stopPropagation()}>
-              <Popconfirm
-                placement="rightTop"
-                title={`Delete "${key}"?`}
-                onConfirm={() => removeNode(key)}
-                okText="Yes"
-                cancelText="No"
-              >
-                <CloseCircleFilled />
-              </Popconfirm>
-            </span>
-          ) : null}
-        </span>
-      </span>
-    );
-  }
-}
-
-export default connect(null, (dispatch) => ({
-  removeNode: (key) =>
-    dispatch({
-      type: 'TREE_REMOVE_NODE',
-      payload: key,
-    }),
-  updateNodeName: (key, name) =>
-    dispatch({
-      type: 'TREE_UPDATE_NODE',
-      payload: { target: key, nodeUpdate: { name } },
-    }),
-}))(TreeNodeTitle);
diff --git a/src/Tree/TreeNodeTitle.tsx b/src/Tree/TreeNodeTitle.tsx
new file mode 100644
index 0000000..08f5ae2
--- /dev/null
+++ b/src/Tree/TreeNodeTitle.tsx
@@ -0,0 +1,149 @@
+import * as React from 'react';
+import { JSONSchema7, JSONSchema7Definition } from 'json-schema';
+import { Popconfirm } from 'antd';
+import { PlusCircleOutlined, CloseCircleFilled } from '@ant-design/icons';
+import { InlineEditor } from '../InlineEditor';
+import { Dropdown } from 'antd';
+import { AddItemMenu } from './Menu';
+import { FormBuilderContext } from '../FormBuilderContext';
+
+import { renameSchemaNode, removeSchemaNode, renameExtraPropsNode, removeExtraPropsNode } from '../utils';
+
+export const TreeNodeTitle: React.FC<{
+  path: (string | number)[];
+  isLeaf?: boolean;
+  searchValue?: string;
+}> = ({ isLeaf, path, searchValue = '' }) => {
+  const {
+    schema: rootSchema,
+    setSchema,
+    extraProps: rootExtraProps,
+    setExtraProps,
+    setSelectedNodePath,
+  } = React.useContext(FormBuilderContext);
+  const isRoot = !path.length;
+  const name = (path[path.length - 1] || 'root').toString();
+  const indexBefore = name.toLowerCase().indexOf(searchValue);
+  const indexAfter = indexBefore + searchValue.length;
+
+  const handleRename = (newName?: string) => {
+    if (newName) {
+      const newSchema = renameSchemaNode(rootSchema, path, newName);
+      if (newSchema !== rootSchema) {
+        setSchema(newSchema);
+        setExtraProps(renameExtraPropsNode(rootExtraProps, path, newName));
+        setSelectedNodePath([...path.slice(0, -1), newName]);
+      }
+    }
+  };
+
+  const handleRemove = () => {
+    const newSchema = removeSchemaNode(rootSchema, path);
+    if (newSchema !== rootSchema) {
+      setSchema(newSchema);
+      setExtraProps(removeExtraPropsNode(rootExtraProps, path));
+    }
+  };
+
+  return (
+    <span style={{ display: 'block' }}>
+      {searchValue && indexBefore >= 0 ? (
+        <InlineEditor value={name} onChange={handleRename}>
+          {name.slice(0, indexBefore)}
+          <span style={{ color: '#f50' }}>{name.slice(indexBefore, indexAfter)}</span>
+          {name.slice(indexAfter)}
+        </InlineEditor>
+      ) : (
+        <InlineEditor value={name} onChange={handleRename}>
+          {name}
+        </InlineEditor>
+      )}
+      <span style={{ float: 'right' }}>
+        {!isLeaf ? (
+          <span className="form-builder-add-item-menu" onClick={(e) => e.stopPropagation()}>
+            <Dropdown placement="bottomLeft" trigger={['click']} overlay={<AddItemMenu />}>
+              <PlusCircleOutlined />
+            </Dropdown>
+          </span>
+        ) : null}
+        {!isRoot ? (
+          <span className="tree-node-delete" onClick={(e) => e.stopPropagation()}>
+            <Popconfirm
+              placement="rightTop"
+              title={`Delete "${path.join('.')}"?`}
+              onConfirm={handleRemove}
+              okText="Yes"
+              cancelText="No"
+            >
+              <CloseCircleFilled />
+            </Popconfirm>
+          </span>
+        ) : null}
+      </span>
+    </span>
+  );
+};
+
+/*
+class TreeNodeTitle extends PureComponent {
+  render() {
+    const { node, removeNode, updateNodeName, searchValue } = this.props;
+    const { name, key } = node;
+    const isLeaf = node.isLeaf;
+    const isRoot = node.name === node.key;
+    const isArray = node.schema.type === 'array';
+    const indexBefore = node.name.toLowerCase().indexOf(searchValue);
+    const indexAfter = indexBefore + searchValue.length;
+    return (
+      <span style={{ display: 'block' }}>
+        {searchValue && indexBefore >= 0 ? (
+          <InlineEditor value={node.name} onChange={(name) => updateNodeName(key, name)}>
+            {name.slice(0, indexBefore)}
+            <span style={{ color: '#f50' }}>{name.slice(indexBefore, indexAfter)}</span>
+            {name.slice(indexAfter)}
+          </InlineEditor>
+        ) : (
+          <InlineEditor value={node.name} onChange={(name) => updateNodeName(key, name)}>
+            {name}
+          </InlineEditor>
+        )}
+        <span className="pull-right">
+          {!(isLeaf || isArray) ? (
+            <span className="form-builder-add-item-menu" onClick={(e) => e.stopPropagation()}>
+              <Dropdown placement="bottomLeft" trigger={['click']} overlay={<AddItemMenu node={node} />}>
+                <PlusCircleOutlined />
+              </Dropdown>
+            </span>
+          ) : null}
+          {!isRoot ? (
+            <span className="tree-node-delete" onClick={(e) => e.stopPropagation()}>
+              <Popconfirm
+                placement="rightTop"
+                title={`Delete "${key}"?`}
+                onConfirm={() => removeNode(key)}
+                okText="Yes"
+                cancelText="No"
+              >
+                <CloseCircleFilled />
+              </Popconfirm>
+            </span>
+          ) : null}
+        </span>
+      </span>
+    );
+  }
+}
+
+export default connect(null, (dispatch) => ({
+  removeNode: (key) =>
+    dispatch({
+      type: 'TREE_REMOVE_NODE',
+      payload: key,
+    }),
+  updateNodeName: (key, name) =>
+    dispatch({
+      type: 'TREE_UPDATE_NODE',
+      payload: { target: key, nodeUpdate: { name } },
+    }),
+}))(TreeNodeTitle);
+*/
diff --git a/src/index.tsx b/src/index.tsx
new file mode 100644
index 0000000..f5185c1
--- /dev/null
+++ b/src/index.tsx
@@ -0,0 +1,17 @@
+import React from 'react';
+import ReactDOM from 'react-dom';
+import './index.css';
+import App from './App';
+import * as serviceWorker from './serviceWorker';
+
+ReactDOM.render(
+  <React.StrictMode>
+    <App />
+  </React.StrictMode>,
+  document.getElementById('root')
+);
+
+// If you want your app to work offline and load faster, you can change
+// unregister() to register() below. Note this comes with some pitfalls.
+// Learn more about service workers: https://bit.ly/CRA-PWA
+serviceWorker.unregister();
diff --git a/src/serviceWorker.ts b/src/serviceWorker.ts
new file mode 100644
index 0000000..20ef740
--- /dev/null
+++ b/src/serviceWorker.ts
@@ -0,0 +1,139 @@
+// This optional code is used to register a service worker.
+// register() is not called by default.
+
+// This lets the app load faster on subsequent visits in production, and gives
+// it offline capabilities. However, it also means that developers (and users)
+// will only see deployed updates on subsequent visits to a page, after all the
+// existing tabs open on the page have been closed, since previously cached
+// resources are updated in the background.
+
+// To learn more about the benefits of this model and instructions on how to
+// opt-in, read https://bit.ly/CRA-PWA
+
+const isLocalhost = Boolean(
+  window.location.hostname === 'localhost' ||
+    // [::1] is the IPv6 localhost address.
+    window.location.hostname === '[::1]' ||
+    // 127.0.0.0/8 are considered localhost for IPv4.
+    window.location.hostname.match(/^127(?:\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}$/)
+);
+
+type Config = {
+  onSuccess?: (registration: ServiceWorkerRegistration) => void;
+  onUpdate?: (registration: ServiceWorkerRegistration) => void;
+};
+
+export function register(config?: Config) {
+  if (process.env.NODE_ENV === 'production' && 'serviceWorker' in navigator) {
+    // The URL constructor is available in all browsers that support SW.
+    const publicUrl = new URL(process.env.PUBLIC_URL, window.location.href);
+    if (publicUrl.origin !== window.location.origin) {
+      // Our service worker won't work if PUBLIC_URL is on a different origin
+      // from what our page is served on. This might happen if a CDN is used to
+      // serve assets; see https://github.com/facebook/create-react-app/issues/2374
+      return;
+    }
+
+    window.addEventListener('load', () => {
+      const swUrl = `${process.env.PUBLIC_URL}/service-worker.js`;
+
+      if (isLocalhost) {
+        // This is running on localhost. Let's check if a service worker still exists or not.
+        checkValidServiceWorker(swUrl, config);
+
+        // Add some additional logging to localhost, pointing developers to the
+        // service worker/PWA documentation.
+        navigator.serviceWorker.ready.then(() => {
+          console.log(
+            'This web app is being served cache-first by a service ' +
+              'worker. To learn more, visit https://bit.ly/CRA-PWA'
+          );
+        });
+      } else {
+        // Is not localhost. Just register service worker
+        registerValidSW(swUrl, config);
+      }
+    });
+  }
+}
+
+function registerValidSW(swUrl: string, config?: Config) {
+  navigator.serviceWorker
+    .register(swUrl)
+    .then((registration) => {
+      registration.onupdatefound = () => {
+        const installingWorker = registration.installing;
+        if (installingWorker == null) {
+          return;
+        }
+        installingWorker.onstatechange = () => {
+          if (installingWorker.state === 'installed') {
+            if (navigator.serviceWorker.controller) {
+              // At this point, the updated precached content has been fetched,
+              // but the previous service worker will still serve the older
+              // content until all client tabs are closed.
+              console.log(
+                'New content is available and will be used when all ' +
+                  'tabs for this page are closed. See https://bit.ly/CRA-PWA.'
+              );
+
+              // Execute callback
+              if (config && config.onUpdate) {
+                config.onUpdate(registration);
+              }
+            } else {
+              // At this point, everything has been precached.
+              // It's the perfect time to display a
+              // "Content is cached for offline use." message.
+              console.log('Content is cached for offline use.');
+
+              // Execute callback
+              if (config && config.onSuccess) {
+                config.onSuccess(registration);
+              }
+            }
+          }
+        };
+      };
+    })
+    .catch((error) => {
+      console.error('Error during service worker registration:', error);
+    });
+}
+
+function checkValidServiceWorker(swUrl: string, config?: Config) {
+  // Check if the service worker can be found. If it can't reload the page.
+  fetch(swUrl, {
+    headers: { 'Service-Worker': 'script' },
+  })
+    .then((response) => {
+      // Ensure service worker exists, and that we really are getting a JS file.
+      const contentType = response.headers.get('content-type');
+      if (response.status === 404 || (contentType != null && contentType.indexOf('javascript') === -1)) {
+        // No service worker found. Probably a different app. Reload the page.
+        navigator.serviceWorker.ready.then((registration) => {
+          registration.unregister().then(() => {
+            window.location.reload();
+          });
+        });
+      } else {
+        // Service worker found. Proceed as normal.
+        registerValidSW(swUrl, config);
+      }
+    })
+    .catch(() => {
+      console.log('No internet connection found. App is running in offline mode.');
+    });
+}
+
+export function unregister() {
+  if ('serviceWorker' in navigator) {
+    navigator.serviceWorker.ready
+      .then((registration) => {
+        registration.unregister();
+      })
+      .catch((error) => {
+        console.error(error.message);
+      });
+  }
+}
diff --git a/src/setupTests.ts b/src/setupTests.ts
new file mode 100644
index 0000000..74b1a27
--- /dev/null
+++ b/src/setupTests.ts
@@ -0,0 +1,5 @@
+// jest-dom adds custom jest matchers for asserting on DOM nodes.
+// allows you to do things like:
+// expect(element).toHaveTextContent(/react/i)
+// learn more: https://github.com/testing-library/jest-dom
+import '@testing-library/jest-dom/extend-expect';
diff --git a/src/utils.ts b/src/utils.ts
new file mode 100644
index 0000000..b4b9461
--- /dev/null
+++ b/src/utils.ts
@@ -0,0 +1,365 @@
+import { JSONSchema7Definition, JSONSchema7 } from 'json-schema';
+import { get, find, isEqual, identity } from 'lodash';
+
+function set(obj: any, path: (string | number)[], value: any): any {
+  if (!path.length) return value;
+
+  const [name, ...rest] = path;
+
+  if (Array.isArray(obj)) {
+    const child: any = obj[name as any];
+    const newObj = [...obj];
+    newObj[name as any] = set(child, rest, value);
+    return newObj;
+  }
+
+  if (typeof obj === 'object') {
+    const child: any = obj[name];
+    const newObj = { ...obj };
+    newObj[name] = set(child, rest, value);
+    return newObj;
+  }
+
+  return { [name]: set(undefined, rest, value) };
+}
+
+export type SchemaPath = (number | string)[];
+
+export interface INode {
+  schema: JSONSchema7Definition;
+  extraProps: any;
+  path: (string | number)[];
+  children: INode[] | null;
+}
+
+type PropsKeyword = keyof Pick<JSONSchema7, 'definitions' | 'properties' | 'patternProperties' /*| 'dependencies'*/>;
+const propsKeywords: PropsKeyword[] = ['definitions', 'properties', 'patternProperties' /*'dependencies'*/];
+
+interface IStack {
+  schema: JSONSchema7;
+  parent: IStack | null;
+  childKeyword: PropsKeyword;
+  childName: string | number;
+}
+
+function getStack(
+  schema: JSONSchema7Definition | undefined,
+  path: (string | number)[],
+  stack: IStack | null = null
+): IStack | null {
+  if (path.length < 2 || typeof schema === 'boolean' || !schema) {
+    return null;
+  }
+  if (path.length === 2) {
+    const [key, name] = path;
+    const k = propsKeywords.find((k) => k === key);
+    if (!k) return null;
+    return {
+      schema,
+      parent: stack,
+      childKeyword: k,
+      childName: name,
+    };
+  }
+
+  const [key, name, ...pathRest] = path;
+
+  for (const k of propsKeywords) {
+    if (k !== key) continue;
+    const children = schema[k];
+    const child = children && children[name];
+    if (Array.isArray(child)) return null;
+    return getStack(child, pathRest, {
+      schema,
+      childKeyword: key,
+      childName: name,
+      parent: stack,
+    });
+  }
+
+  return null;
+}
+
+function composeStack(stack: IStack): JSONSchema7 {
+  let schema: JSONSchema7 = stack.schema;
+
+  for (let current = stack.parent; current; current = current.parent) {
+    const children = current.schema[current.childKeyword];
+    if (!children || Array.isArray(children)) {
+      schema = current.schema;
+      continue;
+    }
+    const child = children[current.childName];
+    if (child === schema) {
+      schema = current.schema;
+    } else {
+      const newChildren: { [key: string]: JSONSchema7Definition } = {
+        ...children,
+      };
+      newChildren[current.childName] = schema; // keep the original props sequence
+      schema = {
+        ...current.schema,
+        [current.childKeyword]: newChildren,
+      };
+    }
+  }
+  return schema;
+}
+
+export function getSchemaByPath(schema: JSONSchema7Definition | undefined, path: (string | number)[]): any {
+  //: JSONSchema7Definition | undefined {
+  const stack = getStack(schema, path);
+  if (!stack) return undefined;
+  const children = stack.schema[stack.childKeyword];
+  return children ? children[stack.childName] : undefined;
+}
+
+export function replaceSchemaNode(
+  schema: JSONSchema7,
+  path: (string | number)[],
+  node: JSONSchema7Definition
+): JSONSchema7 {
+  const stack = getStack(schema, path);
+  if (!stack) return schema;
+  const children = stack.schema[stack.childKeyword];
+  if (Array.isArray(children) || !children || !Object.hasOwnProperty.call(children, stack.childName)) return schema;
+
+  const newChildren: { [key: string]: JSONSchema7Definition } = { ...children };
+  newChildren[stack.childName] = node;
+
+  return composeStack({
+    ...stack,
+    schema: { ...stack.schema, [stack.childKeyword]: newChildren },
+  });
+}
+
+export function removeSchemaNode(schema: JSONSchema7, path: (string | number)[]): JSONSchema7 {
+  const stack = getStack(schema, path);
+  if (!stack) return schema;
+  const children = stack.schema[stack.childKeyword];
+  if (Array.isArray(children) || !children || !Object.hasOwnProperty.call(children, stack.childName)) return schema;
+
+  const { [stack.childName]: _, ...newChildren } = children;
+
+  return composeStack({
+    ...stack,
+    schema: { ...stack.schema, [stack.childKeyword]: newChildren },
+  });
+}
+
+export function addSchemaNode(
+  schema: JSONSchema7,
+  path: (string | number)[],
+  position: number,
+  name: string | number,
+  node: JSONSchema7Definition
+): JSONSchema7 {
+  const stack = getStack(schema, path);
+  if (!stack) return schema;
+
+  const children = stack.schema[stack.childKeyword];
+  if (Array.isArray(children) || !children || Object.hasOwnProperty.call(children, name)) return schema;
+
+  let newChildren: { [key: string]: JSONSchema7Definition } = {};
+  let added = false;
+  let count = 0;
+
+  const dstName = path[path.length - 1];
+  for (const prop in children) {
+    if (prop === dstName) {
+      if (count < position) {
+        newChildren[prop] = children[prop];
+        newChildren[name] = node;
+        added = true;
+      }
+      if (count > position) {
+        newChildren[name] = node;
+        newChildren[prop] = children[prop];
+        added = true;
+      }
+      if (count === position) {
+        const schemaTarget = children[prop];
+        if (typeof schemaTarget !== 'boolean' && schemaTarget.type === 'object') {
+          // dst is object
+          if (!Object.hasOwnProperty.call(schemaTarget.properties, name)) {
+            newChildren[prop] = {
+              ...schemaTarget,
+              // TODO: use stackSrc.childKeyword
+              properties: { ...schemaTarget.properties, [name]: node },
+            };
+          } else {
+            return schema;
+          }
+        } else {
+          newChildren[prop] = children[prop];
+          newChildren[name] = node;
+          added = true;
+        }
+      }
+    } else {
+      newChildren[prop] = children[prop];
+    }
+    count++;
+  }
+
+  return added
+    ? composeStack({
+        ...stack,
+        schema: { ...stack.schema, [stack.childKeyword]: newChildren },
+      })
+    : schema;
+}
+
+export function renameSchemaNode(schema: JSONSchema7, path: (string | number)[], name: string) {
+  const stack = getStack(schema, path);
+  if (!stack) return schema;
+  const children = stack.schema[stack.childKeyword];
+  if (
+    Array.isArray(children) ||
+    !children ||
+    !Object.hasOwnProperty.call(children, stack.childName) ||
+    Object.hasOwnProperty.call(children, name)
+  )
+    return schema;
+
+  let newChildren: { [key: string]: JSONSchema7Definition } = {};
+
+  for (const prop in children) {
+    newChildren[prop === stack.childName ? name : prop] = children[prop];
+  }
+
+  const newSchema = { ...stack.schema };
+  newSchema[stack.childKeyword] = newChildren;
+
+  if (typeof stack.childName === 'string' && newSchema.required) {
+    let updated = false;
+    const newRequired = newSchema.required.map((n) => {
+      if (stack.childName === n) {
+        updated = true;
+        return name;
+      }
+      return n;
+    });
+    if (updated) newSchema.required = newRequired;
+  }
+
+  return composeStack({
+    ...stack,
+    schema: newSchema,
+  });
+}
+
+function reorder(
+  properties: JSONSchema7['properties'],
+  src: string | number,
+  dst: string | number,
+  position: number
+): JSONSchema7['properties'] {
+  const newProperties: JSONSchema7['properties'] = {};
+  let count = 0;
+  for (const prop in properties) {
+    if (prop === src) {
+    } else {
+      if (prop === dst) {
+        if (position < count) {
+          // before dst
+          newProperties[src] = properties[src];
+          newProperties[prop] = properties[prop];
+        } else if (position > count) {
+          // after dst
+          newProperties[prop] = properties[prop];
+          newProperties[src] = properties[src];
+        } else {
+          // drop on dst
+          const schemaTarget = properties[prop];
+          if (typeof schemaTarget !== 'boolean' && schemaTarget.type === 'object') {
+            // dst is object
+            if (!Object.hasOwnProperty.call(schemaTarget.properties, src)) {
+              newProperties[prop] = {
+                ...schemaTarget,
+                properties: { ...schemaTarget.properties, [src]: properties[src] },
+              };
+            } else {
+              return properties;
+            }
+          } else {
+            newProperties[prop] = properties[prop];
+            newProperties[src] = properties[src];
+          }
+        }
+      } else {
+        newProperties[prop] = properties[prop];
+      }
+    }
+    count++;
+  }
+  return newProperties;
+}
+
+export function moveSchemaNode(
+  schema: JSONSchema7,
+  src: (string | number)[],
+  dst: (string | number)[],
+  position: number
+) {
+  if (isEqual(src.slice(0, -1), dst.slice(0, -1))) {
+    const stack = getStack(schema, src);
+    if (!stack) return schema;
+    // TODO: stackSrc.schema[stackSrc.childKeyword];
+    const properties = stack.schema.properties;
+    const newProperties = reorder(properties, src[src.length - 1], dst[dst.length - 1], position);
+    if (newProperties === properties) return schema;
+    return composeStack({
+      ...stack,
+      schema: {
+        ...stack.schema,
+        properties: newProperties,
+      },
+    });
+  }
+
+  // get and remove src node
+  const stackSrc = getStack(schema, src);
+  if (!stackSrc) return schema;
+  const children = stackSrc.schema[stackSrc.childKeyword];
+  if (Array.isArray(children) || !children || !Object.hasOwnProperty.call(children, stackSrc.childName)) return schema;
+
+  const { [stackSrc.childName]: nodeSrc, ...newChildren } = children;
+
+  const newSchema = composeStack({
+    ...stackSrc,
+    schema: { ...stackSrc.schema, [stackSrc.childKeyword]: newChildren },
+  });
+
+  const newSchema2 = addSchemaNode(newSchema, dst, position, stackSrc.childName, nodeSrc);
+  return newSchema === newSchema2 ? schema : newSchema2;
+}
+
+export function addExtraPropsNode(extraProps: object, path: (number | string)[], node: any): any {
+  return set(extraProps, path, node);
+}
+
+export function removeExtraPropsNode(extraProps: object, path: (number | string)[]): object {
+  return set(extraProps, path, undefined);
+}
+
+export function renameExtraPropsNode(extraProps: object, path: (number | string)[], name: string): object {
+  return set(set(extraProps, path, undefined), [...path.slice(0, -1), name], get(extraProps, path));
+}
+
+export function replaceExtraPropsNode(extraProps: object, path: (number | string)[], node: any) {
+  return set(extraProps, path, node);
+}
+
+export function path2key(path: SchemaPath): string {
+  return JSON.stringify(path);
+}
+
+export function key2path(key: string): SchemaPath | null {
+  try {
+    return JSON.parse(key);
+  } catch (e) {
+    console.log(e);
+    return null;
+  }
+}
diff --git a/src/views/FormView.jsx b/src/views/FormView.jsx
deleted file mode 100644
index a878301..0000000
--- a/src/views/FormView.jsx
+++ /dev/null
@@ -1,48 +0,0 @@
-import React from 'react';
-import { connect } from 'react-redux';
-import Form from '../rjsf-patch/Form';
-import { FieldTemplate, ObjectFieldTemplate } from '../Template';
-
-class FormView extends React.Component {
-  render() {
-    if (!this.props.schema) {
-      return null;
-    }
-    const { name, schema, uiSchema, formData, setFormData, liveValidate } = this.props;
-    return (
-      <Form
-        schema={schema}
-        uiSchema={uiSchema}
-        formData={formData}
-        liveValidate={liveValidate}
-        FieldTemplate={FieldTemplate}
-        ObjectFieldTemplate={ObjectFieldTemplate}
-        idPrefix={name}
-        onChange={setFormData}
-      />
-    );
-  }
-}
-
-export default connect(
-  ({
-    tree: {
-      present: [{ name, schema, uiSchema }],
-    },
-    formData,
-    settings: { isLiveValidate },
-  }) => ({
-    name,
-    schema,
-    uiSchema,
-    formData,
-    liveValidate: isLiveValidate,
-  }),
-  (dispatch) => ({
-    setFormData: ({ formData }) =>
-      dispatch({
-        type: 'FORM_DATA_SET',
-        payload: formData,
-      }),
-  })
-)(FormView);
diff --git a/src/views/FormView.tsx b/src/views/FormView.tsx
new file mode 100644
index 0000000..edd229e
--- /dev/null
+++ b/src/views/FormView.tsx
@@ -0,0 +1,25 @@
+import * as React from 'react';
+import { Form, SubmitButtonWithValidationMw, FieldsetTemplateMw, RowMw } from '@gravel-form/antd';
+import { ExtraPropsMw, LocalRefMw, FixedObjectMw, FixedArrayMw } from '@gravel-form/antd/lib/core';
+import { FormBuilderContext } from '../FormBuilderContext';
+import { FormItemTemplateMw, ColMw } from './InlineEditTemplate';
+
+import { formControlMws } from '@gravel-form/antd/lib/preset';
+
+const mws = [
+  SubmitButtonWithValidationMw,
+  ExtraPropsMw,
+  LocalRefMw,
+  ColMw,
+  FieldsetTemplateMw,
+  RowMw,
+  FixedObjectMw,
+  FixedArrayMw,
+  FormItemTemplateMw,
+  ...formControlMws.slice(1),
+];
+
+export const FormView: React.FC = () => {
+  const { schema, extraProps } = React.useContext(FormBuilderContext);
+  return <Form schema={schema} extraProps={extraProps} middlewares={mws} layout="vertical" />;
+};
diff --git a/src/views/InlineEditTemplate.tsx b/src/views/InlineEditTemplate.tsx
new file mode 100644
index 0000000..2374a60
--- /dev/null
+++ b/src/views/InlineEditTemplate.tsx
@@ -0,0 +1,88 @@
+import * as React from 'react';
+import { MiddlewareProps } from '@gravel-form/antd';
+import { toJSONSchemaPath, isRequired } from '@gravel-form/antd/lib/core';
+import { get } from 'lodash';
+import { Form, Col } from 'antd';
+import { FormBuilderContext } from '../FormBuilderContext';
+import { replaceSchemaNode } from '../utils';
+import { InlineEditor } from '../InlineEditor';
+
+export const FormItemTemplateMw: React.ComponentType<MiddlewareProps> = (props) => {
+  const { schema, schemaPath, dataPath, next, errors, extraProps, formProps } = props;
+  const { setSchema } = React.useContext(FormBuilderContext);
+
+  if (typeof schema === 'boolean') return next(props);
+
+  const id = toJSONSchemaPath(dataPath);
+  const error = errors && errors.find(({ dataPath }) => dataPath === id);
+
+  const label = schema.title || schemaPath[schemaPath.length - 1];
+
+  return (
+    <Form.Item
+      label={
+        <InlineEditor
+          value={label.toString()}
+          onChange={(title) => {
+            setSchema(replaceSchemaNode(formProps.schema, schemaPath, { ...schema, title }));
+          }}
+        >
+          {label}
+        </InlineEditor>
+      }
+      extra={
+        schema.description ? (
+          <InlineEditor
+            value={schema.description}
+            onChange={(description) => {
+              setSchema(replaceSchemaNode(formProps.schema, schemaPath, { ...schema, description }));
+            }}
+          >
+            {schema.description}
+          </InlineEditor>
+        ) : null
+      }
+      {...(error && { help: error.message })}
+      validateStatus={error ? 'error' : ''}
+      hasFeedback
+      required={isRequired(props)}
+      {...get(extraProps, 'formItem')}
+    >
+      {next(props)}
+    </Form.Item>
+  );
+};
+
+export const ColMw: React.ComponentType<MiddlewareProps> = (props) => {
+  const { schema, schemaPath, extraProps, parent, next } = props;
+
+  const colRef = React.useRef(null);
+  const [hover, setHover] = React.useState(false);
+  const { selectedNodePath, setSelectedNodePath } = React.useContext(FormBuilderContext);
+  const selected = selectedNodePath ? selectedNodePath.join('.') === schemaPath.join('.') : false;
+
+  const handleMouseEnter = React.useCallback<React.MouseEventHandler>(() => setHover(true), [setHover, colRef]);
+  const handleMouseLeave = React.useCallback<React.MouseEventHandler>(() => setHover(false), [setHover, colRef]);
+  const handleClick = React.useCallback<React.MouseEventHandler>(() => setSelectedNodePath(schemaPath), [
+    schemaPath,
+    setSelectedNodePath,
+  ]);
+
+  const atom = typeof schema === 'boolean' || schema.type !== 'object';
+
+  if (!parent) return next(props);
+
+  return (
+    <Col
+      ref={colRef}
+      style={selected ? { backgroundColor: '#bae7ff' } : hover ? { backgroundColor: '#f5f5f5' } : {}}
+      onMouseEnter={atom ? handleMouseEnter : null}
+      onMouseLeave={atom ? handleMouseLeave : null}
+      onClick={atom ? handleClick : null}
+      span="24"
+      {...get(extraProps, 'col')}
+    >
+      {next(props)}
+    </Col>
+  );
+};
diff --git a/src/views/SchemaView.jsx b/src/views/SchemaView.jsx
deleted file mode 100644
index d380611..0000000
--- a/src/views/SchemaView.jsx
+++ /dev/null
@@ -1,20 +0,0 @@
-import React from 'react';
-import { connect } from 'react-redux';
-import JsonEditor from '../JsonEditor';
-
-export default connect(
-  ({
-    tree: {
-      present: [{ schema }],
-    },
-  }) => ({ schema }),
-  (dispatch) => ({
-    setTree: (schema) =>
-      dispatch({
-        type: 'TREE_SET_TREE',
-        payload: {
-          schema,
-        },
-      }),
-  })
-)(({ schema, setTree }) => <JsonEditor value={schema} onChange={(value) => setTree(value)} autoSize />);
diff --git a/src/views/SchemaView.tsx b/src/views/SchemaView.tsx
new file mode 100644
index 0000000..5045687
--- /dev/null
+++ b/src/views/SchemaView.tsx
@@ -0,0 +1,9 @@
+import React from 'react';
+import { JSONSchema7 } from 'json-schema';
+import { FormBuilderContext } from '../FormBuilderContext';
+import JsonEditor from '../JsonEditor';
+
+export const SchemaView: React.FC<{}> = () => {
+  const { schema, setSchema } = React.useContext(FormBuilderContext);
+  return <JsonEditor value={schema} onChange={(value) => setSchema(value as JSONSchema7)} autoSize />;
+};
diff --git a/tsconfig.json b/tsconfig.json
new file mode 100644
index 0000000..af10394
--- /dev/null
+++ b/tsconfig.json
@@ -0,0 +1,19 @@
+{
+  "compilerOptions": {
+    "target": "es5",
+    "lib": ["dom", "dom.iterable", "esnext"],
+    "allowJs": true,
+    "skipLibCheck": true,
+    "esModuleInterop": true,
+    "allowSyntheticDefaultImports": true,
+    "strict": true,
+    "forceConsistentCasingInFileNames": true,
+    "module": "esnext",
+    "moduleResolution": "node",
+    "resolveJsonModule": true,
+    "isolatedModules": true,
+    "noEmit": true,
+    "jsx": "react"
+  },
+  "include": ["src"]
+}
diff --git a/yarn.lock b/yarn.lock
index a7b6607..6f4011b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9,41 +9,33 @@
   dependencies:
     tinycolor2 "^1.4.1"
 
-"@ant-design/colors@^4.0.5":
-  version "4.0.5"
-  resolved "https://registry.yarnpkg.com/@ant-design/colors/-/colors-4.0.5.tgz#d7d100d7545cca8f624954604a6892fc48ba5aae"
-  integrity sha512-3mnuX2prnWOWvpFTS2WH2LoouWlOgtnIpc6IarWN6GOzzLF8dW/U8UctuvIPhoboETehZfJ61XP+CGakBEPJ3Q==
-  dependencies:
-    tinycolor2 "^1.4.1"
-
 "@ant-design/css-animation@^1.7.2":
-  version "1.7.3"
-  resolved "https://registry.yarnpkg.com/@ant-design/css-animation/-/css-animation-1.7.3.tgz#60a1c970014e86b28f940510d69e503e428f1136"
-  integrity sha512-LrX0OGZtW+W6iLnTAqnTaoIsRelYeuLZWsrmBJFUXDALQphPsN8cE5DCsmoSlL0QYb94BQxINiuS70Ar/8BNgA==
+  version "1.7.2"
+  resolved "https://registry.yarnpkg.com/@ant-design/css-animation/-/css-animation-1.7.2.tgz#4ee5d2ec0fb7cc0a78b44e1c82628bd4621ac7e3"
+  integrity sha512-bvVOe7A+r7lws58B7r+fgnQDK90cV45AXuvGx6i5CCSX1W/M3AJnHsNggDANBxEtWdNdFWcDd5LorB+RdSIlBw==
 
 "@ant-design/icons-svg@^4.0.0":
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/@ant-design/icons-svg/-/icons-svg-4.1.0.tgz#480b025f4b20ef7fe8f47d4a4846e4fee84ea06c"
   integrity sha512-Fi03PfuUqRs76aI3UWYpP864lkrfPo0hluwGqh7NJdLhvH4iRDc3jbJqZIvRDLHKbXrvAfPPV3+zjUccfFvWOQ==
 
-"@ant-design/icons@^4.2.1", "@ant-design/icons@^4.2.2":
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/@ant-design/icons/-/icons-4.2.2.tgz#6533c5a02aec49238ec4748074845ad7d85a4f5e"
-  integrity sha512-DrVV+wcupnHS7PehJ6KiTcJtAR5c25UMgjGECCc6pUT9rsvw0AuYG+a4HDjfxEQuDqKTHwW+oX/nIvCymyLE8Q==
+"@ant-design/icons@^4.1.0", "@ant-design/icons@^4.2.1":
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/@ant-design/icons/-/icons-4.2.1.tgz#6f3ea5d98ab782072e4e9cbb70f25e4403ae1a6b"
+  integrity sha512-245ZI40MOr5GGws+sNSiJIRRoEf/J2xvPSMgwRYf3bv8mVGQZ6XTQI/OMeV16KtiSZ3D+mBKXVYSBz2fhigOXQ==
   dependencies:
     "@ant-design/colors" "^3.1.0"
     "@ant-design/icons-svg" "^4.0.0"
-    "@babel/runtime" "^7.10.4"
+    "@babel/runtime" "^7.10.1"
     classnames "^2.2.6"
     insert-css "^2.0.0"
     rc-util "^5.0.1"
 
-"@ant-design/react-slick@~0.27.0":
-  version "0.27.10"
-  resolved "https://registry.yarnpkg.com/@ant-design/react-slick/-/react-slick-0.27.10.tgz#84b01288ad1a9b049f1ff537d85b765d397b60c1"
-  integrity sha512-Lg/9RlGaYGeFjB1UkvK50xUKf7XgIVpxXVPkm+45/VoA66c3uC1KN5yRxx7AEayHcSPZDqO9TGvMXu1WbbY2vw==
+"@ant-design/react-slick@~0.26.1":
+  version "0.26.2"
+  resolved "https://registry.yarnpkg.com/@ant-design/react-slick/-/react-slick-0.26.2.tgz#0ca89fe166c5035b0e49649d813663b92f73a90f"
+  integrity sha512-6YubL24j/rZl9Oqw9ErsVMdvto6KeZk7To+h1HGvfo8WTpzXmVK/o4nZQzmZK6YDcXnzC8GZv4UwRiRanXdl2w==
   dependencies:
-    "@babel/runtime" "^7.10.4"
     classnames "^2.2.5"
     json2mq "^0.2.0"
     lodash "^4.17.15"
@@ -63,10 +55,10 @@
   dependencies:
     "@babel/highlight" "^7.10.4"
 
-"@babel/compat-data@^7.10.4", "@babel/compat-data@^7.11.0", "@babel/compat-data@^7.9.0":
-  version "7.11.0"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.11.0.tgz#e9f73efe09af1355b723a7f39b11bad637d7c99c"
-  integrity sha512-TPSvJfv73ng0pfnEOh17bYMPQbI95+nGWc71Ss4vZdRBHTDqmM9Z8ZV4rYz8Ks7sfzc95n30k6ODIq5UGnXcYQ==
+"@babel/compat-data@^7.10.4", "@babel/compat-data@^7.9.0":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.10.4.tgz#706a6484ee6f910b719b696a9194f8da7d7ac241"
+  integrity sha512-t+rjExOrSVvjQQXNp5zAIYDp00KjdvGl/TpDX5REPr0S9IAIPQMTilcfG6q8c0QFmj9lSTVySV2VTsyggvtNIw==
   dependencies:
     browserslist "^4.12.0"
     invariant "^2.2.4"
@@ -95,34 +87,35 @@
     source-map "^0.5.0"
 
 "@babel/core@^7.1.0", "@babel/core@^7.4.5":
-  version "7.11.6"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.11.6.tgz#3a9455dc7387ff1bac45770650bc13ba04a15651"
-  integrity sha512-Wpcv03AGnmkgm6uS6k8iwhIwTrcP0m17TL1n1sy7qD0qelDu4XNeW0dN0mHfa+Gei211yDaLoEe/VlbXQzM4Bg==
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.10.4.tgz#780e8b83e496152f8dd7df63892b2e052bf1d51d"
+  integrity sha512-3A0tS0HWpy4XujGc7QtOIHTeNwUgWaZc/WuS5YQrfhU67jnVmsD6OGPc1AKHH0LJHQICGncy3+YUjIhVlfDdcA==
   dependencies:
     "@babel/code-frame" "^7.10.4"
-    "@babel/generator" "^7.11.6"
-    "@babel/helper-module-transforms" "^7.11.0"
+    "@babel/generator" "^7.10.4"
+    "@babel/helper-module-transforms" "^7.10.4"
     "@babel/helpers" "^7.10.4"
-    "@babel/parser" "^7.11.5"
+    "@babel/parser" "^7.10.4"
     "@babel/template" "^7.10.4"
-    "@babel/traverse" "^7.11.5"
-    "@babel/types" "^7.11.5"
+    "@babel/traverse" "^7.10.4"
+    "@babel/types" "^7.10.4"
     convert-source-map "^1.7.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.1"
     json5 "^2.1.2"
-    lodash "^4.17.19"
+    lodash "^4.17.13"
     resolve "^1.3.2"
     semver "^5.4.1"
     source-map "^0.5.0"
 
-"@babel/generator@^7.11.5", "@babel/generator@^7.11.6", "@babel/generator@^7.4.0", "@babel/generator@^7.9.0":
-  version "7.11.6"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.11.6.tgz#b868900f81b163b4d464ea24545c61cbac4dc620"
-  integrity sha512-DWtQ1PV3r+cLbySoHrwn9RWEgKMBLLma4OBQloPRyDYvc5msJM9kvTLo1YnlJd1P/ZuKbdli3ijr5q3FvAF3uA==
+"@babel/generator@^7.10.4", "@babel/generator@^7.4.0", "@babel/generator@^7.9.0":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.10.4.tgz#e49eeed9fe114b62fa5b181856a43a5e32f5f243"
+  integrity sha512-toLIHUIAgcQygFZRAQcsLQV3CBuX6yOIru1kJk/qqqvcRmZrYe6WavZTSG+bB8MxhnL9YPf+pKQfuiP161q7ng==
   dependencies:
-    "@babel/types" "^7.11.5"
+    "@babel/types" "^7.10.4"
     jsesc "^2.5.1"
+    lodash "^4.17.13"
     source-map "^0.5.0"
 
 "@babel/helper-annotate-as-pure@^7.10.4":
@@ -140,14 +133,14 @@
     "@babel/helper-explode-assignable-expression" "^7.10.4"
     "@babel/types" "^7.10.4"
 
-"@babel/helper-builder-react-jsx-experimental@^7.10.4", "@babel/helper-builder-react-jsx-experimental@^7.11.5":
-  version "7.11.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.11.5.tgz#4ea43dd63857b0a35cd1f1b161dc29b43414e79f"
-  integrity sha512-Vc4aPJnRZKWfzeCBsqTBnzulVNjABVdahSPhtdMD3Vs80ykx4a87jTHtF/VR+alSrDmNvat7l13yrRHauGcHVw==
+"@babel/helper-builder-react-jsx-experimental@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.10.4.tgz#d0ffb875184d749c63ffe1f4f65be15143ec322d"
+  integrity sha512-LyacH/kgQPgLAuaWrvvq1+E7f5bLyT8jXCh7nM67sRsy2cpIGfgWJ+FCnAKQXfY+F0tXUaN6FqLkp4JiCzdK8Q==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.10.4"
     "@babel/helper-module-imports" "^7.10.4"
-    "@babel/types" "^7.11.5"
+    "@babel/types" "^7.10.4"
 
 "@babel/helper-builder-react-jsx@^7.10.4":
   version "7.10.4"
@@ -168,13 +161,13 @@
     levenary "^1.1.1"
     semver "^5.5.0"
 
-"@babel/helper-create-class-features-plugin@^7.10.4", "@babel/helper-create-class-features-plugin@^7.10.5", "@babel/helper-create-class-features-plugin@^7.8.3":
-  version "7.10.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.10.5.tgz#9f61446ba80e8240b0a5c85c6fdac8459d6f259d"
-  integrity sha512-0nkdeijB7VlZoLT3r/mY3bUkw3T8WG/hNw+FATs/6+pG2039IJWjTYL0VTISqsNHMUTEnwbVnc89WIJX9Qed0A==
+"@babel/helper-create-class-features-plugin@^7.10.4", "@babel/helper-create-class-features-plugin@^7.8.3":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.10.4.tgz#2d4015d0136bd314103a70d84a7183e4b344a355"
+  integrity sha512-9raUiOsXPxzzLjCXeosApJItoMnX3uyT4QdM2UldffuGApNrF8e938MwNpDCK9CPoyxrEoCgT+hObJc3mZa6lQ==
   dependencies:
     "@babel/helper-function-name" "^7.10.4"
-    "@babel/helper-member-expression-to-functions" "^7.10.5"
+    "@babel/helper-member-expression-to-functions" "^7.10.4"
     "@babel/helper-optimise-call-expression" "^7.10.4"
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/helper-replace-supers" "^7.10.4"
@@ -190,19 +183,20 @@
     regexpu-core "^4.7.0"
 
 "@babel/helper-define-map@^7.10.4":
-  version "7.10.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.10.5.tgz#b53c10db78a640800152692b13393147acb9bb30"
-  integrity sha512-fMw4kgFB720aQFXSVaXr79pjjcW5puTCM16+rECJ/plGS+zByelE8l9nCpV1GibxTnFVmUuYG9U8wYfQHdzOEQ==
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.10.4.tgz#f037ad794264f729eda1889f4ee210b870999092"
+  integrity sha512-nIij0oKErfCnLUCWaCaHW0Bmtl2RO9cN7+u2QT8yqTywgALKlyUVOvHDElh+b5DwVC6YB1FOYFOTWcN/+41EDA==
   dependencies:
     "@babel/helper-function-name" "^7.10.4"
-    "@babel/types" "^7.10.5"
-    lodash "^4.17.19"
+    "@babel/types" "^7.10.4"
+    lodash "^4.17.13"
 
 "@babel/helper-explode-assignable-expression@^7.10.4":
-  version "7.11.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.11.4.tgz#2d8e3470252cc17aba917ede7803d4a7a276a41b"
-  integrity sha512-ux9hm3zR4WV1Y3xXxXkdG/0gxF9nvI0YVmKVhvK9AfMoaQkemL3sJpXw+Xbz65azo8qJiEz2XVDUpK3KYhH3ZQ==
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.10.4.tgz#40a1cd917bff1288f699a94a75b37a1a2dbd8c7c"
+  integrity sha512-4K71RyRQNPRrR85sr5QY4X3VwG4wtVoXZB9+L3r1Gp38DhELyHCtovqydRi7c1Ovb17eRGiQ/FD5s8JdU0Uy5A==
   dependencies:
+    "@babel/traverse" "^7.10.4"
     "@babel/types" "^7.10.4"
 
 "@babel/helper-function-name@^7.10.4":
@@ -228,12 +222,12 @@
   dependencies:
     "@babel/types" "^7.10.4"
 
-"@babel/helper-member-expression-to-functions@^7.10.4", "@babel/helper-member-expression-to-functions@^7.10.5":
-  version "7.11.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.11.0.tgz#ae69c83d84ee82f4b42f96e2a09410935a8f26df"
-  integrity sha512-JbFlKHFntRV5qKw3YC0CvQnDZ4XMwgzzBbld7Ly4Mj4cbFy3KywcR8NtNctRToMWJOVvLINJv525Gd6wwVEx/Q==
+"@babel/helper-member-expression-to-functions@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.10.4.tgz#7cd04b57dfcf82fce9aeae7d4e4452fa31b8c7c4"
+  integrity sha512-m5j85pK/KZhuSdM/8cHUABQTAslV47OjfIB9Cc7P+PvlAoBzdb79BGNfw8RhT5Mq3p+xGd0ZfAKixbrUZx0C7A==
   dependencies:
-    "@babel/types" "^7.11.0"
+    "@babel/types" "^7.10.4"
 
 "@babel/helper-module-imports@^7.10.4", "@babel/helper-module-imports@^7.8.3":
   version "7.10.4"
@@ -242,18 +236,18 @@
   dependencies:
     "@babel/types" "^7.10.4"
 
-"@babel/helper-module-transforms@^7.10.4", "@babel/helper-module-transforms@^7.10.5", "@babel/helper-module-transforms@^7.11.0", "@babel/helper-module-transforms@^7.9.0":
-  version "7.11.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.11.0.tgz#b16f250229e47211abdd84b34b64737c2ab2d359"
-  integrity sha512-02EVu8COMuTRO1TAzdMtpBPbe6aQ1w/8fePD2YgQmxZU4gpNWaL9gK3Jp7dxlkUlUCJOTaSeA+Hrm1BRQwqIhg==
+"@babel/helper-module-transforms@^7.10.4", "@babel/helper-module-transforms@^7.9.0":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.10.4.tgz#ca1f01fdb84e48c24d7506bb818c961f1da8805d"
+  integrity sha512-Er2FQX0oa3nV7eM1o0tNCTx7izmQtwAQsIiaLRWtavAAEcskb0XJ5OjJbVrYXWOTr8om921Scabn4/tzlx7j1Q==
   dependencies:
     "@babel/helper-module-imports" "^7.10.4"
     "@babel/helper-replace-supers" "^7.10.4"
     "@babel/helper-simple-access" "^7.10.4"
-    "@babel/helper-split-export-declaration" "^7.11.0"
+    "@babel/helper-split-export-declaration" "^7.10.4"
     "@babel/template" "^7.10.4"
-    "@babel/types" "^7.11.0"
-    lodash "^4.17.19"
+    "@babel/types" "^7.10.4"
+    lodash "^4.17.13"
 
 "@babel/helper-optimise-call-expression@^7.10.4":
   version "7.10.4"
@@ -268,20 +262,21 @@
   integrity sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==
 
 "@babel/helper-regex@^7.10.4":
-  version "7.10.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.10.5.tgz#32dfbb79899073c415557053a19bd055aae50ae0"
-  integrity sha512-68kdUAzDrljqBrio7DYAEgCoJHxppJOERHOgOrDN7WjOzP0ZQ1LsSDRXcemzVZaLvjaJsJEESb6qt+znNuENDg==
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.10.4.tgz#59b373daaf3458e5747dece71bbaf45f9676af6d"
+  integrity sha512-inWpnHGgtg5NOF0eyHlC0/74/VkdRITY9dtTpB2PrxKKn+AkVMRiZz/Adrx+Ssg+MLDesi2zohBW6MVq6b4pOQ==
   dependencies:
-    lodash "^4.17.19"
+    lodash "^4.17.13"
 
 "@babel/helper-remap-async-to-generator@^7.10.4":
-  version "7.11.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.11.4.tgz#4474ea9f7438f18575e30b0cac784045b402a12d"
-  integrity sha512-tR5vJ/vBa9wFy3m5LLv2faapJLnDFxNWff2SAYkSE4rLUdbp7CdObYFgI7wK4T/Mj4UzpjPwzR8Pzmr5m7MHGA==
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.10.4.tgz#fce8bea4e9690bbe923056ded21e54b4e8b68ed5"
+  integrity sha512-86Lsr6NNw3qTNl+TBcF1oRZMaVzJtbWTyTko+CQL/tvNvcGYEFKbLXDPxtW0HKk3McNOk4KzY55itGWCAGK5tg==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.10.4"
     "@babel/helper-wrap-function" "^7.10.4"
     "@babel/template" "^7.10.4"
+    "@babel/traverse" "^7.10.4"
     "@babel/types" "^7.10.4"
 
 "@babel/helper-replace-supers@^7.10.4":
@@ -302,19 +297,12 @@
     "@babel/template" "^7.10.4"
     "@babel/types" "^7.10.4"
 
-"@babel/helper-skip-transparent-expression-wrappers@^7.11.0":
-  version "7.11.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.11.0.tgz#eec162f112c2f58d3af0af125e3bb57665146729"
-  integrity sha512-0XIdiQln4Elglgjbwo9wuJpL/K7AGCY26kmEt0+pRP0TAj4jjyNq1MjoRvikrTVqKcx4Gysxt4cXvVFXP/JO2Q==
-  dependencies:
-    "@babel/types" "^7.11.0"
-
-"@babel/helper-split-export-declaration@^7.10.4", "@babel/helper-split-export-declaration@^7.11.0":
-  version "7.11.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz#f8a491244acf6a676158ac42072911ba83ad099f"
-  integrity sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==
+"@babel/helper-split-export-declaration@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.10.4.tgz#2c70576eaa3b5609b24cb99db2888cc3fc4251d1"
+  integrity sha512-pySBTeoUff56fL5CBU2hWm9TesA4r/rOkI9DyJLvvgz09MB9YtfIYe3iBriVaYNaPe+Alua0vBIOVOLs2buWhg==
   dependencies:
-    "@babel/types" "^7.11.0"
+    "@babel/types" "^7.10.4"
 
 "@babel/helper-validator-identifier@^7.10.4":
   version "7.10.4"
@@ -349,15 +337,15 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.1.0", "@babel/parser@^7.10.4", "@babel/parser@^7.11.5", "@babel/parser@^7.4.3", "@babel/parser@^7.7.0", "@babel/parser@^7.9.0":
-  version "7.11.5"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.11.5.tgz#c7ff6303df71080ec7a4f5b8c003c58f1cf51037"
-  integrity sha512-X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q==
+"@babel/parser@^7.1.0", "@babel/parser@^7.10.4", "@babel/parser@^7.4.3", "@babel/parser@^7.7.0", "@babel/parser@^7.9.0":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.10.4.tgz#9eedf27e1998d87739fb5028a5120557c06a1a64"
+  integrity sha512-8jHII4hf+YVDsskTF6WuMB3X4Eh+PsUkC2ljq22so5rHvH+T8BzyL94VOdyFLNR8tBSVXOTbNHOKpR4TfRxVtA==
 
 "@babel/plugin-proposal-async-generator-functions@^7.10.4", "@babel/plugin-proposal-async-generator-functions@^7.8.3":
-  version "7.10.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.10.5.tgz#3491cabf2f7c179ab820606cec27fed15e0e8558"
-  integrity sha512-cNMCVezQbrRGvXJwm9fu/1sJj9bHdGAgKodZdLqOQIpfoH3raqmRPBM17+lh7CzhiKRRBrGtZL9WcjxSoGYUSg==
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.10.4.tgz#4b65abb3d9bacc6c657aaa413e56696f9f170fc6"
+  integrity sha512-MJbxGSmejEFVOANAezdO39SObkURO5o/8b6fSH6D1pi9RZQt+ldppKPXfqgUWpSQ9asM6xaSaSJIaeWMDRP0Zg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/helper-remap-async-to-generator" "^7.10.4"
@@ -396,14 +384,6 @@
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-dynamic-import" "^7.8.0"
 
-"@babel/plugin-proposal-export-namespace-from@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.10.4.tgz#570d883b91031637b3e2958eea3c438e62c05f54"
-  integrity sha512-aNdf0LY6/3WXkhh0Fdb6Zk9j1NMD8ovj3F6r0+3j837Pn1S1PdNtcwJ5EG9WkVPNHPxyJDaxMaAOVq4eki0qbg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
-
 "@babel/plugin-proposal-json-strings@^7.10.4", "@babel/plugin-proposal-json-strings@^7.8.3":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.10.4.tgz#593e59c63528160233bd321b1aebe0820c2341db"
@@ -412,14 +392,6 @@
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-json-strings" "^7.8.0"
 
-"@babel/plugin-proposal-logical-assignment-operators@^7.11.0":
-  version "7.11.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.11.0.tgz#9f80e482c03083c87125dee10026b58527ea20c8"
-  integrity sha512-/f8p4z+Auz0Uaf+i8Ekf1iM7wUNLcViFUGiPxKeXvxTSl63B875YPiVdUDdem7hREcI0E0kSpEhS8tF5RphK7Q==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
-
 "@babel/plugin-proposal-nullish-coalescing-operator@7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.8.3.tgz#e4572253fdeed65cddeecfdab3f928afeb2fd5d2"
@@ -452,10 +424,10 @@
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-numeric-separator" "^7.10.4"
 
-"@babel/plugin-proposal-object-rest-spread@^7.11.0", "@babel/plugin-proposal-object-rest-spread@^7.9.0":
-  version "7.11.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.11.0.tgz#bd81f95a1f746760ea43b6c2d3d62b11790ad0af"
-  integrity sha512-wzch41N4yztwoRw0ak+37wxwJM2oiIiy6huGCoqkvSTA9acYWcPfn9Y4aJqmFFJ70KTJUu29f3DQ43uJ9HXzEA==
+"@babel/plugin-proposal-object-rest-spread@^7.10.4", "@babel/plugin-proposal-object-rest-spread@^7.9.0":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.10.4.tgz#50129ac216b9a6a55b3853fdd923e74bf553a4c0"
+  integrity sha512-6vh4SqRuLLarjgeOf4EaROJAHjvu9Gl+/346PbDH9yWbJyfnJ/ah3jmYKYtswEyCoWZiidvVHjHshd4WgjB9BA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-object-rest-spread" "^7.8.0"
@@ -477,13 +449,12 @@
     "@babel/helper-plugin-utils" "^7.8.3"
     "@babel/plugin-syntax-optional-chaining" "^7.8.0"
 
-"@babel/plugin-proposal-optional-chaining@^7.11.0", "@babel/plugin-proposal-optional-chaining@^7.9.0":
-  version "7.11.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.11.0.tgz#de5866d0646f6afdaab8a566382fe3a221755076"
-  integrity sha512-v9fZIu3Y8562RRwhm1BbMRxtqZNFmFA2EG+pT2diuU8PT3H6T/KXoZ54KgYisfOFZHV6PfvAiBIZ9Rcz+/JCxA==
+"@babel/plugin-proposal-optional-chaining@^7.10.4", "@babel/plugin-proposal-optional-chaining@^7.9.0":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.10.4.tgz#750f1255e930a1f82d8cdde45031f81a0d0adff7"
+  integrity sha512-ZIhQIEeavTgouyMSdZRap4VPPHqJJ3NEs2cuHs5p0erH+iz6khB0qfgU8g7UuJkG88+fBMy23ZiU+nuHvekJeQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.11.0"
     "@babel/plugin-syntax-optional-chaining" "^7.8.0"
 
 "@babel/plugin-proposal-private-methods@^7.10.4":
@@ -530,13 +501,6 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-export-namespace-from@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz#028964a9ba80dbc094c915c487ad7c4e7a66465a"
-  integrity sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-
 "@babel/plugin-syntax-flow@^7.8.3":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.10.4.tgz#53351dd7ae01995e567d04ce42af1a6e0ba846a6"
@@ -558,13 +522,6 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-syntax-logical-assignment-operators@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz#ca91ef46303530448b906652bac2e9fe9941f699"
-  integrity sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-
 "@babel/plugin-syntax-nullish-coalescing-operator@^7.8.0":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz#167ed70368886081f74b5c36c65a88c03b66d1a9"
@@ -638,11 +595,12 @@
     "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-transform-block-scoping@^7.10.4", "@babel/plugin-transform-block-scoping@^7.8.3":
-  version "7.11.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.11.1.tgz#5b7efe98852bef8d652c0b28144cd93a9e4b5215"
-  integrity sha512-00dYeDE0EVEHuuM+26+0w/SCL0BH2Qy7LwHuI4Hi4MH5gkC8/AqMN5uWFJIsoXZrAphiMm1iXzBw6L2T+eA0ew==
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.10.4.tgz#a670d1364bb5019a621b9ea2001482876d734787"
+  integrity sha512-J3b5CluMg3hPUii2onJDRiaVbPtKFPLEaV5dOPY5OeAbDi1iU/UbbFFTgwb7WnanaDy7bjU35kc26W3eM5Qa0A==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
+    lodash "^4.17.13"
 
 "@babel/plugin-transform-classes@^7.10.4", "@babel/plugin-transform-classes@^7.9.0":
   version "7.10.4"
@@ -733,11 +691,11 @@
     "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-transform-modules-amd@^7.10.4", "@babel/plugin-transform-modules-amd@^7.9.0":
-  version "7.10.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.10.5.tgz#1b9cddaf05d9e88b3aad339cb3e445c4f020a9b1"
-  integrity sha512-elm5uruNio7CTLFItVC/rIzKLfQ17+fX7EVz5W0TMgIHFo1zY0Ozzx+lgwhL4plzl8OzVn6Qasx5DeEFyoNiRw==
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.10.4.tgz#cb407c68b862e4c1d13a2fc738c7ec5ed75fc520"
+  integrity sha512-3Fw+H3WLUrTlzi3zMiZWp3AR4xadAEMv6XRCYnd5jAlLM61Rn+CRJaZMaNvIpcJpQ3vs1kyifYvEVPFfoSkKOA==
   dependencies:
-    "@babel/helper-module-transforms" "^7.10.5"
+    "@babel/helper-module-transforms" "^7.10.4"
     "@babel/helper-plugin-utils" "^7.10.4"
     babel-plugin-dynamic-import-node "^2.3.3"
 
@@ -752,12 +710,12 @@
     babel-plugin-dynamic-import-node "^2.3.3"
 
 "@babel/plugin-transform-modules-systemjs@^7.10.4", "@babel/plugin-transform-modules-systemjs@^7.9.0":
-  version "7.10.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.10.5.tgz#6270099c854066681bae9e05f87e1b9cadbe8c85"
-  integrity sha512-f4RLO/OL14/FP1AEbcsWMzpbUz6tssRaeQg11RH1BP/XnPpRoVwgeYViMFacnkaw4k4wjRSjn3ip1Uw9TaXuMw==
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.10.4.tgz#8f576afd943ac2f789b35ded0a6312f929c633f9"
+  integrity sha512-Tb28LlfxrTiOTGtZFsvkjpyjCl9IoaRI52AEU/VIwOwvDQWtbNJsAqTXzh+5R7i74e/OZHH2c2w2fsOqAfnQYQ==
   dependencies:
     "@babel/helper-hoist-variables" "^7.10.4"
-    "@babel/helper-module-transforms" "^7.10.5"
+    "@babel/helper-module-transforms" "^7.10.4"
     "@babel/helper-plugin-utils" "^7.10.4"
     babel-plugin-dynamic-import-node "^2.3.3"
 
@@ -792,9 +750,9 @@
     "@babel/helper-replace-supers" "^7.10.4"
 
 "@babel/plugin-transform-parameters@^7.10.4", "@babel/plugin-transform-parameters@^7.8.7":
-  version "7.10.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.10.5.tgz#59d339d58d0b1950435f4043e74e2510005e2c4a"
-  integrity sha512-xPHwUj5RdFV8l1wuYiu5S9fqWGM2DrYc24TMvUiRrPVm+SM3XeqU9BcokQX/kEUe+p2RBwy+yoiR1w/Blq6ubw==
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.10.4.tgz#7b4d137c87ea7adc2a0f3ebf53266871daa6fced"
+  integrity sha512-RurVtZ/D5nYfEg0iVERXYKEgDFeesHrHfx8RT05Sq57ucj2eOYAP6eu5fynL4Adju4I/mP/I6SO0DqNWAXjfLQ==
   dependencies:
     "@babel/helper-get-function-arity" "^7.10.4"
     "@babel/helper-plugin-utils" "^7.10.4"
@@ -828,11 +786,11 @@
     "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-transform-react-jsx-development@^7.10.4", "@babel/plugin-transform-react-jsx-development@^7.9.0":
-  version "7.11.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.11.5.tgz#e1439e6a57ee3d43e9f54ace363fb29cefe5d7b6"
-  integrity sha512-cImAmIlKJ84sDmpQzm4/0q/2xrXlDezQoixy3qoz1NJeZL/8PRon6xZtluvr4H4FzwlDGI5tCcFupMnXGtr+qw==
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.10.4.tgz#6ec90f244394604623880e15ebc3c34c356258ba"
+  integrity sha512-RM3ZAd1sU1iQ7rI2dhrZRZGv0aqzNQMbkIUCS1txYpi9wHQ2ZHNjo5TwX+UD6pvFW4AbWqLVYvKy5qJSAyRGjQ==
   dependencies:
-    "@babel/helper-builder-react-jsx-experimental" "^7.11.5"
+    "@babel/helper-builder-react-jsx-experimental" "^7.10.4"
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-jsx" "^7.10.4"
 
@@ -845,9 +803,9 @@
     "@babel/plugin-syntax-jsx" "^7.10.4"
 
 "@babel/plugin-transform-react-jsx-source@^7.10.4", "@babel/plugin-transform-react-jsx-source@^7.9.0":
-  version "7.10.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.10.5.tgz#34f1779117520a779c054f2cdd9680435b9222b4"
-  integrity sha512-wTeqHVkN1lfPLubRiZH3o73f4rfon42HpgxUSs86Nc+8QIcm/B9s8NNVXu/gwGcOyd7yDib9ikxoDLxJP0UiDA==
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.10.4.tgz#86baf0fcccfe58084e06446a80858e1deae8f291"
+  integrity sha512-FTK3eQFrPv2aveerUSazFmGygqIdTtvskG50SnGnbEUnRPcGx2ylBhdFIzoVS1ty44hEgcPoCAyw5r3VDEq+Ug==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-jsx" "^7.10.4"
@@ -901,13 +859,12 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-spread@^7.11.0", "@babel/plugin-transform-spread@^7.8.3":
-  version "7.11.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.11.0.tgz#fa84d300f5e4f57752fe41a6d1b3c554f13f17cc"
-  integrity sha512-UwQYGOqIdQJe4aWNyS7noqAnN2VbaczPLiEtln+zPowRNlD+79w3oi2TWfYe0eZgd+gjZCbsydN7lzWysDt+gw==
+"@babel/plugin-transform-spread@^7.10.4", "@babel/plugin-transform-spread@^7.8.3":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.10.4.tgz#4e2c85ea0d6abaee1b24dcfbbae426fe8d674cff"
+  integrity sha512-1e/51G/Ni+7uH5gktbWv+eCED9pP8ZpRhZB3jOaI3mmzfvJTWHkuyYTv0Z5PYtyM+Tr2Ccr9kUdQxn60fI5WuQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.11.0"
 
 "@babel/plugin-transform-sticky-regex@^7.10.4", "@babel/plugin-transform-sticky-regex@^7.8.3":
   version "7.10.4"
@@ -918,9 +875,9 @@
     "@babel/helper-regex" "^7.10.4"
 
 "@babel/plugin-transform-template-literals@^7.10.4", "@babel/plugin-transform-template-literals@^7.8.3":
-  version "7.10.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.10.5.tgz#78bc5d626a6642db3312d9d0f001f5e7639fde8c"
-  integrity sha512-V/lnPGIb+KT12OQikDvgSuesRX14ck5FfJXt6+tXhdkJ+Vsd0lDCVtF6jcB4rNClYFzaB2jusZ+lNISDk2mMMw==
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.10.4.tgz#e6375407b30fcb7fcfdbba3bb98ef3e9d36df7bc"
+  integrity sha512-4NErciJkAYe+xI5cqfS8pV/0ntlY5N5Ske/4ImxAVX7mk9Rxt2bwDTGv1Msc2BRJvWQcmYEC+yoMLdX22aE4VQ==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.10.4"
     "@babel/helper-plugin-utils" "^7.10.4"
@@ -933,11 +890,11 @@
     "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-transform-typescript@^7.9.0":
-  version "7.11.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.11.0.tgz#2b4879676af37342ebb278216dd090ac67f13abb"
-  integrity sha512-edJsNzTtvb3MaXQwj8403B7mZoGu9ElDJQZOKjGUnvilquxBA3IQoEIOvkX/1O8xfAsnHS/oQhe2w/IXrr+w0w==
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.10.4.tgz#8b01cb8d77f795422277cc3fcf45af72bc68ba78"
+  integrity sha512-3WpXIKDJl/MHoAN0fNkSr7iHdUMHZoppXjf2HJ9/ed5Xht5wNIsXllJXdityKOxeA3Z8heYRb1D3p2H5rfCdPw==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.10.5"
+    "@babel/helper-create-class-features-plugin" "^7.10.4"
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-typescript" "^7.10.4"
 
@@ -1023,33 +980,29 @@
     semver "^5.5.0"
 
 "@babel/preset-env@^7.4.5":
-  version "7.11.5"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.11.5.tgz#18cb4b9379e3e92ffea92c07471a99a2914e4272"
-  integrity sha512-kXqmW1jVcnB2cdueV+fyBM8estd5mlNfaQi6lwLgRwCby4edpavgbFhiBNjmWA3JpB/yZGSISa7Srf+TwxDQoA==
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.10.4.tgz#fbf57f9a803afd97f4f32e4f798bb62e4b2bef5f"
+  integrity sha512-tcmuQ6vupfMZPrLrc38d0sF2OjLT3/bZ0dry5HchNCQbrokoQi4reXqclvkkAT5b+gWc23meVWpve5P/7+w/zw==
   dependencies:
-    "@babel/compat-data" "^7.11.0"
+    "@babel/compat-data" "^7.10.4"
     "@babel/helper-compilation-targets" "^7.10.4"
     "@babel/helper-module-imports" "^7.10.4"
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-proposal-async-generator-functions" "^7.10.4"
     "@babel/plugin-proposal-class-properties" "^7.10.4"
     "@babel/plugin-proposal-dynamic-import" "^7.10.4"
-    "@babel/plugin-proposal-export-namespace-from" "^7.10.4"
     "@babel/plugin-proposal-json-strings" "^7.10.4"
-    "@babel/plugin-proposal-logical-assignment-operators" "^7.11.0"
     "@babel/plugin-proposal-nullish-coalescing-operator" "^7.10.4"
     "@babel/plugin-proposal-numeric-separator" "^7.10.4"
-    "@babel/plugin-proposal-object-rest-spread" "^7.11.0"
+    "@babel/plugin-proposal-object-rest-spread" "^7.10.4"
     "@babel/plugin-proposal-optional-catch-binding" "^7.10.4"
-    "@babel/plugin-proposal-optional-chaining" "^7.11.0"
+    "@babel/plugin-proposal-optional-chaining" "^7.10.4"
     "@babel/plugin-proposal-private-methods" "^7.10.4"
     "@babel/plugin-proposal-unicode-property-regex" "^7.10.4"
     "@babel/plugin-syntax-async-generators" "^7.8.0"
     "@babel/plugin-syntax-class-properties" "^7.10.4"
     "@babel/plugin-syntax-dynamic-import" "^7.8.0"
-    "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
     "@babel/plugin-syntax-json-strings" "^7.8.0"
-    "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
     "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0"
     "@babel/plugin-syntax-numeric-separator" "^7.10.4"
     "@babel/plugin-syntax-object-rest-spread" "^7.8.0"
@@ -1082,14 +1035,14 @@
     "@babel/plugin-transform-regenerator" "^7.10.4"
     "@babel/plugin-transform-reserved-words" "^7.10.4"
     "@babel/plugin-transform-shorthand-properties" "^7.10.4"
-    "@babel/plugin-transform-spread" "^7.11.0"
+    "@babel/plugin-transform-spread" "^7.10.4"
     "@babel/plugin-transform-sticky-regex" "^7.10.4"
     "@babel/plugin-transform-template-literals" "^7.10.4"
     "@babel/plugin-transform-typeof-symbol" "^7.10.4"
     "@babel/plugin-transform-unicode-escapes" "^7.10.4"
     "@babel/plugin-transform-unicode-regex" "^7.10.4"
     "@babel/preset-modules" "^0.1.3"
-    "@babel/types" "^7.11.5"
+    "@babel/types" "^7.10.4"
     browserslist "^4.12.0"
     core-js-compat "^3.6.2"
     invariant "^2.2.2"
@@ -1097,9 +1050,9 @@
     semver "^5.5.0"
 
 "@babel/preset-modules@^0.1.3":
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.4.tgz#362f2b68c662842970fdb5e254ffc8fc1c2e415e"
-  integrity sha512-J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg==
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.3.tgz#13242b53b5ef8c883c3cf7dddd55b36ce80fbc72"
+  integrity sha512-Ra3JXOHBq2xd56xSF7lMKXdjBn3T772Y1Wet3yWnkDly9zHvJki029tAFzvAAK5cf4YV3yoxuP61crYRol6SVg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-proposal-unicode-property-regex" "^7.4.4"
@@ -1140,18 +1093,10 @@
     "@babel/helper-plugin-utils" "^7.8.3"
     "@babel/plugin-transform-typescript" "^7.9.0"
 
-"@babel/runtime-corejs2@^7.8.7":
-  version "7.11.2"
-  resolved "https://registry.yarnpkg.com/@babel/runtime-corejs2/-/runtime-corejs2-7.11.2.tgz#700a03945ebad0d31ba6690fc8a6bcc9040faa47"
-  integrity sha512-AC/ciV28adSSpEkBglONBWq4/Lvm6GAZuxIoyVtsnUpZMl0bxLtoChEnYAkP+47KyOCayZanojtflUEUJtR/6Q==
-  dependencies:
-    core-js "^2.6.5"
-    regenerator-runtime "^0.13.4"
-
-"@babel/runtime-corejs3@^7.8.3":
-  version "7.11.2"
-  resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.11.2.tgz#02c3029743150188edeb66541195f54600278419"
-  integrity sha512-qh5IR+8VgFz83VBa6OkaET6uN/mJOhHONuy3m1sgF0CV6mXdPSEBdA7e1eUbVvyNtANjMbg22JUv71BaDXLY6A==
+"@babel/runtime-corejs3@^7.10.2", "@babel/runtime-corejs3@^7.8.3":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.10.4.tgz#f29fc1990307c4c57b10dbd6ce667b27159d9e0d"
+  integrity sha512-BFlgP2SoLO9HJX9WBwN67gHWMBhDX/eDz64Jajd6mR/UAUzqrNMm99d4qHnVaKscAElZoFiPv+JpR/Siud5lXw==
   dependencies:
     core-js-pure "^3.0.0"
     regenerator-runtime "^0.13.4"
@@ -1163,10 +1108,10 @@
   dependencies:
     regenerator-runtime "^0.13.4"
 
-"@babel/runtime@^7.0.0", "@babel/runtime@^7.10.1", "@babel/runtime@^7.10.2", "@babel/runtime@^7.10.4", "@babel/runtime@^7.11.1", "@babel/runtime@^7.11.2", "@babel/runtime@^7.3.4", "@babel/runtime@^7.4.5", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4":
-  version "7.11.2"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.11.2.tgz#f549c13c754cc40b87644b9fa9f09a6a95fe0736"
-  integrity sha512-TeWkU52so0mPtDcaCTxNBI/IHiz0pZgr8VEFqXFtZWpYD08ZB6FaSwVAS8MKRQAP3bYKiVjwysOJgMFY28o6Tw==
+"@babel/runtime@^7.0.0", "@babel/runtime@^7.10.1", "@babel/runtime@^7.10.2", "@babel/runtime@^7.10.3", "@babel/runtime@^7.3.4", "@babel/runtime@^7.4.5", "@babel/runtime@^7.5.1", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.10.4.tgz#a6724f1a6b8d2f6ea5236dbfe58c7d7ea9c5eb99"
+  integrity sha512-UpTN5yUJr9b4EX2CnGNWIvER7Ab83ibv0pcvvHc4UOdrBI5jb8bj+32cCwPX6xu0mt2daFNjYhoi+X7beH0RSw==
   dependencies:
     regenerator-runtime "^0.13.4"
 
@@ -1179,28 +1124,28 @@
     "@babel/parser" "^7.10.4"
     "@babel/types" "^7.10.4"
 
-"@babel/traverse@^7.1.0", "@babel/traverse@^7.10.4", "@babel/traverse@^7.11.5", "@babel/traverse@^7.4.3", "@babel/traverse@^7.7.0", "@babel/traverse@^7.9.0":
-  version "7.11.5"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.11.5.tgz#be777b93b518eb6d76ee2e1ea1d143daa11e61c3"
-  integrity sha512-EjiPXt+r7LiCZXEfRpSJd+jUMnBd4/9OUv7Nx3+0u9+eimMwJmG0Q98lw4/289JCoxSE8OolDMNZaaF/JZ69WQ==
+"@babel/traverse@^7.1.0", "@babel/traverse@^7.10.4", "@babel/traverse@^7.4.3", "@babel/traverse@^7.7.0", "@babel/traverse@^7.9.0":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.10.4.tgz#e642e5395a3b09cc95c8e74a27432b484b697818"
+  integrity sha512-aSy7p5THgSYm4YyxNGz6jZpXf+Ok40QF3aA2LyIONkDHpAcJzDUqlCKXv6peqYUs2gmic849C/t2HKw2a2K20Q==
   dependencies:
     "@babel/code-frame" "^7.10.4"
-    "@babel/generator" "^7.11.5"
+    "@babel/generator" "^7.10.4"
     "@babel/helper-function-name" "^7.10.4"
-    "@babel/helper-split-export-declaration" "^7.11.0"
-    "@babel/parser" "^7.11.5"
-    "@babel/types" "^7.11.5"
+    "@babel/helper-split-export-declaration" "^7.10.4"
+    "@babel/parser" "^7.10.4"
+    "@babel/types" "^7.10.4"
     debug "^4.1.0"
     globals "^11.1.0"
-    lodash "^4.17.19"
+    lodash "^4.17.13"
 
-"@babel/types@^7.0.0", "@babel/types@^7.10.4", "@babel/types@^7.10.5", "@babel/types@^7.11.0", "@babel/types@^7.11.5", "@babel/types@^7.3.0", "@babel/types@^7.4.0", "@babel/types@^7.4.4", "@babel/types@^7.7.0", "@babel/types@^7.9.0":
-  version "7.11.5"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.11.5.tgz#d9de577d01252d77c6800cee039ee64faf75662d"
-  integrity sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==
+"@babel/types@^7.0.0", "@babel/types@^7.10.4", "@babel/types@^7.3.0", "@babel/types@^7.4.0", "@babel/types@^7.4.4", "@babel/types@^7.7.0", "@babel/types@^7.9.0":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.10.4.tgz#369517188352e18219981efd156bfdb199fff1ee"
+  integrity sha512-UTCFOxC3FsFHb7lkRMVvgLzaRVamXuAs2Tz4wajva4WxtVY82eZeaUBtC2Zt95FU9TiznuC0Zk35tsim8jeVpg==
   dependencies:
     "@babel/helper-validator-identifier" "^7.10.4"
-    lodash "^4.17.19"
+    lodash "^4.17.13"
     to-fast-properties "^2.0.0"
 
 "@cnakazawa/watch@^1.0.3":
@@ -1221,6 +1166,23 @@
   resolved "https://registry.yarnpkg.com/@csstools/normalize.css/-/normalize.css-10.1.0.tgz#f0950bba18819512d42f7197e56c518aa491cf18"
   integrity sha512-ij4wRiunFfaJxjB0BdrYHIH8FxBJpOwNPhhAcunlmPdXudL1WQV1qoP9un6JsEBAgQH+7UXyyjh0g7jTxXK6tg==
 
+"@gravel-form/antd@^0.0.4":
+  version "0.0.4"
+  resolved "https://registry.yarnpkg.com/@gravel-form/antd/-/antd-0.0.4.tgz#045b861a6de7427d115d9b833f72ec806636ed65"
+  integrity sha512-LsUENdjqoV+nhEfUwmS2j0whESvZ/Ri0NspvuxLhgg6FYF4S5VFtT64F2naDbl9aide5cHL3KLszbRJuSt/gMg==
+  dependencies:
+    "@gravel-form/core-rc" "0.0.3"
+    "@types/json-schema" "^7.0.5"
+    antd "^4.4.0"
+    lodash "^4.17.15"
+
+"@gravel-form/core-rc@0.0.3", "@gravel-form/core-rc@^0.0.3":
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/@gravel-form/core-rc/-/core-rc-0.0.3.tgz#ac3dcc917f609702fda64d081af1a26f66426353"
+  integrity sha512-M5XvdXwBZwLhBNGKPBCM0q9c8ontK1C86ZR/hp3UbIX9Ap0G3QB2OjKqL7g1u6aDz1+fEaWw0zUHl6q6lNX+XQ==
+  dependencies:
+    "@types/json-schema" "^7.0.5"
+
 "@hapi/address@2.x.x":
   version "2.1.4"
   resolved "https://registry.yarnpkg.com/@hapi/address/-/address-2.1.4.tgz#5d67ed43f3fd41a69d4b9ff7b56e7c0d1d0a81e5"
@@ -1401,6 +1363,16 @@
     "@types/istanbul-reports" "^1.1.1"
     "@types/yargs" "^13.0.0"
 
+"@jest/types@^25.5.0":
+  version "25.5.0"
+  resolved "https://registry.yarnpkg.com/@jest/types/-/types-25.5.0.tgz#4d6a4793f7b9599fc3680877b856a97dbccf2a9d"
+  integrity sha512-OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw==
+  dependencies:
+    "@types/istanbul-lib-coverage" "^2.0.0"
+    "@types/istanbul-reports" "^1.1.1"
+    "@types/yargs" "^15.0.0"
+    chalk "^3.0.0"
+
 "@mrmlnc/readdir-enhanced@^2.2.1":
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz#524af240d1a360527b730475ecfa1344aa540dde"
@@ -1414,22 +1386,10 @@
   resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b"
   integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==
 
-"@rjsf/core@^2.3.0":
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/@rjsf/core/-/core-2.3.0.tgz#334c73d2262ef1a8cda477e238067af7336c5599"
-  integrity sha512-OZKYHt9tjKhzOH4CvsPiCwepuIacqI++cNmnL2fsxh1IF+uEWGlo3NLDWhhSaBbOv9jps6a5YQcLbLtjNuSwug==
-  dependencies:
-    "@babel/runtime-corejs2" "^7.8.7"
-    "@types/json-schema" "^7.0.4"
-    ajv "^6.7.0"
-    core-js "^2.5.7"
-    json-schema-merge-allof "^0.6.0"
-    jsonpointer "^4.0.1"
-    lodash "^4.17.15"
-    prop-types "^15.7.2"
-    react-app-polyfill "^1.0.4"
-    react-is "^16.9.0"
-    shortid "^2.2.14"
+"@sheerun/mutationobserver-shim@^0.3.2":
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/@sheerun/mutationobserver-shim/-/mutationobserver-shim-0.3.3.tgz#5405ee8e444ed212db44e79351f0c70a582aae25"
+  integrity sha512-DetpxZw1fzPD5xUBrIAoplLChO2VB8DlL5Gg+I1IR9b2wPqYIca2WSUxL5g1vLeR4MsQq1NeWriXAVffV+U1Fw==
 
 "@svgr/babel-plugin-add-jsx-attribute@^4.2.0":
   version "4.2.0"
@@ -1534,6 +1494,64 @@
     "@svgr/plugin-svgo" "^4.3.1"
     loader-utils "^1.2.3"
 
+"@testing-library/dom@*":
+  version "7.20.0"
+  resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-7.20.0.tgz#2bab85e90f0221a56256c5d4741c2a36b7c45f4d"
+  integrity sha512-TywaC+qDGm/Ro34kRYkFQPdT+pxSF4UjZGLIqcGfFQH5IGR43Y7sGLPnkieIW/GNsu337oxNsLUAgpI0JWhXHw==
+  dependencies:
+    "@babel/runtime" "^7.10.3"
+    "@types/aria-query" "^4.2.0"
+    aria-query "^4.2.2"
+    dom-accessibility-api "^0.4.5"
+    pretty-format "^25.5.0"
+
+"@testing-library/dom@^6.15.0":
+  version "6.16.0"
+  resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-6.16.0.tgz#04ada27ed74ad4c0f0d984a1245bb29b1fd90ba9"
+  integrity sha512-lBD88ssxqEfz0wFL6MeUyyWZfV/2cjEZZV3YRpb2IoJRej/4f1jB0TzqIOznTpfR1r34CNesrubxwIlAQ8zgPA==
+  dependencies:
+    "@babel/runtime" "^7.8.4"
+    "@sheerun/mutationobserver-shim" "^0.3.2"
+    "@types/testing-library__dom" "^6.12.1"
+    aria-query "^4.0.2"
+    dom-accessibility-api "^0.3.0"
+    pretty-format "^25.1.0"
+    wait-for-expect "^3.0.2"
+
+"@testing-library/jest-dom@^4.2.4":
+  version "4.2.4"
+  resolved "https://registry.yarnpkg.com/@testing-library/jest-dom/-/jest-dom-4.2.4.tgz#00dfa0cbdd837d9a3c2a7f3f0a248ea6e7b89742"
+  integrity sha512-j31Bn0rQo12fhCWOUWy9fl7wtqkp7In/YP2p5ZFyRuiiB9Qs3g+hS4gAmDWONbAHcRmVooNJ5eOHQDCOmUFXHg==
+  dependencies:
+    "@babel/runtime" "^7.5.1"
+    chalk "^2.4.1"
+    css "^2.2.3"
+    css.escape "^1.5.1"
+    jest-diff "^24.0.0"
+    jest-matcher-utils "^24.0.0"
+    lodash "^4.17.11"
+    pretty-format "^24.0.0"
+    redent "^3.0.0"
+
+"@testing-library/react@^9.3.2":
+  version "9.5.0"
+  resolved "https://registry.yarnpkg.com/@testing-library/react/-/react-9.5.0.tgz#71531655a7890b61e77a1b39452fbedf0472ca5e"
+  integrity sha512-di1b+D0p+rfeboHO5W7gTVeZDIK5+maEgstrZbWZSSvxDyfDRkkyBE1AJR5Psd6doNldluXlCWqXriUfqu/9Qg==
+  dependencies:
+    "@babel/runtime" "^7.8.4"
+    "@testing-library/dom" "^6.15.0"
+    "@types/testing-library__react" "^9.1.2"
+
+"@testing-library/user-event@^7.1.2":
+  version "7.2.1"
+  resolved "https://registry.yarnpkg.com/@testing-library/user-event/-/user-event-7.2.1.tgz#2ad4e844175a3738cb9e7064be5ea070b8863a1c"
+  integrity sha512-oZ0Ib5I4Z2pUEcoo95cT1cr6slco9WY7yiPpG+RGNkj8YcYgJnM7pXmYmorNOReh8MIGcKSqXyeGjxnr8YiZbA==
+
+"@types/aria-query@^4.2.0":
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/@types/aria-query/-/aria-query-4.2.0.tgz#14264692a9d6e2fa4db3df5e56e94b5e25647ac0"
+  integrity sha512-iIgQNzCm0v7QMhhe4Jjn9uRh+I6GoPmt03CbEtwx3ao8/EfoQcmgtqH4vQ5Db/lxiIGaWDv6nwvunuh0RyX0+A==
+
 "@types/babel__core@^7.1.0":
   version "7.1.9"
   resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.9.tgz#77e59d438522a6fb898fa43dc3455c6e72f3963d"
@@ -1561,9 +1579,9 @@
     "@babel/types" "^7.0.0"
 
 "@types/babel__traverse@*", "@types/babel__traverse@^7.0.6":
-  version "7.0.13"
-  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.13.tgz#1874914be974a492e1b4cb00585cabb274e8ba18"
-  integrity sha512-i+zS7t6/s9cdQvbqKDARrcbrPvtJGlbYsMkazo03nTAK3RX9FNrLllXys22uiTGJapPOTZTQ35nHh4ISph4SLQ==
+  version "7.0.12"
+  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.12.tgz#22f49a028e69465390f87bb103ebd61bd086b8f5"
+  integrity sha512-t4CoEokHTfcyfb4hUaF9oOHu9RmmNWnm1CP0YmMqOOfClKascOmvlEM736vlqeScuGvBDsHkf8R2INd4DWreQA==
   dependencies:
     "@babel/types" "^7.3.0"
 
@@ -1578,9 +1596,9 @@
   integrity sha512-OCutwjDZ4aFS6PB1UZ988C4YgwlBHJd6wCeQqaLdmadZ/7e+w79+hbMUFC1QXDNCmdyoRfAFdm0RypzwR+Qpag==
 
 "@types/glob@^7.1.1":
-  version "7.1.3"
-  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.3.tgz#e6ba80f36b7daad2c685acd9266382e68985c183"
-  integrity sha512-SEYeGAIQIQX8NN6LDKprLjbrd5dARM5EXsd8GI/A5l0apYI1fGMWgPHSe4ZKL4eozlAyI+doUE9XbYS4xCkQ1w==
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.2.tgz#06ca26521353a545d94a0adc74f38a59d232c987"
+  integrity sha512-VgNIkxK+j7Nz5P7jvUZlRvhuPSmsEfS03b0alKcq5V/STUKAa3Plemsn5mrQUO7am6OErJ4rhGEGJbACclrtRA==
   dependencies:
     "@types/minimatch" "*"
     "@types/node" "*"
@@ -1605,10 +1623,22 @@
     "@types/istanbul-lib-coverage" "*"
     "@types/istanbul-lib-report" "*"
 
+"@types/jest@^24.0.0":
+  version "24.9.1"
+  resolved "https://registry.yarnpkg.com/@types/jest/-/jest-24.9.1.tgz#02baf9573c78f1b9974a5f36778b366aa77bd534"
+  integrity sha512-Fb38HkXSVA4L8fGKEZ6le5bB8r6MRWlOCZbVuWZcmOMSCd2wCYOwN1ibj8daIoV9naq7aaOZjrLCoCMptKU/4Q==
+  dependencies:
+    jest-diff "^24.3.0"
+
 "@types/json-schema@^7.0.3", "@types/json-schema@^7.0.4", "@types/json-schema@^7.0.5":
-  version "7.0.6"
-  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.6.tgz#f4c7ec43e81b319a9815115031709f26987891f0"
-  integrity sha512-3c+yGKvVP5Y9TYBEibGNR+kLtijnj7mYrXRg+WpFb2X9xm04g/DXYkfg4hmzJQosc9snFNUPkbYIhu+KAm6jJw==
+  version "7.0.5"
+  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.5.tgz#dcce4430e64b443ba8945f0290fb564ad5bac6dd"
+  integrity sha512-7+2BITlgjgDhH0vvwZU/HZJVyk+2XUlvxXe8dFMedNX/aMkaOq++rMAFXc0tM7ij15QaWlbdQASBR9dihi+bDQ==
+
+"@types/lodash@^4.14.151":
+  version "4.14.157"
+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.157.tgz#fdac1c52448861dfde1a2e1515dbc46e54926dc8"
+  integrity sha512-Ft5BNFmv2pHDgxV5JDsndOWTRJ+56zte0ZpYLowp03tW+K+t8u8YMOzAnpuqPgzX6WO1XpDIUm7u04M8vdDiVQ==
 
 "@types/minimatch@*", "@types/minimatch@^3.0.3":
   version "3.0.3"
@@ -1616,34 +1646,89 @@
   integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==
 
 "@types/node@*":
-  version "14.6.4"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.6.4.tgz#a145cc0bb14ef9c4777361b7bbafa5cf8e3acb5a"
-  integrity sha512-Wk7nG1JSaMfMpoMJDKUsWYugliB2Vy55pdjLpmLixeyMi7HizW2I/9QoxsPCkXl3dO+ZOVqPumKaDUv5zJu2uQ==
+  version "14.0.14"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.0.14.tgz#24a0b5959f16ac141aeb0c5b3cd7a15b7c64cbce"
+  integrity sha512-syUgf67ZQpaJj01/tRTknkMNoBBLWJOBODF0Zm4NrXmiSuxjymFrxnTu1QVYRubhVkRcZLYZG8STTwJRdVm/WQ==
+
+"@types/node@^12.0.0":
+  version "12.12.47"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.47.tgz#5007b8866a2f9150de82335ca7e24dd1d59bdfb5"
+  integrity sha512-yzBInQFhdY8kaZmqoL2+3U5dSTMrKaYcb561VU+lDzAYvqt+2lojvBEy+hmpSNuXnPTx7m9+04CzWYOUqWME2A==
 
 "@types/parse-json@^4.0.0":
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0"
   integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==
 
+"@types/prop-types@*":
+  version "15.7.3"
+  resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.3.tgz#2ab0d5da2e5815f94b0b9d4b95d1e5f243ab2ca7"
+  integrity sha512-KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw==
+
 "@types/q@^1.5.1":
   version "1.5.4"
   resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.4.tgz#15925414e0ad2cd765bfef58842f7e26a7accb24"
   integrity sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug==
 
+"@types/react-dom@*", "@types/react-dom@^16.9.0":
+  version "16.9.8"
+  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.8.tgz#fe4c1e11dfc67155733dfa6aa65108b4971cb423"
+  integrity sha512-ykkPQ+5nFknnlU6lDd947WbQ6TE3NNzbQAkInC2EKY1qeYdTKp7onFusmYZb+ityzx2YviqT6BXSu+LyWWJwcA==
+  dependencies:
+    "@types/react" "*"
+
+"@types/react@*", "@types/react@^16.9.0":
+  version "16.9.41"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.41.tgz#925137ee4d2ff406a0ecf29e8e9237390844002e"
+  integrity sha512-6cFei7F7L4wwuM+IND/Q2cV1koQUvJ8iSV+Gwn0c3kvABZ691g7sp3hfEQHOUBJtccl1gPi+EyNjMIl9nGA0ug==
+  dependencies:
+    "@types/prop-types" "*"
+    csstype "^2.2.0"
+
 "@types/stack-utils@^1.0.1":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-1.0.1.tgz#0a851d3bd96498fa25c33ab7278ed3bd65f06c3e"
   integrity sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw==
 
+"@types/testing-library__dom@*":
+  version "7.5.0"
+  resolved "https://registry.yarnpkg.com/@types/testing-library__dom/-/testing-library__dom-7.5.0.tgz#e0a00dd766983b1d6e9d10d33e708005ce6ad13e"
+  integrity sha512-mj1aH4cj3XUpMEgVpognma5kHVtbm6U6cHZmEFzCRiXPvKkuHrFr3+yXdGLXvfFRBaQIVshPGHI+hGTOJlhS/g==
+  dependencies:
+    "@testing-library/dom" "*"
+
+"@types/testing-library__dom@^6.12.1":
+  version "6.14.0"
+  resolved "https://registry.yarnpkg.com/@types/testing-library__dom/-/testing-library__dom-6.14.0.tgz#1aede831cb4ed4a398448df5a2c54b54a365644e"
+  integrity sha512-sMl7OSv0AvMOqn1UJ6j1unPMIHRXen0Ita1ujnMX912rrOcawe4f7wu0Zt9GIQhBhJvH2BaibqFgQ3lP+Pj2hA==
+  dependencies:
+    pretty-format "^24.3.0"
+
+"@types/testing-library__react@^9.1.2":
+  version "9.1.3"
+  resolved "https://registry.yarnpkg.com/@types/testing-library__react/-/testing-library__react-9.1.3.tgz#35eca61cc6ea923543796f16034882a1603d7302"
+  integrity sha512-iCdNPKU3IsYwRK9JieSYAiX0+aYDXOGAmrC/3/M7AqqSDKnWWVv07X+Zk1uFSL7cMTUYzv4lQRfohucEocn5/w==
+  dependencies:
+    "@types/react-dom" "*"
+    "@types/testing-library__dom" "*"
+    pretty-format "^25.1.0"
+
 "@types/yargs-parser@*":
   version "15.0.0"
   resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-15.0.0.tgz#cb3f9f741869e20cce330ffbeb9271590483882d"
   integrity sha512-FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw==
 
 "@types/yargs@^13.0.0":
-  version "13.0.10"
-  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-13.0.10.tgz#e77bf3fc73c781d48c2eb541f87c453e321e5f4b"
-  integrity sha512-MU10TSgzNABgdzKvQVW1nuuT+sgBMWeXNc3XOs5YXV5SDAK+PPja2eUuBNB9iqElu03xyEDqlnGw0jgl4nbqGQ==
+  version "13.0.9"
+  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-13.0.9.tgz#44028e974343c7afcf3960f1a2b1099c39a7b5e1"
+  integrity sha512-xrvhZ4DZewMDhoH1utLtOAwYQy60eYFoXeje30TzM3VOvQlBwQaEpKFq5m34k1wOw2AKIi2pwtiAjdmhvlBUzg==
+  dependencies:
+    "@types/yargs-parser" "*"
+
+"@types/yargs@^15.0.0":
+  version "15.0.5"
+  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.5.tgz#947e9a6561483bdee9adffc983e91a6902af8b79"
+  integrity sha512-Dk/IDOPtOgubt/IaevIUbTgV7doaKkoorvOyYM2CMwuDyP89bekI7H4xLIwunNYiK9jhCkmc6pUrJk3cj2AB9w==
   dependencies:
     "@types/yargs-parser" "*"
 
@@ -1847,9 +1932,9 @@
   integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==
 
 abab@^2.0.0:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.4.tgz#6dfa57b417ca06d21b2478f0e638302f99c2405c"
-  integrity sha512-Eu9ELJWCz/c1e9gTiCY+FceWxcqzjYEbqMgtndnuSqZSUCOL73TWNK2mHfIj4Cw2E/ongOp+JISVNCmovt2KYQ==
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.3.tgz#623e2075e02eb2d3f2475e49f99c91846467907a"
+  integrity sha512-tsFzPpcttalNjFBCFMqsKYQcWxxen1pgJR56by//QwvJc4/OUS3kPOOttx2tSIfjsylB0pYu7f5D3K1RCxUnUg==
 
 accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7:
   version "1.3.7"
@@ -1888,9 +1973,9 @@ acorn@^6.0.1, acorn@^6.0.4, acorn@^6.2.1:
   integrity sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==
 
 acorn@^7.1.1:
-  version "7.4.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.0.tgz#e1ad486e6c54501634c6c397c5c121daa383607c"
-  integrity sha512-+G7P8jJmCHr+S+cLfQxygbWhXy+8YTVGzAkpEbcLo2mLoL7tij/VG41QSHACSf5QgYRhMZYHuNc6drJaO0Da+w==
+  version "7.3.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.3.1.tgz#85010754db53c3fbaf3b9ea3e083aa5c5d147ffd"
+  integrity sha512-tLc0wSnatxAQHVHUapaHdz72pi9KUyHjq5KyHjGg9Y8Ifdc79pTh2XvI6I1/chZbnM7QtNKzh66ooDogPZSleA==
 
 address@1.1.2, address@^1.0.1:
   version "1.1.2"
@@ -1909,9 +1994,9 @@ adjust-sourcemap-loader@2.0.0:
     regex-parser "2.2.10"
 
 aggregate-error@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a"
-  integrity sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.0.1.tgz#db2fe7246e536f40d9b5442a39e117d7dd6a24e0"
+  integrity sha512-quoaXsZ9/BLNae5yiNoUz+Nhkwz83GhWwtYFglcjEQB2NDHCIpApbqXxIFnm4Pq/Nvhrsq5sYJFyohrrxnTGAA==
   dependencies:
     clean-stack "^2.0.0"
     indent-string "^4.0.0"
@@ -1921,15 +2006,15 @@ ajv-errors@^1.0.0:
   resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.1.tgz#f35986aceb91afadec4102fbd85014950cefa64d"
   integrity sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==
 
-ajv-keywords@^3.1.0, ajv-keywords@^3.4.1, ajv-keywords@^3.5.2:
-  version "3.5.2"
-  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d"
-  integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==
+ajv-keywords@^3.1.0, ajv-keywords@^3.4.1:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.0.tgz#5c894537098785926d71e696114a53ce768ed773"
+  integrity sha512-eyoaac3btgU8eJlvh01En8OCKzRqlLe2G5jDsCr3RiE2uLGMEEB1aaGwVVpwR8M95956tGH6R+9edC++OvzaVw==
 
-ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.7.0:
-  version "6.12.4"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.4.tgz#0614facc4522127fa713445c6bfd3ebd376e2234"
-  integrity sha512-eienB2c9qVQs2KWexhkrdMLVDoIQCz5KSeLxwg9Lzk4DOfBtIK9PQwwufcsn1jjGuf9WZmqPMbGxOzfcuphJCQ==
+ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.2, ajv@^6.5.5:
+  version "6.12.3"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.3.tgz#18c5af38a111ddeb4f2697bd78d68abc1cabd706"
+  integrity sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==
   dependencies:
     fast-deep-equal "^3.1.1"
     fast-json-stable-stringify "^2.0.0"
@@ -1995,7 +2080,7 @@ ansi-styles@^3.2.0, ansi-styles@^3.2.1:
   dependencies:
     color-convert "^1.9.0"
 
-ansi-styles@^4.1.0:
+ansi-styles@^4.0.0, ansi-styles@^4.1.0:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.2.1.tgz#90ae75c424d008d2624c5bf29ead3177ebfcf359"
   integrity sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==
@@ -2003,55 +2088,51 @@ ansi-styles@^4.1.0:
     "@types/color-name" "^1.1.1"
     color-convert "^2.0.1"
 
-antd@^4.6.3:
-  version "4.6.3"
-  resolved "https://registry.yarnpkg.com/antd/-/antd-4.6.3.tgz#aeabfdffa96a6e053b45576623a20b21621d55f1"
-  integrity sha512-3wYzzXK5juew1OO2BKQVesgEWkWhf2P1xjNtyjDJqxACmtUGr7kL3v/6DCAqMDt8P5gLzDvZgsSMpes1sSfS8A==
+antd@^4.4.0, antd@^4.4.1:
+  version "4.4.1"
+  resolved "https://registry.yarnpkg.com/antd/-/antd-4.4.1.tgz#2b21b43fce51187db83278d0ba3d5dd771416bb0"
+  integrity sha512-OUM0gxaLo0yPiDQO9snujA+by9Q9zXTikOWD7nF1b9HCh8PDI+hv8h+c0ePq8JPhZ76gJDlbC8myXQYlmjIvow==
   dependencies:
-    "@ant-design/colors" "^4.0.5"
     "@ant-design/css-animation" "^1.7.2"
     "@ant-design/icons" "^4.2.1"
-    "@ant-design/react-slick" "~0.27.0"
-    "@babel/runtime" "^7.11.2"
+    "@ant-design/react-slick" "~0.26.1"
     array-tree-filter "^2.1.0"
     classnames "^2.2.6"
     copy-to-clipboard "^3.2.0"
-    lodash "^4.17.20"
+    lodash "^4.17.13"
     moment "^2.25.3"
-    omit.js "^2.0.2"
+    omit.js "^1.0.2"
     raf "^3.4.1"
     rc-animate "~3.1.0"
     rc-cascader "~1.3.0"
-    rc-checkbox "~2.3.0"
+    rc-checkbox "~2.2.0"
     rc-collapse "~2.0.0"
-    rc-dialog "~8.2.1"
+    rc-dialog "~8.0.0"
     rc-drawer "~4.1.0"
     rc-dropdown "~3.1.2"
-    rc-field-form "~1.10.0"
-    rc-image "~3.0.2"
-    rc-input-number "~6.0.0"
-    rc-mentions "~1.4.0"
-    rc-menu "~8.5.2"
-    rc-motion "^1.1.1"
+    rc-field-form "~1.5.0"
+    rc-input-number "~5.1.0"
+    rc-mentions "~1.3.0"
+    rc-menu "~8.4.1"
     rc-notification "~4.4.0"
-    rc-pagination "~3.0.3"
-    rc-picker "~2.0.6"
-    rc-progress "~3.1.0"
+    rc-pagination "~2.4.1"
+    rc-picker "~1.10.6"
+    rc-progress "~3.0.0"
     rc-rate "~2.8.2"
     rc-resize-observer "^0.2.3"
-    rc-select "~11.2.0"
+    rc-select "~11.0.0"
     rc-slider "~9.3.0"
-    rc-steps "~4.1.0"
+    rc-steps "~4.0.1"
     rc-switch "~3.2.0"
-    rc-table "~7.9.2"
-    rc-tabs "~11.6.0"
-    rc-textarea "~0.3.0"
+    rc-table "~7.8.0"
+    rc-tabs "~11.5.0"
+    rc-textarea "~0.2.2"
     rc-tooltip "~4.2.0"
-    rc-tree "~3.9.0"
-    rc-tree-select "~4.1.1"
-    rc-trigger "~4.4.0"
-    rc-upload "~3.3.0"
-    rc-util "^5.1.0"
+    rc-tree "~3.6.0"
+    rc-tree-select "~4.0.2"
+    rc-trigger "~4.3.0"
+    rc-upload "~3.2.0"
+    rc-util "^5.0.1"
     scroll-into-view-if-needed "^2.2.25"
     warning "^4.0.3"
 
@@ -2091,6 +2172,14 @@ aria-query@^3.0.0:
     ast-types-flow "0.0.7"
     commander "^2.11.0"
 
+aria-query@^4.0.2, 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"
+
 arity-n@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/arity-n/-/arity-n-1.0.4.tgz#d9e76b11733e08569c0847ae7b39b2860b30b745"
@@ -2190,15 +2279,14 @@ asap@~2.0.6:
   resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
   integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=
 
-asn1.js@^5.2.0:
-  version "5.4.1"
-  resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-5.4.1.tgz#11a980b84ebb91781ce35b0fdc2ee294e3783f07"
-  integrity sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==
+asn1.js@^4.0.0:
+  version "4.10.1"
+  resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.10.1.tgz#b9c2bf5805f1e64aadeed6df3a2bfafb5a73f5a0"
+  integrity sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==
   dependencies:
     bn.js "^4.0.0"
     inherits "^2.0.1"
     minimalistic-assert "^1.0.0"
-    safer-buffer "^2.1.0"
 
 asn1@~0.2.3:
   version "0.2.4"
@@ -2253,9 +2341,9 @@ async-limiter@~1.0.0:
   integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==
 
 async-validator@^3.0.3:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/async-validator/-/async-validator-3.4.0.tgz#871b3e594124bf4c4eb7bcd1a9e78b44f3b09cae"
-  integrity sha512-VrFk4eYiJAWKskEz115iiuCf9O0ftnMMPXrOFMqyzGH2KxO7YwncKyn/FgOOP+0MDHMfXL7gLExagCutaZGigA==
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/async-validator/-/async-validator-3.3.0.tgz#1d92193bbe60d6d6c8b246692c7005e9ed14a8ee"
+  integrity sha512-cAHGD9EL8aCqWXjnb44q94MWiDFzUo1tMhvLb2WzcpWqGiKugsjWG9cvl+jPgkPca7asNbsBU3fa0cwkI/P+Xg==
 
 async@^2.6.1, async@^2.6.2:
   version "2.6.3"
@@ -2275,13 +2363,13 @@ atob@^2.1.2:
   integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
 
 autoprefixer@^9.6.1:
-  version "9.8.6"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.8.6.tgz#3b73594ca1bf9266320c5acf1588d74dea74210f"
-  integrity sha512-XrvP4VVHdRBCdX1S3WXVD8+RyG9qeb1D5Sn1DeLiG2xfSpzellk5k54xbUERJ3M5DggQxes39UGOTP8CFrEGbg==
+  version "9.8.4"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.8.4.tgz#736f1012673a70fa3464671d78d41abd54512863"
+  integrity sha512-84aYfXlpUe45lvmS+HoAWKCkirI/sw4JK0/bTeeqgHYco3dcsOn0NqdejISjptsYwNji/21dnkDri9PsYKk89A==
   dependencies:
     browserslist "^4.12.0"
-    caniuse-lite "^1.0.30001109"
-    colorette "^1.2.1"
+    caniuse-lite "^1.0.30001087"
+    colorette "^1.2.0"
     normalize-range "^0.1.2"
     num2fraction "^1.2.2"
     postcss "^7.0.32"
@@ -2293,9 +2381,9 @@ aws-sign2@~0.7.0:
   integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=
 
 aws4@^1.8.0:
-  version "1.10.1"
-  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.10.1.tgz#e1e82e4f3e999e2cfd61b161280d16a111f86428"
-  integrity sha512-zg7Hz2k5lI8kb7U32998pRRFin7zJlkfezGJjUc2heaD4Pw2wObakCDVzkKztTm/Ln7eiVvYsjqak0Ed4LkMDA==
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.10.0.tgz#a17b3a8ea811060e74d47d306122400ad4497ae2"
+  integrity sha512-3YDiu347mtVtjpyV3u5kVqQLP242c06zwDOgpeRnybmXlYYsLbtTrUBUm8i8srONt+FWobl5aibnU1030PeeuA==
 
 axobject-query@^2.0.2:
   version "2.2.0"
@@ -2439,7 +2527,7 @@ babel-preset-react-app@^9.1.2:
     babel-plugin-macros "2.8.0"
     babel-plugin-transform-react-remove-prop-types "0.4.24"
 
-babel-runtime@^6.26.0:
+babel-runtime@6.x, babel-runtime@^6.23.0, babel-runtime@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
   integrity sha1-llxwWGaOgrVde/4E/yM3vItWR/4=
@@ -2520,9 +2608,9 @@ bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.4.0:
   integrity sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==
 
 bn.js@^5.1.1:
-  version "5.1.3"
-  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.1.3.tgz#beca005408f642ebebea80b042b4d18d2ac0ee6b"
-  integrity sha512-GkTiFpjFtUzU9CbMeJ5iazkCzGL3jrhzerzZIuqLABjbwRaFt33I9tUdSNryIptM+RxDet6OKm2WnLXzW51KsQ==
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.1.2.tgz#c9686902d3c9a27729f43ab10f9d79c2004da7b0"
+  integrity sha512-40rZaf3bUNKTVYu9sIeeEGOg7g14Yvnj9kH7b50EiwX0Q7A6umbvfI5tvHaOERH0XigqKkfLkFQxzb4e6CIXnA==
 
 body-parser@1.19.0:
   version "1.19.0"
@@ -2645,15 +2733,15 @@ browserify-rsa@^4.0.0, browserify-rsa@^4.0.1:
     randombytes "^2.0.1"
 
 browserify-sign@^4.0.0:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.2.1.tgz#eaf4add46dd54be3bb3b36c0cf15abbeba7956c3"
-  integrity sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.2.0.tgz#545d0b1b07e6b2c99211082bf1b12cce7a0b0e11"
+  integrity sha512-hEZC1KEeYuoHRqhGhTy6gWrpJA3ZDjFWv0DE61643ZnOXAKJb3u7yWcrU0mMc9SwAqK1n7myPGndkp0dFG7NFA==
   dependencies:
     bn.js "^5.1.1"
     browserify-rsa "^4.0.1"
     create-hash "^1.2.0"
     create-hmac "^1.1.7"
-    elliptic "^6.5.3"
+    elliptic "^6.5.2"
     inherits "^2.0.4"
     parse-asn1 "^5.1.5"
     readable-stream "^3.6.0"
@@ -2677,14 +2765,14 @@ browserslist@4.10.0:
     pkg-up "^3.1.0"
 
 browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.6.2, browserslist@^4.6.4, browserslist@^4.8.5, browserslist@^4.9.1:
-  version "4.14.1"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.14.1.tgz#cb2b490ba881d45dc3039078c7ed04411eaf3fa3"
-  integrity sha512-zyBTIHydW37pnb63c7fHFXUG6EcqWOqoMdDx6cdyaDFriZ20EoVxcE95S54N+heRqY8m8IUgB5zYta/gCwSaaA==
+  version "4.13.0"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.13.0.tgz#42556cba011e1b0a2775b611cba6a8eca18e940d"
+  integrity sha512-MINatJ5ZNrLnQ6blGvePd/QOz9Xtu+Ne+x29iQSCHfkU5BugKVJwZKn/iiL8UbpIpa3JhviKjz+XxMo0m2caFQ==
   dependencies:
-    caniuse-lite "^1.0.30001124"
-    electron-to-chromium "^1.3.562"
-    escalade "^3.0.2"
-    node-releases "^1.1.60"
+    caniuse-lite "^1.0.30001093"
+    electron-to-chromium "^1.3.488"
+    escalade "^3.0.1"
+    node-releases "^1.1.58"
 
 bser@2.1.1:
   version "2.1.1"
@@ -2849,10 +2937,10 @@ caniuse-api@^3.0.0:
     lodash.memoize "^4.1.2"
     lodash.uniq "^4.5.0"
 
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001035, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001124:
-  version "1.0.30001124"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001124.tgz#5d9998190258e11630d674fc50ea8e579ae0ced2"
-  integrity sha512-zQW8V3CdND7GHRH6rxm6s59Ww4g/qGWTheoboW9nfeMg7sUoopIfKCcNZUjwYRCOrvereh3kwDpZj4VLQ7zGtA==
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001035, caniuse-lite@^1.0.30001087, caniuse-lite@^1.0.30001093:
+  version "1.0.30001094"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001094.tgz#0b11d02e1cdc201348dbd8e3e57bd9b6ce82b175"
+  integrity sha512-ufHZNtMaDEuRBpTbqD93tIQnngmJ+oBknjvr0IbFympSdtFpAUFmNv4mVKbb53qltxFx0nK3iy32S9AqkLzUNA==
 
 capture-exit@^2.0.0:
   version "2.0.0"
@@ -2931,10 +3019,10 @@ chokidar@^2.1.8:
   optionalDependencies:
     fsevents "^1.2.7"
 
-chokidar@^3.3.0, chokidar@^3.4.1:
-  version "3.4.2"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.4.2.tgz#38dc8e658dec3809741eb3ef7bb0a47fe424232d"
-  integrity sha512-IZHaDeBeI+sZJRX7lGcXsdzgvZqKv6sECqsbErJA4mHWfpRrD8B97kSFN4cQz6nGBGiuFia1MKR4d6c1o8Cv7A==
+chokidar@^3.3.0, chokidar@^3.4.0:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.4.0.tgz#b30611423ce376357c765b9b8f904b9fba3c0be8"
+  integrity sha512-aXAaho2VJtisB/1fg1+3nlLJqGOuewTzQpd/Tz0yTg2R0e4IGtshYvtjowyEumcBv2z+y4+kc75Mz7j5xJskcQ==
   dependencies:
     anymatch "~3.1.1"
     braces "~3.0.2"
@@ -2981,7 +3069,7 @@ class-utils@^0.3.5:
     isobject "^3.0.0"
     static-extend "^0.1.1"
 
-classnames@2.x, classnames@^2.2.1, classnames@^2.2.3, classnames@^2.2.5, classnames@^2.2.6:
+classnames@2.x, classnames@^2.2.0, classnames@^2.2.1, classnames@^2.2.3, classnames@^2.2.5, classnames@^2.2.6:
   version "2.2.6"
   resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.2.6.tgz#43935bffdd291f326dad0a205309b38d00f650ce"
   integrity sha512-JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q==
@@ -3015,6 +3103,15 @@ cli-width@^3.0.0:
   resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-3.0.0.tgz#a2f48437a2caa9a22436e794bf071ec9e61cedf6"
   integrity sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==
 
+cliui@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-4.1.0.tgz#348422dbe82d800b3022eef4f6ac10bf2e4d1b49"
+  integrity sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==
+  dependencies:
+    string-width "^2.1.1"
+    strip-ansi "^4.0.0"
+    wrap-ansi "^2.0.0"
+
 cliui@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz#deefcfdb2e800784aa34f46fa08e06851c7bbbc5"
@@ -3058,6 +3155,11 @@ coa@^2.0.2:
     chalk "^2.4.1"
     q "^1.1.2"
 
+code-point-at@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
+  integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
+
 collection-visit@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
@@ -3106,7 +3208,7 @@ color@^3.0.0:
     color-convert "^1.9.1"
     color-string "^1.5.2"
 
-colorette@^1.2.1:
+colorette@^1.2.0:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.1.tgz#4d0b921325c14faf92633086a536db6e89564b1b"
   integrity sha512-puCDz0CzydiSYOrnXpz/PKd69zRrribezjtE9yd4zvytoRc8+RY/KJPvtPFKZS3E3wP6neGyMe0vOTlHO5L3Pw==
@@ -3175,29 +3277,10 @@ compression@^1.7.4:
     safe-buffer "5.1.2"
     vary "~1.1.2"
 
-compute-gcd@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/compute-gcd/-/compute-gcd-1.2.0.tgz#fc1ede5b65001e950226502f46543863e4fea10e"
-  integrity sha1-/B7eW2UAHpUCJlAvRlQ4Y+T+oQ4=
-  dependencies:
-    validate.io-array "^1.0.3"
-    validate.io-function "^1.0.2"
-    validate.io-integer-array "^1.0.0"
-
-compute-lcm@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/compute-lcm/-/compute-lcm-1.1.0.tgz#abd96d040b41b0a166f89944b5c8b7c511e21ad5"
-  integrity sha1-q9ltBAtBsKFm+JlEtci3xRHiGtU=
-  dependencies:
-    compute-gcd "^1.2.0"
-    validate.io-array "^1.0.3"
-    validate.io-function "^1.0.2"
-    validate.io-integer-array "^1.0.0"
-
-compute-scroll-into-view@^1.0.16:
-  version "1.0.16"
-  resolved "https://registry.yarnpkg.com/compute-scroll-into-view/-/compute-scroll-into-view-1.0.16.tgz#5b7bf4f7127ea2c19b750353d7ce6776a90ee088"
-  integrity sha512-a85LHKY81oQnikatZYA90pufpZ6sQx++BoCxOEMsjpZx+ZnaKGQnCyCehTRr/1p9GBIAHTjcU9k71kSYWloLiQ==
+compute-scroll-into-view@^1.0.14:
+  version "1.0.14"
+  resolved "https://registry.yarnpkg.com/compute-scroll-into-view/-/compute-scroll-into-view-1.0.14.tgz#80e3ebb25d6aa89f42e533956cb4b16a04cfe759"
+  integrity sha512-mKDjINe3tc6hGelUMNDzuhorIUZ7kS7BwyY0r2wQd2HOH2tRuJykiC06iSEX8y1TuhNzvz4GcJnK16mM2J1NMQ==
 
 concat-map@0.0.1:
   version "0.0.1"
@@ -3310,7 +3393,7 @@ core-js-pure@^3.0.0:
   resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.6.5.tgz#c79e75f5e38dbc85a662d91eea52b8256d53b813"
   integrity sha512-lacdXOimsiD0QyNf9BC/mxivNJ/ybBGJXQFKzRekp1WTHoVUWsUHEn+2T8GJAzzIhyOuXA+gOxCVN3l+5PLPUA==
 
-core-js@^2.4.0, core-js@^2.5.7, core-js@^2.6.5:
+core-js@^2.4.0:
   version "2.6.11"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.11.tgz#38831469f9922bded8ee21c9dc46985e0399308c"
   integrity sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==
@@ -3346,24 +3429,13 @@ cosmiconfig@^6.0.0:
     path-type "^4.0.0"
     yaml "^1.7.2"
 
-cosmiconfig@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.0.tgz#ef9b44d773959cae63ddecd122de23853b60f8d3"
-  integrity sha512-pondGvTuVYDk++upghXJabWzL6Kxu6f26ljFw64Swq9v6sQPUL3EUlVDV56diOjpCayKihL6hVe8exIACU4XcA==
-  dependencies:
-    "@types/parse-json" "^4.0.0"
-    import-fresh "^3.2.1"
-    parse-json "^5.0.0"
-    path-type "^4.0.0"
-    yaml "^1.10.0"
-
 create-ecdh@^4.0.0:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.4.tgz#d6e7f4bffa66736085a0762fd3a632684dabcc4e"
-  integrity sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.3.tgz#c9111b6f33045c4697f144787f9254cdc77c45ff"
+  integrity sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==
   dependencies:
     bn.js "^4.1.0"
-    elliptic "^6.5.3"
+    elliptic "^6.0.0"
 
 create-hash@^1.1.0, create-hash@^1.1.2, create-hash@^1.2.0:
   version "1.2.0"
@@ -3538,7 +3610,12 @@ css-what@^3.2.1:
   resolved "https://registry.yarnpkg.com/css-what/-/css-what-3.3.0.tgz#10fec696a9ece2e591ac772d759aacabac38cd39"
   integrity sha512-pv9JPyatiPaQ6pf4OvD/dbfm0o5LviWmwxNWzblYf/1u9QZd0ihV+PMwy5jdQWQ3349kZmKEx9WXuSka2dM4cg==
 
-css@^2.0.0:
+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@^2.0.0, css@^2.2.3:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/css/-/css-2.2.4.tgz#c646755c73971f2bba6a601e2cf2fd71b1298929"
   integrity sha512-oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw==
@@ -3650,6 +3727,11 @@ cssstyle@^1.0.0, cssstyle@^1.1.1:
   dependencies:
     cssom "0.3.x"
 
+csstype@^2.2.0:
+  version "2.6.11"
+  resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.11.tgz#452f4d024149ecf260a852b025e36562a253ffc5"
+  integrity sha512-l8YyEC9NBkSm783PFTvh0FmJy7s5pFKrDp49ZL7zBGX3fWkO+N4EEyan1qqp8cwPLDcD0OSdyY6hAMoxp34JFw==
+
 cyclist@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.1.tgz#596e9698fd0c80e12038c2b82d6eb1b35b6224d9"
@@ -3684,16 +3766,6 @@ data-urls@^1.0.0, data-urls@^1.1.0:
     whatwg-mimetype "^2.2.0"
     whatwg-url "^7.0.0"
 
-date-fns@^2.15.0:
-  version "2.16.1"
-  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.16.1.tgz#05775792c3f3331da812af253e1a935851d3834b"
-  integrity sha512-sAJVKx/FqrLYHAQeN7VpJrPhagZc9R4ImZIWYRFZaaohR3KzmuK88touwsSwSVT8Qcbd4zoDsnGfX4GFB4imyQ==
-
-dayjs@^1.8.30:
-  version "1.8.35"
-  resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.8.35.tgz#67118378f15d31623f3ee2992f5244b887606888"
-  integrity sha512-isAbIEenO4ilm6f8cpqvgjZCsuerDAz2Kb7ri201AiNn58aqXuaLJEnCtfIMdCvERZHNGRY5lDMTr/jdAnKSWQ==
-
 debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.9:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
@@ -3897,6 +3969,16 @@ doctrine@^3.0.0:
   dependencies:
     esutils "^2.0.2"
 
+dom-accessibility-api@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/dom-accessibility-api/-/dom-accessibility-api-0.3.0.tgz#511e5993dd673b97c87ea47dba0e3892f7e0c983"
+  integrity sha512-PzwHEmsRP3IGY4gv/Ug+rMeaTIyTJvadCb+ujYXYeIylbHJezIyNToe8KfEgHTCEYyC+/bUghYOGg8yMGlZ6vA==
+
+dom-accessibility-api@^0.4.5:
+  version "0.4.5"
+  resolved "https://registry.yarnpkg.com/dom-accessibility-api/-/dom-accessibility-api-0.4.5.tgz#d9c1cefa89f509d8cf132ab5d250004d755e76e3"
+  integrity sha512-HcPDilI95nKztbVikaN2vzwvmv0sE8Y2ZJFODy/m15n7mGXLeOKGiys9qWVbFbh+aq/KYj2lqMLybBOkYAEXqg==
+
 dom-align@^1.7.0:
   version "1.12.0"
   resolved "https://registry.yarnpkg.com/dom-align/-/dom-align-1.12.0.tgz#56fb7156df0b91099830364d2d48f88963f5a29c"
@@ -3971,9 +4053,9 @@ dot-case@^3.0.3:
     tslib "^1.10.0"
 
 dot-prop@^5.2.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.3.0.tgz#90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88"
-  integrity sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.2.0.tgz#c34ecc29556dc45f1f4c22697b6f4904e0cc4fcb"
+  integrity sha512-uEUyaDKoSQ1M4Oq8l45hSE26SnTxL6snNnqvK/VWx5wJhmff5z0FUVJDKDanor/6w3kzE3i7XZOk+7wC0EXr1A==
   dependencies:
     is-obj "^2.0.0"
 
@@ -3988,9 +4070,9 @@ dotenv@8.2.0:
   integrity sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw==
 
 duplexer@^0.1.1:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6"
-  integrity sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
+  integrity sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=
 
 duplexify@^3.4.2, duplexify@^3.6.0:
   version "3.7.1"
@@ -4015,12 +4097,12 @@ ee-first@1.1.1:
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
   integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
 
-electron-to-chromium@^1.3.378, electron-to-chromium@^1.3.562:
-  version "1.3.562"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.562.tgz#79c20277ee1c8d0173a22af00e38433b752bc70f"
-  integrity sha512-WhRe6liQ2q/w1MZc8mD8INkenHivuHdrr4r5EQHNomy3NJux+incP6M6lDMd0paShP3MD0WGe5R1TWmEClf+Bg==
+electron-to-chromium@^1.3.378, electron-to-chromium@^1.3.488:
+  version "1.3.488"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.488.tgz#9226229f5fbc825959210e81e0bb3e63035d1c06"
+  integrity sha512-NReBdOugu1yl8ly+0VDtiQ6Yw/1sLjnvflWq0gvY1nfUXU2PbA+1XAVuEb7ModnwL/MfUPjby7e4pAFnSHiy6Q==
 
-elliptic@^6.5.3:
+elliptic@^6.0.0, elliptic@^6.5.2:
   version "6.5.3"
   resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.3.tgz#cb59eb2efdaf73a0bd78ccd7015a62ad6e0f93d6"
   integrity sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw==
@@ -4071,9 +4153,9 @@ end-of-stream@^1.0.0, end-of-stream@^1.1.0:
     once "^1.4.0"
 
 enhanced-resolve@^4.1.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.3.0.tgz#3b806f3bfafc1ec7de69551ef93cca46c1704126"
-  integrity sha512-3e87LvavsdxyoCfGusJnrZ5G8SLPOFeHSNpZI/ATL9a5leXo2k0w6MKnbqhdBad9qTobSfB20Ld7UmgoNbAZkQ==
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.2.0.tgz#5d43bda4a0fd447cb0ebbe71bef8deff8805ad0d"
+  integrity sha512-S7eiFb/erugyd1rLb6mQ3Vuq+EXHv5cpCkNqqIkYkBgN2QdFnyCZzFBleqwGEx4lgNGYij81BWnCrFNK7vxvjQ==
   dependencies:
     graceful-fs "^4.1.2"
     memory-fs "^0.5.0"
@@ -4120,24 +4202,6 @@ es-abstract@^1.17.0, es-abstract@^1.17.0-next.1, es-abstract@^1.17.2, es-abstrac
     string.prototype.trimend "^1.0.1"
     string.prototype.trimstart "^1.0.1"
 
-es-abstract@^1.18.0-next.0:
-  version "1.18.0-next.0"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.0-next.0.tgz#b302834927e624d8e5837ed48224291f2c66e6fc"
-  integrity sha512-elZXTZXKn51hUBdJjSZGYRujuzilgXo8vSPQzjGYXLvSlGiCo8VO8ZGV3kjo9a0WNJJ57hENagwbtlRuHuzkcQ==
-  dependencies:
-    es-to-primitive "^1.2.1"
-    function-bind "^1.1.1"
-    has "^1.0.3"
-    has-symbols "^1.0.1"
-    is-callable "^1.2.0"
-    is-negative-zero "^2.0.0"
-    is-regex "^1.1.1"
-    object-inspect "^1.8.0"
-    object-keys "^1.1.1"
-    object.assign "^4.1.0"
-    string.prototype.trimend "^1.0.1"
-    string.prototype.trimstart "^1.0.1"
-
 es-to-primitive@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a"
@@ -4173,10 +4237,10 @@ es6-symbol@^3.1.1, es6-symbol@~3.1.3:
     d "^1.0.1"
     ext "^1.1.2"
 
-escalade@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.0.2.tgz#6a580d70edb87880f22b4c91d0d56078df6962c4"
-  integrity sha512-gPYAU37hYCUhW5euPeR+Y74F7BL+IBsV93j5cvGriSaD1aG6MGsqsV1yamRdrWrb2j3aiZvb0X+UBOWpx3JWtQ==
+escalade@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.0.1.tgz#52568a77443f6927cd0ab9c73129137533c965ed"
+  integrity sha512-DR6NO3h9niOT+MZs7bjxlj2a1k+POu5RN8CLTPX2+i78bRi9eLe7+0zXgUHMnGXWybYcL61E9hGhPKqedy8tQA==
 
 escape-html@~1.0.3:
   version "1.0.3"
@@ -4402,21 +4466,21 @@ esquery@^1.0.1:
     estraverse "^5.1.0"
 
 esrecurse@^4.1.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921"
-  integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.1.tgz#007a3b9fdbc2b3bb87e4879ea19c92fdbd3942cf"
+  integrity sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==
   dependencies:
-    estraverse "^5.2.0"
+    estraverse "^4.1.0"
 
-estraverse@^4.1.1, estraverse@^4.2.0:
+estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
   integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
 
-estraverse@^5.1.0, estraverse@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz#307df42547e6cc7324d3cf03c155d5cdb8c53880"
-  integrity sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==
+estraverse@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.1.0.tgz#374309d39fd935ae500e7b92e8a6b4c720e59642"
+  integrity sha512-FyohXK+R0vE+y1nHLoBM7ZTyqRpqAlhdZHCWIWEviFLiGB8b04H6bQs8G+XTthacvT8VuwvteiP7RJSxMs8UEw==
 
 esutils@^2.0.2:
   version "2.0.3"
@@ -4429,14 +4493,14 @@ etag@~1.8.1:
   integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=
 
 eventemitter3@^4.0.0:
-  version "4.0.7"
-  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f"
-  integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.4.tgz#b5463ace635a083d018bdc7c917b4c5f10a85384"
+  integrity sha512-rlaVLnVxtxvoyLsQQFBx53YmXHDxRIzzTLbdfxqi4yocpSjAxXwkU0cScM5JgSKMqEhrZpnvQ2D9gjylR0AimQ==
 
 events@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/events/-/events-3.2.0.tgz#93b87c18f8efcd4202a461aec4dfc0556b639379"
-  integrity sha512-/46HWwbfCX2xTawVfkKLGxMifJYQBWMwY1mjywRtb4c9x8l5NP3KoJtnIOiL1hfdRkIuYhETxQlo62IF8tcnlg==
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/events/-/events-3.1.0.tgz#84279af1b34cb75aa88bf5ff291f6d0bd9b31a59"
+  integrity sha512-Rv+u8MLHNOdMjTAFeT3nCjHn2aGlx435FP/sDHNaRhDEMwyI/aB22Kj2qIN8R0cw3z28psEQLYwxVKLsKrMgWg==
 
 eventsource@^1.0.7:
   version "1.0.7"
@@ -4471,18 +4535,18 @@ execa@^1.0.0:
     signal-exit "^3.0.0"
     strip-eof "^1.0.0"
 
-execa@^4.0.0:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-4.0.3.tgz#0a34dabbad6d66100bd6f2c576c8669403f317f2"
-  integrity sha512-WFDXGHckXPWZX19t1kCsXzOpqX9LWYNqn4C+HqZlk/V0imTkzJZqf87ZBhvpHaftERYknpk0fjSylnXVlVgI0A==
+execa@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-2.1.0.tgz#e5d3ecd837d2a60ec50f3da78fd39767747bbe99"
+  integrity sha512-Y/URAVapfbYy2Xp/gb6A0E7iR8xeqOCXsuuaoMn7A5PzrXUK84E1gyiEfq0wQd/GHA6GsoHWwhNq8anb0mleIw==
   dependencies:
     cross-spawn "^7.0.0"
     get-stream "^5.0.0"
-    human-signals "^1.1.1"
     is-stream "^2.0.0"
     merge-stream "^2.0.0"
-    npm-run-path "^4.0.0"
+    npm-run-path "^3.0.0"
     onetime "^5.1.0"
+    p-finally "^2.0.0"
     signal-exit "^3.0.2"
     strip-final-newline "^2.0.0"
 
@@ -4767,7 +4831,7 @@ find-cache-dir@^2.1.0:
     make-dir "^2.0.0"
     pkg-dir "^3.0.0"
 
-find-cache-dir@^3.3.1:
+find-cache-dir@^3.2.0:
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.1.tgz#89b33fad4a4670daa94f855f7fbe31d6d84fe880"
   integrity sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==
@@ -4841,9 +4905,9 @@ flush-write-stream@^1.0.0:
     readable-stream "^2.3.6"
 
 follow-redirects@^1.0.0:
-  version "1.13.0"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.0.tgz#b42e8d93a2a7eea5ed88633676d6597bc8e384db"
-  integrity sha512-aq6gF1BEKje4a9i9+5jimNFIpq4Q1WiwBToeRK5NvZBd/TRsmW8BsJfOEGkr76TbOyPVD3OVDN910EcUNtRYEA==
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.12.1.tgz#de54a6205311b93d60398ebc01cf7015682312b6"
+  integrity sha512-tmRv0AVuR7ZyouUHLeNSiO6pqulF7dYa3s19c6t+wz9LD69/uSzdMxJ2S91nTI9U3rt/IldxpzMOFejp6f0hjg==
 
 for-in@^0.1.3:
   version "0.1.8"
@@ -4997,6 +5061,11 @@ gensync@^1.0.0-beta.1:
   resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.1.tgz#58f4361ff987e5ff6e1e7a210827aa371eaac269"
   integrity sha512-r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg==
 
+get-caller-file@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"
+  integrity sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==
+
 get-caller-file@^2.0.1:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
@@ -5015,9 +5084,9 @@ get-stream@^4.0.0:
     pump "^3.0.0"
 
 get-stream@^5.0.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3"
-  integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.1.0.tgz#01203cdc92597f9b909067c3e656cc1f4d3c4dc9"
+  integrity sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw==
   dependencies:
     pump "^3.0.0"
 
@@ -5033,16 +5102,15 @@ getpass@^0.1.1:
   dependencies:
     assert-plus "^1.0.0"
 
-gh-pages@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/gh-pages/-/gh-pages-3.1.0.tgz#ec3ed0f6a6e3fc3d888758fa018f08191c96bd55"
-  integrity sha512-3b1rly9kuf3/dXsT8+ZxP0UhNLOo1CItj+3e31yUVcaph/yDsJ9RzD7JOw5o5zpBTJVQLlJAASNkUfepi9fe2w==
+gh-pages@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/gh-pages/-/gh-pages-2.2.0.tgz#74ebeaca8d2b9a11279dcbd4a39ddfff3e6caa24"
+  integrity sha512-c+yPkNOPMFGNisYg9r4qvsMIjVYikJv7ImFOhPIVPt0+AcRUamZ7zkGRLHz7FKB0xrlZ+ddSOJsZv9XAFVXLmA==
   dependencies:
     async "^2.6.1"
     commander "^2.18.0"
     email-addresses "^3.0.1"
     filenamify-url "^1.0.0"
-    find-cache-dir "^3.3.1"
     fs-extra "^8.1.0"
     globby "^6.1.0"
 
@@ -5159,11 +5227,11 @@ har-schema@^2.0.0:
   integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=
 
 har-validator@~5.1.3:
-  version "5.1.5"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz#1f0803b9f8cb20c0fa13822df1ecddb36bde1efd"
-  integrity sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==
+  version "5.1.3"
+  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz#1ef89ebd3e4996557675eed9893110dc350fa080"
+  integrity sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==
   dependencies:
-    ajv "^6.12.3"
+    ajv "^6.5.5"
     har-schema "^2.0.0"
 
 harmony-reflect@^1.4.6:
@@ -5267,7 +5335,7 @@ hmac-drbg@^1.0.0:
     minimalistic-assert "^1.0.0"
     minimalistic-crypto-utils "^1.0.1"
 
-hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.2:
+hoist-non-react-statics@^3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45"
   integrity sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==
@@ -5311,7 +5379,7 @@ html-encoding-sniffer@^1.0.2:
   dependencies:
     whatwg-encoding "^1.0.1"
 
-html-entities@^1.3.1:
+html-entities@^1.2.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.3.1.tgz#fb9a1a4b5b14c5daba82d3e34c6ae4fe701a0e44"
   integrity sha512-rhE/4Z3hIhzHAUKbW8jVcCyuT5oJCXXqhN/6mXXVCpzTmvJnoH2HL/bt3EZ6p55jbFJBeAe1ZNpL5BugLujxNA==
@@ -5433,11 +5501,6 @@ https-browserify@^1.0.0:
   resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
   integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=
 
-human-signals@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3"
-  integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==
-
 humanize-url@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/humanize-url/-/humanize-url-1.0.1.tgz#f4ab99e0d288174ca4e1e50407c55fbae464efff"
@@ -5446,15 +5509,15 @@ humanize-url@^1.0.0:
     normalize-url "^1.0.0"
     strip-url-auth "^1.0.0"
 
-husky@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/husky/-/husky-4.3.0.tgz#0b2ec1d66424e9219d359e26a51c58ec5278f0de"
-  integrity sha512-tTMeLCLqSBqnflBZnlVDhpaIMucSGaYyX6855jM4AguGeWCeSzNdb1mfyWduTZ3pe3SJVvVWGL0jO1iKZVPfTA==
+husky@^4.2.5:
+  version "4.2.5"
+  resolved "https://registry.yarnpkg.com/husky/-/husky-4.2.5.tgz#2b4f7622673a71579f901d9885ed448394b5fa36"
+  integrity sha512-SYZ95AjKcX7goYVZtVZF2i6XiZcHknw50iXvY7b0MiGoj5RwdgRQNEHdb+gPDPCXKlzwrybjFjkL6FOj8uRhZQ==
   dependencies:
     chalk "^4.0.0"
     ci-info "^2.0.0"
     compare-versions "^3.6.0"
-    cosmiconfig "^7.0.0"
+    cosmiconfig "^6.0.0"
     find-versions "^3.2.0"
     opencollective-postinstall "^2.0.2"
     pkg-dir "^4.2.0"
@@ -5528,7 +5591,7 @@ import-fresh@^2.0.0:
     caller-path "^2.0.0"
     resolve-from "^3.0.0"
 
-import-fresh@^3.0.0, import-fresh@^3.1.0, import-fresh@^3.2.1:
+import-fresh@^3.0.0, import-fresh@^3.1.0:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.1.tgz#633ff618506e793af5ac91bf48b72677e15cbe66"
   integrity sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==
@@ -5619,9 +5682,9 @@ inquirer@7.0.4:
     through "^2.3.6"
 
 inquirer@^7.0.0:
-  version "7.3.3"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.3.3.tgz#04d176b2af04afc157a83fd7c100e98ee0aad003"
-  integrity sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==
+  version "7.3.0"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.3.0.tgz#aa3e7cb0c18a410c3c16cdd2bc9dcbe83c4d333e"
+  integrity sha512-K+LZp6L/6eE5swqIcVXrxl21aGDU4S50gKH0/d96OMQnSBCyGyZl/oZhbkVmdp5sBoINHd4xZvFSARh2dk6DWA==
   dependencies:
     ansi-escapes "^4.2.1"
     chalk "^4.1.0"
@@ -5629,7 +5692,7 @@ inquirer@^7.0.0:
     cli-width "^3.0.0"
     external-editor "^3.0.3"
     figures "^3.0.0"
-    lodash "^4.17.19"
+    lodash "^4.17.15"
     mute-stream "0.0.8"
     run-async "^2.4.0"
     rxjs "^6.6.0"
@@ -5666,6 +5729,11 @@ invariant@^2.2.2, invariant@^2.2.4:
   dependencies:
     loose-envify "^1.0.0"
 
+invert-kv@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-2.0.0.tgz#7393f5afa59ec9ff5f67a27620d11c226e3eec02"
+  integrity sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==
+
 ip-regex@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"
@@ -5806,9 +5874,9 @@ is-directory@^0.3.1:
   integrity sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=
 
 is-docker@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.1.1.tgz#4125a88e44e450d384e09047ede71adc2d144156"
-  integrity sha512-ZOoqiXfEwtGknTiuDEy8pN2CfE3TxMHprvNer1mXiqwkOT77Rw3YVrUQ52EqAOU3QAWDQ+bQdx7HJzrv7LS2Hw==
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.0.0.tgz#2cb0df0e75e2d064fe1864c37cdeacb7b2dcf25b"
+  integrity sha512-pJEdRugimx4fBMra5z2/5iRdZ63OhYV0vr0Dwm5+xtW4D1FvRkB8hamMIhnWfyJeDdyr/aa7BDyNbtG38VxgoQ==
 
 is-extendable@^0.1.0, is-extendable@^0.1.1:
   version "0.1.1"
@@ -5827,6 +5895,13 @@ is-extglob@^2.1.0, is-extglob@^2.1.1:
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
   integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
 
+is-fullwidth-code-point@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
+  integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs=
+  dependencies:
+    number-is-nan "^1.0.0"
+
 is-fullwidth-code-point@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
@@ -5856,11 +5931,6 @@ is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1:
   dependencies:
     is-extglob "^2.1.1"
 
-is-negative-zero@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.0.tgz#9553b121b0fac28869da9ed459e20c7543788461"
-  integrity sha1-lVOxIbD6wohp2p7UWeIMdUN4hGE=
-
 is-number@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
@@ -5914,10 +5984,10 @@ is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   dependencies:
     isobject "^3.0.1"
 
-is-regex@^1.0.4, is-regex@^1.1.0, is-regex@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.1.tgz#c6f98aacc546f6cec5468a07b7b153ab564a57b9"
-  integrity sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==
+is-regex@^1.0.4, is-regex@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.0.tgz#ece38e389e490df0dc21caea2bd596f987f767ff"
+  integrity sha512-iI97M8KTWID2la5uYXlkbSDQIg4F6o1sYboZKKTDpnDQMLtUL86zxhgDet3Q2SriaYsyGqZ6Mn2SjbRKeLHdqw==
   dependencies:
     has-symbols "^1.0.1"
 
@@ -6110,7 +6180,7 @@ jest-config@^24.9.0:
     pretty-format "^24.9.0"
     realpath-native "^1.1.0"
 
-jest-diff@^24.9.0:
+jest-diff@^24.0.0, jest-diff@^24.3.0, jest-diff@^24.9.0:
   version "24.9.0"
   resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-24.9.0.tgz#931b7d0d5778a1baf7452cb816e325e3724055da"
   integrity sha512-qMfrTs8AdJE2iqrTp0hzh7kTd2PQWrsFyj9tORoKmu32xjPjeE4NyjVRDz8ybYwqS2ik8N4hsIpiVTyFeo2lBQ==
@@ -6227,7 +6297,7 @@ jest-leak-detector@^24.9.0:
     jest-get-type "^24.9.0"
     pretty-format "^24.9.0"
 
-jest-matcher-utils@^24.9.0:
+jest-matcher-utils@^24.0.0, jest-matcher-utils@^24.9.0:
   version "24.9.0"
   resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-24.9.0.tgz#f5b3661d5e628dffe6dd65251dfdae0e87c3a073"
   integrity sha512-OZz2IXsu6eaiMAwe67c1T+5tUAtQyQx27/EMEkbFAGiw52tB9em+uGbzpcgYVpA8wl0hlxKPZxrly4CXU/GjHA==
@@ -6430,7 +6500,7 @@ jest-worker@^24.6.0, jest-worker@^24.9.0:
     merge-stream "^2.0.0"
     supports-color "^6.1.0"
 
-jest-worker@^25.4.0:
+jest-worker@^25.1.0:
   version "25.5.0"
   resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-25.5.0.tgz#2611d071b79cea0f43ee57a3d118593ac1547db1"
   integrity sha512-/dsSmUkIy5EBGfv/IjjqmFxrNAUpBERfGs1oHROyD7yxjG/w+t0GOJDX8O1k32ySmd7+a5IhnJU2qQFcJ4n1vw==
@@ -6548,27 +6618,6 @@ json-parse-better-errors@^1.0.1, json-parse-better-errors@^1.0.2:
   resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
   integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==
 
-json-parse-even-better-errors@^2.3.0:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d"
-  integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==
-
-json-schema-compare@^0.2.2:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/json-schema-compare/-/json-schema-compare-0.2.2.tgz#dd601508335a90c7f4cfadb6b2e397225c908e56"
-  integrity sha512-c4WYmDKyJXhs7WWvAWm3uIYnfyWFoIp+JEoX34rctVvEkMYCPGhXtvmFFXiffBbxfZsvQ0RNnV5H7GvDF5HCqQ==
-  dependencies:
-    lodash "^4.17.4"
-
-json-schema-merge-allof@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/json-schema-merge-allof/-/json-schema-merge-allof-0.6.0.tgz#64d48820fec26b228db837475ce3338936bf59a5"
-  integrity sha512-LEw4VMQVRceOPLuGRWcxW5orTTiR9ZAtqTAe4rQUjNADTeR81bezBVFa0MqIwp0YmHIM1KkhSjZM7o+IQhaPbQ==
-  dependencies:
-    compute-lcm "^1.1.0"
-    json-schema-compare "^0.2.2"
-    lodash "^4.17.4"
-
 json-schema-traverse@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
@@ -6634,11 +6683,6 @@ jsonify@~0.0.0:
   resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
   integrity sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=
 
-jsonpointer@^4.0.1:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.1.0.tgz#501fb89986a2389765ba09e6053299ceb4f2c2cc"
-  integrity sha512-CXcRvMyTlnR53xMcKnuMzfCA5i/nfblTnnr74CZb6C4vG39eu6w51t7nKmU5MfLfbTgGItliNyjO/ciNPDqClg==
-
 jsprim@^1.2.2:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
@@ -6716,6 +6760,13 @@ lazy-cache@^1.0.3:
   resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"
   integrity sha1-odePw6UEdMuAhF07O24dpJpEbo4=
 
+lcid@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/lcid/-/lcid-2.0.0.tgz#6ef5d2df60e52f82eb228a4c373e8d1f397253cf"
+  integrity sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==
+  dependencies:
+    invert-kv "^2.0.0"
+
 left-pad@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/left-pad/-/left-pad-1.3.0.tgz#5b8a3a7765dfe001261dde915589e782f8c94d1e"
@@ -6855,15 +6906,15 @@ lodash.uniq@^4.5.0:
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
   integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
 
-"lodash@>=3.5 <5", lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.4, lodash@^4.17.5:
-  version "4.17.20"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52"
-  integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==
+"lodash@>=3.5 <5", lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.5:
+  version "4.17.15"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
+  integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
 
-loglevel@^1.6.8:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.7.0.tgz#728166855a740d59d38db01cf46f042caa041bb0"
-  integrity sha512-i2sY04nal5jDcagM3FMfG++T69GEEM8CYuOfeOIvmXzOIcwE9a/CJPR0MFM97pYMj/u10lzz7/zd7+qwhrBTqQ==
+loglevel@^1.6.6:
+  version "1.6.8"
+  resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.8.tgz#8a25fb75d092230ecd4457270d80b54e28011171"
+  integrity sha512-bsU7+gc9AJ2SqpzxwU3+1fedl8zAntbtC5XYlt3s2j1hJcn2PsXSmgN8TaLG/J1/2mod4+cE/3vNL70/c1RNCA==
 
 loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.4.0:
   version "1.4.0"
@@ -6913,6 +6964,13 @@ mamacro@^0.0.3:
   resolved "https://registry.yarnpkg.com/mamacro/-/mamacro-0.0.3.tgz#ad2c9576197c9f1abf308d0787865bd975a3f3e4"
   integrity sha512-qMEwh+UujcQ+kbz3T6V+wAmO2U8veoq2w+3wY8MquqwVA3jChfwY+Tk52GZKDfACEPjuZ7r2oJLejwpt8jtwTA==
 
+map-age-cleaner@^0.1.1:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz#7d583a7306434c055fe474b0f45078e6e1b4b92a"
+  integrity sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==
+  dependencies:
+    p-defer "^1.0.0"
+
 map-cache@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
@@ -6949,6 +7007,15 @@ media-typer@0.3.0:
   resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
   integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=
 
+mem@^4.0.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/mem/-/mem-4.3.0.tgz#461af497bc4ae09608cdb2e60eefb69bff744178"
+  integrity sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==
+  dependencies:
+    map-age-cleaner "^0.1.1"
+    mimic-fn "^2.0.0"
+    p-is-promise "^2.0.0"
+
 memory-fs@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552"
@@ -7048,11 +7115,16 @@ mime@^2.4.4:
   resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.6.tgz#e5b407c90db442f2beb5b162373d07b69affa4d1"
   integrity sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA==
 
-mimic-fn@^2.1.0:
+mimic-fn@^2.0.0, mimic-fn@^2.1.0:
   version "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-css-extract-plugin@0.9.0:
   version "0.9.0"
   resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.9.0.tgz#47f2cf07aa165ab35733b1fc97d4c46c0564339e"
@@ -7064,9 +7136,9 @@ mini-css-extract-plugin@0.9.0:
     webpack-sources "^1.1.0"
 
 mini-store@^3.0.1:
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/mini-store/-/mini-store-3.0.6.tgz#44b86be5b2877271224ce0689b3a35a2dffb1ca9"
-  integrity sha512-YzffKHbYsMQGUWQRKdsearR79QsMzzJcDDmZKlJBqt5JNkqpyJHYlK6gP61O36X+sLf76sO9G6mhKBe83gIZIQ==
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/mini-store/-/mini-store-3.0.5.tgz#1b3808ee5e8173ecdcbf43b029137e9a72bb9fb8"
+  integrity sha512-A7f0+d7TEvjJNY2K+splh2OG3AhmoPoiF3VntlAcJuBzryMumOF9LAVzg8mRJPPbCkz7mlWQg9MCMQPR2auftA==
   dependencies:
     hoist-non-react-statics "^3.3.2"
     shallowequal "^1.0.2"
@@ -7108,9 +7180,9 @@ minipass-flush@^1.0.5:
     minipass "^3.0.0"
 
 minipass-pipeline@^1.2.2:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz#68472f79711c084657c067c5c6ad93cddea8214c"
-  integrity sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.3.tgz#55f7839307d74859d6e8ada9c3ebe72cec216a34"
+  integrity sha512-cFOknTvng5vqnwOpDsZTWhNll6Jf8o2x+/diplafmxpuIymAjzoOolZG0VvQf3V2HgqzJNhnuKHYp2BqDgz8IQ==
   dependencies:
     minipass "^3.0.0"
 
@@ -7153,7 +7225,7 @@ mixin-object@^2.0.1:
     for-in "^0.1.3"
     is-extendable "^0.1.1"
 
-mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.5, mkdirp@~0.5.1:
+mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@~0.5.1:
   version "0.5.5"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
   integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==
@@ -7177,10 +7249,10 @@ move-concurrently@^1.0.1:
     rimraf "^2.5.4"
     run-queue "^1.0.3"
 
-mri@^1.1.5:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/mri/-/mri-1.1.6.tgz#49952e1044db21dbf90f6cd92bc9c9a777d415a6"
-  integrity sha512-oi1b3MfbyGa7FJMP9GmLTttni5JoICpYBRlq+x5V16fZbLsnL9N3wFqqIm/nIG43FjUFkFh9Epzp/kzUGUnJxQ==
+mri@^1.1.4:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/mri/-/mri-1.1.5.tgz#ce21dba2c69f74a9b7cf8a1ec62307e089e223e0"
+  integrity sha512-d2RKzMD4JNyHMbnbWnznPaa8vbdlq/4pNZ3IgdaGrVbBhebBsGUUE/6qorTMYNS6TwuH3ilfOlD2bf4Igh8CKg==
 
 ms@2.0.0:
   version "2.0.0"
@@ -7231,11 +7303,6 @@ nan@^2.12.1:
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.1.tgz#d7be34dfa3105b91494c3147089315eff8874b01"
   integrity sha512-isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw==
 
-nanoid@^2.1.0:
-  version "2.1.11"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-2.1.11.tgz#ec24b8a758d591561531b4176a01e3ab4f0f0280"
-  integrity sha512-s/snB+WGm6uwi0WjsZdaVcuf3KJXlfGl2LcxgwkEwJF0D/BWzVWAZW/XY4bFaiR7s0Jk3FPvlnepg1H1b1UwlA==
-
 nanomatch@^1.2.9:
   version "1.2.13"
   resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
@@ -7264,9 +7331,9 @@ negotiator@0.6.2:
   integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==
 
 neo-async@^2.5.0, neo-async@^2.6.1:
-  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
-  integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.1.tgz#ac27ada66167fa8849a6addd837f6b189ad2081c"
+  integrity sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==
 
 next-tick@~1.0.0:
   version "1.0.0"
@@ -7341,10 +7408,10 @@ node-notifier@^5.4.2:
     shellwords "^0.1.1"
     which "^1.3.0"
 
-node-releases@^1.1.52, node-releases@^1.1.60:
-  version "1.1.60"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.60.tgz#6948bdfce8286f0b5d0e5a88e8384e954dfe7084"
-  integrity sha512-gsO4vjEdQaTusZAEebUWp2a5d7dF5DYoIpDG7WySnk7BuZDW+GPpHXoXXuYawRBr/9t5q54tirPz79kFIWg4dA==
+node-releases@^1.1.52, node-releases@^1.1.58:
+  version "1.1.58"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.58.tgz#8ee20eef30fa60e52755fcc0942def5a734fe935"
+  integrity sha512-NxBudgVKiRh/2aPWMgPR7bPTX0VPmGx5QBwCtdHitnqFE5/O8DeBXuIMH1nwNnw/aMo6AjOrpsHzfY3UbUJ7yg==
 
 normalize-package-data@^2.3.2:
   version "2.5.0"
@@ -7395,10 +7462,10 @@ npm-run-path@^2.0.0:
   dependencies:
     path-key "^2.0.0"
 
-npm-run-path@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea"
-  integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==
+npm-run-path@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-3.1.0.tgz#7f91be317f6a466efed3c9f2980ad8a4ee8b0fa5"
+  integrity sha512-Dbl4A/VfiVGLgQv29URL9xshU8XDY1GeLy+fsaZ1AA8JDSfjvr5P5+pzRbWqRSBxk6/DW7MIh8lTM/PaGnP2kg==
   dependencies:
     path-key "^3.0.0"
 
@@ -7414,6 +7481,11 @@ num2fraction@^1.2.2:
   resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede"
   integrity sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=
 
+number-is-nan@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
+  integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=
+
 nwsapi@^2.0.7, nwsapi@^2.1.3:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz#204879a9e3d068ff2a55139c2c772780681a38b7"
@@ -7443,7 +7515,7 @@ object-hash@^2.0.1:
   resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-2.0.3.tgz#d12db044e03cd2ca3d77c0570d87225b02e1e6ea"
   integrity sha512-JPKn0GMu+Fa3zt3Bmr66JhokJU5BaNBIh4ZeTlaCBzrBsOeXzwcKKAK1tbLiPKgvwmPXsDvvLHoWh5Bm7ofIYg==
 
-object-inspect@^1.7.0, object-inspect@^1.8.0:
+object-inspect@^1.7.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.8.0.tgz#df807e5ecf53a609cc6bfe93eac3cc7be5b3a9d0"
   integrity sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA==
@@ -7532,10 +7604,12 @@ obuf@^1.0.0, obuf@^1.1.2:
   resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e"
   integrity sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==
 
-omit.js@^2.0.0, omit.js@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/omit.js/-/omit.js-2.0.2.tgz#dd9b8436fab947a5f3ff214cb2538631e313ec2f"
-  integrity sha512-hJmu9D+bNB40YpL9jYebQl4lsTW6yEHRTroJzNLqQJYHm7c+NQnJGfZmIWh8S3q3KoaxV1aLhV6B3+0N0/kyJg==
+omit.js@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/omit.js/-/omit.js-1.0.2.tgz#91a14f0eba84066dfa015bf30e474c47f30bc858"
+  integrity sha512-/QPc6G2NS+8d4L/cQhbk6Yit1WTB6Us2g84A7A/1+w9d/eRGHyEqC5kkQtHVoHZ5NFWGG7tUGgrhVZwgZanKrQ==
+  dependencies:
+    babel-runtime "^6.23.0"
 
 on-finished@~2.3.0:
   version "2.3.0"
@@ -7557,16 +7631,16 @@ once@^1.3.0, once@^1.3.1, once@^1.4.0:
     wrappy "1"
 
 onetime@^5.1.0:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e"
-  integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.0.tgz#fff0f3c91617fe62bb50189636e99ac8a6df7be5"
+  integrity sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==
   dependencies:
     mimic-fn "^2.1.0"
 
 open@^7.0.2:
-  version "7.2.1"
-  resolved "https://registry.yarnpkg.com/open/-/open-7.2.1.tgz#07b0ade11a43f2a8ce718480bdf3d7563a095195"
-  integrity sha512-xbYCJib4spUdmcs0g/2mK1nKo/jO2T7INClWd/beL7PFkXRWgr8B23ssDHX/USPn2M2IjDR5UdpYs6I67SnTSA==
+  version "7.0.4"
+  resolved "https://registry.yarnpkg.com/open/-/open-7.0.4.tgz#c28a9d315e5c98340bf979fdcb2e58664aa10d83"
+  integrity sha512-brSA+/yq+b08Hsr4c8fsEW2CRzk1BmfN3SAK/5VCHQ9bdoZJ4qa/+AfR0xHjlbbZUyPkUHs1b8x1RqdyZdkVqQ==
   dependencies:
     is-docker "^2.0.0"
     is-wsl "^2.1.1"
@@ -7615,11 +7689,25 @@ os-browserify@^0.3.0:
   resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27"
   integrity sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=
 
+os-locale@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.1.0.tgz#a802a6ee17f24c10483ab9935719cef4ed16bf1a"
+  integrity sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==
+  dependencies:
+    execa "^1.0.0"
+    lcid "^2.0.0"
+    mem "^4.0.0"
+
 os-tmpdir@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
   integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
 
+p-defer@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"
+  integrity sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=
+
 p-each-series@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-each-series/-/p-each-series-1.0.0.tgz#930f3d12dd1f50e7434457a22cd6f04ac6ad7f71"
@@ -7632,6 +7720,16 @@ p-finally@^1.0.0:
   resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
   integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=
 
+p-finally@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-2.0.1.tgz#bd6fcaa9c559a096b680806f4d657b3f0f240561"
+  integrity sha512-vpm09aKwq6H9phqRQzecoDpD8TmVyGw70qmWlyq5onxY7tqyTTFVvxMykxQSQKILBSFlbXpypIw2T1Ml7+DDtw==
+
+p-is-promise@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-2.1.0.tgz#918cebaea248a62cf7ffab8e3bca8c5f882fc42e"
+  integrity sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==
+
 p-limit@^1.1.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"
@@ -7639,7 +7737,7 @@ p-limit@^1.1.0:
   dependencies:
     p-try "^1.0.0"
 
-p-limit@^2.0.0, p-limit@^2.2.0, p-limit@^2.3.0:
+p-limit@^2.0.0, p-limit@^2.2.0, p-limit@^2.2.2:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
   integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==
@@ -7731,12 +7829,13 @@ parent-module@^1.0.0:
     callsites "^3.0.0"
 
 parse-asn1@^5.0.0, parse-asn1@^5.1.5:
-  version "5.1.6"
-  resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.6.tgz#385080a3ec13cb62a62d39409cb3e88844cdaed4"
-  integrity sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==
+  version "5.1.5"
+  resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.5.tgz#003271343da58dc94cace494faef3d2147ecea0e"
+  integrity sha512-jkMYn1dcJqF6d5CpU689bq7w/b5ALS9ROVSpQDPrZsqqesUJii9qutvoT5ltGedNXMO2e16YUWIghG9KxaViTQ==
   dependencies:
-    asn1.js "^5.2.0"
+    asn1.js "^4.0.0"
     browserify-aes "^1.0.0"
+    create-hash "^1.1.0"
     evp_bytestokey "^1.0.0"
     pbkdf2 "^3.0.3"
     safe-buffer "^5.1.1"
@@ -7757,13 +7856,13 @@ parse-json@^4.0.0:
     json-parse-better-errors "^1.0.1"
 
 parse-json@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.1.0.tgz#f96088cdf24a8faa9aea9a009f2d9d942c999646"
-  integrity sha512-+mi/lmVVNKFNVyLXV31ERiy2CY5E1/F6QtJFEzoChPRwwngMNXRDQ9GJ5WdE2Z2P4AujsOi0/+2qHID68KwfIQ==
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.0.0.tgz#73e5114c986d143efa3712d4ea24db9a4266f60f"
+  integrity sha512-OOY5b7PAEFV0E2Fir1KOkxchnZNCdowAJgQ5NuxjpBKTRP3pQhwkrkxqQjeoKJ+fO7bCpmIZaogI4eZGDMEGOw==
   dependencies:
     "@babel/code-frame" "^7.0.0"
     error-ex "^1.3.1"
-    json-parse-even-better-errors "^2.3.0"
+    json-parse-better-errors "^1.0.1"
     lines-and-columns "^1.1.6"
 
 parse5@4.0.0:
@@ -7979,14 +8078,14 @@ pnp-webpack-plugin@1.6.4:
   dependencies:
     ts-pnp "^1.1.6"
 
-portfinder@^1.0.26:
-  version "1.0.28"
-  resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.28.tgz#67c4622852bd5374dd1dd900f779f53462fac778"
-  integrity sha512-Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA==
+portfinder@^1.0.25:
+  version "1.0.26"
+  resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.26.tgz#475658d56ca30bed72ac7f1378ed350bd1b64e70"
+  integrity sha512-Xi7mKxJHHMI3rIUrnm/jjUgwhbYMkp/XKEcZX3aG4BrumLpq3nmoQMX+ClYnDZnZ/New7IatC1no5RX0zo1vXQ==
   dependencies:
     async "^2.6.2"
     debug "^3.1.1"
-    mkdirp "^0.5.5"
+    mkdirp "^0.5.1"
 
 posix-character-classes@^0.1.0:
   version "0.1.1"
@@ -8009,9 +8108,9 @@ postcss-browser-comments@^3.0.0:
     postcss "^7"
 
 postcss-calc@^7.0.1:
-  version "7.0.4"
-  resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-7.0.4.tgz#5e177ddb417341e6d4a193c5d9fd8ada79094f8b"
-  integrity sha512-0I79VRAd1UTkaHzY9w83P39YGO/M3bG7/tNLrHGEunBolfoGM0hSjrGvjoeaj0JE/zIw5GsI2KZ0UwDJqv5hjw==
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-7.0.2.tgz#504efcd008ca0273120568b0792b16cdcde8aac1"
+  integrity sha512-rofZFHUg6ZIrvRwPeFktv06GdbDYLcGqh9EwiMutZg+a0oePCCw1zHOEiji6LCpyRcjTREtPASuUqeAvYlEVvQ==
   dependencies:
     postcss "^7.0.27"
     postcss-selector-parser "^6.0.2"
@@ -8315,14 +8414,14 @@ postcss-modules-extract-imports@^2.0.0:
     postcss "^7.0.5"
 
 postcss-modules-local-by-default@^3.0.2:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.3.tgz#bb14e0cc78279d504dbdcbfd7e0ca28993ffbbb0"
-  integrity sha512-e3xDq+LotiGesympRlKNgaJ0PCzoUIdpH0dj47iWAui/kyTgh3CiAr1qP54uodmJhl6p9rN6BoNcdEDVJx9RDw==
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.2.tgz#e8a6561be914aaf3c052876377524ca90dbb7915"
+  integrity sha512-jM/V8eqM4oJ/22j0gx4jrp63GSvDH6v86OqyTHHUvk4/k1vceipZsaymiZ5PvocqZOl5SFHiFJqjs3la0wnfIQ==
   dependencies:
     icss-utils "^4.1.1"
-    postcss "^7.0.32"
+    postcss "^7.0.16"
     postcss-selector-parser "^6.0.2"
-    postcss-value-parser "^4.1.0"
+    postcss-value-parser "^4.0.0"
 
 postcss-modules-scope@^2.1.1:
   version "2.2.0"
@@ -8622,7 +8721,7 @@ postcss-value-parser@^3.0.0:
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281"
   integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==
 
-postcss-value-parser@^4.0.2, postcss-value-parser@^4.1.0:
+postcss-value-parser@^4.0.0, postcss-value-parser@^4.0.2, postcss-value-parser@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz#443f6a20ced6481a2bda4fa8532a6e55d789a2cb"
   integrity sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==
@@ -8645,7 +8744,7 @@ postcss@7.0.21:
     source-map "^0.6.1"
     supports-color "^6.1.0"
 
-postcss@^7, postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.17, postcss@^7.0.2, postcss@^7.0.23, postcss@^7.0.27, postcss@^7.0.32, postcss@^7.0.5, postcss@^7.0.6:
+postcss@^7, postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.16, postcss@^7.0.17, postcss@^7.0.2, postcss@^7.0.23, postcss@^7.0.27, postcss@^7.0.32, postcss@^7.0.5, postcss@^7.0.6:
   version "7.0.32"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.32.tgz#4310d6ee347053da3433db2be492883d62cec59d"
   integrity sha512-03eXong5NLnNCD05xscnGKGDZ98CyzoqPSMjOe6SuoQY7Z2hIj0Ld1g/O/UQRuOle2aRtiIRDg9tDcTGAkLfKw==
@@ -8664,15 +8763,15 @@ prepend-http@^1.0.0:
   resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"
   integrity sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=
 
-prettier@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.1.1.tgz#d9485dd5e499daa6cb547023b87a6cf51bee37d6"
-  integrity sha512-9bY+5ZWCfqj3ghYBLxApy2zf6m+NJo5GzmLTpr9FsApsfjriNnS2dahWReHMi7qNPhhHl9SYHJs2cHZLgexNIw==
+prettier@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.0.5.tgz#d6d56282455243f2f92cc1716692c08aa31522d4"
+  integrity sha512-7PtVymN48hGcO4fGjybyBSIWDsLU4H4XlvOHfq91pz9kkGlonzwTfYkaIEwiRg/dAJF9YlbsduBAgtYLi+8cFg==
 
 pretty-bytes@^5.1.0:
-  version "5.4.1"
-  resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.4.1.tgz#cd89f79bbcef21e3d21eb0da68ffe93f803e884b"
-  integrity sha512-s1Iam6Gwz3JI5Hweaz4GoCD1WUNUIyzePFy5+Js2hjwGVt2Z79wNN+ZKOZ2vB6C+Xs6njyB84Z1IthQg8d9LxA==
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.3.0.tgz#f2849e27db79fb4d6cfe24764fc4134f165989f2"
+  integrity sha512-hjGrh+P926p4R4WbaB6OckyRtO0F0/lQBiT+0gnxjV+5kjPBrfVBFCsCLbMqVQeydvIoouYTCmmEURiH3R1Bdg==
 
 pretty-error@^2.1.1:
   version "2.1.1"
@@ -8682,7 +8781,7 @@ pretty-error@^2.1.1:
     renderkid "^2.0.1"
     utila "~0.4"
 
-pretty-format@^24.9.0:
+pretty-format@^24.0.0, pretty-format@^24.3.0, pretty-format@^24.9.0:
   version "24.9.0"
   resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-24.9.0.tgz#12fac31b37019a4eea3c11aa9a959eb7628aa7c9"
   integrity sha512-00ZMZUiHaJrNfk33guavqgvfJS30sLYf0f8+Srklv0AMPodGGHcoHgksZ3OThYnIvOd+8yMCn0YiEOogjlgsnA==
@@ -8692,16 +8791,26 @@ pretty-format@^24.9.0:
     ansi-styles "^3.2.0"
     react-is "^16.8.4"
 
-pretty-quick@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/pretty-quick/-/pretty-quick-3.0.0.tgz#cba8597eca7f3821232abe6a93302d362cc30d71"
-  integrity sha512-oIXlGQUcUxt3XpoNfQECEWvH1Q9PtKfelF2pdp6UvC1CSQ5QcB7gUYKu0kuJGlm3LMBZzJaO/vbRkxA61pWlcg==
+pretty-format@^25.1.0, pretty-format@^25.5.0:
+  version "25.5.0"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-25.5.0.tgz#7873c1d774f682c34b8d48b6743a2bf2ac55791a"
+  integrity sha512-kbo/kq2LQ/A/is0PQwsEHM7Ca6//bGPPvU6UnsdDRSKTWxT/ru/xb88v4BJf6a69H+uTytOEsTusT9ksd/1iWQ==
   dependencies:
-    chalk "^3.0.0"
-    execa "^4.0.0"
+    "@jest/types" "^25.5.0"
+    ansi-regex "^5.0.0"
+    ansi-styles "^4.0.0"
+    react-is "^16.12.0"
+
+pretty-quick@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/pretty-quick/-/pretty-quick-2.0.1.tgz#417ee605ade98ecc686e72f63b5d28a2c35b43e9"
+  integrity sha512-y7bJt77XadjUr+P1uKqZxFWLddvj3SKY6EU4BuQtMxmmEFSMpbN132pUWdSG1g1mtUfO0noBvn7wBf0BVeomHg==
+  dependencies:
+    chalk "^2.4.2"
+    execa "^2.1.0"
     find-up "^4.1.0"
     ignore "^5.1.4"
-    mri "^1.1.5"
+    mri "^1.1.4"
     multimatch "^4.0.0"
 
 process-nextick-args@~2.0.0:
@@ -8852,9 +8961,9 @@ querystring@0.2.0:
   integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=
 
 querystringify@^2.1.1:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6"
-  integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.1.1.tgz#60e5a5fd64a7f8bfa4d2ab2ed6fdf4c85bad154e"
+  integrity sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA==
 
 raf@^3.4.0, raf@^3.4.1:
   version "3.4.1"
@@ -8894,9 +9003,9 @@ raw-body@2.4.0:
     unpipe "1.0.0"
 
 rc-align@^4.0.0:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/rc-align/-/rc-align-4.0.3.tgz#9f83e816efd9ec66bb57adf22918794cec0dd7ed"
-  integrity sha512-TpI0t1tvAo/wYdoZbZlkCK+MkQBqNuPyRZesfsji4tMlqoqQ0q0MhnC9JD5KGPitMvmSB+KWgFpaN2uTz4hw6Q==
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/rc-align/-/rc-align-4.0.1.tgz#0566de141a82d9a1923b7672c70bdb19dcde6e23"
+  integrity sha512-RQ5Fhxl0LW+zsxbY8dxAcpXdaHkHH2jzRSSpvBTS7G9LMK3T+WRcn4ovjg/eqAESM6TdTx0hfqWF2S1pO75jxQ==
   dependencies:
     "@babel/runtime" "^7.10.1"
     classnames "2.x"
@@ -8904,7 +9013,7 @@ rc-align@^4.0.0:
     rc-util "^5.0.1"
     resize-observer-polyfill "^1.5.1"
 
-rc-animate@3.x, rc-animate@~3.1.0:
+rc-animate@3.x, rc-animate@^3.0.0, rc-animate@^3.1.0, rc-animate@~3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/rc-animate/-/rc-animate-3.1.0.tgz#051b689c2c7194e4c8ae016d32a0e5f9de6c8baa"
   integrity sha512-8FsM+3B1H+0AyTyGggY6JyVldHTs1CyYT8CfTmG/nGHHXlecvSLeICJhcKgRLjUiQlctNnRtB1rwz79cvBVmrw==
@@ -8924,13 +9033,13 @@ rc-cascader@~1.3.0:
     rc-util "^5.0.1"
     warning "^4.0.1"
 
-rc-checkbox@~2.3.0:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/rc-checkbox/-/rc-checkbox-2.3.1.tgz#2a61bc43017c783bd2e9f1a67553bf8efe7aa4d3"
-  integrity sha512-i290/iTqmZ0WtI2UPIryqT9rW6O99+an4KeZIyZDH3r+Jbb6YdddaWNdzq7g5m9zaNhJvgjf//wJtC4fvve2Tg==
+rc-checkbox@~2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/rc-checkbox/-/rc-checkbox-2.2.0.tgz#a0ce95c34f05e0eb882664174518cd4baa36dce9"
+  integrity sha512-Wjh/nutLA8iIPTT1P9I9KOqlUblVe+CWa3SxMibFySnLyYbMxKNtPhwNcbADPOqzNU0AsCntTduNeJg1n0B5fg==
   dependencies:
-    "@babel/runtime" "^7.10.1"
-    classnames "^2.2.1"
+    babel-runtime "^6.23.0"
+    classnames "2.x"
 
 rc-collapse@~2.0.0:
   version "2.0.0"
@@ -8943,12 +9052,12 @@ rc-collapse@~2.0.0:
     react-is "^16.7.0"
     shallowequal "^1.1.0"
 
-rc-dialog@~8.2.1, rc-dialog@~8.2.2:
-  version "8.2.2"
-  resolved "https://registry.yarnpkg.com/rc-dialog/-/rc-dialog-8.2.2.tgz#fe97479575ec30bb9f75241a9f29bf39d71636c6"
-  integrity sha512-U4jR5bE7XpIbMC20JAIv91254b+vQ8LODd8Kxco0XvkL+eJ1aCYkOfRqevJ1ipOIzF3s6F08jSH8YvJqxvpAvA==
+rc-dialog@~8.0.0:
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/rc-dialog/-/rc-dialog-8.0.1.tgz#b9265edfc9ac5d75a381bd340bc5e9720572a760"
+  integrity sha512-ZOO2F8KHN4Dkpf1KiXNPKFWaLZutIuAhQw+YCafcFrigDv50AxGivoMSC//k4yjcJr3XRQTQMlMsmdAff4dEhw==
   dependencies:
-    "@babel/runtime" "^7.10.1"
+    babel-runtime "6.x"
     rc-animate "3.x"
     rc-util "^5.0.1"
 
@@ -8970,72 +9079,50 @@ rc-dropdown@^3.1.0, rc-dropdown@~3.1.2:
     classnames "^2.2.6"
     rc-trigger "^4.0.0"
 
-rc-field-form@~1.10.0:
-  version "1.10.1"
-  resolved "https://registry.yarnpkg.com/rc-field-form/-/rc-field-form-1.10.1.tgz#f6eb76b5f24b58938ebadfc03cdd814c24de7db3"
-  integrity sha512-aosTtNTqLYX2jsG5GyCv7axe+b57XH73T7TmmrX/cmhemhtFjvNE6RkRkmtP9VOJnZg5YGC5HfK172cnJ1Ij7Q==
+rc-field-form@~1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/rc-field-form/-/rc-field-form-1.5.0.tgz#3c0c7f138c28c2f5c502d5723f2c00513e9f01bb"
+  integrity sha512-rub5kOWl/UQpRDWMuvGvwje5LW5veuD/iXbyA0Kak4dO7sHk6Z09Ec7lqKzYTi4dW5urObygyUtUgOavoIx9SA==
   dependencies:
     "@babel/runtime" "^7.8.4"
     async-validator "^3.0.3"
     rc-util "^5.0.0"
 
-rc-image@~3.0.2:
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/rc-image/-/rc-image-3.0.6.tgz#b1ad31463d0cc21b8ee6a0bcdc391b35a384b9d5"
-  integrity sha512-Dn8mTSlcgKJko417OX8+6yyNIL9+DEa81aexBfT78qWlEpcxtR4GgdsU0+zJLNqa2rnGZyjaBLFtaPw9tUuxYA==
-  dependencies:
-    "@ant-design/icons" "^4.2.2"
-    "@babel/runtime" "^7.11.2"
-    classnames "^2.2.6"
-    rc-dialog "~8.2.2"
-    rc-util "^5.0.6"
-
-rc-input-number@~6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/rc-input-number/-/rc-input-number-6.0.0.tgz#0c0af57c8183f3ca6b87f7edf6fed3bd5a3ba16f"
-  integrity sha512-vbe+g7HvR/joknSnvLkBTi9N9I+LsV4kljfuog8WNiS7OAF3aEN0QcHSOQ4+xk6+Hx9P1tU63z2+TyEx8W/j2Q==
+rc-input-number@~5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/rc-input-number/-/rc-input-number-5.1.0.tgz#64da7d8c24ad0c5603d32faba22fd25733d6f96a"
+  integrity sha512-jh27NecKJaqooeK54JLGICgOmITwQ6fh4EW+pEgoD/T1JPFtkBer24q/U62dFEIFP8Jy7oWhxjYMe7LrGTYkHQ==
   dependencies:
-    "@babel/runtime" "^7.10.1"
-    classnames "^2.2.5"
+    classnames "^2.2.0"
     rc-util "^5.0.1"
 
-rc-mentions@~1.4.0:
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/rc-mentions/-/rc-mentions-1.4.2.tgz#534c29622445be8a5c197d405d20491e0ab35cf0"
-  integrity sha512-wSmHRF9kFwrbj59mR+u4yVr0KtcrfPw53PYOVizYxYeDfmwaCcSgk29F8OjlDy5jVqUaMhHX5nIiYCePu5Aytg==
+rc-mentions@~1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/rc-mentions/-/rc-mentions-1.3.0.tgz#275807b6beca082d8d7045f67e95443f2f82d2b9"
+  integrity sha512-koAnQlg5QqMYtdfesAPHJDMmeQublwcmWtf2FoaiHPvoUCcgbbSmJAQ/iNRBCCUvXiCy+twb8TUSfvXmCRZD0A==
   dependencies:
     "@babel/runtime" "^7.10.1"
     classnames "^2.2.6"
     rc-menu "^8.0.1"
-    rc-textarea "^0.3.0"
+    rc-textarea "^0.2.0"
     rc-trigger "^4.3.0"
     rc-util "^5.0.1"
 
-rc-menu@^8.0.1, rc-menu@^8.2.1, rc-menu@~8.5.2:
-  version "8.5.3"
-  resolved "https://registry.yarnpkg.com/rc-menu/-/rc-menu-8.5.3.tgz#ac427c50929a2bc1a5fb1ce57e187033d3f09361"
-  integrity sha512-OLdN+jwhabgyRZDvWYjYpO7RP7wLybhNuAulgGqx1oUPBJrtgVlG/X4HtPb7nypRx/n+eicj6H8CtbCs0L4m/Q==
+rc-menu@^8.0.1, rc-menu@^8.2.1, rc-menu@~8.4.1:
+  version "8.4.1"
+  resolved "https://registry.yarnpkg.com/rc-menu/-/rc-menu-8.4.1.tgz#576855ce380b6e748d77f4a30d20581f8c7d1768"
+  integrity sha512-qVtEF83A8KuyhdiQKnMXH8zxkZxlm3nNXnN+d0rlHUa536rhocbTKZgg6+Q3z2R9HDbWn4ZgSq+o6i0DtqlkGQ==
   dependencies:
     "@babel/runtime" "^7.10.1"
     classnames "2.x"
     mini-store "^3.0.1"
-    omit.js "^2.0.0"
-    rc-motion "^1.0.1"
-    rc-trigger "^4.4.0"
+    omit.js "^1.0.2"
+    rc-animate "^3.1.0"
+    rc-trigger "^4.2.0"
     rc-util "^5.0.1"
     resize-observer-polyfill "^1.5.0"
     shallowequal "^1.1.0"
 
-rc-motion@^1.0.0, rc-motion@^1.0.1, rc-motion@^1.1.1:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/rc-motion/-/rc-motion-1.1.2.tgz#07212f1b96c715b8245ec121339146c4a9b0968c"
-  integrity sha512-YC/E7SSWKBFakYg4PENhSRWD4ZLDqkI7FKmutJcrMewZ91/ZIWfoZSDvPaBdKO0hsFrrzWepFhXQIq0FNnCMWA==
-  dependencies:
-    "@babel/runtime" "^7.11.1"
-    classnames "^2.2.1"
-    raf "^3.4.1"
-    rc-util "^5.0.6"
-
 rc-notification@~4.4.0:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/rc-notification/-/rc-notification-4.4.0.tgz#192d082cd6e2995705f43c6929162631c71e3db1"
@@ -9046,34 +9133,31 @@ rc-notification@~4.4.0:
     rc-animate "3.x"
     rc-util "^5.0.1"
 
-rc-pagination@~3.0.3:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/rc-pagination/-/rc-pagination-3.0.4.tgz#32509fcdf77387ca124c025c3575e7bab0c7debd"
-  integrity sha512-9v9mmB7FTWS4kWRLFfWafm6LtvB+xdNi+pTIwUODSevzImrlrmMOIhDrOB3u2tEXiy8LyqvCnoyPYt5jQBapxA==
+rc-pagination@~2.4.1:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/rc-pagination/-/rc-pagination-2.4.1.tgz#ec0586ee704ce6f024e5aab5f05af948c80a616e"
+  integrity sha512-mUPToa3Wv/KuAgOtlEIPxQQgxLO7MBM9YBmztiiwK9QhoXzqil0trSuRzGY7w812pu3o2FRgl/pzvZxW1H0x4Q==
   dependencies:
     "@babel/runtime" "^7.10.1"
     classnames "^2.2.1"
 
-rc-picker@~2.0.6:
-  version "2.0.10"
-  resolved "https://registry.yarnpkg.com/rc-picker/-/rc-picker-2.0.10.tgz#89b585cd94d5aa19ee7f3222b8d1e5a92405a1dd"
-  integrity sha512-Vvd4Akb0d2IriAjEG94yB1O7XIWgObQU5mbTdyNUX+U2CvHWVFayMvm+sKDmkbf831n+q3WgVfrgfGujcf72ZQ==
+rc-picker@~1.10.6:
+  version "1.10.6"
+  resolved "https://registry.yarnpkg.com/rc-picker/-/rc-picker-1.10.6.tgz#05edcdcc4acdc6cbc8288a3540ac3d2a2bf8f2b4"
+  integrity sha512-KhTDU9/25IsCbsjGhPl/Ied04/3f8GZBEi3IxIMeSCIDG9O73RQkwXzxhVSJXNCdqJBX9HfXSMfjYICxiYQG7g==
   dependencies:
     "@babel/runtime" "^7.10.1"
     classnames "^2.2.1"
-    date-fns "^2.15.0"
-    dayjs "^1.8.30"
     moment "^2.24.0"
     rc-trigger "^4.0.0"
     rc-util "^5.0.1"
     shallowequal "^1.1.0"
 
-rc-progress@~3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/rc-progress/-/rc-progress-3.1.0.tgz#cd4a5a7853db3e0c10918ad2c170688a68e3cebd"
-  integrity sha512-DIe9CFkGA4R/pLZ/4nPChQFmIeB8/4tVCr2knlSf9he71j8Fky469zZHhtCFyNwvNGjw/GVDeoTn4BqU4S0ylw==
+rc-progress@~3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/rc-progress/-/rc-progress-3.0.0.tgz#cea324ce8fc31421cd815d94a4649a8a29f8f8db"
+  integrity sha512-dQv1KU3o6Vay604FMYMF4S0x4GNXAgXf1tbQ1QoxeIeQt4d5fUeB7Ri82YPu+G+aRvH/AtxYAlEcnxyVZ1/4Hw==
   dependencies:
-    "@babel/runtime" "^7.10.1"
     classnames "^2.2.6"
 
 rc-rate@~2.8.2:
@@ -9086,26 +9170,26 @@ rc-rate@~2.8.2:
     rc-util "^5.0.1"
 
 rc-resize-observer@^0.2.0, rc-resize-observer@^0.2.1, rc-resize-observer@^0.2.3:
-  version "0.2.5"
-  resolved "https://registry.yarnpkg.com/rc-resize-observer/-/rc-resize-observer-0.2.5.tgz#03e3a5c3dfccd6c996a547e4f82721e4f20f6156"
-  integrity sha512-cc4sOI722MVoCkGf/ZZybDVsjxvnH0giyDdA7wBJLTiMSFJ0eyxBMnr0JLYoClxftjnr75Xzl/VUB3HDrAx04Q==
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/rc-resize-observer/-/rc-resize-observer-0.2.3.tgz#8268284d1766d163240b1682661ae7b59bc4523d"
+  integrity sha512-dEPCGX15eRRnu+TNBIGyEghpzE24fTDW8pHdJPJS/kCR3lafFqBLqKzBgZW6pMUuM70/ZDyFQ0Kynx9kWsXRNw==
   dependencies:
     "@babel/runtime" "^7.10.1"
     classnames "^2.2.1"
     rc-util "^5.0.0"
     resize-observer-polyfill "^1.5.1"
 
-rc-select@^11.1.1, rc-select@~11.2.0:
-  version "11.2.0"
-  resolved "https://registry.yarnpkg.com/rc-select/-/rc-select-11.2.0.tgz#6372dca772779104eadd9f832633fcb79bb86844"
-  integrity sha512-rw9XH2ALt/lpXDM/gULWiPDkEh5UndLDMqZo5FRiZji7MYLg+CbmcFpvJ6iYN5KpKosyLsCWrwvzeWZOCL6q0Q==
+rc-select@^11.0.4, rc-select@~11.0.0:
+  version "11.0.8"
+  resolved "https://registry.yarnpkg.com/rc-select/-/rc-select-11.0.8.tgz#74ffc11c5a13b595a287ff8e36483a3270dd2604"
+  integrity sha512-9StmtIPPZPXOs0A/xkbdw5EbxaZJqf8cqbRqz4/3eVJP2VtnBGBKeAkx+dEs5SW3CBYbZBarB/tLQqM3a9WHJQ==
   dependencies:
     "@babel/runtime" "^7.10.1"
     classnames "2.x"
-    rc-motion "^1.0.1"
+    rc-animate "^3.0.0"
     rc-trigger "^4.3.0"
     rc-util "^5.0.1"
-    rc-virtual-list "^3.0.3"
+    rc-virtual-list "^1.1.2"
     warning "^4.0.3"
 
 rc-slider@~9.3.0:
@@ -9119,40 +9203,40 @@ rc-slider@~9.3.0:
     rc-util "^5.0.0"
     shallowequal "^1.1.0"
 
-rc-steps@~4.1.0:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/rc-steps/-/rc-steps-4.1.2.tgz#370f4c6b40d3888f03b271f1628953c66eb91c04"
-  integrity sha512-kTPiojPtJi12Y7whRqlydRgJXQ1u9JlvGchI6xDrmOMZVpCTLpfc/18iu+aHCtCZaSnM2ENU/9lfm/naWVFcRw==
+rc-steps@~4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/rc-steps/-/rc-steps-4.0.1.tgz#a0e52f951b4e370d0cd2df29ae87eb744431d0d1"
+  integrity sha512-6MuqunJDIZexZj7v5EcHiOF6Q7Xg53+mcxELiIROhvXatssfLxDESpRZJ3zLquecxRjq5epYt92X8xBJ653itg==
   dependencies:
     "@babel/runtime" "^7.10.2"
     classnames "^2.2.3"
     rc-util "^5.0.1"
 
 rc-switch@~3.2.0:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/rc-switch/-/rc-switch-3.2.1.tgz#775f8b2c86716431d83d2b13e4710815baafede0"
-  integrity sha512-ZXYSmx2U+bpHjljjqS5LGj2UIPcQk0EAq6japkaOzQ/OcyzMwWVD9oXMjcRZdO5W1g/pClIV70uEBOWuBMqP4g==
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/rc-switch/-/rc-switch-3.2.0.tgz#aa36bb417409ff4cc7d542ec4381cb5d87cfedc1"
+  integrity sha512-WQZnRrWZ+KGh4Cd98FpP1ZgvMmebctoHzKAO2n1Xsry1FQBSGgIw4rQJRxET31VS/dR1LIKb5md/k0UzcXXc0g==
   dependencies:
     "@babel/runtime" "^7.10.1"
     classnames "^2.2.1"
     rc-util "^5.0.1"
 
-rc-table@~7.9.2:
-  version "7.9.7"
-  resolved "https://registry.yarnpkg.com/rc-table/-/rc-table-7.9.7.tgz#1fca749ca0cd99cdba4db7ee10317ba6f54f9663"
-  integrity sha512-S/46pdU7fKBoL7N8JDu+KpkGSB3fJkiGoxvMCLBrR4p7/BJEYr1X4MFKb5BpkE7ZpEK4n44ILiVZZT7I7EiGVA==
+rc-table@~7.8.0:
+  version "7.8.4"
+  resolved "https://registry.yarnpkg.com/rc-table/-/rc-table-7.8.4.tgz#493e6e8ccd9f078a073f0f7cf46bbb02c55f74d7"
+  integrity sha512-+8JPFD4oGy/4/VdXsPE/12oEkopiZoIi4cS6DJGzjf2CjhrM7KevUOjrs0MhFlXZp/Pnb8qSKoVdVHN1JYtL7Q==
   dependencies:
     "@babel/runtime" "^7.10.1"
     classnames "^2.2.5"
     raf "^3.4.1"
     rc-resize-observer "^0.2.0"
-    rc-util "^5.0.4"
+    rc-util "^5.0.0"
     shallowequal "^1.1.0"
 
-rc-tabs@~11.6.0:
-  version "11.6.1"
-  resolved "https://registry.yarnpkg.com/rc-tabs/-/rc-tabs-11.6.1.tgz#a31a277b12f807cc7bdc31476c0d21124ce93e14"
-  integrity sha512-fJZUOmwBo2E4WTbucCSZO/N1ZK+d9K/QchgDeycTIqxl5D/xtX0Dw/vC2DFi140OFjAy2JL7H0EmsSeOFfCgzw==
+rc-tabs@~11.5.0:
+  version "11.5.2"
+  resolved "https://registry.yarnpkg.com/rc-tabs/-/rc-tabs-11.5.2.tgz#d529a5a7de5b756d68864f4b5cc8b628a91d6267"
+  integrity sha512-NCDDrlHAoJTs0nsMGCfkIZQd4KMbXlUaLh34oUhwytotUZnVtBufYIRTTujsrFHMPh3fG1JnrhfWphUtQ79NqQ==
   dependencies:
     "@babel/runtime" "^7.10.1"
     classnames "2.x"
@@ -9163,84 +9247,82 @@ rc-tabs@~11.6.0:
     rc-trigger "^4.2.1"
     rc-util "^5.0.0"
 
-rc-textarea@^0.3.0, rc-textarea@~0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/rc-textarea/-/rc-textarea-0.3.0.tgz#9860ef797e00717d8227d1ef4ee7895dd9358ddf"
-  integrity sha512-vrTPkPT6wrO7EI8ouLFZZLXA1pFVrVRCnkmyyf0yRComFbcH1ogmFEGu85CjVT96rQqAiQFOe0QV3nKopZOJow==
+rc-textarea@^0.2.0, rc-textarea@~0.2.2:
+  version "0.2.6"
+  resolved "https://registry.yarnpkg.com/rc-textarea/-/rc-textarea-0.2.6.tgz#7a73c8da108b7593fb7bf40f8c0e945cf196ac80"
+  integrity sha512-eCVgLDBe2baurllr9gR9OjcDtMlKvt6hBKIJPbZZjH8BlasjLkpEisO7jdu5TINglZKoEo9nmcF/zh4Kk8o0Aw==
   dependencies:
     "@babel/runtime" "^7.10.1"
     classnames "^2.2.1"
-    omit.js "^2.0.0"
+    omit.js "^1.0.2"
     rc-resize-observer "^0.2.3"
 
 rc-tooltip@^4.0.0, rc-tooltip@~4.2.0:
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/rc-tooltip/-/rc-tooltip-4.2.2.tgz#b0c374a26846f285b21eb74f9d533e6049e34b22"
-  integrity sha512-mAs+gAngUyHVA6HdFXsELoJOHgfjAACLLc8SGtnVhovJdyqs5ZGSL9p5i+ApNaVpwjswqShw7L4DRtMl7cXCQg==
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/rc-tooltip/-/rc-tooltip-4.2.1.tgz#c1a2d5017ee03a771a9301c0dfdb46dfdf8fef94"
+  integrity sha512-oykuaGsHg7RFvPUaxUpxo7ScEqtH61C66x4JUmjlFlSS8gSx2L8JFtfwM1D68SLBxUqGqJObtxj4TED75gQTiA==
   dependencies:
     rc-trigger "^4.2.1"
 
-rc-tree-select@~4.1.1:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/rc-tree-select/-/rc-tree-select-4.1.2.tgz#bf012c3c32cf2e82fc7ffbdd60cb596163a290a0"
-  integrity sha512-2tRwZ4ChY+BarVKHoPR65kSZtopgwKCig6ngJiiTVgYfRdAhfdQp2j2+L8YW9TkosYGmwgTOhmlphlG3QNy7Pg==
+rc-tree-select@~4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/rc-tree-select/-/rc-tree-select-4.0.2.tgz#78d0f071145f05b434743dad53ee4c8ebdd0c613"
+  integrity sha512-SqV0LgCdeW/YNbsG102eflwGTrg3+OrT2DbJ9MGLqF+luxLbekcOAZzOhcgmsUtI+PademEzcIt3UWhSsjqf1A==
   dependencies:
     "@babel/runtime" "^7.10.1"
     classnames "2.x"
-    rc-select "^11.1.1"
-    rc-tree "^3.8.0"
-    rc-util "^5.0.5"
+    rc-select "^11.0.4"
+    rc-tree "^3.6.0"
+    rc-util "^5.0.1"
 
-rc-tree@^3.8.0, rc-tree@~3.9.0:
-  version "3.9.5"
-  resolved "https://registry.yarnpkg.com/rc-tree/-/rc-tree-3.9.5.tgz#07bab1baf11414ec910578759e69f9373e93f424"
-  integrity sha512-ZGVl1o83hZoz971pzY9Y7yZM+f9qcia1Gym+QNyc3zMGQVshbr6CX2WZ8xUK18tTkdRSqbTXmZFnvYf1lfqT8A==
+rc-tree@^3.6.0, rc-tree@~3.6.0:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/rc-tree/-/rc-tree-3.6.0.tgz#5b32b70c6323d6bd533c65930294fe652db58e5b"
+  integrity sha512-2Hy/F+zWuqF5vFlSqpcVXh9Ik2Dl6/tQcRks5EnK8UwXUOgav4+LVORCtdqy4KX7J94vz7d4xfiyWBye/gO1Xg==
   dependencies:
     "@babel/runtime" "^7.10.1"
     classnames "2.x"
-    rc-motion "^1.0.0"
+    rc-animate "^3.1.0"
     rc-util "^5.0.0"
-    rc-virtual-list "^3.0.1"
+    rc-virtual-list "^1.1.0"
 
-rc-trigger@^4.0.0, rc-trigger@^4.2.1, rc-trigger@^4.3.0, rc-trigger@^4.4.0, rc-trigger@~4.4.0:
-  version "4.4.2"
-  resolved "https://registry.yarnpkg.com/rc-trigger/-/rc-trigger-4.4.2.tgz#74f7ebcfdcdc191b7c82380def68fbba79ed5aec"
-  integrity sha512-uw2/s7j1b/RXyixa4omPuxZWv/3ln+H+p0v3trIUBxseolbdj8TTFpXYjXMZdGtMpAEAIbN1yo/K+r7wRB+xtQ==
+rc-trigger@^4.0.0, rc-trigger@^4.2.0, rc-trigger@^4.2.1, rc-trigger@^4.3.0, rc-trigger@~4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/rc-trigger/-/rc-trigger-4.3.0.tgz#94ea1851d123359716d1dc3030083c015a92ecfb"
+  integrity sha512-jnGNzosXmDdivMBjPCYe/AfOXTpJU2/xQ9XukgoXDQEoZq/9lcI1r7eUIfq70WlWpLxlUEqQktiV3hwyy6Nw9g==
   dependencies:
     "@babel/runtime" "^7.10.1"
     classnames "^2.2.6"
     raf "^3.4.1"
     rc-align "^4.0.0"
-    rc-motion "^1.0.0"
+    rc-animate "^3.0.0"
     rc-util "^5.0.1"
 
-rc-upload@~3.3.0:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/rc-upload/-/rc-upload-3.3.1.tgz#ad8658b2a796031930b35d2b07ab312b7cd4c9ed"
-  integrity sha512-KWkJbVM9BwU8qi/2jZwmZpAcdRzDkuyfn/yAOLu+nm47dyd6//MtxzQD3XZDFkC6jQ6D5FmlKn6DhmOfV3v43w==
+rc-upload@~3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/rc-upload/-/rc-upload-3.2.0.tgz#251fc3c9105902e808600a414f368f285d63bfba"
+  integrity sha512-/vyOGVxl5QVM3ZE7s+GqYPbCLC/Q/vJq0sjdwnvJw01KvAR5kVOC4jbHEaU56dMss7PFGDfNzc8zO5bWYLDzVQ==
   dependencies:
-    "@babel/runtime" "^7.10.1"
     classnames "^2.2.5"
-    rc-util "^5.2.0"
 
-rc-util@^5.0.0, rc-util@^5.0.1, rc-util@^5.0.4, rc-util@^5.0.5, rc-util@^5.0.6, rc-util@^5.0.7, rc-util@^5.1.0, rc-util@^5.2.0:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/rc-util/-/rc-util-5.2.1.tgz#c01a3e25b4d65570e433f46f85fdf36ed44de6af"
-  integrity sha512-OnIKp4DsYZpT3St9LwiGARXyMR38wNbk7C4jXS6NGAGHZEQWck7W6qfiJwj+MUmhJiUisAknU6BUs65exbhFTw==
+rc-util@^5.0.0, rc-util@^5.0.1:
+  version "5.0.5"
+  resolved "https://registry.yarnpkg.com/rc-util/-/rc-util-5.0.5.tgz#d29d626edc931fbf8b45b4aa48fb9e44ce2300bd"
+  integrity sha512-zLIdNm6qz+hQbB5T1fmzHFFgPuRl3uB2eS2iLR/mewUWvgC3l7NzRYRVlHoCEEFVUkKEEsHuJXG1J52FInl5lA==
   dependencies:
     react-is "^16.12.0"
     shallowequal "^1.1.0"
 
-rc-virtual-list@^3.0.1, rc-virtual-list@^3.0.3:
-  version "3.0.13"
-  resolved "https://registry.yarnpkg.com/rc-virtual-list/-/rc-virtual-list-3.0.13.tgz#c02b313ebd6bdc20d8115b435569739126392fa8"
-  integrity sha512-POf1buTgrPrqHDSAOMexjo6XiWhUrHIEvtL/spX4GS9K2ZR9XuDjWOdU/QFfd65U5cobyW8UCBOcJ9BSLjlavw==
+rc-virtual-list@^1.1.0, rc-virtual-list@^1.1.2:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/rc-virtual-list/-/rc-virtual-list-1.1.5.tgz#6edf7222830c7dd732f62698c8468b7f08ac8dec"
+  integrity sha512-roZ6HE5MNKaiop+Ic7jZS7xlMnXBLp0XBElsMbE4eEL3GnnnJAet2iXoT5wjKcKMXEVyVCD0L4yQozmH7+Kgxg==
   dependencies:
     classnames "^2.2.6"
-    rc-resize-observer "^0.2.3"
-    rc-util "^5.0.7"
+    raf "^3.4.1"
+    rc-util "^5.0.0"
 
-react-app-polyfill@^1.0.4, react-app-polyfill@^1.0.6:
+react-app-polyfill@^1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/react-app-polyfill/-/react-app-polyfill-1.0.6.tgz#890f8d7f2842ce6073f030b117de9130a5f385f0"
   integrity sha512-OfBnObtnGgLGfweORmdZbyEz+3dgVePQBb3zipiaDsMHV1NpWm0rDFYIVXFV/AK+x4VIIfWHhrdMIeoTLyRr2g==
@@ -9297,26 +9379,15 @@ react-error-overlay@^6.0.7:
   resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-6.0.7.tgz#1dcfb459ab671d53f660a991513cb2f0a0553108"
   integrity sha512-TAv1KJFh3RhqxNvhzxj6LeT5NWklP6rDr2a0jaTfsZ5wSZWHOGeqQyejUp3xxLfPt2UpyJEcVQB/zyPcmonNFA==
 
-react-is@^16.12.0, react-is@^16.7.0, react-is@^16.8.1, react-is@^16.8.4, react-is@^16.9.0:
+react-is@^16.12.0, react-is@^16.7.0, react-is@^16.8.1, react-is@^16.8.4:
   version "16.13.1"
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
   integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
 
-react-redux@^7.2.1:
-  version "7.2.1"
-  resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-7.2.1.tgz#8dedf784901014db2feca1ab633864dee68ad985"
-  integrity sha512-T+VfD/bvgGTUA74iW9d2i5THrDQWbweXP0AVNI8tNd1Rk5ch1rnMiJkDD67ejw7YBKM4+REvcvqRuWJb7BLuEg==
-  dependencies:
-    "@babel/runtime" "^7.5.5"
-    hoist-non-react-statics "^3.3.0"
-    loose-envify "^1.4.0"
-    prop-types "^15.7.2"
-    react-is "^16.9.0"
-
-react-scripts@^3.4.3:
-  version "3.4.3"
-  resolved "https://registry.yarnpkg.com/react-scripts/-/react-scripts-3.4.3.tgz#21de5eb93de41ee92cd0b85b0e1298d0bb2e6c51"
-  integrity sha512-oSnoWmii/iKdeQiwaO6map1lUaZLmG0xIUyb/HwCVFLT7gNbj8JZ9RmpvMCZ4fB98ZUMRfNmp/ft8uy/xD1RLA==
+react-scripts@^3.4.1:
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/react-scripts/-/react-scripts-3.4.1.tgz#f551298b5c71985cc491b9acf3c8e8c0ae3ada0a"
+  integrity sha512-JpTdi/0Sfd31mZA6Ukx+lq5j1JoKItX7qqEK4OiACjVQletM1P38g49d9/D0yTxp9FrSF+xpJFStkGgKEIRjlQ==
   dependencies:
     "@babel/core" "7.9.0"
     "@svgr/webpack" "4.3.3"
@@ -9363,11 +9434,11 @@ react-scripts@^3.4.3:
     sass-loader "8.0.2"
     semver "6.3.0"
     style-loader "0.23.1"
-    terser-webpack-plugin "2.3.8"
+    terser-webpack-plugin "2.3.5"
     ts-pnp "1.1.6"
     url-loader "2.3.0"
     webpack "4.42.0"
-    webpack-dev-server "3.11.0"
+    webpack-dev-server "3.10.3"
     webpack-manifest-plugin "2.2.0"
     workbox-webpack-plugin "4.3.1"
   optionalDependencies:
@@ -9468,15 +9539,13 @@ recursive-readdir@2.2.2:
   dependencies:
     minimatch "3.0.4"
 
-redux-persist@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/redux-persist/-/redux-persist-6.0.0.tgz#b4d2972f9859597c130d40d4b146fecdab51b3a8"
-  integrity sha512-71LLMbUq2r02ng2We9S215LtPu3fY0KgaGE0k8WRgl6RkqxtGfl7HUozz1Dftwsb0D/5mZ8dwAaPbtnzfvbEwQ==
-
-redux-undo@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/redux-undo/-/redux-undo-1.0.1.tgz#8d989d6c326e6718f4471042e90a5b8b6f3317eb"
-  integrity sha512-0yFPT+FUgwxCEiS0Mg5T1S4tkgjR8h6sJRY9CW4EMsbJOf1SxO289TbJmlzhRouCHacdDF+powPjrjLHoJYxWQ==
+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"
 
 redux@^4.0.5:
   version "4.0.5"
@@ -9504,9 +9573,9 @@ regenerator-runtime@^0.11.0:
   integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==
 
 regenerator-runtime@^0.13.3, regenerator-runtime@^0.13.4:
-  version "0.13.7"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz#cac2dacc8a1ea675feaabaeb8ae833898ae46f55"
-  integrity sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==
+  version "0.13.5"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz#d878a1d094b4306d10b9096484b33ebd55e26697"
+  integrity sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==
 
 regenerator-transform@^0.14.2:
   version "0.14.5"
@@ -9601,19 +9670,19 @@ repeat-string@^1.6.1:
   resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
   integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
 
-request-promise-core@1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.4.tgz#3eedd4223208d419867b78ce815167d10593a22f"
-  integrity sha512-TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw==
+request-promise-core@1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.3.tgz#e9a3c081b51380dfea677336061fea879a829ee9"
+  integrity sha512-QIs2+ArIGQVp5ZYbWD5ZLCY29D5CfWizP8eWnm8FoGD1TX61veauETVQbrV60662V0oFBkrDOuaBI8XgtuyYAQ==
   dependencies:
-    lodash "^4.17.19"
+    lodash "^4.17.15"
 
 request-promise-native@^1.0.5:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.9.tgz#e407120526a5efdc9a39b28a5679bf47b9d9dc28"
-  integrity sha512-wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g==
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.8.tgz#a455b960b826e44e2bf8999af64dff2bfe58cb36"
+  integrity sha512-dapwLGqkHtwL5AEbfenuzjTYg35Jd6KPytsC2/TLkVMz8rm+tNt72MGUWT1RP/aYawMpN6HqbNGBQaRcBtjQMQ==
   dependencies:
-    request-promise-core "1.1.4"
+    request-promise-core "1.1.3"
     stealthy-require "^1.1.1"
     tough-cookie "^2.3.3"
 
@@ -9648,6 +9717,11 @@ require-directory@^2.1.1:
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
   integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
 
+require-main-filename@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
+  integrity sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=
+
 require-main-filename@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
@@ -9801,9 +9875,9 @@ run-queue@^1.0.0, run-queue@^1.0.3:
     aproba "^1.1.1"
 
 rxjs@^6.5.3, rxjs@^6.6.0:
-  version "6.6.3"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.3.tgz#8ca84635c4daa900c0d3967a6ee7ac60271ee552"
-  integrity sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==
+  version "6.6.0"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.0.tgz#af2901eedf02e3a83ffa7f886240ff9018bbec84"
+  integrity sha512-3HMA8z/Oz61DUHe+SdOiQyzIf4tOx5oQHmMir7IZEu6TMqCLHT4LRcmNaUS0NwOz8VLvmmBduMsoaUvMaIiqzg==
   dependencies:
     tslib "^1.9.0"
 
@@ -9889,21 +9963,21 @@ schema-utils@^1.0.0:
     ajv-errors "^1.0.0"
     ajv-keywords "^3.1.0"
 
-schema-utils@^2.5.0, schema-utils@^2.6.0, schema-utils@^2.6.1, schema-utils@^2.6.5, schema-utils@^2.6.6:
-  version "2.7.1"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.1.tgz#1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7"
-  integrity sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==
+schema-utils@^2.5.0, schema-utils@^2.6.0, schema-utils@^2.6.1, schema-utils@^2.6.4, schema-utils@^2.6.5:
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.0.tgz#17151f76d8eae67fbbf77960c33c676ad9f4efc7"
+  integrity sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A==
   dependencies:
-    "@types/json-schema" "^7.0.5"
-    ajv "^6.12.4"
-    ajv-keywords "^3.5.2"
+    "@types/json-schema" "^7.0.4"
+    ajv "^6.12.2"
+    ajv-keywords "^3.4.1"
 
 scroll-into-view-if-needed@^2.2.25:
-  version "2.2.26"
-  resolved "https://registry.yarnpkg.com/scroll-into-view-if-needed/-/scroll-into-view-if-needed-2.2.26.tgz#e4917da0c820135ff65ad6f7e4b7d7af568c4f13"
-  integrity sha512-SQ6AOKfABaSchokAmmaxVnL9IArxEnLEX9j4wAZw+x4iUTb40q7irtHG3z4GtAWz5veVZcCnubXDBRyLVQaohw==
+  version "2.2.25"
+  resolved "https://registry.yarnpkg.com/scroll-into-view-if-needed/-/scroll-into-view-if-needed-2.2.25.tgz#117b7bc7c61bc7a2b7872a0984bc73a19bc6e961"
+  integrity sha512-C8RKJPq9lK7eubwGpLbUkw3lklcG3Ndjmea2PyauzrA0i4DPlzAmVMGxaZrBFqCrVLfvJmP80IyHnv4jxvg1OQ==
   dependencies:
-    compute-scroll-into-view "^1.0.16"
+    compute-scroll-into-view "^1.0.14"
 
 select-hose@^2.0.0:
   version "2.0.0"
@@ -9966,10 +10040,15 @@ send@0.17.1:
     range-parser "~1.2.1"
     statuses "~1.5.0"
 
-serialize-javascript@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-4.0.0.tgz#b525e1238489a5ecfc42afacc3fe99e666f4b1aa"
-  integrity sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==
+serialize-javascript@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-2.1.2.tgz#ecec53b0e0317bdc95ef76ab7074b7384785fa61"
+  integrity sha512-rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ==
+
+serialize-javascript@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-3.1.0.tgz#8bf3a9170712664ef2561b44b691eafe399214ea"
+  integrity sha512-JIJT1DGiWmIKhzRsG91aS6Ze4sFUrYbltlkg2onR5OrnNM02Kl/hnY/T4FN2omvyeBbQmMJv+K4cPOpGzOTFBg==
   dependencies:
     randombytes "^2.1.0"
 
@@ -10090,20 +10169,13 @@ shellwords@^0.1.1:
   resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b"
   integrity sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==
 
-shortid@^2.2.14:
-  version "2.2.15"
-  resolved "https://registry.yarnpkg.com/shortid/-/shortid-2.2.15.tgz#2b902eaa93a69b11120373cd42a1f1fe4437c122"
-  integrity sha512-5EaCy2mx2Jgc/Fdn9uuDuNIIfWBpzY4XIlhoqtXF6qsf+/+SGZ+FxDdX/ZsMZiWupIWNqAEmiNY4RC+LSmCeOw==
-  dependencies:
-    nanoid "^2.1.0"
-
 side-channel@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.3.tgz#cdc46b057550bbab63706210838df5d4c19519c3"
-  integrity sha512-A6+ByhlLkksFoUepsGxfj5x1gTSrs+OydsRptUxeNCabQpCFUvcwIczgOigI8vhY/OJCnPnyE9rGiwgvr9cS1g==
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.2.tgz#df5d1abadb4e4bf4af1cd8852bf132d2f7876947"
+  integrity sha512-7rL9YlPHg7Ancea1S96Pa8/QWb4BtXL/TZvS6B8XFetGBeuhAsfmUspK6DokBeZ64+Kj9TCNRD/30pVz1BvQNA==
   dependencies:
-    es-abstract "^1.18.0-next.0"
-    object-inspect "^1.8.0"
+    es-abstract "^1.17.0-next.1"
+    object-inspect "^1.7.0"
 
 signal-exit@^3.0.0, signal-exit@^3.0.2:
   version "3.0.3"
@@ -10188,14 +10260,13 @@ sockjs-client@1.4.0:
     json3 "^3.3.2"
     url-parse "^1.4.3"
 
-sockjs@0.3.20:
-  version "0.3.20"
-  resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.20.tgz#b26a283ec562ef8b2687b44033a4eeceac75d855"
-  integrity sha512-SpmVOVpdq0DJc0qArhF3E5xsxvaiqGNb73XfgBpK1y3UD5gs8DSo8aCTsuT5pX8rssdc2NDIzANwP9eCAiSdTA==
+sockjs@0.3.19:
+  version "0.3.19"
+  resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.19.tgz#d976bbe800af7bd20ae08598d582393508993c0d"
+  integrity sha512-V48klKZl8T6MzatbLlzzRNhMepEys9Y4oGFpypBFFn1gLI/QQ9HtLLyWJNbPlwGLelOVOEijUbTTJeLLI59jLw==
   dependencies:
     faye-websocket "^0.10.0"
-    uuid "^3.4.0"
-    websocket-driver "0.6.5"
+    uuid "^3.0.1"
 
 sort-keys@^1.0.0:
   version "1.1.2"
@@ -10281,7 +10352,7 @@ spdy-transport@^3.0.0:
     readable-stream "^3.0.6"
     wbuf "^1.7.3"
 
-spdy@^4.0.2:
+spdy@^4.0.1:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/spdy/-/spdy-4.0.2.tgz#b74f466203a3eda452c02492b91fb9e84a27677b"
   integrity sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==
@@ -10420,6 +10491,23 @@ string-length@^3.1.0:
     astral-regex "^1.0.0"
     strip-ansi "^5.2.0"
 
+string-width@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
+  integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=
+  dependencies:
+    code-point-at "^1.0.0"
+    is-fullwidth-code-point "^1.0.0"
+    strip-ansi "^3.0.0"
+
+string-width@^2.0.0, string-width@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
+  integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
+  dependencies:
+    is-fullwidth-code-point "^2.0.0"
+    strip-ansi "^4.0.0"
+
 string-width@^3.0.0, string-width@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961"
@@ -10540,10 +10628,17 @@ 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"
+
 strip-json-comments@^3.0.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
-  integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.0.tgz#7638d31422129ecf4457440009fba03f9f9ac180"
+  integrity sha512-e6/d0eBu7gHtdCqFt0xJr642LdToM5/cN4Qb9DbHjVx1CP5RyeM+zH7pbecEmDv/lBqb0QH+6Uqq75rxFPkM0w==
 
 strip-outer@^1.0.0:
   version "1.0.1"
@@ -10594,9 +10689,9 @@ supports-color@^6.1.0:
     has-flag "^3.0.0"
 
 supports-color@^7.0.0, supports-color@^7.1.0:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da"
-  integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.1.0.tgz#68e32591df73e25ad1c4b49108a2ec507962bfd1"
+  integrity sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==
   dependencies:
     has-flag "^4.0.0"
 
@@ -10649,37 +10744,37 @@ tapable@^1.0.0, tapable@^1.1.3:
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"
   integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==
 
-terser-webpack-plugin@2.3.8:
-  version "2.3.8"
-  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-2.3.8.tgz#894764a19b0743f2f704e7c2a848c5283a696724"
-  integrity sha512-/fKw3R+hWyHfYx7Bv6oPqmk4HGQcrWLtV3X6ggvPuwPNHSnzvVV51z6OaaCOus4YLjutYGOz3pEpbhe6Up2s1w==
+terser-webpack-plugin@2.3.5:
+  version "2.3.5"
+  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-2.3.5.tgz#5ad971acce5c517440ba873ea4f09687de2f4a81"
+  integrity sha512-WlWksUoq+E4+JlJ+h+U+QUzXpcsMSSNXkDy9lBVkSqDn1w23Gg29L/ary9GeJVYCGiNJJX7LnVc4bwL1N3/g1w==
   dependencies:
     cacache "^13.0.1"
-    find-cache-dir "^3.3.1"
-    jest-worker "^25.4.0"
-    p-limit "^2.3.0"
-    schema-utils "^2.6.6"
-    serialize-javascript "^4.0.0"
+    find-cache-dir "^3.2.0"
+    jest-worker "^25.1.0"
+    p-limit "^2.2.2"
+    schema-utils "^2.6.4"
+    serialize-javascript "^2.1.2"
     source-map "^0.6.1"
-    terser "^4.6.12"
+    terser "^4.4.3"
     webpack-sources "^1.4.3"
 
 terser-webpack-plugin@^1.4.3:
-  version "1.4.5"
-  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.5.tgz#a217aefaea330e734ffacb6120ec1fa312d6040b"
-  integrity sha512-04Rfe496lN8EYruwi6oPQkG0vo8C+HT49X687FZnpPF0qMAIHONI6HEXYPKDOE8e5HjXTyKfqRd/agHtH0kOtw==
+  version "1.4.4"
+  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.4.tgz#2c63544347324baafa9a56baaddf1634c8abfc2f"
+  integrity sha512-U4mACBHIegmfoEe5fdongHESNJWqsGU+W0S/9+BmYGVQDw1+c2Ow05TpMhxjPK1sRb7cuYq1BPl1e5YHJMTCqA==
   dependencies:
     cacache "^12.0.2"
     find-cache-dir "^2.1.0"
     is-wsl "^1.1.0"
     schema-utils "^1.0.0"
-    serialize-javascript "^4.0.0"
+    serialize-javascript "^3.1.0"
     source-map "^0.6.1"
     terser "^4.1.2"
     webpack-sources "^1.4.0"
     worker-farm "^1.7.0"
 
-terser@^4.1.2, terser@^4.6.12, terser@^4.6.3:
+terser@^4.1.2, terser@^4.4.3, terser@^4.6.3:
   version "4.8.0"
   resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.0.tgz#63056343d7c70bb29f3af665865a46fe03a0df17"
   integrity sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==
@@ -10899,15 +10994,20 @@ type@^1.0.1:
   integrity sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==
 
 type@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/type/-/type-2.1.0.tgz#9bdc22c648cf8cf86dd23d32336a41cfb6475e3f"
-  integrity sha512-G9absDWvhAWCV2gmF1zKud3OyC61nZDwWvBL2DApaVFogI07CprggiQAOOjvp2NRjYWFzPyu7vwtDrQFq8jeSA==
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/type/-/type-2.0.0.tgz#5f16ff6ef2eb44f260494dae271033b29c09a9c3"
+  integrity sha512-KBt58xCHry4Cejnc2ISQAF7QY+ORngsWfxezO68+12hKV6lQY8P/psIkcbjeHWn7MqcgciWJyCCevFMJdIXpow==
 
 typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
+typescript@~3.7.2:
+  version "3.7.5"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.7.5.tgz#0692e21f65fd4108b9330238aac11dd2e177a1ae"
+  integrity sha512-/P5lkRXkWHNAbcJIiHPfRoKqyd7bsyCma1hZNUGfn20qm64T6ZBlrzprymeu918H+mB/0rIg2gGK/BXkhhYgBw==
+
 unicode-canonical-property-names-ecmascript@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz#2619800c4c825800efdd8343af7dd9933cbe2818"
@@ -10994,9 +11094,9 @@ upath@^1.1.1:
   integrity sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==
 
 uri-js@^4.2.2:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.0.tgz#aa714261de793e8a82347a7bcc9ce74e86f28602"
-  integrity sha512-B0yRTzYdUCCn9n+F4+Gh4yIDtMQcaJsmYBDsTSG8g/OejKBodLQ2IHfN3bM7jUsRXndopT7OIXWdYqc1fjmV6g==
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0"
+  integrity sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==
   dependencies:
     punycode "^2.1.0"
 
@@ -11082,7 +11182,7 @@ utils-merge@1.0.1:
   resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
   integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=
 
-uuid@^3.3.2, uuid@^3.4.0:
+uuid@^3.0.1, uuid@^3.3.2:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
   integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
@@ -11100,36 +11200,6 @@ validate-npm-package-license@^3.0.1:
     spdx-correct "^3.0.0"
     spdx-expression-parse "^3.0.0"
 
-validate.io-array@^1.0.3:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/validate.io-array/-/validate.io-array-1.0.6.tgz#5b5a2cafd8f8b85abb2f886ba153f2d93a27774d"
-  integrity sha1-W1osr9j4uFq7L4hroVPy2Tond00=
-
-validate.io-function@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/validate.io-function/-/validate.io-function-1.0.2.tgz#343a19802ed3b1968269c780e558e93411c0bad7"
-  integrity sha1-NDoZgC7TsZaCaceA5VjpNBHAutc=
-
-validate.io-integer-array@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/validate.io-integer-array/-/validate.io-integer-array-1.0.0.tgz#2cabde033293a6bcbe063feafe91eaf46b13a089"
-  integrity sha1-LKveAzKTpry+Bj/q/pHq9GsToIk=
-  dependencies:
-    validate.io-array "^1.0.3"
-    validate.io-integer "^1.0.4"
-
-validate.io-integer@^1.0.4:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/validate.io-integer/-/validate.io-integer-1.0.5.tgz#168496480b95be2247ec443f2233de4f89878068"
-  integrity sha1-FoSWSAuVviJH7EQ/IjPeT4mHgGg=
-  dependencies:
-    validate.io-number "^1.0.3"
-
-validate.io-number@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/validate.io-number/-/validate.io-number-1.0.3.tgz#f63ffeda248bf28a67a8d48e0e3b461a1665baf8"
-  integrity sha1-9j/+2iSL8opnqNSODjtGGhZluvg=
-
 vary@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
@@ -11170,6 +11240,11 @@ w3c-xmlserializer@^1.1.2:
     webidl-conversions "^4.0.2"
     xml-name-validator "^3.0.0"
 
+wait-for-expect@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/wait-for-expect/-/wait-for-expect-3.0.2.tgz#d2f14b2f7b778c9b82144109c8fa89ceaadaa463"
+  integrity sha512-cfS1+DZxuav1aBYbaO/kE06EOS8yRw7qOFoD3XtjTkYvCvh3zUvNST8DXK/nPaeqIzIv3P3kL3lRJn8iwOiSag==
+
 walker@^1.0.7, walker@~1.0.5:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.7.tgz#2f7f9b8fd10d677262b18a884e28d19618e028fb"
@@ -11192,14 +11267,14 @@ watchpack-chokidar2@^2.0.0:
     chokidar "^2.1.8"
 
 watchpack@^1.6.0:
-  version "1.7.4"
-  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.7.4.tgz#6e9da53b3c80bb2d6508188f5b200410866cd30b"
-  integrity sha512-aWAgTW4MoSJzZPAicljkO1hsi1oKj/RRq/OJQh2PKI2UKL04c2Bs+MBOB+BBABHTXJpf9mCwHN7ANCvYsvY2sg==
+  version "1.7.2"
+  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.7.2.tgz#c02e4d4d49913c3e7e122c3325365af9d331e9aa"
+  integrity sha512-ymVbbQP40MFTp+cNMvpyBpBtygHnPzPkHqoIwRRj/0B8KhqQwV8LaKjtbaxF2lK4vl8zN9wCxS46IFCU5K4W0g==
   dependencies:
     graceful-fs "^4.1.2"
     neo-async "^2.5.0"
   optionalDependencies:
-    chokidar "^3.4.1"
+    chokidar "^3.4.0"
     watchpack-chokidar2 "^2.0.0"
 
 wbuf@^1.1.0, wbuf@^1.7.3:
@@ -11225,10 +11300,10 @@ webpack-dev-middleware@^3.7.2:
     range-parser "^1.2.1"
     webpack-log "^2.0.0"
 
-webpack-dev-server@3.11.0:
-  version "3.11.0"
-  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.11.0.tgz#8f154a3bce1bcfd1cc618ef4e703278855e7ff8c"
-  integrity sha512-PUxZ+oSTxogFQgkTtFndEtJIPNmml7ExwufBZ9L2/Xyyd5PnOL5UreWe5ZT7IU25DSdykL9p1MLQzmLh2ljSeg==
+webpack-dev-server@3.10.3:
+  version "3.10.3"
+  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.10.3.tgz#f35945036813e57ef582c2420ef7b470e14d3af0"
+  integrity sha512-e4nWev8YzEVNdOMcNzNeCN947sWJNd43E5XvsJzbAL08kGc2frm1tQ32hTJslRS+H65LCb/AaUCYU7fjHCpDeQ==
   dependencies:
     ansi-html "0.0.7"
     bonjour "^3.5.0"
@@ -11238,31 +11313,31 @@ webpack-dev-server@3.11.0:
     debug "^4.1.1"
     del "^4.1.1"
     express "^4.17.1"
-    html-entities "^1.3.1"
+    html-entities "^1.2.1"
     http-proxy-middleware "0.19.1"
     import-local "^2.0.0"
     internal-ip "^4.3.0"
     ip "^1.1.5"
     is-absolute-url "^3.0.3"
     killable "^1.0.1"
-    loglevel "^1.6.8"
+    loglevel "^1.6.6"
     opn "^5.5.0"
     p-retry "^3.0.1"
-    portfinder "^1.0.26"
+    portfinder "^1.0.25"
     schema-utils "^1.0.0"
     selfsigned "^1.10.7"
     semver "^6.3.0"
     serve-index "^1.9.1"
-    sockjs "0.3.20"
+    sockjs "0.3.19"
     sockjs-client "1.4.0"
-    spdy "^4.0.2"
+    spdy "^4.0.1"
     strip-ansi "^3.0.1"
     supports-color "^6.1.0"
     url "^0.11.0"
     webpack-dev-middleware "^3.7.2"
     webpack-log "^2.0.0"
     ws "^6.2.1"
-    yargs "^13.3.2"
+    yargs "12.0.5"
 
 webpack-log@^2.0.0:
   version "2.0.0"
@@ -11319,13 +11394,6 @@ webpack@4.42.0:
     watchpack "^1.6.0"
     webpack-sources "^1.4.1"
 
-websocket-driver@0.6.5:
-  version "0.6.5"
-  resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.6.5.tgz#5cb2556ceb85f4373c6d8238aa691c8454e13a36"
-  integrity sha1-XLJVbOuF9Dc8bYI4qmkchFThOjY=
-  dependencies:
-    websocket-extensions ">=0.1.1"
-
 websocket-driver@>=0.5.1:
   version "0.7.4"
   resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.4.tgz#89ad5295bbf64b480abcba31e4953aca706f5760"
@@ -11348,9 +11416,9 @@ whatwg-encoding@^1.0.1, whatwg-encoding@^1.0.3, whatwg-encoding@^1.0.5:
     iconv-lite "0.4.24"
 
 whatwg-fetch@^3.0.0:
-  version "3.4.1"
-  resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.4.1.tgz#e5f871572d6879663fa5674c8f833f15a8425ab3"
-  integrity sha512-sofZVzE1wKwO+EYPbWfiwzaKovWiZXf4coEzjGP9b2GBVgQRLQUZ2QcuPpQExGDAW5GItpEm6Tl4OU5mywnAoQ==
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.1.0.tgz#49d630cdfa308dba7f2819d49d09364f540dbcc6"
+  integrity sha512-pgmbsVWKpH9GxLXZmtdowDIqtb/rvPyjjQv3z9wLcmgWKFHilKnZD3ldgrOlwJoPGOUluQsRPWd52yVkPfmI1A==
 
 whatwg-mimetype@^2.1.0, whatwg-mimetype@^2.2.0, whatwg-mimetype@^2.3.0:
   version "2.3.0"
@@ -11553,6 +11621,14 @@ worker-rpc@^0.1.0:
   dependencies:
     microevent.ts "~0.1.1"
 
+wrap-ansi@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
+  integrity sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=
+  dependencies:
+    string-width "^1.0.1"
+    strip-ansi "^3.0.1"
+
 wrap-ansi@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz#1fd1f67235d5b6d0fee781056001bfb694c03b09"
@@ -11619,7 +11695,7 @@ xtend@^4.0.0, xtend@~4.0.1:
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
   integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
 
-y18n@^4.0.0:
+"y18n@^3.2.1 || ^4.0.0", y18n@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
   integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==
@@ -11634,11 +11710,19 @@ yallist@^4.0.0:
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
   integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
 
-yaml@^1.10.0, yaml@^1.7.2:
+yaml@^1.7.2:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.0.tgz#3b593add944876077d4d683fee01081bd9fff31e"
   integrity sha512-yr2icI4glYaNG+KWONODapy2/jDdMSDnrONSjblABjD9B4Z5LgiircSt8m8sRZFNi08kG9Sm0uSHtEmP3zaEGg==
 
+yargs-parser@^11.1.1:
+  version "11.1.1"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-11.1.1.tgz#879a0865973bca9f6bab5cbdf3b1c67ec7d3bcf4"
+  integrity sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==
+  dependencies:
+    camelcase "^5.0.0"
+    decamelize "^1.2.0"
+
 yargs-parser@^13.1.2:
   version "13.1.2"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz#130f09702ebaeef2650d54ce6e3e5706f7a4fb38"
@@ -11647,7 +11731,25 @@ yargs-parser@^13.1.2:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
 
-yargs@^13.3.0, yargs@^13.3.2:
+yargs@12.0.5:
+  version "12.0.5"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.5.tgz#05f5997b609647b64f66b81e3b4b10a368e7ad13"
+  integrity sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==
+  dependencies:
+    cliui "^4.0.0"
+    decamelize "^1.2.0"
+    find-up "^3.0.0"
+    get-caller-file "^1.0.1"
+    os-locale "^3.0.0"
+    require-directory "^2.1.1"
+    require-main-filename "^1.0.1"
+    set-blocking "^2.0.0"
+    string-width "^2.0.0"
+    which-module "^2.0.0"
+    y18n "^3.2.1 || ^4.0.0"
+    yargs-parser "^11.1.1"
+
+yargs@^13.3.0:
   version "13.3.2"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd"
   integrity sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==

From a55ae7be43097f43afc696261d4f6f96d00f9c31 Mon Sep 17 00:00:00 2001
From: knilink <esurllink@gmail.com>
Date: Sun, 12 Jul 2020 22:24:34 +1000
Subject: [PATCH 2/3] before react grid layout

---
 src/App.tsx                      | 11 ++--
 src/FormBuilderContext.tsx       |  4 +-
 src/{Toolbar.jsx => Toolbar.tsx} | 97 +++++++++++++++++++++++++++-----
 src/Tree/Menu.tsx                | 20 ++++---
 src/Tree/Tree.tsx                |  6 +-
 src/Tree/TreeNodeTitle.tsx       | 66 +---------------------
 src/{css.js => css.ts}           |  0
 src/utils.ts                     | 17 +++---
 src/views/ExtraPropsView.tsx     |  8 +++
 src/views/UiSchemaView.jsx       | 20 -------
 10 files changed, 122 insertions(+), 127 deletions(-)
 rename src/{Toolbar.jsx => Toolbar.tsx} (53%)
 rename src/{css.js => css.ts} (100%)
 create mode 100644 src/views/ExtraPropsView.tsx
 delete mode 100644 src/views/UiSchemaView.jsx

diff --git a/src/App.tsx b/src/App.tsx
index f76d1e2..9051826 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -6,8 +6,9 @@ import { FormSchemaTree } from './Tree/Tree';
 // import { FormView, SchemaView, UiSchemaView, FormDataView } from './views';
 import { FormView } from './views/FormView';
 import { SchemaView } from './views/SchemaView';
+import { ExtraPropsView } from './views/ExtraPropsView';
 import { Editor } from './Editor/Editor';
-// import Toolbar from './Toolbar';
+import { Toolbar } from './Toolbar';
 // import Settings from './Settings';
 import { Provider, SettingsContext, FormBuilderContext } from './FormBuilderContext';
 
@@ -45,7 +46,7 @@ const App: React.FC<{}> = () => {
         </Tabs>
       </Sider>
       <Layout style={{ marginLeft: settings.leftSiderWidth }}>
-        <Header style={{ background: '#fff', padding: 0 }}>{/* <Toolbar /> */}</Header>
+        <Header style={{ background: '#fff', padding: 0 }}>{<Toolbar />}</Header>
         <Content style={{ minHeight: 280, padding: '12px 8px' }}>
           <Card
             bordered={false}
@@ -67,10 +68,10 @@ const App: React.FC<{}> = () => {
                     <SchemaView />
                   </Card>
                 );
-              case 'uiSchema':
+              case 'extraProps':
                 return (
-                  <Card key="uiSchema" title="Ui Schema" style={style}>
-                    {/* <UiSchemaView /> */}
+                  <Card key="extraProps" title="Ui Schema" style={style}>
+                    <ExtraPropsView />
                   </Card>
                 );
               case 'formData':
diff --git a/src/FormBuilderContext.tsx b/src/FormBuilderContext.tsx
index ce249ae..6f34a7d 100644
--- a/src/FormBuilderContext.tsx
+++ b/src/FormBuilderContext.tsx
@@ -11,7 +11,7 @@ interface ISettings {
   rightSiderWidth: number;
   isInlineMode: boolean;
   isLiveValidate: boolean;
-  subViews: ('schema' | 'uiSchema' | 'formData')[];
+  subViews: ('schema' | 'extraProps' | 'formData')[];
 }
 
 export interface SettingsContext {
@@ -46,7 +46,7 @@ const defaultSettings: ISettings = {
   rightSiderWidth: 360,
   formWidth: 600,
   isInlineMode: true,
-  subViews: ['schema', 'uiSchema', 'formData'],
+  subViews: ['schema', 'extraProps', 'formData'],
   isLiveValidate: false,
 };
 
diff --git a/src/Toolbar.jsx b/src/Toolbar.tsx
similarity index 53%
rename from src/Toolbar.jsx
rename to src/Toolbar.tsx
index 4ed9762..4e8666c 100644
--- a/src/Toolbar.jsx
+++ b/src/Toolbar.tsx
@@ -1,11 +1,14 @@
-import React from 'react';
-import { connect } from 'react-redux';
+import * as React from 'react';
+// import { connect } from 'react-redux';
 import { Button, Tooltip, message, Select } from 'antd';
 import { FileAddOutlined, FolderOpenOutlined, SaveOutlined, UndoOutlined, RedoOutlined } from '@ant-design/icons';
+import { JSONSchema7 } from 'json-schema';
+import { FormBuilderContext } from './FormBuilderContext';
+import { rejects } from 'assert';
 
-import { ActionTypes } from 'redux-undo';
+// import { ActionTypes } from 'redux-undo';
 
-function write(filename, json) {
+function write(filename: string, json: any) {
   const a = window.document.createElement('a');
   a.href = window.URL.createObjectURL(new Blob([JSON.stringify(json, null, 2)], { type: 'application/json' }));
   a.download = `${filename}.json`;
@@ -14,17 +17,19 @@ function write(filename, json) {
   document.body.removeChild(a);
 }
 
-function read(e) {
-  var file = e.target.files[0];
-  if (!file) {
-    return;
-  }
+function read(e: React.ChangeEvent<HTMLInputElement>) {
+  var files = e?.target?.files;
+  const file = files && files[0];
+  if (!file) throw new Error('No file');
   var reader = new FileReader();
 
-  const p = new Promise(function (resolve) {
+  const p = new Promise<string>(function (resolve, reject) {
     reader.onload = function (e) {
-      var contents = e.target.result;
-      resolve(contents);
+      if (e?.target?.result) {
+        resolve(e.target.result.toString());
+      } else {
+        reject();
+      }
     };
   });
   reader.readAsText(file);
@@ -32,7 +37,72 @@ function read(e) {
 }
 
 const buttonStyle = { marginLeft: 8 };
-class Toolbar extends React.Component {
+
+export const Toolbar: React.FC = () => {
+  const { setSchema, setExtraProps } = React.useContext(FormBuilderContext);
+
+  const handleNew = React.useCallback(() => {
+    return;
+    setSchema({ type: 'object' });
+    setExtraProps({});
+  }, [setSchema, setExtraProps]);
+
+  const handleOpen = React.useCallback<React.ChangeEventHandler<HTMLInputElement>>(async (e) => {
+    return;
+    try {
+      const s = await read(e);
+      const { schema, extraProps } = JSON.parse(s);
+      setSchema(schema as JSONSchema7);
+      setExtraProps(extraProps);
+    } catch (e) {
+      message.error('Invalid json file!');
+    }
+  }, []);
+
+  const inputRef = React.useRef(null);
+
+  return (
+    <span>
+      <input ref={inputRef} type="file" accept="application/json" onChange={handleOpen} hidden />
+      <Tooltip title="New">
+        <Button style={buttonStyle} onClick={handleNew} icon={<FileAddOutlined />} />
+      </Tooltip>
+      <Tooltip title="Open">
+        <Button
+          style={buttonStyle}
+          onClick={() => {
+            // inputRef.current?.click(null)
+          }}
+          icon={<FolderOpenOutlined />}
+        />
+      </Tooltip>
+      <Tooltip title="Save">
+        <Button style={buttonStyle} onClick={() => {}} icon={<SaveOutlined />} />
+      </Tooltip>
+      <Tooltip title="Undo">
+        <Button style={buttonStyle} onClick={() => {}} disabled={false /*!past.length*/} icon={<UndoOutlined />} />
+      </Tooltip>
+      <Tooltip title="Redo">
+        <Button style={buttonStyle} onClick={() => {}} disabled={false /*!future.length*/} icon={<RedoOutlined />} />
+      </Tooltip>
+      {/*<Select
+        mode="multiple"
+        style={{ width: 290, marginLeft: 12 }}
+        value={settings.subViews}
+        onChange={updateSettings}
+        placeholder="Select sub views..."
+      >
+        <Select.Option key="schema">Schema</Select.Option>
+        <Select.Option key="uiSchema">Ui Schema</Select.Option>
+        <Select.Option key="formData">Data</Select.Option>
+      </Select>*/}
+    </span>
+  );
+};
+
+/*
+
+class Toolbar_ extends React.Component {
   constructor(props) {
     super(props);
     this.state = {};
@@ -112,3 +182,4 @@ export default connect(
       }),
   })
 )(Toolbar);
+*/
diff --git a/src/Tree/Menu.tsx b/src/Tree/Menu.tsx
index 74a9b8c..1830ea1 100644
--- a/src/Tree/Menu.tsx
+++ b/src/Tree/Menu.tsx
@@ -3,7 +3,7 @@ import * as React from 'react';
 import { Menu } from 'antd';
 import { JSONSchema7, JSONSchema7Definition } from 'json-schema';
 import { FormBuilderContext } from '../FormBuilderContext';
-import { addSchemaNode, addExtraPropsNode } from '../utils';
+import { addSchemaNode, addExtraPropsNode, getSchemaByPath } from '../utils';
 const { SubMenu, Item } = Menu;
 
 function nameGen(name: string, occupied: string[]) {
@@ -66,7 +66,9 @@ const menuExtraProps = {
 };
 
 export const AddItemMenu: React.FC<{ schemaPath: (string | number)[] }> = ({ schemaPath }) => {
-  const { schema, setSchema, selectedSchema, extraProps, setExtraProps } = React.useContext(FormBuilderContext);
+  const { schema, setSchema, extraProps, setExtraProps, setSelectedNodePath } = React.useContext(FormBuilderContext);
+
+  const selectedSchema = getSchemaByPath(schema, schemaPath);
 
   const handleAddNode = (key: string, newSchemaNode: JSONSchema7Definition, newExtraPropsNode: any) => {
     if (typeof selectedSchema === 'boolean' || !selectedSchema?.properties) return;
@@ -75,13 +77,12 @@ export const AddItemMenu: React.FC<{ schemaPath: (string | number)[] }> = ({ sch
     const childrenNames = Object.keys(properties);
     const name = nameGen(key, childrenNames);
 
-    /*const newSchema = addSchemaNode(
-      schema,
-      newSchemaNode,
-      [...schemaPath, 'properties', childrenNames[childrenNames.length - 1]],
-      name
-
-    );*/
+    const newSchema = addSchemaNode(schema, schemaPath, 0, name, newSchemaNode);
+    if (newSchema !== schema) {
+      setSchema(newSchema);
+      setExtraProps(addExtraPropsNode(extraProps, [...schemaPath, 'properties', name], newExtraPropsNode));
+      setSelectedNodePath([...schemaPath, 'properties', name]);
+    }
   };
 
   const { properties } = menueSchema;
@@ -93,6 +94,7 @@ export const AddItemMenu: React.FC<{ schemaPath: (string | number)[] }> = ({ sch
       {Object.keys(properties).map((key) => {
         const itemSchema = properties[key];
         const itemExtraProps = (menuExtraProps.properties as any)[key];
+        key === 'textarea' && console.log(itemExtraProps);
         if (typeof itemSchema === 'boolean') return null;
 
         return (
diff --git a/src/Tree/Tree.tsx b/src/Tree/Tree.tsx
index e6d1a64..98e77e5 100644
--- a/src/Tree/Tree.tsx
+++ b/src/Tree/Tree.tsx
@@ -77,12 +77,12 @@ export const FormSchemaTree: React.FC = () => {
     (info) => {
       const dropKey = info.node.key;
       const dragKey = info.dragNode.key;
-      // const dropPos = info.node.pos.split('-');
-      // const dropPosition = info.dropPosition - +dropPos[dropPos.length - 1];
+      const dropPos = info.node.pos.split('-');
+      const dropPosition = info.dropPosition - +dropPos[dropPos.length - 1];
       const src = key2path(dragKey);
       const dst = key2path(dropKey);
       if (src && dst) {
-        setSchema(moveSchemaNode(schema, src, dst, info.dropPosition));
+        setSchema(moveSchemaNode(schema, src, dst, dropPosition));
       }
     },
     [schema]
diff --git a/src/Tree/TreeNodeTitle.tsx b/src/Tree/TreeNodeTitle.tsx
index 08f5ae2..70d9f1e 100644
--- a/src/Tree/TreeNodeTitle.tsx
+++ b/src/Tree/TreeNodeTitle.tsx
@@ -61,7 +61,7 @@ export const TreeNodeTitle: React.FC<{
       <span style={{ float: 'right' }}>
         {!isLeaf ? (
           <span className="form-builder-add-item-menu" onClick={(e) => e.stopPropagation()}>
-            <Dropdown placement="bottomLeft" trigger={['click']} overlay={<AddItemMenu />}>
+            <Dropdown placement="bottomLeft" trigger={['click']} overlay={<AddItemMenu schemaPath={path} />}>
               <PlusCircleOutlined />
             </Dropdown>
           </span>
@@ -83,67 +83,3 @@ export const TreeNodeTitle: React.FC<{
     </span>
   );
 };
-
-/*
-class TreeNodeTitle extends PureComponent {
-  render() {
-    const { node, removeNode, updateNodeName, searchValue } = this.props;
-    const { name, key } = node;
-    const isLeaf = node.isLeaf;
-    const isRoot = node.name === node.key;
-    const isArray = node.schema.type === 'array';
-    const indexBefore = node.name.toLowerCase().indexOf(searchValue);
-    const indexAfter = indexBefore + searchValue.length;
-    return (
-      <span style={{ display: 'block' }}>
-        {searchValue && indexBefore >= 0 ? (
-          <InlineEditor value={node.name} onChange={(name) => updateNodeName(key, name)}>
-            {name.slice(0, indexBefore)}
-            <span style={{ color: '#f50' }}>{name.slice(indexBefore, indexAfter)}</span>
-            {name.slice(indexAfter)}
-          </InlineEditor>
-        ) : (
-          <InlineEditor value={node.name} onChange={(name) => updateNodeName(key, name)}>
-            {name}
-          </InlineEditor>
-        )}
-        <span className="pull-right">
-          {!(isLeaf || isArray) ? (
-            <span className="form-builder-add-item-menu" onClick={(e) => e.stopPropagation()}>
-              <Dropdown placement="bottomLeft" trigger={['click']} overlay={<AddItemMenu node={node} />}>
-                <PlusCircleOutlined />
-              </Dropdown>
-            </span>
-          ) : null}
-          {!isRoot ? (
-            <span className="tree-node-delete" onClick={(e) => e.stopPropagation()}>
-              <Popconfirm
-                placement="rightTop"
-                title={`Delete "${key}"?`}
-                onConfirm={() => removeNode(key)}
-                okText="Yes"
-                cancelText="No"
-              >
-                <CloseCircleFilled />
-              </Popconfirm>
-            </span>
-          ) : null}
-        </span>
-      </span>
-    );
-  }
-}
-
-export default connect(null, (dispatch) => ({
-  removeNode: (key) =>
-    dispatch({
-      type: 'TREE_REMOVE_NODE',
-      payload: key,
-    }),
-  updateNodeName: (key, name) =>
-    dispatch({
-      type: 'TREE_UPDATE_NODE',
-      payload: { target: key, nodeUpdate: { name } },
-    }),
-}))(TreeNodeTitle);
-*/
diff --git a/src/css.js b/src/css.ts
similarity index 100%
rename from src/css.js
rename to src/css.ts
diff --git a/src/utils.ts b/src/utils.ts
index b4b9461..af25871 100644
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -162,22 +162,21 @@ export function addSchemaNode(
 
   let newChildren: { [key: string]: JSONSchema7Definition } = {};
   let added = false;
-  let count = 0;
 
   const dstName = path[path.length - 1];
   for (const prop in children) {
     if (prop === dstName) {
-      if (count < position) {
+      if (position > 0) {
         newChildren[prop] = children[prop];
         newChildren[name] = node;
         added = true;
       }
-      if (count > position) {
+      if (position < 0) {
         newChildren[name] = node;
         newChildren[prop] = children[prop];
         added = true;
       }
-      if (count === position) {
+      if (position === 0) {
         const schemaTarget = children[prop];
         if (typeof schemaTarget !== 'boolean' && schemaTarget.type === 'object') {
           // dst is object
@@ -193,13 +192,12 @@ export function addSchemaNode(
         } else {
           newChildren[prop] = children[prop];
           newChildren[name] = node;
-          added = true;
         }
+        added = true;
       }
     } else {
       newChildren[prop] = children[prop];
     }
-    count++;
   }
 
   return added
@@ -256,16 +254,16 @@ function reorder(
   position: number
 ): JSONSchema7['properties'] {
   const newProperties: JSONSchema7['properties'] = {};
-  let count = 0;
+
   for (const prop in properties) {
     if (prop === src) {
     } else {
       if (prop === dst) {
-        if (position < count) {
+        if (position < 0) {
           // before dst
           newProperties[src] = properties[src];
           newProperties[prop] = properties[prop];
-        } else if (position > count) {
+        } else if (position > 0) {
           // after dst
           newProperties[prop] = properties[prop];
           newProperties[src] = properties[src];
@@ -291,7 +289,6 @@ function reorder(
         newProperties[prop] = properties[prop];
       }
     }
-    count++;
   }
   return newProperties;
 }
diff --git a/src/views/ExtraPropsView.tsx b/src/views/ExtraPropsView.tsx
new file mode 100644
index 0000000..028536b
--- /dev/null
+++ b/src/views/ExtraPropsView.tsx
@@ -0,0 +1,8 @@
+import * as React from 'react';
+import { FormBuilderContext } from '../FormBuilderContext';
+import JsonEditor from '../JsonEditor';
+
+export const ExtraPropsView: React.FC = () => {
+  const { extraProps, setExtraProps } = React.useContext(FormBuilderContext);
+  return <JsonEditor value={extraProps} onChange={setExtraProps} autoSize />;
+};
diff --git a/src/views/UiSchemaView.jsx b/src/views/UiSchemaView.jsx
deleted file mode 100644
index ce0ae00..0000000
--- a/src/views/UiSchemaView.jsx
+++ /dev/null
@@ -1,20 +0,0 @@
-import React from 'react';
-import { connect } from 'react-redux';
-import JsonEditor from '../JsonEditor';
-
-export default connect(
-  ({
-    tree: {
-      present: [{ uiSchema }],
-    },
-  }) => ({ uiSchema }),
-  (dispatch) => ({
-    setTree: (uiSchema) =>
-      dispatch({
-        type: 'TREE_SET_TREE',
-        payload: {
-          uiSchema,
-        },
-      }),
-  })
-)(({ uiSchema, setTree }) => <JsonEditor value={uiSchema} onChange={(value) => setTree(value)} autoSize />);

From 20dc1ecc5c240a88668acec1a9b309512589e94d Mon Sep 17 00:00:00 2001
From: knilink <esurllink@gmail.com>
Date: Mon, 7 Sep 2020 23:49:06 +1000
Subject: [PATCH 3/3] fix

---
 src/App.test.js                  |   9 -
 src/Editor/Editor.tsx            |  62 ---
 src/Editor/SchemaEditor.tsx      |  88 ++-
 src/FormBuilderContext.tsx       |   1 -
 src/InlineEditor.tsx             |   4 +-
 src/JsonEditor.tsx               |   2 +-
 src/Settings.jsx                 | 179 ------
 src/Template/Template.jsx        |  58 --
 src/Template/connectors.jsx      | 187 -------
 src/Template/index.jsx           |   5 -
 src/Toolbar.tsx                  | 197 +++----
 src/Tree/Menu.tsx                |   3 +-
 src/Tree/Tree.tsx                |  10 +-
 src/Tree/TreeNodeTitle.tsx       |   1 -
 src/Tree/index.js                |   2 -
 src/core.js                      | 685 -----------------------
 src/core.test.js                 | 912 -------------------------------
 src/css.ts                       |  22 -
 src/default/menu.js              |  48 --
 src/default/settings.js          |   7 -
 src/index.js                     |  12 -
 src/reducers.js                  | 170 ------
 src/rjsf-patch/ArrayField.jsx    |  50 --
 src/rjsf-patch/BooleanField.jsx  |  77 ---
 src/rjsf-patch/Form.jsx          |  17 -
 src/rjsf-patch/SchemaField.jsx   |  12 -
 src/rjsf-patch/StringField.jsx   |  86 ---
 src/rjsf-patch/utils.js          |  47 --
 src/store.js                     |  92 ----
 src/utils.ts                     |   2 +-
 src/views/FormDataView.jsx       |  82 ---
 src/views/InlineEditTemplate.tsx |  17 +-
 src/views/index.js               |   4 -
 33 files changed, 183 insertions(+), 2967 deletions(-)
 delete mode 100644 src/App.test.js
 delete mode 100644 src/Settings.jsx
 delete mode 100644 src/Template/Template.jsx
 delete mode 100644 src/Template/connectors.jsx
 delete mode 100644 src/Template/index.jsx
 delete mode 100644 src/Tree/index.js
 delete mode 100644 src/core.js
 delete mode 100644 src/core.test.js
 delete mode 100644 src/default/menu.js
 delete mode 100644 src/default/settings.js
 delete mode 100644 src/index.js
 delete mode 100644 src/reducers.js
 delete mode 100644 src/rjsf-patch/ArrayField.jsx
 delete mode 100644 src/rjsf-patch/BooleanField.jsx
 delete mode 100644 src/rjsf-patch/Form.jsx
 delete mode 100644 src/rjsf-patch/SchemaField.jsx
 delete mode 100644 src/rjsf-patch/StringField.jsx
 delete mode 100644 src/rjsf-patch/utils.js
 delete mode 100644 src/store.js
 delete mode 100644 src/views/FormDataView.jsx
 delete mode 100644 src/views/index.js

diff --git a/src/App.test.js b/src/App.test.js
deleted file mode 100644
index a754b20..0000000
--- a/src/App.test.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import React from 'react';
-import ReactDOM from 'react-dom';
-import App from './App';
-
-it('renders without crashing', () => {
-  const div = document.createElement('div');
-  ReactDOM.render(<App />, div);
-  ReactDOM.unmountComponentAtNode(div);
-});
diff --git a/src/Editor/Editor.tsx b/src/Editor/Editor.tsx
index 5c7e532..8b3cf96 100644
--- a/src/Editor/Editor.tsx
+++ b/src/Editor/Editor.tsx
@@ -3,11 +3,8 @@ import { Tabs } from 'antd';
 import { NodeJsonEditor } from './JsonEditor';
 import { SchemaEditor } from './SchemaEditor';
 
-const { getNode } = require('../core');
 const { TabPane } = Tabs;
 
-// const editorList = [NodeJsonEditor];
-
 export const Editor: React.FC = () => {
   const Editor = NodeJsonEditor;
   return (
@@ -21,62 +18,3 @@ export const Editor: React.FC = () => {
     </Tabs>
   );
 };
-
-/*
-class Editor extends React.Component {
-  updateUiOptions = (uiOptionsUpdate) => {
-    const { uiSchema = {}, key } = this.props.node;
-    const uiOptions = uiSchema['ui:options'] || {};
-    const newUiOptions = { ...uiOptions, ...uiOptionsUpdate };
-    for (const i in newUiOptions) {
-      if (newUiOptions[i] !== undefined) {
-        this.props.updateNode(key, { uiSchema: { ...uiSchema, 'ui:options': { ...uiOptions, ...newUiOptions } } });
-        return;
-      }
-    }
-    this.props.updateNode(key, { uiSchema: { ...uiSchema, 'ui:options': undefined } });
-  };
-
-  render() {
-    const { node, updateNode } = this.props;
-    if (!(node && node.schema)) return null;
-    const filteredEditors = editorList.filter((a) => a.filter(node));
-    return (
-      <Tabs defaultActiveKey={filteredEditors[0].key} type="card">
-        {filteredEditors.map((Editor) => (
-          <TabPane tab={Editor.name} key={Editor.key}>
-            <div style={{ margin: '0px 16px' }}>
-              <Editor
-                key={node.key}
-                node={node}
-                updateNode={(nodeUpdate) => updateNode(node.key, nodeUpdate)}
-                updateSchema={(schemaUpdate) => updateNode(node.key, { schema: { ...node.schema, ...schemaUpdate } })}
-                updateUiSchema={(uiSchemaUpdate) =>
-                  updateNode(node.key, { uiSchema: { ...node.uiSchema, ...uiSchemaUpdate } })
-                }
-                updateUiOptions={this.updateUiOptions}
-              />
-            </div>
-          </TabPane>
-        ))}
-      </Tabs>
-    );
-  }
-}
-
-export default connect(
-  ({ tree: { present }, activeNodeKey }) => ({
-    node: activeNodeKey && getNode(present, activeNodeKey),
-  }),
-  (dispatch) => ({
-    updateNode: (target, nodeUpdate) =>
-      dispatch({
-        type: 'TREE_UPDATE_NODE',
-        payload: {
-          target,
-          nodeUpdate,
-        },
-      }),
-  })
-)(Editor);
-*/
diff --git a/src/Editor/SchemaEditor.tsx b/src/Editor/SchemaEditor.tsx
index 8de1198..8f6621f 100644
--- a/src/Editor/SchemaEditor.tsx
+++ b/src/Editor/SchemaEditor.tsx
@@ -1,10 +1,43 @@
 import * as React from 'react';
+import isNil from 'lodash/isNil';
+import toString from 'lodash/toString';
 import { JSONSchema7 } from 'json-schema';
-import { Input, List, Divider, Button, Menu, Dropdown } from 'antd';
+import { Input, List, Divider, Button, Menu, Dropdown, Row, Col } from 'antd';
 import { EditOutlined, CaretDownOutlined, CloseOutlined, PlusOutlined } from '@ant-design/icons';
 import { FormBuilderContext } from '../FormBuilderContext';
 import { replaceSchemaNode } from '../utils';
 
+import {
+  Form,
+  presetMws,
+  SubmitButtonWithValidationMw,
+  FieldsetTemplateMw,
+  RowMw,
+  MiddlewareProps,
+} from '@gravel-form/antd';
+
+import { ExtraPropsMw, LocalRefMw, FixedObjectMw, FixedArrayMw } from '@gravel-form/antd/lib/core';
+import { formControlMws } from '@gravel-form/antd/lib/preset';
+
+const FormControlTemplate: React.ComponentType<MiddlewareProps> = (props) => {
+  const { schema, schemaPath, next, data } = props;
+  if (typeof schema === 'boolean') return next(props);
+  const title = schema.title || schemaPath[schemaPath.length - 1];
+
+  return (
+    <Row gutter={[16, 16]}>
+      <Col span={8} style={{ textAlign: 'right' }}>
+        {title}:
+      </Col>
+      <Col span={16}>
+        <div style={{ background: '#f0f0f0', width: '100%' }}>{isNil(data) ? <>&#8203;</> : toString(data)}</div>
+      </Col>
+    </Row>
+  );
+};
+
+const mws = [ExtraPropsMw, FieldsetTemplateMw, FixedObjectMw, FixedArrayMw, FormControlTemplate];
+
 interface ISchemaEditor {
   schema: JSONSchema7;
   onUpdate: (schema: JSONSchema7) => void;
@@ -43,9 +76,22 @@ const editors: {
       );
     },
   },
+  {
+    key: 'length',
+    title: 'Length',
+    setDefault: (schema) => ({ ...schema, length: undefined }),
+    handleRemove: (schema) => {
+      const { description, ...rest } = schema;
+      return rest;
+    },
+    Component: ({ schema, onUpdate }) => {
+      return (
+        <Input value={schema.description} onChange={(e) => onUpdate({ ...schema, description: e.target.value })} />
+      );
+    },
+  },
 ];
-
-export const SchemaEditor: React.FC = () => {
+export const SchemaEditor_: React.FC = () => {
   const { selectedSchema, selectedNodePath, schema, setSchema } = React.useContext(FormBuilderContext);
 
   if (!selectedNodePath || !selectedSchema || typeof selectedSchema === 'boolean') return null;
@@ -92,3 +138,39 @@ export const SchemaEditor: React.FC = () => {
     />
   );
 };
+
+const Foo = () => {
+  const { schema, selectedSchema, selectedNodePath, setSchema } = React.useContext(FormBuilderContext);
+  if (!selectedNodePath || !selectedSchema || typeof selectedSchema === 'boolean') return null;
+  const handleUpdate = (newSchemaNode: JSONSchema7) => {
+    setSchema(replaceSchemaNode(schema, selectedNodePath, newSchemaNode));
+  };
+  return (
+    <Form
+      size="small"
+      labelCol={{
+        xs: { span: 24 },
+        sm: { span: 6 },
+      }}
+      schema={{
+        type: 'object',
+        properties: {
+          title: { type: 'string', title: 'Title' },
+          description: { type: 'string', title: 'Description' },
+        },
+      }}
+      extraProps={{
+        properties: {
+          description: {
+            component: 'TextArea',
+          },
+        },
+      }}
+      middlewares={mws}
+      data={selectedSchema}
+      onChange={handleUpdate as any}
+    />
+  );
+};
+
+export const SchemaEditor = Foo;
diff --git a/src/FormBuilderContext.tsx b/src/FormBuilderContext.tsx
index 6f34a7d..79f3350 100644
--- a/src/FormBuilderContext.tsx
+++ b/src/FormBuilderContext.tsx
@@ -2,7 +2,6 @@ import * as React from 'react';
 import { Dispatch, SetStateAction } from 'react';
 import get from 'lodash/get';
 import { JSONSchema7, JSONSchema7Definition } from 'json-schema';
-import { MiddlewareProps } from '@gravel-form/antd';
 import { SchemaPath, getSchemaByPath } from './utils';
 
 interface ISettings {
diff --git a/src/InlineEditor.tsx b/src/InlineEditor.tsx
index 7346dc2..c54b5b6 100644
--- a/src/InlineEditor.tsx
+++ b/src/InlineEditor.tsx
@@ -17,7 +17,7 @@ export const InlineEditor: React.FC<
       setEditing(true);
       setMouseOver(false);
     },
-    [setEditing, inputRef, value]
+    [setEditing, value, setMouseOver]
   );
 
   React.useEffect(() => {
@@ -36,7 +36,7 @@ export const InlineEditor: React.FC<
 
   const handleCancelEditing = React.useCallback(() => {
     setEditing(false);
-  }, [value]);
+  }, []);
 
   const handleChange = React.useCallback<React.ChangeEventHandler<HTMLInputElement>>((e) => {
     setEditingValue(e.target.value);
diff --git a/src/JsonEditor.tsx b/src/JsonEditor.tsx
index 95e5aae..ddc83be 100644
--- a/src/JsonEditor.tsx
+++ b/src/JsonEditor.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { Input, Alert } from 'antd';
+import { Input } from 'antd';
 import { TextAreaProps } from 'antd/lib/input';
 
 const { TextArea } = Input;
diff --git a/src/Settings.jsx b/src/Settings.jsx
deleted file mode 100644
index 462e556..0000000
--- a/src/Settings.jsx
+++ /dev/null
@@ -1,179 +0,0 @@
-import React from 'react';
-import { connect } from 'react-redux';
-import { Slider, Switch, Button, List, Modal } from 'antd';
-const { confirm } = Modal;
-
-const tipFormatter = ((flag = false) => (number) => {
-  flag = !flag;
-  return flag ? number : window.innerWidth - number;
-})();
-
-class Settings extends React.Component {
-  siderWidth() {
-    const { leftSiderWidth, rightSiderWidth } = this.props.settings;
-    return {
-      key: 'sider-width',
-      title: 'Sider Width',
-      description: (
-        <Slider
-          included
-          min={0}
-          max={window.innerWidth}
-          tipFormatter={tipFormatter}
-          range
-          value={[leftSiderWidth, window.innerWidth - rightSiderWidth]}
-          onChange={([left, right]) => {
-            this.props.updateSettings({
-              leftSiderWidth: left > 200 ? left : 200,
-              rightSiderWidth: window.innerWidth - right,
-            });
-          }}
-        />
-      ),
-    };
-  }
-
-  formWidth() {
-    return {
-      key: 'form-item',
-      title: 'Form Width',
-      description: (
-        <Slider
-          min={0}
-          max={window.innerWidth}
-          value={this.props.settings.formWidth}
-          onChange={(value) => {
-            this.props.updateSettings({
-              formWidth: value,
-            });
-          }}
-        />
-      ),
-    };
-  }
-
-  inlineMode() {
-    return {
-      key: 'inline-mode',
-      title: 'Inline Mode',
-      actions: [
-        <Switch
-          onChange={(v) => this.props.updateSettings({ isInlineMode: v })}
-          checked={this.props.settings.isInlineMode}
-        />,
-      ],
-    };
-  }
-
-  liveValidate() {
-    return {
-      key: 'live-validate',
-      title: 'Live Validate',
-      actions: [
-        <Switch
-          onChange={(v) => this.props.updateSettings({ isLiveValidate: v })}
-          checked={this.props.settings.isLiveValidate}
-        />,
-      ],
-    };
-  }
-
-  menu() {
-    const { setTree, rootNode, setMenu, menu } = this.props;
-    return {
-      key: 'menu',
-      title: 'Menu',
-      description: [
-        <Button key="edit" onClick={() => setTree(menu)}>
-          Customize
-        </Button>,
-        <Button key="set" onClick={() => setMenu(rootNode)}>
-          Apply Change
-        </Button>,
-      ],
-    };
-  }
-
-  reset() {
-    return {
-      key: 'reset',
-      description: (
-        <Button
-          type="danger"
-          sytle={{ width: '100%' }}
-          key="edit"
-          onClick={() => {
-            confirm({
-              title: 'Reset Form Buiilder?',
-              content: 'Removing persistent data from local storage.\n All settings and unsaved form will be lost.',
-              okText: 'Continue',
-              okType: 'danger',
-              closable: true,
-              maskClosable: true,
-              onOk() {
-                window.localStorage.removeItem('persist:react-jsonschema-formbuilder');
-                window.location.reload();
-              },
-            });
-          }}
-        >
-          Reset Form Builder
-        </Button>
-      ),
-    };
-  }
-
-  listItems() {
-    return [this.siderWidth(), this.formWidth(), this.inlineMode(), this.liveValidate(), this.menu(), this.reset()];
-  }
-
-  renderItem(a) {
-    const {
-      Item,
-      Item: { Meta },
-    } = List;
-    return (
-      <Item key={a.key} actions={a.actions}>
-        <Meta title={a.title} description={a.description} />
-      </Item>
-    );
-  }
-
-  render() {
-    return <List itemLayout="horizontal" dataSource={this.listItems()} renderItem={this.renderItem} />;
-  }
-}
-
-export default connect(
-  ({
-    settings,
-    tree: {
-      present: [rootNode],
-    },
-    menu,
-  }) => ({ settings, rootNode, menu }),
-  (dispatch) => ({
-    updateSettings: (payload) =>
-      dispatch({
-        type: 'SETTINGS_UPDATE',
-        payload,
-      }),
-    setTree: ({ schema, uiSchema }) =>
-      dispatch({
-        type: 'TREE_SET_TREE',
-        payload: {
-          name: 'menu',
-          schema,
-          uiSchema,
-        },
-      }),
-    setMenu: ({ schema, uiSchema }) =>
-      dispatch({
-        type: 'MENU_SET',
-        payload: {
-          schema,
-          uiSchema,
-        },
-      }),
-  })
-)(Settings);
diff --git a/src/Template/Template.jsx b/src/Template/Template.jsx
deleted file mode 100644
index 794bb4f..0000000
--- a/src/Template/Template.jsx
+++ /dev/null
@@ -1,58 +0,0 @@
-import React from 'react';
-
-const REQUIRED_FIELD_SYMBOL = '*';
-
-function Label(props) {
-  const { label, required, id } = props;
-  if (!label) {
-    // See #312: Ensure compatibility with old versions of React.
-    return <div />;
-  }
-  return (
-    <label className="control-label" htmlFor={id}>
-      {label}
-      {required && <span className="required">{REQUIRED_FIELD_SYMBOL}</span>}
-    </label>
-  );
-}
-
-export function DefaultTemplate(props) {
-  const { id, classNames, label, children, errors, help, description, hidden, required, displayLabel } = props;
-  if (hidden) {
-    return children;
-  }
-
-  return (
-    <div className={classNames}>
-      {displayLabel && <Label label={label} required={required} id={id} />}
-      {displayLabel && description ? description : null}
-      {children}
-      {errors}
-      {help}
-    </div>
-  );
-}
-
-export function DefaultObjectFieldTemplate(props) {
-  const { TitleField, DescriptionField } = props;
-  return (
-    <fieldset>
-      {(props.uiSchema['ui:title'] || props.title) && (
-        <TitleField
-          id={`${props.idSchema.$id}__title`}
-          title={props.title || props.uiSchema['ui:title']}
-          required={props.required}
-          formContext={props.formContext}
-        />
-      )}
-      {props.description && (
-        <DescriptionField
-          id={`${props.idSchema.$id}__description`}
-          description={props.description}
-          formContext={props.formContext}
-        />
-      )}
-      {props.properties.map((prop) => prop.content)}
-    </fieldset>
-  );
-}
diff --git a/src/Template/connectors.jsx b/src/Template/connectors.jsx
deleted file mode 100644
index 1bb2d3b..0000000
--- a/src/Template/connectors.jsx
+++ /dev/null
@@ -1,187 +0,0 @@
-import React from 'react';
-import InlineEditor from '../InlineEditor';
-import { connect } from 'react-redux';
-import { Input, Popconfirm, Tooltip } from 'antd';
-import { SelectOutlined, DeleteOutlined } from '@ant-design/icons';
-const { getNodeByRjsfId } = require('../core');
-const { TextArea } = Input;
-
-const ACTIVE_STYLE = { backgroundColor: '#bae7ff' };
-
-class ExtendedInlineEditor extends InlineEditor {
-  renderView() {
-    return (
-      <span className="fb-test" onClick={this.onStartEditing}>
-        {this.props.children}
-      </span>
-    );
-  }
-}
-
-class InlineTextAreaEditor extends ExtendedInlineEditor {
-  renderEditing() {
-    return (
-      <TextArea
-        ref={(r) => (this.input = r)}
-        value={this.state.value}
-        onBlur={this.onCompleteEditing}
-        onChange={this.onChange}
-        autoSize
-        onKeyUp={(e) => {
-          if (e.keyCode === 27) {
-            this.onCancelEditing();
-          }
-        }}
-      />
-    );
-  }
-}
-
-const ButtonGroup = connect(null, (dispatch, { id }) => ({
-  select: () => dispatch({ type: 'ACTIVE_NODE_KEY_SET_BY_RJSF_ID', payload: id }),
-  remove: () => dispatch({ type: 'TREE_REMOVE_NODE_BY_RJSF_ID', payload: id }),
-}))((props) => {
-  const { select, remove, id } = props;
-  return (
-    <Tooltip title={id} placement="right">
-      <a href="#!">
-        <SelectOutlined onClick={select} />
-      </a>
-      <Popconfirm title={`Remove ${id}?`} onConfirm={remove}>
-        <a href="#!">
-          <DeleteOutlined />
-        </a>
-      </Popconfirm>
-    </Tooltip>
-  );
-});
-
-export function fieldTemplateConnector(FieldTemplate) {
-  return connect(
-    ({ tree: { present }, activeNodeKey, settings: { isInlineMode } }, { id }) => {
-      const n = getNodeByRjsfId(present, id);
-      const active = n && n.key === activeNodeKey;
-      return { tree: present, active, isInlineMode };
-    },
-    (dispatch, { id, schema, uiSchema }) => ({
-      updateTitle: (title) =>
-        dispatch({
-          type: 'TREE_UPDATE_NODE_BY_RJSF_ID',
-          payload: { rjsfId: id, nodeUpdate: { schema: { ...schema, title } } },
-        }),
-      updateDescription: (description) =>
-        dispatch({
-          type: 'TREE_UPDATE_NODE_BY_RJSF_ID',
-          payload: { rjsfId: id, nodeUpdate: { schema: { ...schema, description } } },
-        }),
-      updateHelp: (help) =>
-        dispatch({
-          type: 'TREE_UPDATE_NODE_BY_RJSF_ID',
-          payload: { rjsfId: id, nodeUpdate: { uiSchema: { ...uiSchema, 'ui:help': help } } },
-        }),
-    })
-  )((props) => {
-    const {
-      id,
-      label,
-      description,
-      help,
-      schema,
-      updateTitle,
-      updateDescription,
-      updateHelp,
-      active,
-      classNames,
-      isInlineMode,
-    } = props;
-    if (!isInlineMode) return <FieldTemplate {...props} />;
-    const labelElement = label && (
-      <ExtendedInlineEditor value={label} onChange={updateTitle}>
-        {label}
-      </ExtendedInlineEditor>
-    );
-    const descriptionElement = description && (
-      <InlineTextAreaEditor value={description.props.description} onChange={updateDescription}>
-        {description}
-      </InlineTextAreaEditor>
-    );
-    const helpElement = help && (
-      <ExtendedInlineEditor value={help.props.help} onChange={updateHelp}>
-        {help}
-      </ExtendedInlineEditor>
-    );
-    return (
-      <div className={classNames} style={active ? ACTIVE_STYLE : null}>
-        {['object', 'array'].includes(schema.type) ? null : (
-          <div className="pull-right">
-            {' '}
-            <ButtonGroup id={id} />{' '}
-          </div>
-        )}
-        <FieldTemplate
-          _label={label}
-          _description={description}
-          _help={help}
-          {...props}
-          classNames={null}
-          label={labelElement}
-          description={descriptionElement}
-          help={helpElement}
-        />
-      </div>
-    );
-  });
-}
-
-export function objectFieldTemplateConnector(ObjectFieldTemplate) {
-  return connect(
-    ({ tree: { present }, activeNodeKey, settings: { isInlineMode } }, { idSchema }) => {
-      const n = idSchema && idSchema.$id && getNodeByRjsfId(present, idSchema.$id);
-      const active = n && n.key === activeNodeKey;
-      return { tree: present, active, isInlineMode };
-    },
-    (dispatch, { idSchema, schema }) => ({
-      updateTitle: (title) =>
-        dispatch({
-          type: 'TREE_UPDATE_NODE_BY_RJSF_ID',
-          payload: { rjsfId: idSchema.$id, nodeUpdate: { schema: { ...schema, title } } },
-        }),
-      updateDescription: (description) =>
-        dispatch({
-          type: 'TREE_UPDATE_NODE_BY_RJSF_ID',
-          payload: { rjsfId: idSchema.$id, nodeUpdate: { schema: { ...schema, description } } },
-        }),
-    })
-  )((props) => {
-    const { idSchema, title, description, updateTitle, updateDescription, active, isInlineMode } = props;
-    if (!isInlineMode) return <ObjectFieldTemplate {...props} />;
-    const titleElement = title && (
-      <span>
-        <ExtendedInlineEditor value={title} onChange={updateTitle}>
-          {title}
-        </ExtendedInlineEditor>
-        <span className="pull-right">
-          {' '}
-          <ButtonGroup id={idSchema.$id} />{' '}
-        </span>
-      </span>
-    );
-    const descriptionElement = description && (
-      <InlineTextAreaEditor value={description} onChange={updateDescription}>
-        {description}
-      </InlineTextAreaEditor>
-    );
-
-    return (
-      <div style={active ? ACTIVE_STYLE : null}>
-        <ObjectFieldTemplate
-          _title={title}
-          _description={description}
-          {...props}
-          title={titleElement}
-          description={descriptionElement}
-        />
-      </div>
-    );
-  });
-}
diff --git a/src/Template/index.jsx b/src/Template/index.jsx
deleted file mode 100644
index f8a3d60..0000000
--- a/src/Template/index.jsx
+++ /dev/null
@@ -1,5 +0,0 @@
-import { DefaultTemplate, DefaultObjectFieldTemplate } from './Template';
-import { fieldTemplateConnector, objectFieldTemplateConnector } from './connectors';
-
-export const FieldTemplate = fieldTemplateConnector(DefaultTemplate);
-export const ObjectFieldTemplate = objectFieldTemplateConnector(DefaultObjectFieldTemplate);
diff --git a/src/Toolbar.tsx b/src/Toolbar.tsx
index 4e8666c..56dd8c4 100644
--- a/src/Toolbar.tsx
+++ b/src/Toolbar.tsx
@@ -1,12 +1,8 @@
 import * as React from 'react';
-// import { connect } from 'react-redux';
-import { Button, Tooltip, message, Select } from 'antd';
+import { Button, Tooltip, message } from 'antd';
 import { FileAddOutlined, FolderOpenOutlined, SaveOutlined, UndoOutlined, RedoOutlined } from '@ant-design/icons';
 import { JSONSchema7 } from 'json-schema';
 import { FormBuilderContext } from './FormBuilderContext';
-import { rejects } from 'assert';
-
-// import { ActionTypes } from 'redux-undo';
 
 function write(filename: string, json: any) {
   const a = window.document.createElement('a');
@@ -38,28 +34,83 @@ function read(e: React.ChangeEvent<HTMLInputElement>) {
 
 const buttonStyle = { marginLeft: 8 };
 
+interface FormSchema {
+  schema: JSONSchema7;
+  extraProps: any;
+}
+
+interface History {
+  past: FormSchema[];
+  current: FormSchema;
+  future: FormSchema[];
+}
+
 export const Toolbar: React.FC = () => {
-  const { setSchema, setExtraProps } = React.useContext(FormBuilderContext);
+  const { setSchema, setExtraProps, schema, extraProps } = React.useContext(FormBuilderContext);
+
+  const { current: history } = React.useRef<History>({ past: [], current: { schema, extraProps }, future: [] });
+
+  const [historyStatus, setHistoryStatus] = React.useState({ disableUndo: true, disableRedo: true });
+
+  React.useEffect(() => {
+    if (history.current.schema !== schema || history.current.extraProps !== extraProps) {
+      history.past.push(history.current);
+      history.current = { schema, extraProps };
+      history.future = [];
+      setHistoryStatus({ disableUndo: false, disableRedo: true });
+    }
+  }, [history, schema, extraProps, historyStatus]);
+
+  const handleUndo = () => {
+    const past = history.past.pop();
+    if (past) {
+      history.future.push(history.current);
+      history.current = past;
+      setSchema(past.schema);
+      setExtraProps(past.extraProps);
+      setHistoryStatus({ disableUndo: history.past.length === 0, disableRedo: false });
+    }
+  };
+
+  const handleRedo = () => {
+    const future = history.future.pop();
+    if (future) {
+      history.past.push(history.current);
+      history.current = future;
+      setSchema(future.schema);
+      setExtraProps(future.extraProps);
+      setHistoryStatus({ disableUndo: false, disableRedo: history.future.length === 0 });
+    }
+  };
 
   const handleNew = React.useCallback(() => {
-    return;
     setSchema({ type: 'object' });
     setExtraProps({});
   }, [setSchema, setExtraProps]);
 
-  const handleOpen = React.useCallback<React.ChangeEventHandler<HTMLInputElement>>(async (e) => {
-    return;
-    try {
-      const s = await read(e);
-      const { schema, extraProps } = JSON.parse(s);
-      setSchema(schema as JSONSchema7);
-      setExtraProps(extraProps);
-    } catch (e) {
-      message.error('Invalid json file!');
-    }
-  }, []);
+  const handleOpen = React.useCallback<React.ChangeEventHandler<HTMLInputElement>>(
+    async (e) => {
+      try {
+        const s = await read(e);
+        const { schema, extraProps } = JSON.parse(s);
+        setSchema(schema as JSONSchema7);
+        setExtraProps(extraProps);
+      } catch (e) {
+        message.error('Invalid json file!');
+      }
+    },
+    [setSchema, setExtraProps]
+  );
+
+  const handleSave = () => {
+    write('form', { schema, extraProps });
+  };
 
-  const inputRef = React.useRef(null);
+  const inputRef = React.useRef<HTMLInputElement>(null);
+
+  const handleLoad = React.useCallback(() => {
+    inputRef.current?.click();
+  }, [inputRef]);
 
   return (
     <span>
@@ -68,118 +119,28 @@ export const Toolbar: React.FC = () => {
         <Button style={buttonStyle} onClick={handleNew} icon={<FileAddOutlined />} />
       </Tooltip>
       <Tooltip title="Open">
-        <Button
-          style={buttonStyle}
-          onClick={() => {
-            // inputRef.current?.click(null)
-          }}
-          icon={<FolderOpenOutlined />}
-        />
+        <Button style={buttonStyle} onClick={handleLoad} icon={<FolderOpenOutlined />} />
       </Tooltip>
       <Tooltip title="Save">
-        <Button style={buttonStyle} onClick={() => {}} icon={<SaveOutlined />} />
+        <Button style={buttonStyle} onClick={handleSave} icon={<SaveOutlined />} />
       </Tooltip>
       <Tooltip title="Undo">
-        <Button style={buttonStyle} onClick={() => {}} disabled={false /*!past.length*/} icon={<UndoOutlined />} />
+        <Button style={buttonStyle} onClick={handleUndo} disabled={historyStatus.disableUndo} icon={<UndoOutlined />} />
       </Tooltip>
       <Tooltip title="Redo">
-        <Button style={buttonStyle} onClick={() => {}} disabled={false /*!future.length*/} icon={<RedoOutlined />} />
+        <Button style={buttonStyle} onClick={handleRedo} disabled={historyStatus.disableRedo} icon={<RedoOutlined />} />
       </Tooltip>
       {/*<Select
-        mode="multiple"
-        style={{ width: 290, marginLeft: 12 }}
-        value={settings.subViews}
-        onChange={updateSettings}
-        placeholder="Select sub views..."
-      >
-        <Select.Option key="schema">Schema</Select.Option>
-        <Select.Option key="uiSchema">Ui Schema</Select.Option>
-        <Select.Option key="formData">Data</Select.Option>
-      </Select>*/}
-    </span>
-  );
-};
-
-/*
-
-class Toolbar_ extends React.Component {
-  constructor(props) {
-    super(props);
-    this.state = {};
-  }
-  save = () => {
-    const { name, schema, uiSchema } = this.props.tree.present[0];
-    write(name, { name, schema, uiSchema });
-  };
-  open = async (e) => {
-    const s = await read(e);
-    try {
-      const { name, schema, uiSchema } = JSON.parse(s);
-      this.props.setTree({ name, schema, uiSchema });
-    } catch (e) {
-      message.error('Invalid json file!');
-    }
-  };
-  render() {
-    const { tree, undo, redo, settings, updateSettings, newForm } = this.props;
-    const { past, future } = tree;
-    return (
-      <span>
-        <input ref={(ref) => (this.loadFile = ref)} type="file" accept="application/json" onChange={this.open} hidden />
-        <Tooltip title="New">
-          <Button style={buttonStyle} onClick={newForm} icon={<FileAddOutlined />} />
-        </Tooltip>
-        <Tooltip title="Open">
-          <Button
-            style={buttonStyle}
-            onClick={() => this.loadFile && this.loadFile.click()}
-            icon={<FolderOpenOutlined />}
-          />
-        </Tooltip>
-        <Tooltip title="Save">
-          <Button style={buttonStyle} onClick={this.save} icon={<SaveOutlined />} />
-        </Tooltip>
-        <Tooltip title="Undo">
-          <Button style={buttonStyle} onClick={undo} disabled={!past.length} icon={<UndoOutlined />} />
-        </Tooltip>
-        <Tooltip title="Redo">
-          <Button style={buttonStyle} onClick={redo} disabled={!future.length} icon={<RedoOutlined />} />
-        </Tooltip>
-        <Select
           mode="multiple"
           style={{ width: 290, marginLeft: 12 }}
           value={settings.subViews}
           onChange={updateSettings}
           placeholder="Select sub views..."
-        >
+          >
           <Select.Option key="schema">Schema</Select.Option>
           <Select.Option key="uiSchema">Ui Schema</Select.Option>
           <Select.Option key="formData">Data</Select.Option>
-        </Select>
-      </span>
-    );
-  }
-}
-
-export default connect(
-  ({ tree, settings }) => ({ tree, settings }),
-  (dispatch) => ({
-    newForm: () =>
-      dispatch({
-        type: 'TREE_CLEAR',
-      }),
-    setTree: (payload) =>
-      dispatch({
-        type: 'TREE_SET_TREE',
-        payload,
-      }),
-    undo: () => dispatch({ type: ActionTypes.UNDO }),
-    redo: () => dispatch({ type: ActionTypes.REDO }),
-    updateSettings: (subViews) =>
-      dispatch({
-        type: 'SETTINGS_UPDATE',
-        payload: { subViews },
-      }),
-  })
-)(Toolbar);
-*/
+          </Select>*/}
+    </span>
+  );
+};
diff --git a/src/Tree/Menu.tsx b/src/Tree/Menu.tsx
index 1830ea1..759d735 100644
--- a/src/Tree/Menu.tsx
+++ b/src/Tree/Menu.tsx
@@ -1,10 +1,9 @@
 import * as React from 'react';
-// import { connect } from 'react-redux';
 import { Menu } from 'antd';
 import { JSONSchema7, JSONSchema7Definition } from 'json-schema';
 import { FormBuilderContext } from '../FormBuilderContext';
 import { addSchemaNode, addExtraPropsNode, getSchemaByPath } from '../utils';
-const { SubMenu, Item } = Menu;
+const { Item } = Menu;
 
 function nameGen(name: string, occupied: string[]) {
   let n = 1;
diff --git a/src/Tree/Tree.tsx b/src/Tree/Tree.tsx
index 98e77e5..a09b15f 100644
--- a/src/Tree/Tree.tsx
+++ b/src/Tree/Tree.tsx
@@ -3,20 +3,14 @@ import { flatMap } from 'lodash';
 import { Tree, Input } from 'antd';
 import { TreeProps } from 'antd/lib/tree';
 import { DataNode } from 'rc-tree/lib/interface';
-import { INode, path2key, key2path, moveSchemaNode } from '../utils';
+import { path2key, key2path, moveSchemaNode } from '../utils';
 import { FormBuilderContext } from '../FormBuilderContext';
 import { compose, MiddlewareProps } from '@gravel-form/core-rc';
 import { Middleware } from '@gravel-form/core-rc/lib/compose';
-import { JSONSchema7Definition } from 'json-schema';
 
 import { TreeNodeTitle } from './TreeNodeTitle';
-const { TreeNode } = Tree;
 const { Search } = Input;
 
-function isClassComponent<T>(Component: React.ComponentType<T>): Component is React.ComponentClass<T> {
-  return Component.prototype && Component.prototype.isReactComponent;
-}
-
 interface TreeMiddlewareProps extends Pick<MiddlewareProps, 'schema' | 'schemaPath'> {
   parent: TreeMiddlewareProps | null;
   composed: TreeNodeMiddleware;
@@ -85,7 +79,7 @@ export const FormSchemaTree: React.FC = () => {
         setSchema(moveSchemaNode(schema, src, dst, dropPosition));
       }
     },
-    [schema]
+    [schema, setSchema]
   );
 
   const handleExpand: TreeProps['onExpand'] = setExpandedKeys;
diff --git a/src/Tree/TreeNodeTitle.tsx b/src/Tree/TreeNodeTitle.tsx
index 70d9f1e..89a6e57 100644
--- a/src/Tree/TreeNodeTitle.tsx
+++ b/src/Tree/TreeNodeTitle.tsx
@@ -1,5 +1,4 @@
 import * as React from 'react';
-import { JSONSchema7, JSONSchema7Definition } from 'json-schema';
 import { Popconfirm } from 'antd';
 import { PlusCircleOutlined, CloseCircleFilled } from '@ant-design/icons';
 import { InlineEditor } from '../InlineEditor';
diff --git a/src/Tree/index.js b/src/Tree/index.js
deleted file mode 100644
index 8de2085..0000000
--- a/src/Tree/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import Tree from './Tree';
-export default Tree;
diff --git a/src/core.js b/src/core.js
deleted file mode 100644
index 521364a..0000000
--- a/src/core.js
+++ /dev/null
@@ -1,685 +0,0 @@
-function isEmptyObject(obj) {
-  if (!obj) return true;
-  for (const i in obj) {
-    if (obj[i] !== undefined) {
-      return false;
-    }
-  }
-  return true;
-}
-
-function isLeaf(node) {
-  return node.isLeaf;
-}
-
-function schema2tree(name, schema, uiSchema) {
-  return [schema2node([name], schema, uiSchema)];
-}
-
-let forceChange = ((FORCE_CHANGE_KEY) => (obj) => {
-  // workaround for forcing rjsf to rerender because the schema still deep equal to after reordering properties.
-  if (FORCE_CHANGE_KEY in obj) {
-    delete obj[FORCE_CHANGE_KEY];
-  } else {
-    obj[FORCE_CHANGE_KEY] = undefined;
-  }
-})(`__${Date.now()}__`);
-
-try {
-  if (process.env.NODE_ENV === 'test') {
-    forceChange = (a) => a;
-  }
-} catch (e) {}
-
-function schema2node(path, schema, uiSchema) {
-  if (!schema) return null;
-  const key = path.join('.');
-  const name = path[path.length - 1];
-  if (schema.type === 'object') {
-    let children = [];
-    for (const i in schema.properties) {
-      const nextPath = [...path, i];
-      const child = schema2node(nextPath, schema.properties[i], uiSchema && uiSchema[i]);
-      if (child) children.push(child);
-    }
-    return {
-      key,
-      name,
-      //path,
-      schema,
-      uiSchema,
-      children,
-    };
-  }
-  if (schema.type === 'array') {
-    let children;
-    if (Array.isArray(schema.items)) {
-      const nextPath = [...path, '[items]'];
-      children = [
-        {
-          key: key + '.[items]',
-          name: '[items]',
-          //path: nextPath,
-          children: schema.items.map((a, i) =>
-            schema2node([...nextPath, i.toString()], schema.items[i], uiSchema && uiSchema.items && uiSchema.items[i])
-          ),
-        },
-      ];
-      if ('additionalItems' in schema) {
-        const nextPath = [...path, 'additionalItems'];
-        children.push(schema2node(nextPath, schema.additionalItems, uiSchema && uiSchema.additionalItems));
-      }
-    } else {
-      children = [schema2node([...path, 'items'], schema.items, uiSchema && uiSchema.items)];
-    }
-
-    return {
-      key,
-      name,
-      schema,
-      uiSchema,
-      children,
-      //path,
-    };
-  }
-  return {
-    key,
-    name,
-    //path,
-    schema,
-    uiSchema,
-    isLeaf: true,
-  };
-}
-
-function getNodeByPath(tree, path) {
-  let node;
-  let children = tree;
-  for (const i of path) {
-    node = children.find((a) => a.name === i);
-    if (!node) return null;
-    children = node.children;
-  }
-  return node;
-}
-
-function getNode(tree, key) {
-  return getNodeByPath(tree, key.split('.'));
-}
-
-function updateParentKey(tree, parentKey) {
-  return tree.map((node) => {
-    const key = parentKey + '.' + node.name;
-    return Object.assign(
-      {},
-      node,
-      {
-        key: parentKey + '.' + node.name,
-      },
-      node.children && {
-        children: updateParentKey(node.children, key),
-      }
-    );
-  });
-}
-
-function getNodeParentKey(node) {
-  return node.key.substring(0, node.key.length - node.name.length - 1);
-}
-
-function updateNodeParentKeyAndName(node, parentKey, name) {
-  if (!name) {
-    name = node.name;
-  }
-  if (!parentKey) {
-    parentKey = getNodeParentKey(node);
-  }
-  const newKey = parentKey ? parentKey + '.' + name : name;
-  if (node.key === newKey) return node;
-  return Object.assign(
-    {},
-    node,
-    {
-      name,
-      key: newKey,
-    },
-    node.children && {
-      children: updateParentKey(node.children, newKey),
-    }
-  );
-}
-
-function updateSchema(node, newChildren) {
-  let newSchema = Object.assign({}, node.schema);
-  if (node.schema.type === 'object') {
-    let newProperties = {};
-    for (const child of newChildren) {
-      newProperties[child.name] = child.schema;
-    }
-    newSchema.properties = newProperties;
-  } else if (node.schema.type === 'array') {
-    if (Array.isArray(node.schema.items)) {
-      // items is array
-      newSchema = Object.assign({}, node.schema);
-      const newItemsNode = newChildren.find((a) => a.name === '[items]');
-      const oldItemsNode = node.children.find((a) => a.name === '[items]');
-      if (newItemsNode !== oldItemsNode) {
-        // items field updated
-        if (newItemsNode) {
-          newSchema.items = newItemsNode.children.map((a) => a.schema);
-        } else {
-          delete newSchema.items;
-        }
-      } else {
-        // additionalItems field updated
-        const newAdditionalItemsNode = newChildren.find((a) => a.name === 'additionalItems');
-        if (newAdditionalItemsNode) {
-          newSchema.additionalItems = newAdditionalItemsNode.schema;
-        } else {
-          delete newSchema.additionalItems;
-        }
-      }
-    } else {
-      // items is not array
-      const newItemsNode = newChildren.find((a) => a.name === 'items');
-      if (newItemsNode) {
-        newSchema.items = newItemsNode.schema;
-      } else {
-        delete newSchema.items;
-      }
-    }
-  }
-  return newSchema;
-}
-
-function updateUiSchema(node, newChildren) {
-  let newUiSchema = {};
-  for (const i in node.uiSchema) {
-    if (i.startsWith('ui:') || i === 'classNames') {
-      newUiSchema[i] = node.uiSchema[i];
-    }
-  }
-  if (node.schema.type === 'object') {
-    for (const child of newChildren) {
-      if (child.uiSchema) {
-        newUiSchema[child.name] = child.uiSchema;
-      }
-    }
-  } else if (node.schema.type === 'array') {
-    if (Array.isArray(node.schema.items)) {
-      // items is array
-      const newItemsNode = newChildren.find((a) => a.name === '[items]');
-      const oldItemsNode = node.children.find((a) => a.name === '[items]');
-      if (newItemsNode !== oldItemsNode) {
-        // items field updated
-        if (newItemsNode) {
-          let empty = true;
-          newUiSchema.items = newItemsNode.children.map((a) => {
-            empty = empty && !a.uiSchema;
-            return a.uiSchema || null;
-          });
-          if (empty) {
-            delete newUiSchema.items;
-          }
-        }
-        if ('additionalItems' in node.uiSchema) {
-          newUiSchema.additionalItems = node.uiSchema.additionalItems;
-        }
-      } else {
-        // additionalItems field updated
-        if ('items' in node.uiSchema) {
-          newUiSchema.items = node.uiSchema.items;
-        }
-        const newAdditionalItemsNode = newChildren.find((a) => a.name === 'additionalItems');
-        if (newAdditionalItemsNode) {
-          newUiSchema.additionalItems = newItemsNode.children.map((a) => a.schema);
-        }
-      }
-    } else {
-      // items is not array
-      const newItemsNode = newChildren.find((a) => a.name === 'items');
-      if (newItemsNode && newItemsNode.uiSchema) {
-        newUiSchema.items = newItemsNode.uiSchema;
-      }
-    }
-  }
-  return newUiSchema;
-}
-
-function updateNodeByNewChildren(oldNode, newChildren) {
-  if (!oldNode.schema) {
-    return { ...oldNode, children: newChildren };
-  }
-  const schema = updateSchema(oldNode, newChildren);
-  const uiSchema = updateUiSchema(oldNode, newChildren);
-  const newNode = Object.assign({}, oldNode, {
-    schema,
-    uiSchema,
-    children: newChildren,
-  });
-  if (isEmptyObject(uiSchema)) {
-    delete newNode.uiSchema;
-  }
-  return newNode;
-}
-
-function updateArrayIndex(tree) {
-  return tree.map((node, i) =>
-    node.name === i.toString() ? node : updateNodeParentKeyAndName(node, null, i.toString())
-  );
-}
-
-function _removeNodeByPath(tree, [head, ...tail], arrayItemsFlag = 0) {
-  if (!head && head !== 0) {
-    return tree;
-  }
-  let removed = false;
-  let newTree = [];
-  if (!tail.length) {
-    let newTree = tree.filter((a) => a.name !== head);
-    if (arrayItemsFlag === 2) {
-      newTree = updateArrayIndex(newTree);
-    }
-    return newTree.length === tree.length ? tree : newTree;
-  }
-  for (const node of tree) {
-    if (node.name !== head) {
-      newTree.push(node);
-      continue;
-    }
-    if (node.schema && node.schema.type === 'array' && Array.isArray(node.schema.items)) {
-      arrayItemsFlag = 1;
-    } else if (arrayItemsFlag === 1 && head === '[items]') {
-      arrayItemsFlag = 2;
-    } else {
-      arrayItemsFlag = 0;
-    }
-    const newChildren = _removeNodeByPath(node.children, tail, arrayItemsFlag);
-    if (newChildren === node.children) {
-      // no change
-      return tree;
-    }
-    removed = true;
-    let newNode = updateNodeByNewChildren(node, newChildren);
-    let newSchema = null;
-    if (tail.length === 1 && (newSchema = newNode.schema) && newSchema.required) {
-      const newRequired = newSchema.required.filter((a) => a !== tail[0]);
-      if (newRequired.length !== newSchema.required.length) {
-        newNode.schema = Object.assign({}, newSchema, {
-          required: newRequired.length ? newRequired : undefined,
-        });
-      }
-    }
-    newTree.push(newNode);
-  }
-  return removed ? newTree : tree;
-}
-
-function removeNodeByPath(tree, path) {
-  return _removeNodeByPath(tree, path);
-}
-
-function removeNode(tree, key) {
-  return _removeNodeByPath(tree, key.split('.'));
-}
-
-function _addNodeByPath(tree, [head, ...tail], position, node2Add, arrayItemsFlag = 0) {
-  if (!head && head !== 0) {
-    return tree;
-  }
-  let added = false;
-  let newTree = [];
-  if (!tail.length) {
-    tree = tree || [];
-    let added = false;
-    for (const i in tree) {
-      const cn = tree[i];
-      if (cn.name !== head) {
-        newTree.push(cn);
-        continue;
-      }
-      added = true;
-      if (position < 0) {
-        if (!arrayItemsFlag && tree.find((a) => a.name === node2Add.name)) {
-          // name already exists;
-          return tree;
-        }
-        newTree.push(updateNodeParentKeyAndName(node2Add, getNodeParentKey(cn)));
-      }
-      if (position === 0) {
-        if (isLeaf(cn)) return tree;
-        if (!arrayItemsFlag && cn.children.find((a) => a.name === node2Add.name)) {
-          // name already exists;
-          return tree;
-        }
-
-        let newNodeChildren = [...(cn.children || []), updateNodeParentKeyAndName(node2Add, cn.key)];
-        if (arrayItemsFlag === 1) {
-          newNodeChildren = updateArrayIndex(newNodeChildren);
-        }
-        newTree.push(updateNodeByNewChildren(cn, newNodeChildren));
-      } else {
-        newTree.push(cn);
-      }
-      if (position > 0) {
-        if (!arrayItemsFlag && tree.find((a) => a.name === node2Add.name)) {
-          // name already exists;
-          return tree;
-        }
-        newTree.push(updateNodeParentKeyAndName(node2Add, getNodeParentKey(cn)));
-      }
-    }
-    if (!added) return tree;
-    if (arrayItemsFlag === 2) {
-      return updateArrayIndex(newTree);
-    }
-    return newTree;
-  }
-  for (const node of tree) {
-    if (node.name !== head) {
-      newTree.push(node);
-      continue;
-    }
-    if (node.schema && node.schema.type === 'array' && Array.isArray(node.schema.items)) {
-      arrayItemsFlag = 1;
-    } else if (arrayItemsFlag === 1 && head === '[items]') {
-      arrayItemsFlag = 2;
-    } else {
-      arrayItemsFlag = 0;
-    }
-    const newChildren = _addNodeByPath(node.children, tail, position, node2Add, arrayItemsFlag);
-    if (newChildren === node.children) {
-      // no change
-      return tree;
-    }
-    added = true;
-    newTree.push(updateNodeByNewChildren(node, newChildren));
-  }
-  return added ? newTree : tree;
-}
-
-function addNodeByPath(tree, [head, ...tail], position, newNode) {
-  return _addNodeByPath(tree, [head, ...tail], position, newNode);
-}
-
-function addNode(tree, targetKey, position, newNode) {
-  return _addNodeByPath(tree, targetKey.split('.'), position, newNode);
-}
-
-function _moveNodeByPath(tree, [sh, ...st], [th, ...tt], position, arrayItemsFlag = 0) {
-  if (!sh) return tree;
-  if (sh === th && tt.length) {
-    let newTree = [];
-    let updated = false;
-    for (const node of tree) {
-      if (node.name !== sh) {
-        newTree.push(node);
-        continue;
-      }
-      if (isLeaf(node)) return tree;
-      if (node.schema && node.schema.type === 'array' && Array.isArray(node.schema.items)) {
-        arrayItemsFlag = 1;
-      } else if (arrayItemsFlag === 1 && sh === '[items]') {
-        arrayItemsFlag = 2;
-      } else {
-        arrayItemsFlag = 0;
-      }
-      const newChildren = _moveNodeByPath(node.children, st, tt, position, arrayItemsFlag);
-      if (newChildren === node.children) {
-        // no change
-        return tree;
-      }
-      updated = true;
-      if (tt.length === 1 && st.length === 1 && node.schema && node.schema.type === 'object') {
-        // reorder object properties
-        let properties = {};
-        for (const child of newChildren) {
-          properties[child.name] = child.schema;
-        }
-        let schema = Object.assign({}, node.schema, {
-          properties,
-        });
-        forceChange(schema);
-        newTree.push(
-          Object.assign({}, node, {
-            schema,
-            children: newChildren,
-          })
-        );
-      } else {
-        newTree.push(updateNodeByNewChildren(node, newChildren));
-      }
-    }
-    return updated ? newTree : tree;
-  }
-
-  if (!st.length && !tt.length) {
-    let newTree = [];
-    let updated = false;
-    const node2move = tree.find((a) => a.name === sh);
-    if (!node2move) return tree;
-    for (const i in tree) {
-      const cn = tree[i];
-      if (cn.name === sh) continue;
-      if (cn.name === th) {
-        updated = true;
-        if (position < 0) newTree.push(node2move);
-        if (position === 0) {
-          if (isLeaf(cn)) return tree;
-          let newNodeChildren = [...(cn.children || []), updateNodeParentKeyAndName(node2move, cn.key)];
-          if (arrayItemsFlag === 1) {
-            newNodeChildren = updateArrayIndex(newNodeChildren);
-          }
-          newTree.push(updateNodeByNewChildren(cn, newNodeChildren));
-        } else {
-          newTree.push(cn);
-        }
-        if (position > 0) newTree.push(node2move);
-      } else {
-        newTree.push(cn);
-      }
-    }
-    if (arrayItemsFlag === 2) {
-      newTree = updateArrayIndex(newTree);
-    }
-    return updated ? newTree : tree;
-  }
-
-  const node2move = getNodeByPath(tree, [sh, ...st]);
-  if (!node2move) return tree;
-  const tmpTree = _removeNodeByPath(tree, [sh, ...st], arrayItemsFlag);
-  const newTree = _addNodeByPath(tmpTree, [th, ...tt], position, node2move, arrayItemsFlag);
-  return newTree === tmpTree ? tree : newTree;
-}
-
-function moveNodeByPath(tree, sourceNode, targetNode, position) {
-  return _moveNodeByPath(tree, sourceNode, targetNode, position);
-}
-function moveNode(tree, sourceKey, targetKey, position) {
-  return _moveNodeByPath(tree, sourceKey.split('.'), targetKey.split('.'), position);
-}
-
-var allowedUpdatedTypes = ['string', 'number', 'integer', 'boolean'];
-
-function _updateNodeByPath(tree, [head, ...tail], nodeUpdate) {
-  let newTree = [];
-  let updated = false;
-  for (const node of tree) {
-    if (node.name !== head) {
-      newTree.push(node);
-      continue;
-    }
-    let newNode = Object.assign({}, node);
-    if (!tail.length) {
-      const { schema, uiSchema, name } = nodeUpdate;
-      let nu = Object.assign({}, nodeUpdate);
-      delete nu.schema;
-      delete nu.uiSchema;
-      delete nu.name;
-      delete nu.children;
-      delete nu.key;
-      newNode = Object.assign(newNode, nu);
-      let typeUpdated = false;
-      if (schema) {
-        updated = true;
-        const oldSchema = node.schema;
-        let newSchema = Object.assign({}, schema);
-        if (!newSchema.type) {
-          newSchema.type = oldSchema.type;
-        } else {
-          if (newSchema.type !== oldSchema.type) {
-            if (allowedUpdatedTypes.includes(newSchema.type) && allowedUpdatedTypes.includes(oldSchema.type)) {
-              typeUpdated = true;
-              for (const i in newSchema) {
-                if (!['type', 'title', 'description'].includes(i)) {
-                  delete newSchema[i];
-                }
-              }
-            } else {
-              return tree;
-            }
-          }
-        }
-
-        if (newSchema.type === 'object') {
-          newSchema.properties = oldSchema.properties;
-        }
-        if (newSchema.type === 'array') {
-          newSchema.items = oldSchema.items;
-          newSchema.additionalItems = oldSchema.items;
-        }
-        newNode.schema = newSchema;
-      }
-      if (uiSchema) {
-        updated = true;
-        const oldUiSchema = node.uiSchema;
-        const newUiSchema = {};
-        for (const i in uiSchema) {
-          if (i.startsWith('ui:') || i === 'classNames') {
-            newUiSchema[i] = uiSchema[i];
-          }
-        }
-        if (typeUpdated) delete newUiSchema['ui:widget'];
-        for (const i in node.uiSchema) {
-          if (!(i.startsWith('ui:') || i === 'classNames')) {
-            newUiSchema[i] = oldUiSchema[i];
-          }
-        }
-        if (isEmptyObject(newUiSchema)) {
-          delete newNode.uiSchema;
-        } else {
-          newNode.uiSchema = newUiSchema;
-        }
-      }
-      if (name && name !== newNode.name) {
-        if (tree.find((a) => a.name === name)) return tree;
-        updated = true;
-        newNode = updateNodeParentKeyAndName(newNode, null, name);
-      }
-      newTree.push(newNode);
-    } else {
-      if (node.children) {
-        const newChildren = _updateNodeByPath(node.children, tail, nodeUpdate);
-        if (newChildren === node.children) {
-          return tree;
-        }
-        updated = true;
-        let newNode = updateNodeByNewChildren(node, newChildren);
-        // update required
-        let newSchema = null;
-        if (
-          tail.length === 1 &&
-          nodeUpdate.name &&
-          (newSchema = newNode.schema) &&
-          newSchema.required &&
-          newSchema.required.includes(tail[0])
-        ) {
-          newNode.schema = Object.assign({}, newSchema, {
-            required: newSchema.required.map((a) => (a === tail[0] ? nodeUpdate.name : a)),
-          });
-        }
-        newTree.push(newNode);
-      } else {
-        return tree;
-      }
-    }
-  }
-  return updated ? newTree : tree;
-}
-
-function updateNodeByPath(tree, path, nodeUpdate) {
-  return _updateNodeByPath(tree, path, nodeUpdate);
-}
-
-function updateNode(tree, targetKey, nodeUpdate) {
-  return updateNodeByPath(tree, targetKey.split('.'), nodeUpdate);
-}
-
-var SEPERATOR = '_';
-function getNodeByRjsfId(tree, rjsfId) {
-  for (const node of tree) {
-    if (node && node.name === rjsfId) {
-      return node;
-    }
-    if (rjsfId.startsWith(node.name) && rjsfId[node.name.length] === SEPERATOR) {
-      if (node.schema.type === 'array') {
-        rjsfId = rjsfId.slice(node.name.length + 1);
-        const i = rjsfId.indexOf(SEPERATOR);
-        const index = i > 0 ? rjsfId.slice(0, i) : rjsfId;
-        if (isNaN(index)) return null;
-        const rest = i > 0 ? rjsfId.slice(i + 1) : null;
-        if (Array.isArray(node.schema.items)) {
-          if (+index < node.schema.items.length) {
-            let n = node.children.find((a) => a.name === '[items]');
-            n = n && n.children.find((a) => a.name === index);
-            return rest ? n && getNodeByRjsfId(n.children, rjsfId.slice(i + 1)) : n;
-          } else {
-            let n = node.children.find((a) => a.name === 'additionalItems');
-            return rest ? n && getNodeByRjsfId(n.children, rest) : n;
-          }
-        } else {
-          let n = node.children.find((a) => a.name === 'items');
-          return rest ? n && getNodeByRjsfId(n.children, rjsfId.slice(i + 1)) : n;
-        }
-      }
-
-      if (node.children) {
-        rjsfId = rjsfId.slice(node.name.length + 1);
-        const n = getNodeByRjsfId(node.children, rjsfId);
-        if (n) return n;
-      }
-    }
-  }
-  return null;
-}
-
-export {
-  schema2tree,
-  removeNodeByPath,
-  addNodeByPath,
-  moveNodeByPath,
-  updateNodeByPath,
-  getNode,
-  removeNode,
-  addNode,
-  moveNode,
-  updateNode,
-  schema2node,
-  getNodeByRjsfId,
-};
-
-export default {
-  schema2tree,
-  removeNodeByPath,
-  addNodeByPath,
-  moveNodeByPath,
-  updateNodeByPath,
-
-  getNode,
-  removeNode,
-  addNode,
-  moveNode,
-  updateNode,
-  schema2node,
-  getNodeByRjsfId,
-};
diff --git a/src/core.test.js b/src/core.test.js
deleted file mode 100644
index 4f704f9..0000000
--- a/src/core.test.js
+++ /dev/null
@@ -1,912 +0,0 @@
-const { schema2tree, removeNodeByPath, addNodeByPath, moveNodeByPath, updateNodeByPath } = require('./core');
-describe('core functions', function() {
-  describe('schema 2 tree', function() {
-    it('properly handle undefined', () => {
-      const actual = schema2tree('root', {
-        type: 'object',
-        properties: {
-          foo: { type: 'string' },
-          bar: undefined,
-        },
-      });
-      const expected = schema2tree('root', {
-        type: 'object',
-        properties: {
-          foo: { type: 'string' },
-        },
-      });
-      expect(actual).toEqual(expected);
-    });
-  });
-  describe('Remove tree node', function() {
-    function r(before, after, key) {
-      const treeBefore = schema2tree('root', before.schema, before.uiSchema);
-      const treeAfter = removeNodeByPath(treeBefore, key.split('.'));
-      const expectedTreeAfter = schema2tree('root', after.schema, after.uiSchema);
-      expect(treeAfter).toEqual(expectedTreeAfter);
-    }
-
-    it('remove object item properties', () => {
-      const before = {
-        schema: {
-          type: 'object',
-          properties: {
-            foo: { type: 'string' },
-            bar: { type: 'number' },
-          },
-        },
-        uiSchema: {
-          foo: { 'ui:foo': 'foo' },
-          bar: { 'ui:bar': 'bar' },
-        },
-      };
-      const after = {
-        schema: {
-          type: 'object',
-          properties: {
-            bar: { type: 'number' },
-          },
-        },
-        uiSchema: {
-          bar: { 'ui:bar': 'bar' },
-        },
-      };
-      r(before, after, 'root.foo');
-    });
-    it('remove nested item', () => {
-      const before = {
-        schema: {
-          type: 'object',
-          properties: {
-            foo: {
-              type: 'object',
-              properties: {
-                bar: { type: 'string' },
-              },
-            },
-          },
-        },
-        uiSchema: {
-          foo: {
-            'ui:foo': 'foo',
-            bar: {
-              'ui:bar': 'bar',
-            },
-          },
-        },
-      };
-      const after1 = {
-        schema: {
-          type: 'object',
-          properties: {
-            foo: {
-              type: 'object',
-              properties: {},
-            },
-          },
-        },
-        uiSchema: {
-          foo: {
-            'ui:foo': 'foo',
-          },
-        },
-      };
-      const after2 = {
-        schema: {
-          type: 'object',
-          properties: {},
-        },
-      };
-      r(before, after1, 'root.foo.bar');
-      r(before, after2, 'root.foo');
-    });
-    it('remove array array items', () => {
-      const before = {
-        schema: {
-          type: 'array',
-          items: [{ type: 'string' }, { type: 'number' }],
-        },
-        uiSchema: {
-          items: [{ 'ui:0': '0' }, { 'ui:1': '1' }],
-        },
-      };
-      const after = {
-        schema: {
-          type: 'array',
-          items: [{ type: 'number' }],
-        },
-        uiSchema: {
-          items: [{ 'ui:1': '1' }],
-        },
-      };
-      r(before, after, 'root.[items].0');
-    });
-    it('remove array additional items', () => {
-      const before = {
-        schema: {
-          type: 'array',
-          items: [{ type: 'string' }, { type: 'number' }],
-          additionalItems: {
-            type: 'string',
-          },
-        },
-        uiSchema: {
-          'ui:root': 'root',
-          additionalItems: {
-            'ui:a': 'a',
-          },
-        },
-      };
-      const after = {
-        schema: {
-          type: 'array',
-          items: [{ type: 'string' }, { type: 'number' }],
-        },
-        uiSchema: {
-          'ui:root': 'root',
-        },
-      };
-      r(before, after, 'root.additionalItems');
-    });
-    it('remove array items properties', () => {
-      const before = {
-        schema: {
-          type: 'array',
-          items: [
-            {
-              type: 'object',
-              properties: {
-                foo: { type: 'string' },
-                bar: { type: 'string' },
-              },
-            },
-            { type: 'number' },
-          ],
-          additionalItems: {
-            type: 'string',
-          },
-        },
-        uiSchema: {
-          'ui:root': 'root',
-          items: [
-            {
-              foo: {
-                'ui:foo': 'foo',
-              },
-            },
-          ],
-        },
-      };
-      const after = {
-        schema: {
-          type: 'array',
-          items: [
-            {
-              type: 'object',
-              properties: {
-                bar: { type: 'string' },
-              },
-            },
-            { type: 'number' },
-          ],
-          additionalItems: {
-            type: 'string',
-          },
-        },
-        uiSchema: {
-          'ui:root': 'root',
-        },
-      };
-      r(before, after, 'root.[items].0.foo');
-    });
-    it('remove array object item', () => {
-      const before = {
-        schema: {
-          type: 'array',
-          items: {
-            type: 'object',
-            properties: {
-              foo: { type: 'string' },
-              bar: { type: 'string' },
-            },
-          },
-        },
-      };
-      const after = {
-        schema: {
-          type: 'array',
-          items: {
-            type: 'object',
-            properties: {
-              bar: { type: 'string' },
-            },
-          },
-        },
-      };
-      r(before, after, 'root.items.foo');
-    });
-    it('remove associated required properties', () => {
-      const before = {
-        schema: {
-          type: 'object',
-          required: ['foo', 'bar'],
-          properties: {
-            foo: { type: 'string' },
-            bar: { type: 'string' },
-          },
-        },
-      };
-      const after = {
-        schema: {
-          type: 'object',
-          required: ['bar'],
-          properties: {
-            bar: { type: 'string' },
-          },
-        },
-      };
-      const after2 = {
-        schema: {
-          type: 'object',
-          properties: {},
-        },
-      };
-      r(before, after, 'root.foo');
-      r(after, after2, 'root.bar');
-    });
-  });
-  describe('add tree node', function() {
-    function r(before, after, key, position, add, name) {
-      const treeBefore = schema2tree('root', before.schema, before.uiSchema);
-      const nodeAdd = schema2tree(name, add.schema, add.uiSchema)[0];
-      const treeAfter = addNodeByPath(treeBefore, key.split('.'), position, nodeAdd);
-      const expectedTreeAfter = schema2tree('root', after.schema, after.uiSchema);
-      expect(treeAfter).toEqual(expectedTreeAfter);
-    }
-    it('add object item properties', () => {
-      const before = {
-        schema: {
-          type: 'object',
-          properties: {
-            bar: { type: 'number' },
-            baz: { type: 'boolean' },
-          },
-        },
-        uiSchema: {
-          bar: { 'ui:bar': 'bar' },
-        },
-      };
-      const toadd = {
-        schema: { type: 'string' },
-        uiSchema: { 'ui:foo': 'foo' },
-      };
-      const addBeforeAfter = {
-        schema: {
-          type: 'object',
-          properties: {
-            foo: { type: 'string' },
-            bar: { type: 'number' },
-            baz: { type: 'boolean' },
-          },
-        },
-        uiSchema: {
-          foo: { 'ui:foo': 'foo' },
-          bar: { 'ui:bar': 'bar' },
-        },
-      };
-      const addAfterAfter = {
-        schema: {
-          type: 'object',
-          properties: {
-            bar: { type: 'number' },
-            foo: { type: 'string' },
-            baz: { type: 'boolean' },
-          },
-        },
-        uiSchema: {
-          bar: { 'ui:bar': 'bar' },
-          foo: { 'ui:foo': 'foo' },
-        },
-      };
-      r(before, addBeforeAfter, 'root.bar', -1, toadd, 'foo');
-      r(before, addAfterAfter, 'root.bar', 1, toadd, 'foo');
-    });
-
-    it('add object properties', () => {
-      const before = {
-        schema: {
-          type: 'object',
-          properties: {
-            bar: { type: 'object' },
-          },
-        },
-        uiSchema: {
-          bar: { 'ui:bar': 'bar' },
-        },
-      };
-      const toadd = {
-        schema: { type: 'string' },
-        uiSchema: { 'ui:foo': 'foo' },
-      };
-      const after = {
-        schema: {
-          type: 'object',
-          properties: {
-            bar: {
-              type: 'object',
-              properties: {
-                foo: { type: 'string' },
-              },
-            },
-          },
-        },
-        uiSchema: {
-          bar: {
-            'ui:bar': 'bar',
-            foo: { 'ui:foo': 'foo' },
-          },
-        },
-      };
-      r(before, after, 'root.bar', 0, toadd, 'foo');
-    });
-
-    it('add properties in nested object', () => {
-      const before = {
-        schema: {
-          type: 'object',
-          properties: {
-            bar: { type: 'object' },
-          },
-        },
-        uiSchema: {
-          bar: { 'ui:bar': 'bar' },
-        },
-      };
-      const toadd = {
-        schema: { type: 'string' },
-        uiSchema: { 'ui:foo': 'foo' },
-      };
-      const after = {
-        schema: {
-          type: 'object',
-          properties: {
-            bar: {
-              type: 'object',
-              properties: {
-                foo: { type: 'string' },
-              },
-            },
-          },
-        },
-        uiSchema: {
-          bar: {
-            'ui:bar': 'bar',
-            foo: { 'ui:foo': 'foo' },
-          },
-        },
-      };
-      r(before, after, 'root.bar', 0, toadd, 'foo');
-    });
-
-    it('should not add under leaf', () => {
-      const before = {
-        schema: {
-          type: 'object',
-          properties: {
-            bar: { type: 'string' },
-          },
-        },
-        uiSchema: {
-          bar: { 'ui:bar': 'bar' },
-        },
-      };
-      const toadd = {
-        schema: { type: 'string' },
-        uiSchema: { 'ui:foo': 'foo' },
-      };
-      r(before, before, 'root.bar', 0, toadd, 'foo');
-    });
-
-    it('add array items', () => {
-      const before = {
-        schema: {
-          type: 'array',
-          items: [{ type: 'string' }],
-        },
-        uiSchema: {
-          items: [{ 'ui:bar': 'bar' }],
-        },
-      };
-      const toadd = {
-        schema: { type: 'number' },
-        uiSchema: { 'ui:foo': 'foo' },
-      };
-      const addBeforeAfter = {
-        schema: {
-          type: 'array',
-          items: [{ type: 'number' }, { type: 'string' }],
-        },
-        uiSchema: {
-          items: [{ 'ui:foo': 'foo' }, { 'ui:bar': 'bar' }],
-        },
-      };
-      const addAfterAfter = {
-        schema: {
-          type: 'array',
-          items: [{ type: 'string' }, { type: 'number' }],
-        },
-        uiSchema: {
-          items: [{ 'ui:bar': 'bar' }, { 'ui:foo': 'foo' }],
-        },
-      };
-      r(before, addBeforeAfter, 'root.[items].0', -1, toadd, 'foo');
-      r(before, addAfterAfter, 'root.[items].0', 1, toadd, 'foo');
-    });
-    it('brother nodes should not have the same names', function() {
-      const data = {
-        schema: {
-          type: 'object',
-          properties: {
-            foo: { type: 'number' },
-          },
-        },
-      };
-      const tree = schema2tree('root', data.schema, data.uiSchema);
-      const newTree = addNodeByPath(tree, 'root'.split('.'), 0, { name: 'foo', schema: { type: 'string' } });
-      expect(newTree).toBe(tree);
-    });
-  });
-  describe('Move tree node', function() {
-    function r(before, after, source, target, position) {
-      const treeBefore = schema2tree('root', before.schema, before.uiSchema);
-      const treeAfter = moveNodeByPath(treeBefore, source.split('.'), target.split('.'), position);
-      const expectedTreeAfter = schema2tree('root', after.schema, after.uiSchema);
-      expect(treeAfter).toEqual(expectedTreeAfter);
-    }
-    it('reorder properties', () => {
-      const before = {
-        schema: {
-          type: 'object',
-          properties: {
-            foo: { type: 'number' },
-            bar: { type: 'string' },
-            baz: { type: 'boolean' },
-          },
-        },
-        uiSchema: {
-          foo: { 'ui:foo': 'foo' },
-          bar: { 'ui:bar': 'bar' },
-          baz: { 'ui:baz': 'baz' },
-        },
-      };
-      const moveForwardAfter = {
-        schema: {
-          type: 'object',
-          properties: {
-            foo: { type: 'number' },
-            baz: { type: 'boolean' },
-            bar: { type: 'string' },
-          },
-        },
-        uiSchema: {
-          foo: { 'ui:foo': 'foo' },
-          bar: { 'ui:bar': 'bar' },
-          baz: { 'ui:baz': 'baz' },
-        },
-      };
-      const moveBackwardAfter = {
-        schema: {
-          type: 'object',
-          properties: {
-            bar: { type: 'string' },
-            foo: { type: 'number' },
-            baz: { type: 'boolean' },
-          },
-        },
-        uiSchema: {
-          foo: { 'ui:foo': 'foo' },
-          bar: { 'ui:bar': 'bar' },
-          baz: { 'ui:baz': 'baz' },
-        },
-      };
-      r(before, moveForwardAfter, 'root.baz', 'root.foo', 1);
-      r(before, moveForwardAfter, 'root.baz', 'root.bar', -1);
-      r(before, moveBackwardAfter, 'root.foo', 'root.bar', 1);
-      r(before, moveBackwardAfter, 'root.foo', 'root.baz', -1);
-    });
-    it('move properties between objects', () => {
-      const before = {
-        schema: {
-          type: 'object',
-          properties: {
-            foo: {
-              type: 'object',
-              properties: {
-                foofoo: { type: 'string' },
-              },
-            },
-            bar: { type: 'string' },
-          },
-        },
-        uiSchema: {
-          foo: {
-            'ui:foo': 'foo',
-            foofoo: { 'ui:foofoo': 'foofoo' },
-          },
-          bar: { 'ui:bar': 'bar' },
-        },
-      };
-      const moveInAfter = {
-        schema: {
-          type: 'object',
-          properties: {
-            foo: {
-              type: 'object',
-              properties: {
-                foofoo: { type: 'string' },
-                bar: { type: 'string' },
-              },
-            },
-          },
-        },
-        uiSchema: {
-          foo: {
-            'ui:foo': 'foo',
-            foofoo: { 'ui:foofoo': 'foofoo' },
-            bar: { 'ui:bar': 'bar' },
-          },
-        },
-      };
-      const moveOutAfter = {
-        schema: {
-          type: 'object',
-          properties: {
-            foo: {
-              type: 'object',
-              properties: {},
-            },
-            bar: { type: 'string' },
-            foofoo: { type: 'string' },
-          },
-        },
-        uiSchema: {
-          foo: {
-            'ui:foo': 'foo',
-          },
-          bar: { 'ui:bar': 'bar' },
-          foofoo: { 'ui:foofoo': 'foofoo' },
-        },
-      };
-      r(before, moveInAfter, 'root.bar', 'root.foo.foofoo', 1);
-      r(before, moveOutAfter, 'root.foo.foofoo', 'root.bar', 2);
-    });
-    it('move array items within array', () => {
-      const before = {
-        schema: {
-          type: 'array',
-          items: [{ name: 'foo', type: 'string' }, { name: 'bar', type: 'number' }, { name: 'baz', type: 'boolean' }],
-        },
-        uiSchema: {
-          items: [{ 'ui:foo': 'foo' }, { 'ui:bar': 'bar' }, { 'ui:baz': 'baz' }],
-        },
-      };
-      const moveForwardAfter = {
-        schema: {
-          type: 'array',
-          items: [{ name: 'foo', type: 'string' }, { name: 'baz', type: 'boolean' }, { name: 'bar', type: 'number' }],
-        },
-        uiSchema: {
-          items: [{ 'ui:foo': 'foo' }, { 'ui:baz': 'baz' }, { 'ui:bar': 'bar' }],
-        },
-      };
-      const moveBackwardAfter = {
-        schema: {
-          type: 'array',
-          items: [{ name: 'bar', type: 'number' }, { name: 'foo', type: 'string' }, { name: 'baz', type: 'boolean' }],
-        },
-        uiSchema: {
-          items: [{ 'ui:bar': 'bar' }, { 'ui:foo': 'foo' }, { 'ui:baz': 'baz' }],
-        },
-      };
-      r(before, moveForwardAfter, 'root.[items].2', 'root.[items].0', 1);
-      r(before, moveForwardAfter, 'root.[items].2', 'root.[items].1', -1);
-      r(before, moveBackwardAfter, 'root.[items].0', 'root.[items].1', 1);
-      r(before, moveBackwardAfter, 'root.[items].0', 'root.[items].2', -1);
-    });
-    it('should not drop under leaf', function() {
-      const data = {
-        schema: {
-          type: 'object',
-          properties: {
-            foo: { type: 'number' },
-            bar: { type: 'object', properties: { barr: { type: 'string' } } },
-            baz: { type: 'boolean' },
-          },
-        },
-        uiSchema: {
-          foo: { 'ui:foo': 'foo' },
-          bar: { barr: { 'ui:bar': 'bar' } },
-          baz: { 'ui:baz': 'baz' },
-        },
-      };
-      const tree = schema2tree('root', data.schema, data.uiSchema);
-      expect(moveNodeByPath(tree, 'root.baz'.split('.'), 'root.foo'.split('.'), 0)).toBe(tree);
-      expect(moveNodeByPath(tree, 'root.bar.barr'.split('.'), 'root.foo'.split('.'), 0)).toBe(tree);
-      expect(moveNodeByPath(tree, 'root.foo'.split('.'), 'root.bar.barr'.split('.'), 0)).toBe(tree);
-    });
-    it('brother nodes should not have the same name', function() {
-      const data = {
-        schema: {
-          type: 'object',
-          properties: {
-            foo: { type: 'number' },
-            bar: {
-              type: 'object',
-              properties: {
-                foo: { type: 'string' },
-              },
-            },
-          },
-        },
-      };
-      const tree = schema2tree('root', data.schema, data.uiSchema);
-      const newTree = moveNodeByPath(tree, 'root.bar.foo'.split('.'), 'root'.split('.'), 0);
-      expect(newTree).toBe(tree);
-    });
-    it('move up', function() {
-      const before = {
-        schema: {
-          type: 'object',
-          properties: {
-            foo: {
-              type: 'object',
-              properties: {
-                bar: { type: 'string' },
-              },
-            },
-          },
-        },
-      };
-      const after = {
-        schema: {
-          type: 'object',
-          properties: {
-            foo: {
-              type: 'object',
-              properties: {},
-            },
-            bar: { type: 'string' },
-          },
-        },
-      };
-      r(before, after, 'root.foo.bar', 'root', 0);
-      r(before, after, 'root.foo.bar', 'root.foo', 1);
-    });
-  });
-  describe('update tree node', function() {
-    function r(before, after, key, nodeUpdate) {
-      const treeBefore = schema2tree('root', before.schema, before.uiSchema);
-      const treeAfter = updateNodeByPath(treeBefore, key.split('.'), nodeUpdate);
-      const expectedTreeAfter = schema2tree('root', after.schema, after.uiSchema);
-      expect(treeAfter).toEqual(expectedTreeAfter);
-    }
-    it('update schema', function() {
-      const before = {
-        schema: {
-          type: 'object',
-          properties: {
-            foo: { type: 'string' },
-            bar: { type: 'number' },
-          },
-        },
-        uiSchema: {
-          foo: { 'ui:foo': 'foo' },
-          bar: { 'ui:bar': 'bar' },
-        },
-      };
-      const after = {
-        schema: {
-          type: 'object',
-          properties: {
-            foofoo: { type: 'string', name: 'Foo' },
-            bar: { type: 'number' },
-          },
-        },
-        uiSchema: {
-          bar: { 'ui:bar': 'bar' },
-        },
-      };
-      r(before, after, 'root.foo', { schema: { name: 'Foo' }, uiSchema: {}, name: 'foofoo' });
-    });
-    it('update root name', function() {
-      const data = {
-        schema: {
-          type: 'object',
-          properties: {
-            foo: { type: 'string' },
-          },
-        },
-      };
-      const treeBefore = schema2tree('root_before', data.schema);
-      const expectedTreeAfter = schema2tree('root_after', data.schema);
-      const treeAfter = updateNodeByPath(treeBefore, ['root_before'], { name: 'root_after' });
-      expect(treeAfter).toEqual(expectedTreeAfter);
-    });
-    it('update node name', function() {
-      const before = {
-        schema: {
-          type: 'object',
-          properties: {
-            foo: { type: 'string' },
-            bar: { type: 'number' },
-          },
-        },
-      };
-      const after = {
-        schema: {
-          type: 'object',
-          properties: {
-            foofoo: { type: 'string' },
-            bar: { type: 'number' },
-          },
-        },
-      };
-      r(before, after, 'root.foo', { name: 'foofoo' });
-    });
-    it('update array name', function() {
-      const before = {
-        schema: {
-          type: 'object',
-          properties: {
-            foo: {
-              type: 'array',
-              items: [{ type: 'string' }],
-            },
-          },
-        },
-      };
-      const after = {
-        schema: {
-          type: 'object',
-          properties: {
-            bar: {
-              type: 'array',
-              items: [{ type: 'string' }],
-            },
-          },
-        },
-      };
-      r(before, after, 'root.foo', { name: 'bar' });
-    });
-    it('update uiSchema', function() {
-      const before = {
-        schema: {
-          type: 'object',
-          properties: {
-            foo: {
-              type: 'string',
-            },
-          },
-        },
-        uiSchema: {
-          foo: {
-            'ui:foo1': 'foo1',
-          },
-        },
-      };
-      const after = {
-        schema: {
-          type: 'object',
-          properties: {
-            foo: {
-              type: 'string',
-            },
-          },
-        },
-        uiSchema: {
-          foo: {
-            'ui:foo2': 'foo2',
-          },
-        },
-      };
-      r(before, after, 'root.foo', { uiSchema: { 'ui:foo2': 'foo2' } });
-    });
-    it('update required', function() {
-      const before = {
-        schema: {
-          type: 'object',
-          required: ['foo'],
-          properties: {
-            foo: {
-              type: 'string',
-            },
-          },
-        },
-      };
-      const after = {
-        schema: {
-          type: 'object',
-          required: ['bar'],
-          properties: {
-            bar: {
-              type: 'string',
-            },
-          },
-        },
-      };
-      r(before, after, 'root.foo', { name: 'bar' });
-    });
-    it('update basic type', function() {
-      const before = {
-        schema: {
-          type: 'object',
-          properties: {
-            foo: {
-              type: 'string',
-            },
-          },
-        },
-      };
-      const after = {
-        schema: {
-          type: 'object',
-          properties: {
-            foo: {
-              type: 'number',
-            },
-          },
-        },
-      };
-      r(before, after, 'root.foo', { schema: { type: 'number' } });
-    });
-    it('not update object/array type', function() {
-      const d1 = {
-        schema: {
-          type: 'object',
-          properties: {
-            foo: {
-              type: 'object',
-              properties: {},
-            },
-          },
-        },
-      };
-      const d2 = {
-        schema: {
-          type: 'object',
-          properties: {
-            foo: {
-              type: 'array',
-              items: { type: 'string' },
-            },
-          },
-        },
-      };
-      const d3 = {
-        schema: {
-          type: 'object',
-          properties: {
-            foo: {
-              type: 'string',
-            },
-          },
-        },
-      };
-      r(d1, d1, 'root.foo', { schema: { type: 'string' } });
-      r(d2, d2, 'root.foo', { schema: { type: 'string' } });
-      r(d3, d3, 'root.foo', { schema: { type: 'object', properties: {} } });
-      r(d3, d3, 'root.foo', { schema: { type: 'array', items: { type: 'string' } } });
-    });
-    it('not break uiSchema structure', function() {
-      const data = {
-        schema: {
-          type: 'object',
-          properties: {
-            foo: { type: 'string' },
-          },
-        },
-      };
-      r(data, data, 'root', { uiSchema: { foo: { 'ui:widget': 'text' } } });
-    });
-  });
-});
diff --git a/src/css.ts b/src/css.ts
index 432f01d..00233f2 100644
--- a/src/css.ts
+++ b/src/css.ts
@@ -1,23 +1 @@
 import 'antd/dist/antd.css';
-/*
-import 'antd/lib/style/css';
-import 'antd/lib/layout/style/css';
-import 'antd/lib/menu/style/css';
-import 'antd/lib/input/style/css';
-import 'antd/lib/input-number/style/css';
-import 'antd/lib/tree/style/css';
-import 'antd/lib/grid/style/css';
-import 'antd/lib/tabs/style/css';
-import 'antd/lib/popconfirm/style/css';
-import 'antd/lib/alert/style/css';
-import 'antd/lib/form/style/css';
-import 'antd/lib/select/style/css';
-import 'antd/lib/notification/style/css';
-import 'antd/lib/slider/style/css';
-import 'antd/lib/switch/style/css';
-import 'antd/lib/table/style/css';
-import 'antd/lib/list/style/css';
-import 'antd/lib/card/style/css';
-import 'antd/lib/message/style/css';
-import 'antd/lib/modal/style/css';
-*/
diff --git a/src/default/menu.js b/src/default/menu.js
deleted file mode 100644
index 4964982..0000000
--- a/src/default/menu.js
+++ /dev/null
@@ -1,48 +0,0 @@
-const basic = {
-  schema: {
-    type: 'object',
-    title: 'Basic',
-    properties: {
-      object: { type: 'object', title: 'Object', properties: {} },
-      text: { type: 'string', title: 'Text' },
-      checkbox: { type: 'boolean', title: 'Checkbox' },
-      checkboxes: {
-        type: 'array',
-        title: 'Check Boxes',
-        items: {
-          type: 'string',
-          enum: ['option-1', 'option-2', 'option-3'],
-        },
-        uniqueItems: true,
-      },
-      dropdown: {
-        type: 'string',
-        title: 'Dropdown',
-        enum: ['option-1', 'option-2', 'option-3'],
-        enumNames: ['Option 1', 'Option 2', 'Option 3'],
-      },
-      number: { type: 'number', title: 'Number' },
-      textarea: { type: 'string', title: 'Text Area' },
-      datetime: { type: 'string', title: 'Date Time' },
-    },
-  },
-  uiSchema: {
-    textarea: { 'ui:widget': 'textarea' },
-    datetime: { 'ui:widget': 'datetime' },
-    checkboxes: {
-      'ui:widget': 'checkboxes',
-    },
-  },
-};
-
-module.exports = {
-  schema: {
-    type: 'object',
-    properties: {
-      basic: basic.schema,
-    },
-  },
-  uiSchema: {
-    basic: basic.uiSchema,
-  },
-};
diff --git a/src/default/settings.js b/src/default/settings.js
deleted file mode 100644
index 0ca89ce..0000000
--- a/src/default/settings.js
+++ /dev/null
@@ -1,7 +0,0 @@
-module.exports = {
-  leftSiderWidth: 300,
-  rightSiderWidth: 360,
-  formWidth: 600,
-  isInlineMode: true,
-  subViews: ['schema', 'uiSchema', 'formData'],
-};
diff --git a/src/index.js b/src/index.js
deleted file mode 100644
index 87d1be5..0000000
--- a/src/index.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import React from 'react';
-import ReactDOM from 'react-dom';
-import './index.css';
-import App from './App';
-import * as serviceWorker from './serviceWorker';
-
-ReactDOM.render(<App />, document.getElementById('root'));
-
-// If you want your app to work offline and load faster, you can change
-// unregister() to register() below. Note this comes with some pitfalls.
-// Learn more about service workers: https://bit.ly/CRA-PWA
-serviceWorker.unregister();
diff --git a/src/reducers.js b/src/reducers.js
deleted file mode 100644
index 8e24724..0000000
--- a/src/reducers.js
+++ /dev/null
@@ -1,170 +0,0 @@
-import { schema2tree, schema2node, removeNode, addNode, moveNode, updateNode, getNodeByRjsfId } from './core';
-import defaultSettings from './default/settings';
-import defaultMenuSchema from './default/menu';
-import undoable from 'redux-undo';
-import { includeAction } from 'redux-undo';
-import { combineReducers } from 'redux';
-
-const defaultMenu = schema2node(['menu'], defaultMenuSchema.schema, defaultMenuSchema.uiSchema);
-const DEFAULT_TREE_NAME = 'root';
-
-const emptyTree = schema2tree(DEFAULT_TREE_NAME, { type: 'object', properties: {} });
-
-function tree(state = emptyTree, action) {
-  switch (action.type) {
-    case 'TREE_CLEAR':
-      return emptyTree;
-    case 'TREE_SET_TREE': {
-      const { name, schema, uiSchema } = action.payload;
-      return schema2tree(
-        name || (state[0] && state[0].name) || DEFAULT_TREE_NAME,
-        schema || state[0].schema,
-        uiSchema || state[0].uiSchema
-      );
-    }
-    case 'TREE_ADD_NODE': {
-      const { targetNodeKey, position, node2add } = action.payload;
-      return addNode(state, targetNodeKey, position, node2add);
-    }
-    case 'TREE_REMOVE_NODE':
-      const newState = removeNode(state, action.payload);
-      return newState.length ? newState : emptyTree;
-    case 'TREE_MOVE_NODE': {
-      const { source, target, position } = action.payload;
-      return moveNode(state, source, target, position);
-    }
-    case 'TREE_UPDATE_NODE': {
-      const { target, nodeUpdate } = action.payload;
-      const newState = updateNode(state, target, nodeUpdate);
-      return newState;
-    }
-    default:
-      return state;
-  }
-}
-
-function activeNodeKey(state = null, action) {
-  switch (action.type) {
-    case 'ACTIVE_NODE_KEY_SET':
-      return action.payload || null;
-    case 'TREE_UPDATE_NODE':
-      const { target, nodeUpdate } = action.payload;
-      if (state === target && nodeUpdate.name) {
-        const path = state.split('.');
-        if (path[path.length - 1] !== nodeUpdate.name) {
-          return path.slice(0, -1).join('.') + '.' + nodeUpdate.name;
-        }
-      }
-      return state;
-    case 'TREE_SET_TREE':
-    case 'TREE_CLEAR':
-      return null;
-    default:
-      return state;
-  }
-}
-
-function formData(state = {}, action) {
-  switch (action.type) {
-    case 'FORM_DATA_SET':
-      return action.payload;
-    default:
-      return state;
-  }
-}
-
-function settings(state = defaultSettings, action) {
-  switch (action.type) {
-    case 'SETTINGS_UPDATE':
-      return Object.assign({}, state, action.payload);
-    default:
-      return state;
-  }
-}
-
-function menu(state = defaultMenu, action) {
-  switch (action.type) {
-    case 'MENU_SET': {
-      const { schema, uiSchema } = action.payload;
-      return schema2node(['menu'], schema, uiSchema);
-    }
-    case 'MENU_DEFAULT': {
-      return defaultMenu;
-    }
-    default:
-      return state;
-  }
-}
-
-function menuOpenKeys(state = [], action) {
-  switch (action.type) {
-    case 'MENU_OPEN_KEYS_SET':
-      return action.payload;
-    default:
-      return state;
-  }
-}
-
-function removeUnnecessaryHistory(reducer) {
-  return (state, action) => {
-    let newState = reducer(state, action);
-    delete newState.history;
-    return newState;
-  };
-}
-
-var reducer = combineReducers({
-  tree: removeUnnecessaryHistory(
-    undoable(tree, {
-      filter: includeAction([
-        'TREE_UPDATE_NODE',
-        'TREE_SET_TREE',
-        'TREE_CLEAR',
-        'TREE_ADD_NODE',
-        'TREE_REMOVE_NODE',
-        'TREE_MOVE_NODE',
-      ]),
-    })
-  ),
-  activeNodeKey,
-  settings,
-  menu,
-  formData,
-  menuOpenKeys,
-});
-
-export default function (state, action) {
-  switch (action.type) {
-    case 'TREE_REMOVE_NODE_BY_RJSF_ID': {
-      const target = getNodeByRjsfId(state.tree.present, action.payload);
-      if (!target) return state;
-      action = {
-        type: 'TREE_REMOVE_NODE',
-        payload: target.key,
-      };
-      break;
-    }
-    case 'ACTIVE_NODE_KEY_SET_BY_RJSF_ID': {
-      const target = getNodeByRjsfId(state.tree.present, action.payload);
-      if (!target) return state;
-      action = {
-        type: 'ACTIVE_NODE_KEY_SET',
-        payload: target.key,
-      };
-      break;
-    }
-    case 'TREE_UPDATE_NODE_BY_RJSF_ID': {
-      const { rjsfId } = action.payload;
-      const target = getNodeByRjsfId(state.tree.present, rjsfId);
-      if (!target) return state;
-      action = {
-        type: 'TREE_UPDATE_NODE',
-        payload: { ...action.payload, target: target.key },
-      };
-      break;
-    }
-    default:
-      break;
-  }
-  return reducer(state, action);
-}
diff --git a/src/rjsf-patch/ArrayField.jsx b/src/rjsf-patch/ArrayField.jsx
deleted file mode 100644
index 0ea5f1d..0000000
--- a/src/rjsf-patch/ArrayField.jsx
+++ /dev/null
@@ -1,50 +0,0 @@
-import React from 'react';
-import ArrayField from '@rjsf/core/lib/components/fields/ArrayField';
-
-import { getWidget, getUiOptions, optionsList, retrieveSchema, getDefaultRegistry } from './utils';
-
-class ArrayFieldPatched extends ArrayField {
-  renderMultiSelect() {
-    const {
-      schema,
-      idSchema,
-      uiSchema,
-      formData,
-      disabled,
-      readonly,
-      autofocus,
-      onBlur,
-      onFocus,
-      registry = getDefaultRegistry(),
-      rawErrors,
-    } = this.props;
-    const items = this.props.formData;
-    const { widgets, definitions, formContext } = registry;
-    const itemsSchema = retrieveSchema(schema.items, definitions, formData);
-    const enumOptions = optionsList(itemsSchema);
-    const { widget = 'select', ...options } = {
-      ...getUiOptions(uiSchema),
-      enumOptions,
-    };
-    const Widget = getWidget(schema, widget, widgets);
-    return (
-      <Widget
-        id={idSchema && idSchema.$id}
-        multiple
-        onChange={this.onSelectChange}
-        onBlur={onBlur}
-        onFocus={onFocus}
-        options={options}
-        schema={schema}
-        value={items}
-        disabled={disabled}
-        readonly={readonly}
-        formContext={formContext}
-        autofocus={autofocus}
-        rawErrors={rawErrors}
-      />
-    );
-  }
-}
-
-export default ArrayFieldPatched;
diff --git a/src/rjsf-patch/BooleanField.jsx b/src/rjsf-patch/BooleanField.jsx
deleted file mode 100644
index ff44d0b..0000000
--- a/src/rjsf-patch/BooleanField.jsx
+++ /dev/null
@@ -1,77 +0,0 @@
-import React from 'react';
-import * as types from '@rjsf/core/lib/types';
-
-import { getWidget, getUiOptions, optionsList, getDefaultRegistry } from './utils';
-
-function BooleanField(props) {
-  const {
-    schema,
-    name,
-    uiSchema,
-    idSchema,
-    formData,
-    registry = getDefaultRegistry(),
-    required,
-    disabled,
-    readonly,
-    autofocus,
-    onChange,
-    onFocus,
-    onBlur,
-    rawErrors,
-  } = props;
-  const { title } = schema;
-  const { widgets, formContext, fields } = registry;
-  const { widget = 'checkbox', ...options } = getUiOptions(uiSchema);
-  const Widget = getWidget(schema, widget, widgets);
-
-  let enumOptions;
-
-  if (Array.isArray(schema.oneOf)) {
-    enumOptions = optionsList({
-      oneOf: schema.oneOf.map((option) => ({
-        ...option,
-        title: option.title || (option.const === true ? 'Yes' : 'No'),
-      })),
-    });
-  } else {
-    enumOptions = optionsList({
-      enum: schema.enum || [true, false],
-      enumNames: schema.enumNames || (schema.enum && schema.enum[0] === false ? ['No', 'Yes'] : ['Yes', 'No']),
-    });
-  }
-
-  return (
-    <Widget
-      options={{ ...options, enumOptions }}
-      schema={schema}
-      id={idSchema && idSchema.$id}
-      onChange={onChange}
-      onFocus={onFocus}
-      onBlur={onBlur}
-      label={title === undefined ? name : title}
-      value={formData}
-      required={required}
-      disabled={disabled}
-      readonly={readonly}
-      registry={registry}
-      formContext={formContext}
-      autofocus={autofocus}
-      rawErrors={rawErrors}
-      DescriptionField={fields.DescriptionField}
-    />
-  );
-}
-
-if (process.env.NODE_ENV !== 'production') {
-  BooleanField.propTypes = types.fieldProps;
-}
-
-BooleanField.defaultProps = {
-  uiSchema: {},
-  disabled: false,
-  readonly: false,
-  autofocus: false,
-};
-
-export default BooleanField;
diff --git a/src/rjsf-patch/Form.jsx b/src/rjsf-patch/Form.jsx
deleted file mode 100644
index 931a114..0000000
--- a/src/rjsf-patch/Form.jsx
+++ /dev/null
@@ -1,17 +0,0 @@
-import Form from '@rjsf/core/lib';
-import { getDefaultRegistry } from './utils';
-
-export default class FormPatch extends Form {
-  getRegistry() {
-    const { fields, widgets } = getDefaultRegistry();
-    return {
-      fields: { ...fields, ...this.props.fields },
-      widgets: { ...widgets, ...this.props.widgets },
-      ArrayFieldTemplate: this.props.ArrayFieldTemplate,
-      ObjectFieldTemplate: this.props.ObjectFieldTemplate,
-      FieldTemplate: this.props.FieldTemplate,
-      definitions: this.props.schema.definitions || {},
-      formContext: this.props.formContext || {},
-    };
-  }
-}
diff --git a/src/rjsf-patch/SchemaField.jsx b/src/rjsf-patch/SchemaField.jsx
deleted file mode 100644
index 69a155f..0000000
--- a/src/rjsf-patch/SchemaField.jsx
+++ /dev/null
@@ -1,12 +0,0 @@
-import SchemaField from '@rjsf/core/lib/components/fields/SchemaField';
-import { notification } from 'antd';
-
-export default class PatchedSchemaField extends SchemaField {
-  componentDidCatch(error, info) {
-    notification.error({
-      message: `Error: ${this.props.idSchema.$id}`,
-      description: error.toString(),
-      duration: 0,
-    });
-  }
-}
diff --git a/src/rjsf-patch/StringField.jsx b/src/rjsf-patch/StringField.jsx
deleted file mode 100644
index 23e107d..0000000
--- a/src/rjsf-patch/StringField.jsx
+++ /dev/null
@@ -1,86 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-
-import { getWidget, getUiOptions, isSelect, optionsList, getDefaultRegistry, hasWidget } from './utils';
-
-function StringField(props) {
-  const {
-    schema,
-    name,
-    uiSchema,
-    idSchema,
-    formData,
-    required,
-    disabled,
-    readonly,
-    autofocus,
-    onChange,
-    onBlur,
-    onFocus,
-    registry = getDefaultRegistry(),
-    rawErrors,
-  } = props;
-  const { title, format } = schema;
-  const { widgets, formContext } = registry;
-  const enumOptions = isSelect(schema) && optionsList(schema);
-  let defaultWidget = enumOptions ? 'select' : 'text';
-  if (format && hasWidget(schema, format, widgets)) {
-    defaultWidget = format;
-  }
-  const { widget = defaultWidget, placeholder = '', ...options } = getUiOptions(uiSchema);
-  const Widget = getWidget(schema, widget, widgets);
-
-  return (
-    <Widget
-      options={{ ...options, enumOptions }}
-      schema={schema}
-      id={idSchema && idSchema.$id}
-      label={title === undefined ? name : title}
-      value={formData}
-      onChange={onChange}
-      onBlur={onBlur}
-      onFocus={onFocus}
-      required={required}
-      disabled={disabled}
-      readonly={readonly}
-      formContext={formContext}
-      autofocus={autofocus}
-      registry={registry}
-      placeholder={placeholder}
-      rawErrors={rawErrors}
-    />
-  );
-}
-
-if (process.env.NODE_ENV !== 'production') {
-  StringField.propTypes = {
-    schema: PropTypes.object.isRequired,
-    uiSchema: PropTypes.object.isRequired,
-    idSchema: PropTypes.object,
-    onChange: PropTypes.func.isRequired,
-    onBlur: PropTypes.func,
-    onFocus: PropTypes.func,
-    formData: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
-    registry: PropTypes.shape({
-      widgets: PropTypes.objectOf(PropTypes.oneOfType([PropTypes.func, PropTypes.object])).isRequired,
-      fields: PropTypes.objectOf(PropTypes.func).isRequired,
-      definitions: PropTypes.object.isRequired,
-      formContext: PropTypes.object.isRequired,
-    }),
-    formContext: PropTypes.object.isRequired,
-    required: PropTypes.bool,
-    disabled: PropTypes.bool,
-    readonly: PropTypes.bool,
-    autofocus: PropTypes.bool,
-    rawErrors: PropTypes.arrayOf(PropTypes.string),
-  };
-}
-
-StringField.defaultProps = {
-  uiSchema: {},
-  disabled: false,
-  readonly: false,
-  autofocus: false,
-};
-
-export default StringField;
diff --git a/src/rjsf-patch/utils.js b/src/rjsf-patch/utils.js
deleted file mode 100644
index 197f900..0000000
--- a/src/rjsf-patch/utils.js
+++ /dev/null
@@ -1,47 +0,0 @@
-import React from 'react';
-import { Alert } from 'antd';
-import ArrayField from './ArrayField';
-import BooleanField from './BooleanField';
-import StringField from './StringField';
-import SchemaField from './SchemaField';
-import { getWidget as _getWidget } from '@rjsf/core/lib/utils';
-export * from '@rjsf/core/lib/utils';
-
-function Error(msg) {
-  return () => <Alert message={msg} type="error" showIcon />;
-}
-
-export function getWidget(...args) {
-  try {
-    return _getWidget(...args);
-  } catch (e) {
-    return Error(e.toString());
-  }
-}
-
-function TitleField(props) {
-  const { id, title, required } = props;
-  return (
-    <legend id={id}>
-      {title}
-      {required ? '*' : null}
-    </legend>
-  );
-}
-
-export function getDefaultRegistry() {
-  const fields = {
-    ...require('@rjsf/core/lib/components/fields').default,
-    ArrayField,
-    StringField,
-    BooleanField,
-    TitleField,
-    SchemaField,
-  };
-  return {
-    fields,
-    widgets: require('@rjsf/core/lib/components/widgets').default,
-    definitions: {},
-    formContext: {},
-  };
-}
diff --git a/src/store.js b/src/store.js
deleted file mode 100644
index 4e72762..0000000
--- a/src/store.js
+++ /dev/null
@@ -1,92 +0,0 @@
-import { createStore } from 'redux';
-import reducer from './reducers';
-import { persistStore, persistReducer } from 'redux-persist';
-import storage from 'redux-persist/lib/storage';
-import hardSet from 'redux-persist/lib/stateReconciler/hardSet';
-var persistConfig = {
-  key: 'react-jsonschema-formbuilder',
-  storage,
-  stateReconciler: hardSet,
-  throttle: 15,
-};
-
-var { schema2tree } = require('./core');
-
-var form = {
-  schema: {
-    title: 'A registration form',
-    description: 'A simple form example.',
-    type: 'object',
-    required: ['firstName', 'lastName'],
-    properties: {
-      firstName: {
-        type: 'string',
-        title: 'First name',
-      },
-      lastName: {
-        type: 'string',
-        title: 'Last name',
-      },
-      age: {
-        type: 'integer',
-        title: 'Age',
-        description: '(earthian year)',
-      },
-      bio: {
-        type: 'string',
-        title: 'Bio',
-      },
-      password: {
-        type: 'string',
-        title: 'Password',
-        minLength: 3,
-      },
-      telephone: {
-        type: 'string',
-        title: 'Telephone',
-        minLength: 10,
-      },
-    },
-  },
-  uiSchema: {
-    firstName: {
-      classNames: '',
-      'ui:emptyValue': '',
-    },
-    age: {
-      'ui:widget': 'updown',
-    },
-    bio: {
-      'ui:widget': 'textarea',
-    },
-    password: {
-      'ui:widget': 'password',
-      'ui:help': 'Hint: Make it strong!',
-    },
-    date: {
-      'ui:widget': 'alt-datetime',
-    },
-    telephone: {
-      'ui:options': {
-        inputType: 'tel',
-      },
-    },
-  },
-};
-
-var initTree = schema2tree('root', form.schema, form.uiSchema);
-
-var persistedReducer = persistReducer(persistConfig, reducer);
-
-var store = createStore(persistedReducer, {
-  tree: {
-    past: [],
-    present: initTree,
-    future: [],
-  },
-});
-
-var persistor = persistStore(store);
-
-export { store, persistor };
-export default { store, persistor };
diff --git a/src/utils.ts b/src/utils.ts
index af25871..c9c0f35 100644
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -1,5 +1,5 @@
 import { JSONSchema7Definition, JSONSchema7 } from 'json-schema';
-import { get, find, isEqual, identity } from 'lodash';
+import { get, isEqual } from 'lodash';
 
 function set(obj: any, path: (string | number)[], value: any): any {
   if (!path.length) return value;
diff --git a/src/views/FormDataView.jsx b/src/views/FormDataView.jsx
deleted file mode 100644
index b7ebd64..0000000
--- a/src/views/FormDataView.jsx
+++ /dev/null
@@ -1,82 +0,0 @@
-import React from 'react';
-import { connect } from 'react-redux';
-import { Button } from 'antd';
-import JsonEditor from '../JsonEditor';
-
-function name2title(name) {
-  if (!name) return name;
-  const words = name.indexOf('_') >= 0 ? name.split('_') : name.split(/(?=[A-Z])/);
-  return words.map((a) => a.charAt(0).toUpperCase() + a.slice(1)).join(' ');
-}
-
-function json2schema(data, name) {
-  const title = name ? name2title(name) : undefined;
-  if (typeof data === 'number') {
-    return {
-      type: Number.isInteger(data) ? 'integer' : 'number',
-      title,
-    };
-  }
-  if (typeof data === 'string') {
-    return {
-      type: 'string',
-      title,
-    };
-  }
-  if (typeof data === 'boolean') {
-    return {
-      type: 'boolean',
-      title,
-    };
-  }
-  if (typeof data === 'object') {
-    if (Array.isArray(data)) {
-      return {
-        type: 'array',
-        title,
-        items: json2schema(data[0]),
-      };
-    }
-    let properties = {};
-    for (const i in data) {
-      const s = json2schema(data[i], i);
-      if (s) {
-        properties[i] = s;
-      }
-    }
-    return {
-      type: 'object',
-      title,
-      properties,
-    };
-  }
-  return undefined;
-}
-
-export default connect(
-  ({ formData }) => ({ formData }),
-  (dispatch) => ({
-    setFormData: (formData) =>
-      dispatch({
-        type: 'FORM_DATA_SET',
-        payload: formData,
-      }),
-    genForm: (formData) =>
-      dispatch({
-        type: 'TREE_SET_TREE',
-        payload: {
-          name: 'root',
-          schema: json2schema(formData, 'form'),
-          uiSchema: {},
-        },
-      }),
-  })
-)(({ formData, setFormData, genForm }) => (
-  <div>
-    <JsonEditor value={formData} onChange={(value) => setFormData(value)} autoSize />
-    <Button type="primary" onClick={() => genForm(formData)}>
-      Gen Form
-    </Button>
-    <Button onClick={() => setFormData({})}>Clear</Button>
-  </div>
-));
diff --git a/src/views/InlineEditTemplate.tsx b/src/views/InlineEditTemplate.tsx
index 2374a60..f301a32 100644
--- a/src/views/InlineEditTemplate.tsx
+++ b/src/views/InlineEditTemplate.tsx
@@ -48,7 +48,14 @@ export const FormItemTemplateMw: React.ComponentType<MiddlewareProps> = (props)
       required={isRequired(props)}
       {...get(extraProps, 'formItem')}
     >
-      {next(props)}
+      <div
+        style={{ background: '#FFF' }}
+        onClick={(event) => {
+          event.stopPropagation();
+        }}
+      >
+        {next(props)}
+      </div>
     </Form.Item>
   );
 };
@@ -63,10 +70,10 @@ export const ColMw: React.ComponentType<MiddlewareProps> = (props) => {
 
   const handleMouseEnter = React.useCallback<React.MouseEventHandler>(() => setHover(true), [setHover, colRef]);
   const handleMouseLeave = React.useCallback<React.MouseEventHandler>(() => setHover(false), [setHover, colRef]);
-  const handleClick = React.useCallback<React.MouseEventHandler>(() => setSelectedNodePath(schemaPath), [
-    schemaPath,
-    setSelectedNodePath,
-  ]);
+  const handleClick = React.useCallback<React.MouseEventHandler>(
+    () => setSelectedNodePath(selected ? null : schemaPath),
+    [schemaPath, setSelectedNodePath]
+  );
 
   const atom = typeof schema === 'boolean' || schema.type !== 'object';
 
diff --git a/src/views/index.js b/src/views/index.js
deleted file mode 100644
index c8723f1..0000000
--- a/src/views/index.js
+++ /dev/null
@@ -1,4 +0,0 @@
-export { default as FormView } from './FormView';
-export { default as SchemaView } from './SchemaView';
-export { default as UiSchemaView } from './UiSchemaView';
-export { default as FormDataView } from './FormDataView';