Fixed a regression introduced in d7971bd (#1193) - plugins with targe…

…t=hidden should never render in Drawer.
hajkmap · Dec 19, 2022 · fd18477 · fd18477
1 parent 33fd129
commit fd18477
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/new-client/src/plugins/BaseWindowPlugin.js b/new-client/src/plugins/BaseWindowPlugin.js
@@ -212,10 +212,11 @@ class BaseWindowPlugin extends React.PureComponent {
             windowVisible: this.state.windowVisible,
           })}
         </Window>
-        {/* Always render a Drawer button (it's a backup for plugins 
-              render elsewhere: we hide Widget and Control buttons on 
-              small screens and fall back to Drawer button). */}
-        {this.renderDrawerButton()}
+        {/* Always render a Drawer button unless its target is "hidden". 
+              It's a backup for plugins render elsewhere: we hide 
+              Widget and Control buttons on small screens and fall 
+              back to Drawer button). */}
+        {target !== "hidden" && this.renderDrawerButton()}
         {/* Widget buttons must also render a Widget */}
         {this.pluginIsWidget(target) &&
           this.renderWidgetButton(`${target}-column`)}

diff --git a/new-client/src/plugins/DialogWindowPlugin.js b/new-client/src/plugins/DialogWindowPlugin.js
@@ -222,10 +222,11 @@ class DialogWindowPlugin extends React.PureComponent {
       this.props.app.config.mapConfig.map.clean !== true && (
         <>
           {this.renderDialog()}
-          {/* Always render a Drawer button (it's a backup for plugins 
-              render elsewhere: we hide Widget and Control buttons on 
-              small screens and fall back to Drawer button). */}
-          {this.renderDrawerButton()}
+          {/* Always render a Drawer button unless its target is "hidden". 
+              It's a backup for plugins render elsewhere: we hide 
+              Widget and Control buttons on small screens and fall 
+              back to Drawer button). */}
+          {target !== "hidden" && this.renderDrawerButton()}
           {/* Widget buttons must also render a Widget */}
           {this.#pluginIsWidget(target) &&
             this.renderWidgetButton(`${target}-column`)}