Bug 1463055 - Font editor: merge editor panel with overview (temporary until redesign). r=pbro
MozReview-Commit-ID: 5QSEEGgsoPO
--- a/devtools/client/inspector/fonts/components/FontEditor.js
+++ b/devtools/client/inspector/fonts/components/FontEditor.js
@@ -189,20 +189,17 @@ class FontEditor extends PureComponent {
const hasSlantOrItalicAxis = hasFontAxes && font.variationAxes.find(axis => {
return axis.tag === "slnt" || axis.tag === "ital";
});
const hasWeightAxis = hasFontAxes && font.variationAxes.find(axis => {
return axis.tag === "wght";
});
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.
hasFontInstances && this.renderInstances(font.variationInstances, instance),
// Always render UI for font size.
this.renderFontSize(properties["font-size"]),
// Render UI for font weight if no "wght" registered axis is defined.
!hasWeightAxis && this.renderFontWeight(properties["font-weight"]),
--- a/devtools/client/inspector/fonts/components/FontsApp.js
+++ b/devtools/client/inspector/fonts/components/FontsApp.js
@@ -33,31 +33,31 @@ class FontsApp extends PureComponent {
fontEditor,
fontOptions,
onInstanceChange,
onPreviewFonts,
onPropertyChange,
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,
+ })
);
}
}
module.exports = connect(state => state)(FontsApp);