Bug 1463055 - Font editor: merge editor panel with overview (temporary until redesign). r=pbro

MozReview-Commit-ID: 5QSEEGgsoPO

--HG--
extra : rebase_source : 35ca58c787c52106c6f9d4cd0ee326bfd6638e74

devtools/client/inspector/fonts/components/FontEditor.js

@@ -194,10 +194,7 @@ class FontEditor extends PureComponent {
     });
 
     return dom.div(
-      {
-        className: "theme-sidebar inspector-tabpanel",
-        id: "sidebar-panel-fontinspector"
-      },
+      {},
       // Always render UI for font family, format and font file URL.
       this.renderFontFamily(font),
       // Render UI for font variation instances if they are defined.

devtools/client/inspector/fonts/components/FontsApp.js

@@ -38,24 +38,24 @@ class FontsApp extends PureComponent {
       onToggleFontHighlight,
     } = this.props;
 
+    const hasFonts = fontEditor.fonts.length > 0;
+
     return dom.div(
       {
         className: "theme-sidebar inspector-tabpanel",
         id: "sidebar-panel-fontinspector"
       },
-      fontEditor.isVisible ?
-        FontEditor({
-          fontEditor,
-          onInstanceChange,
-          onPropertyChange,
-        })
-        :
-        FontOverview({
-          fontData,
-          fontOptions,
-          onPreviewFonts,
-          onToggleFontHighlight,
-        })
+      hasFonts && FontEditor({
+        fontEditor,
+        onInstanceChange,
+        onPropertyChange,
+      }),
+      FontOverview({
+        fontData,
+        fontOptions,
+        onPreviewFonts,
+        onToggleFontHighlight,
+      })
     );
   }
 }