From 5480560cb0933346b31a68ea091dfc07843c0071 Mon Sep 17 00:00:00 2001
From: Martin Povolny <mpovolny@redhat.com>
Date: Tue, 1 Oct 2019 15:52:36 +0200
Subject: [PATCH] Fix enabled calculation: use "onwhen" when available if not
 use "enabled".

---
 src/toolbar/ToolbarButton.jsx | 2 +-
 src/toolbar/ToolbarList.jsx   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/toolbar/ToolbarButton.jsx b/src/toolbar/ToolbarButton.jsx
index 3f459ee..dd8fc97 100644
--- a/src/toolbar/ToolbarButton.jsx
+++ b/src/toolbar/ToolbarButton.jsx
@@ -29,7 +29,7 @@ ButtonIcon.propTypes = {
 
 export const ToolbarButton = (props) => {
   const count = useContext(CountContext);
-  const disabled = !props.enabled || !isEnabled(props.onwhen, count);
+  const disabled = !(props.onwhen ? isEnabled(props.onwhen, count) : props.enabled);
 
   return (
     <button
diff --git a/src/toolbar/ToolbarList.jsx b/src/toolbar/ToolbarList.jsx
index 7182558..f0f66f3 100644
--- a/src/toolbar/ToolbarList.jsx
+++ b/src/toolbar/ToolbarList.jsx
@@ -34,7 +34,7 @@ export const ToolbarList = (props) => {
   // Toolbar is disabled if no item is enabled.
   let isToolbarEnabled = false;
   const enabledItems = visibleItems.map((i) => {
-    const enabled = i.enabled && isEnabled(i.onwhen, count);
+    const enabled = i.onwhen ? isEnabled(i.onwhen, count) : i.enabled;
     isToolbarEnabled = isToolbarEnabled || enabled;
 
     return {