From 904bb20eb42082fc2b0685314adc505a8d2bfc17 Mon Sep 17 00:00:00 2001
From: Simen Bekkhus <sbekkhus91@gmail.com>
Date: Thu, 14 Nov 2019 09:36:24 +0100
Subject: [PATCH 1/2] fix: put summary in `<Static>`

Fixes #9
---
 src/Reporter.tsx | 83 ++++++++++++++++++++++++++++--------------------
 1 file changed, 48 insertions(+), 35 deletions(-)

diff --git a/src/Reporter.tsx b/src/Reporter.tsx
index df93daf..cab4896 100644
--- a/src/Reporter.tsx
+++ b/src/Reporter.tsx
@@ -89,35 +89,43 @@ const FailureMessage: React.FC<{
 const CompletedTests: React.FC<{
   completedTests: State['completedTests'];
   globalConfig: Config.GlobalConfig;
-}> = ({ completedTests, globalConfig }) => {
+  summary: React.ReactElement;
+  PostMessage: () => React.ReactElement;
+  done: boolean;
+}> = ({ completedTests, globalConfig, summary, PostMessage, done }) => {
   if (completedTests.length === 0) {
     return null;
   }
   const didUpdate = globalConfig.updateSnapshot === 'all';
 
+  let testOutputs = completedTests.map(({ testResult, config }) => (
+    <React.Fragment key={testResult.testFilePath + config.name}>
+      <ResultHeader config={config} testResult={testResult} />
+      <VerboseTestList testResult={testResult} globalConfig={globalConfig} />
+      <TestConsoleOutput
+        console={testResult.console}
+        verbose={globalConfig.verbose}
+        cwd={config.cwd}
+      />
+      <FailureMessage failureMessage={testResult.failureMessage} />
+      <SnapshotStatus snapshot={testResult.snapshot} afterUpdate={didUpdate} />
+    </React.Fragment>
+  ));
+
+  if (done) {
+    testOutputs = testOutputs.concat(
+      <Box paddingTop={1} key="summary">
+        {summary}
+      </Box>,
+      <React.Fragment key="postmessage">
+        <PostMessage />
+      </React.Fragment>,
+    );
+  }
+
   return (
     <Box paddingBottom={1} flexDirection="column">
-      <Static items={completedTests}>
-        {({ testResult, config }) => (
-          <React.Fragment key={testResult.testFilePath + config.name}>
-            <ResultHeader config={config} testResult={testResult} />
-            <VerboseTestList
-              testResult={testResult}
-              globalConfig={globalConfig}
-            />
-            <TestConsoleOutput
-              console={testResult.console}
-              verbose={globalConfig.verbose}
-              cwd={config.cwd}
-            />
-            <FailureMessage failureMessage={testResult.failureMessage} />
-            <SnapshotStatus
-              snapshot={testResult.snapshot}
-              afterUpdate={didUpdate}
-            />
-          </React.Fragment>
-        )}
-      </Static>
+      <Static items={testOutputs}>{ele => ele}</Static>
     </Box>
   );
 };
@@ -242,29 +250,34 @@ const Reporter: React.FC<Props> = ({
   const { exit } = useApp();
   React.useEffect(() => {
     if (done) {
-      exit();
+      setImmediate(exit);
     }
   }, [done, exit]);
 
+  const summary = (
+    <Summary
+      aggregatedResults={aggregatedResults}
+      options={{ estimatedTime, roundTime: true, width }}
+      done={done}
+    />
+  );
   return (
     <Box flexDirection="column">
       <CompletedTests
         completedTests={completedTests}
         globalConfig={globalConfig}
-      />
-      <RunningTests tests={currentTests} width={width} />
-      <Summary
-        aggregatedResults={aggregatedResults}
-        options={{ estimatedTime, roundTime: true, width }}
+        summary={summary}
         done={done}
+        PostMessage={() => (
+          <PostMessage
+            aggregatedResults={aggregatedResults}
+            globalConfig={globalConfig}
+            contexts={contexts}
+          />
+        )}
       />
-      {done ? (
-        <PostMessage
-          aggregatedResults={aggregatedResults}
-          globalConfig={globalConfig}
-          contexts={contexts}
-        />
-      ) : null}
+      <RunningTests tests={currentTests} width={width} />
+      {done ? null : summary}
     </Box>
   );
 };

From 55bc253c83fb8c4c9ffc31ea03a2f35f508262ca Mon Sep 17 00:00:00 2001
From: Simen Bekkhus <sbekkhus91@gmail.com>
Date: Fri, 15 Nov 2019 12:01:21 +0100
Subject: [PATCH 2/2] chore: use 2 effects instead

---
 src/Reporter.tsx | 29 ++++++++++++++++++++++-------
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/src/Reporter.tsx b/src/Reporter.tsx
index cab4896..69d3951 100644
--- a/src/Reporter.tsx
+++ b/src/Reporter.tsx
@@ -222,6 +222,27 @@ const RunningTests: React.FC<{
   );
 };
 
+const Exiter: React.FC<{ done: boolean }> = ({ done }) => {
+  const { exit } = useApp();
+
+  const [shouldExit, setShouldExit] = React.useState(false);
+
+  // use a separate effect to ensure output is properly flushed. This _might_ be a bug in Ink, not sure
+  React.useEffect(() => {
+    if (done) {
+      setShouldExit(true);
+    }
+  }, [done, exit]);
+
+  React.useEffect(() => {
+    if (shouldExit) {
+      exit();
+    }
+  }, [exit, shouldExit]);
+
+  return null;
+};
+
 const Reporter: React.FC<Props> = ({
   register,
   globalConfig,
@@ -247,13 +268,6 @@ const Reporter: React.FC<Props> = ({
     state;
   const { estimatedTime = 0 } = options;
 
-  const { exit } = useApp();
-  React.useEffect(() => {
-    if (done) {
-      setImmediate(exit);
-    }
-  }, [done, exit]);
-
   const summary = (
     <Summary
       aggregatedResults={aggregatedResults}
@@ -278,6 +292,7 @@ const Reporter: React.FC<Props> = ({
       />
       <RunningTests tests={currentTests} width={width} />
       {done ? null : summary}
+      <Exiter done={done} />
     </Box>
   );
 };