Kicking a problem a little further down the line (#610)

* fix(editor) Extract built-in modules to a separate file for better resolving * fix(editor) Tie built in versions to those in our package.json * fix(editor) Moved error and console log tracking into OpenFileEditor * chore(tests) Isolating the failing to test * chore(tests) Now run both performance tests * wtf * fix(Editor) Remove setTimeout around console logging * chore(Editor) Pulled out 2 hooks from OpenFileEditor
concrete-utopia · Oct 13, 2020 · 87a16a4 · 87a16a4
1 parent 3ea8d5a
commit 87a16a4
Show file tree

Hide file tree

Showing 2 changed files with 82 additions and 76 deletions.
diff --git a/editor/src/components/editor/editor-component.tsx b/editor/src/components/editor/editor-component.tsx
@@ -74,8 +74,6 @@ const EmptyArray: Array<RuntimeErrorInfo> = []
 
 const ConsoleLogSizeLimit = 100
 const EmptyConsoleLogs: Array<ConsoleLog> = []
-let consoleLogTimeoutID: number | null = null
-let canvasConsoleLogsVariable: Array<ConsoleLog> = EmptyConsoleLogs
 
 export const EditorComponentInner = betterReactMemo(
   'EditorComponentInner',
@@ -194,63 +192,6 @@ export const EditorComponentInner = betterReactMemo(
       [updateDeltaWidth],
     )
 
-    const [runtimeErrors, setRuntimeErrors] = React.useState<Array<RuntimeErrorInfo>>(EmptyArray)
-
-    const onRuntimeError = React.useCallback(
-      (editedFile: string, error: FancyError, errorInfo?: React.ErrorInfo) => {
-        setRuntimeErrors([
-          {
-            editedFile: editedFile,
-            error: error,
-            errorInfo: Utils.defaultIfNull(null, errorInfo),
-          },
-        ])
-      },
-      [],
-    )
-
-    const clearRuntimeErrors = React.useCallback(() => {
-      setRuntimeErrors(EmptyArray)
-    }, [])
-
-    const [canvasConsoleLogsState, setCanvasConsoleLogsState] = React.useState<Array<ConsoleLog>>(
-      [],
-    )
-
-    const modifyLogs = React.useCallback(
-      (updateLogs: (logs: Array<ConsoleLog>) => Array<ConsoleLog>) => {
-        const updatedLogs = updateLogs(canvasConsoleLogsVariable)
-        if (updatedLogs !== canvasConsoleLogsVariable) {
-          canvasConsoleLogsVariable = updateLogs(canvasConsoleLogsVariable)
-          if (consoleLogTimeoutID != null) {
-            clearTimeout(consoleLogTimeoutID)
-          }
-          consoleLogTimeoutID = setTimeout(() => {
-            setCanvasConsoleLogsState(canvasConsoleLogsVariable)
-            consoleLogTimeoutID = null
-          })
-        }
-      },
-      [setCanvasConsoleLogsState],
-    )
-
-    const clearConsoleLogs = React.useCallback(() => {
-      modifyLogs((_) => EmptyConsoleLogs)
-    }, [modifyLogs])
-
-    const addToConsoleLogs = React.useCallback(
-      (log: ConsoleLog) => {
-        modifyLogs((logs) => {
-          let result = [...logs, log]
-          while (result.length > ConsoleLogSizeLimit) {
-            result.shift()
-          }
-          return result
-        })
-      },
-      [modifyLogs],
-    )
-
     const canvasIsLive = useEditorState((store) => isLiveMode(store.editor.mode))
 
     const toggleLiveCanvas = React.useCallback(
@@ -392,14 +333,7 @@ export const EditorComponentInner = betterReactMemo(
                     overflowX: 'hidden',
                   }}
                 >
-                  <OpenFileEditor
-                    runtimeErrors={runtimeErrors}
-                    onRuntimeError={onRuntimeError}
-                    clearRuntimeErrors={clearRuntimeErrors}
-                    canvasConsoleLogs={canvasConsoleLogsState}
-                    clearConsoleLogs={clearConsoleLogs}
-                    addToConsoleLogs={addToConsoleLogs}
-                  />
+                  <OpenFileEditor />
                 </SimpleFlexRow>
               </SimpleFlexColumn>
               {/* insert more columns here */}
@@ -491,16 +425,76 @@ const HelpTriangle = () => (
   </div>
 )
 
-interface OpenFileEditorProps {
+function useRuntimeErrors(): {
   runtimeErrors: Array<RuntimeErrorInfo>
   onRuntimeError: (editedFile: string, error: FancyError, errorInfo?: React.ErrorInfo) => void
   clearRuntimeErrors: () => void
-  canvasConsoleLogs: Array<ConsoleLog>
-  clearConsoleLogs: () => void
+} {
+  const [runtimeErrors, setRuntimeErrors] = React.useState<Array<RuntimeErrorInfo>>(EmptyArray)
+
+  const onRuntimeError = React.useCallback(
+    (editedFile: string, error: FancyError, errorInfo?: React.ErrorInfo) => {
+      setRuntimeErrors([
+        {
+          editedFile: editedFile,
+          error: error,
+          errorInfo: Utils.defaultIfNull(null, errorInfo),
+        },
+      ])
+    },
+    [],
+  )
+
+  const clearRuntimeErrors = React.useCallback(() => {
+    setRuntimeErrors(EmptyArray)
+  }, [])
+
+  return {
+    runtimeErrors: runtimeErrors,
+    onRuntimeError: onRuntimeError,
+    clearRuntimeErrors: clearRuntimeErrors,
+  }
+}
+
+function useConsoleLogs(): {
+  consoleLogs: Array<ConsoleLog>
   addToConsoleLogs: (log: ConsoleLog) => void
+  clearConsoleLogs: () => void
+} {
+  const [consoleLogs, setConsoleLogs] = React.useState<Array<ConsoleLog>>(EmptyConsoleLogs)
+
+  const modifyLogs = React.useCallback(
+    (updateLogs: (logs: Array<ConsoleLog>) => Array<ConsoleLog>) => {
+      setConsoleLogs(updateLogs)
+    },
+    [setConsoleLogs],
+  )
+
+  const clearConsoleLogs = React.useCallback(() => {
+    modifyLogs((_) => EmptyConsoleLogs)
+  }, [modifyLogs])
+
+  const addToConsoleLogs = React.useCallback(
+    (log: ConsoleLog) => {
+      modifyLogs((logs) => {
+        let result = [...logs, log]
+        while (result.length > ConsoleLogSizeLimit) {
+          result.shift()
+        }
+        return result
+      })
+    },
+    [modifyLogs],
+  )
+
+  return {
+    consoleLogs: consoleLogs,
+    addToConsoleLogs: addToConsoleLogs,
+    clearConsoleLogs: clearConsoleLogs,
+  }
 }
 
-const OpenFileEditor = betterReactMemo('OpenFileEditor', (props: OpenFileEditorProps) => {
+const OpenFileEditor = betterReactMemo('OpenFileEditor', () => {
   const {
     noFileOpen,
     isUiJsFileOpen,
@@ -517,20 +511,32 @@ const OpenFileEditor = betterReactMemo('OpenFileEditor', (props: OpenFileEditorP
     }
   })
 
+  const { runtimeErrors, onRuntimeError, clearRuntimeErrors } = useRuntimeErrors()
+  const { consoleLogs, addToConsoleLogs, clearConsoleLogs } = useConsoleLogs()
+
   if (noFileOpen) {
     return <Subdued>No file open</Subdued>
   } else if (areReleaseNotesOpen) {
     return <ReleaseNotesContent />
   } else if (isUiJsFileOpen) {
-    return <SplitViewCanvasRoot {...props} />
+    return (
+      <SplitViewCanvasRoot
+        runtimeErrors={runtimeErrors}
+        onRuntimeError={onRuntimeError}
+        clearRuntimeErrors={clearRuntimeErrors}
+        canvasConsoleLogs={consoleLogs}
+        clearConsoleLogs={clearConsoleLogs}
+        addToConsoleLogs={addToConsoleLogs}
+      />
+    )
   } else if (isUserConfigurationOpen) {
     return <UserConfiguration />
   } else {
     return (
       <ScriptEditor
         relevantPanel={'misccodeeditor'}
-        runtimeErrors={props.runtimeErrors}
-        canvasConsoleLogs={props.canvasConsoleLogs}
+        runtimeErrors={runtimeErrors}
+        canvasConsoleLogs={consoleLogs}
       />
     )
   }

diff --git a/editor/src/core/performance/performance-regression-tests.spec.tsx b/editor/src/core/performance/performance-regression-tests.spec.tsx
@@ -59,8 +59,8 @@ describe('React Render Count Tests - ', () => {
     )
 
     const renderCountAfter = renderResult.getNumberOfRenders()
-    expect(renderCountAfter - renderCountBefore).toBeGreaterThan(750) // if this breaks, GREAT NEWS but update the test please :)
-    expect(renderCountAfter - renderCountBefore).toBeLessThan(760)
+    expect(renderCountAfter - renderCountBefore).toBeGreaterThan(695) // if this breaks, GREAT NEWS but update the test please :)
+    expect(renderCountAfter - renderCountBefore).toBeLessThan(705)
   })
 
   it('Changing the selected view', async () => {