From f00ff722112775a8be83ba3871d4e618a1a3da52 Mon Sep 17 00:00:00 2001 From: John Knox Date: Fri, 26 Apr 2019 09:24:20 -0700 Subject: [PATCH] Allow null TableRow sidebars Summary: Makes the API a bit easier to use. Don't have to build an empty sidebar if you don't want one. Reviewed By: passy Differential Revision: D15064205 fbshipit-source-id: bd31c1aa97fd6d1c93717c10b268f49e44eb1299 --- .../java/com/facebook/flipper/nativeplugins/table/TableRow.java | 2 +- src/plugins/TableNativePlugin.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/android/src/main/java/com/facebook/flipper/nativeplugins/table/TableRow.java b/android/src/main/java/com/facebook/flipper/nativeplugins/table/TableRow.java index 6404e4754..8967180cb 100644 --- a/android/src/main/java/com/facebook/flipper/nativeplugins/table/TableRow.java +++ b/android/src/main/java/com/facebook/flipper/nativeplugins/table/TableRow.java @@ -92,7 +92,7 @@ public abstract class TableRow { columnsObject.put("id", id); return new FlipperObject.Builder() .put("columns", columnsObject.build()) - .put("sidebar", sidebar.serialize()) + .put("sidebar", sidebar != null ? sidebar.serialize() : null) .put("id", id) .build(); } diff --git a/src/plugins/TableNativePlugin.js b/src/plugins/TableNativePlugin.js index a4acade62..405cc13ad 100644 --- a/src/plugins/TableNativePlugin.js +++ b/src/plugins/TableNativePlugin.js @@ -199,7 +199,7 @@ function renderToolbar(section: ToolbarSection) { function renderSidebarForRow(rowData: RowData): Node { if (!rowData.sidebar) { - throw new Error('renderSidebar used with missing rowData.sidebar'); + return null; } if (!Array.isArray(rowData.sidebar)) { throw new Error('typeof rowData.sidebar is not array as expected: ');