From 22210900371fb08844be05c080691b9c07e8fae9 Mon Sep 17 00:00:00 2001
From: John Knox <jknox@fb.com>
Date: Thu, 30 May 2019 03:12:38 -0700
Subject: [PATCH] Fix Select value/selected React warning

Summary:
React outputs the following error:
  Warning: Use the `defaultValue` or `value` props on <select> instead of setting `selected` on <option>.

This fixes it by using value instead of selected.

Reviewed By: danielbuechele

Differential Revision: D15535717

fbshipit-source-id: eb784ba2cdefe1c6744cc15592cd3e0191d237d0
---
 src/plugins/databases/index.js | 4 +++-
 src/ui/components/Select.js    | 5 +++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/plugins/databases/index.js b/src/plugins/databases/index.js
index 661f29ac3..800d56b68 100644
--- a/src/plugins/databases/index.js
+++ b/src/plugins/databases/index.js
@@ -698,7 +698,9 @@ export default class DatabasesPlugin extends FlipperPlugin<
                 obj[item] = item;
                 return obj;
               }, {})}
-            selected={String(this.state.selectedDatabase)}
+            selected={
+              this.state.databases[this.state.selectedDatabase - 1]?.name
+            }
             onChange={this.onDatabaseSelected}
           />
           <BoldSpan style={{marginLeft: 16, marginRight: 16}}>Table</BoldSpan>
diff --git a/src/ui/components/Select.js b/src/ui/components/Select.js
index 361e70372..8fb65f20b 100644
--- a/src/ui/components/Select.js
+++ b/src/ui/components/Select.js
@@ -56,9 +56,10 @@ export default class Select extends Component<{
         grow={grow}
         id={this.selectID}
         onChange={this.onChange}
-        className={className}>
+        className={className}
+        value={selected || ''}>
         {Object.keys(options).map((key, index) => (
-          <option key={index} selected={key === selected}>
+          <option value={options[key]} key={index}>
             {options[key]}
           </option>
         ))}