Skip to content

Commit 030e85b

Browse files
committed
fix(topbar): fix conditional rendering of File Menu
Refs #2710
1 parent bc37fae commit 030e85b

File tree

1 file changed

+7
-11
lines changed

1 file changed

+7
-11
lines changed

src/standalone/topbar/topbar.jsx

+7-11
Original file line numberDiff line numberDiff line change
@@ -334,16 +334,6 @@ export default class Topbar extends React.Component {
334334
}
335335
}
336336

337-
const saveAsElements = []
338-
339-
if(isJson) {
340-
saveAsElements.push(<li><button type="button" onClick={this.saveAsJson}>Save as JSON</button></li>)
341-
saveAsElements.push(<li><button type="button" onClick={this.saveAsYaml}>Convert and save as YAML</button></li>)
342-
} else {
343-
saveAsElements.push(<li><button type="button" onClick={this.saveAsYaml}>Save as YAML</button></li>)
344-
saveAsElements.push(<li><button type="button" onClick={this.saveAsJson}>Convert and save as JSON</button></li>)
345-
}
346-
347337
return (
348338
<div className="swagger-editor-standalone">
349339
<div className="topbar">
@@ -355,7 +345,13 @@ export default class Topbar extends React.Component {
355345
<li><button type="button" onClick={this.importFromURL}>Import URL</button></li>
356346
<ImportFileMenuItem onDocumentLoad={content => this.props.specActions.updateSpec(content)} />
357347
<li role="separator"></li>
358-
{saveAsElements}
348+
{isJson ? [
349+
<li key="1"><button type="button" onClick={this.saveAsJson}>Save as JSON</button></li>,
350+
<li key="2"><button type="button" onClick={this.saveAsYaml}>Convert and save as YAML</button></li>
351+
] : [
352+
<li key="1"><button type="button" onClick={this.saveAsYaml}>Save as YAML</button></li>,
353+
<li key="2"><button type="button" onClick={this.saveAsJson}>Convert and save as JSON</button></li>
354+
]}
359355
<li role="separator"></li>
360356
<li><button type="button" onClick={this.clearEditor}>Clear editor</button></li>
361357
</DropdownMenu>

0 commit comments

Comments
 (0)