Merge pull request #135 from FMS-Cat/multiple-selection

feature (gui): Multiple selection
0b5vr · Apr 20, 2021 · 645cf35 · 645cf35
2 parents 7f463f7 + 596e86a
commit 645cf35
Show file tree

Hide file tree

Showing 43 changed files with 1,856 additions and 693 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -0,0 +1,15 @@
+{
+  // Use IntelliSense to learn about possible attributes.
+  // Hover to view descriptions of existing attributes.
+  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "type": "pwa-chrome",
+      "request": "launch",
+      "name": "Launch Chrome against localhost",
+      "url": "http://localhost:10001/dev.html",
+      "webRoot": "${workspaceFolder}"
+    }
+  ]
+}
diff --git a/dev.html b/dev.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+
+<meta charset="UTF-8">
+<title>Automaton development index!!!!!!!!</title>
+
+<body>
+  <h1>haha</h1>
+  <p>
+    <a href="./packages/automaton-with-gui/">automaton-with-gui</a>
+  </p>
+</body>
diff --git a/packages/automaton-with-gui/package.json b/packages/automaton-with-gui/package.json
@@ -66,6 +66,7 @@
     "immer": "^7.0.8",
     "react": "^16.13.1",
     "react-dom": "^16.13.1",
+    "react-error-boundary": "^3.1.1",
     "react-redux": "^7.2.1",
     "redux": "^4.0.5",
     "resize-observer-polyfill": "^1.5.1",

diff --git a/packages/automaton-with-gui/src/view/components/App.tsx b/packages/automaton-with-gui/src/view/components/App.tsx
@@ -8,6 +8,7 @@ import { Colors } from '../constants/Colors';
 import { ContextMenu } from './ContextMenu';
 import { CurveEditor } from './CurveEditor';
 import { CurveList } from './CurveList';
+import { ErrorBoundary } from './ErrorBoundary';
 import { FxSpawner } from './FxSpawner';
 import { GUIRemocon } from '../../GUIRemocon';
 import { GUIRemoconListener } from './GUIRemoconListener';
@@ -145,24 +146,31 @@ const Fuck = ( { className, automaton, guiRemocon }: AppProps ): JSX.Element =>
       className={ className }
       onContextMenu={ handleContextMenu }
     >
-      <AutomatonStateListener automaton={ automaton } />
-      <GUIRemoconListener guiRemocon={ guiRemocon } />
-      <StyledHeader />
-      <StyledModeSelector />
-      <StyledChannelListAndDopeSheet />
-      { mode === 'channel' && <StyledChannelEditor /> }
-      { mode === 'curve' && <>
-        <StyledCurveList />
-        <StyledCurveEditor />
-      </> }
-      <StyledInspector />
-      { isFxSpawnerVisible && <StyledFxSpawner /> }
-      { isAboutVisible && <StyledAbout /> }
-      { isContextMenuVisible && <ContextMenu /> }
-      { isTextPromptVisible && <TextPrompt /> }
-
-      <Toasty />
-      <Stalker />
+      <ErrorBoundary>
+        <AutomatonStateListener automaton={ automaton } />
+        <GUIRemoconListener guiRemocon={ guiRemocon } />
+
+        <ErrorBoundary>
+          <StyledHeader />
+          <StyledModeSelector />
+          <StyledChannelListAndDopeSheet />
+          { mode === 'channel' && <StyledChannelEditor /> }
+          { mode === 'curve' && <>
+            <StyledCurveList />
+            <StyledCurveEditor />
+          </> }
+          <StyledInspector />
+          { isFxSpawnerVisible && <StyledFxSpawner /> }
+          { isAboutVisible && <StyledAbout /> }
+          { isContextMenuVisible && <ContextMenu /> }
+          { isTextPromptVisible && <TextPrompt /> }
+        </ErrorBoundary>
+
+        <ErrorBoundary>
+          <Toasty />
+          <Stalker />
+        </ErrorBoundary>
+      </ErrorBoundary>
     </Root>
   );
 };