Merge pull request #154 from martinpovolny/toolbar_fix_onwhen

Fix enabled calculation: use "onwhen" when available if not use "enabled".
ManageIQ · Oct 2, 2019 · 76cce4b · 76cce4b
2 parents 43c1be9 + 5480560
commit 76cce4b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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 {