From b71ae59545eee43e90bdc262ddd49e961819584d Mon Sep 17 00:00:00 2001
From: John Knox <jknox@fb.com>
Date: Mon, 9 Sep 2019 06:49:30 -0700
Subject: [PATCH] TableNativePlugin

Reviewed By: passy

Differential Revision: D17258701

fbshipit-source-id: 0d622e63cc028969c9c6d51c5aa2cc8977aac151
---
 src/plugins/TableNativePlugin.tsx | 48 +++++++++++++++++--------------
 src/ui/components/ErrorBlock.tsx  |  2 +-
 2 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/src/plugins/TableNativePlugin.tsx b/src/plugins/TableNativePlugin.tsx
index 4cde22ba3..537215b5c 100644
--- a/src/plugins/TableNativePlugin.tsx
+++ b/src/plugins/TableNativePlugin.tsx
@@ -140,20 +140,23 @@ function buildRow(
   }
   const oldColumns =
     previousRowData && previousRowData.columns
-      ? Object.keys(previousRowData.columns).reduce((map, key) => {
-          if (key !== 'id') {
-            let value = null;
-            if (previousRowData && previousRowData.columns) {
-              value = previousRowData.columns[key].value;
-            }
+      ? Object.keys(previousRowData.columns).reduce(
+          (map: {[key: string]: {value: any; isFilterable: boolean}}, key) => {
+            if (key !== 'id') {
+              let value = null;
+              if (previousRowData && previousRowData.columns) {
+                value = previousRowData.columns[key].value;
+              }
 
-            map[key] = {
-              value,
-              isFilterable: true,
-            };
-          }
-          return map;
-        }, {})
+              map[key] = {
+                value,
+                isFilterable: true,
+              };
+            }
+            return map;
+          },
+          {},
+        )
       : {};
   const columns = Object.keys(rowData.columns).reduce((map, key) => {
     if (rowData.columns && key !== 'id') {
@@ -186,10 +189,13 @@ function renderToolbar(section: ToolbarSection) {
         return [
           <Label>{item.label}</Label>,
           <Select
-            options={item.options.reduce((obj, item) => {
-              obj[item] = item;
-              return obj;
-            }, {})}
+            options={item.options.reduce(
+              (obj: {[key: string]: string}, item) => {
+                obj[item] = item;
+                return obj;
+              },
+              {},
+            )}
             selected={item.value}
             onChange={() => {}}
           />,
@@ -259,7 +265,7 @@ export default function createTableNativePlugin(id: string, title: string) {
     ): Partial<PersistedState> => {
       if (message.method === 'updateRows') {
         const newRows = [];
-        const newData = {};
+        const newData: {[key: string]: NumberedRowData} = {};
 
         for (const rowData of message.data.reverse()) {
           if (rowData.id == null) {
@@ -312,14 +318,14 @@ export default function createTableNativePlugin(id: string, title: string) {
         method === 'updateRows'
           ? {
               method,
-              data,
+              data: data || [],
             }
           : {method};
       return this.typedPersistedStateReducer(persistedState, message);
     }
 
     state = {
-      selectedIds: [],
+      selectedIds: [] as Array<ID>,
       error: null,
     };
 
@@ -366,7 +372,7 @@ export default function createTableNativePlugin(id: string, title: string) {
         return;
       }
       let paste = '';
-      const mapFn = row =>
+      const mapFn = (row: TableBodyRow) =>
         (
           (this.props.persistedState.tableMetadata &&
             Object.keys(this.props.persistedState.tableMetadata.columns)) ||
diff --git a/src/ui/components/ErrorBlock.tsx b/src/ui/components/ErrorBlock.tsx
index 7e54411df..cef26144a 100644
--- a/src/ui/components/ErrorBlock.tsx
+++ b/src/ui/components/ErrorBlock.tsx
@@ -23,7 +23,7 @@ export const ErrorBlockContainer = styled(CodeBlock)({
  */
 export default class ErrorBlock extends React.Component<{
   /** Error message to display. Error object's `stack` or `message` property is used. */
-  error: Error | string | void;
+  error: Error | string | null;
   /** Additional className added to the container. */
   className?: string;
 }> {