[misc cleanup] Remove manual conditions in favor of `callWithItemIfFu…

…nction` util
elastic · Apr 9, 2024 · c3bd4c1 · c3bd4c1
1 parent 9eef965
commit c3bd4c1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 21 deletions.
diff --git a/src/components/basic_table/collapsed_item_actions.tsx b/src/components/basic_table/collapsed_item_actions.tsx
@@ -14,7 +14,6 @@ import React, {
   ReactElement,
 } from 'react';
 
-import { isString } from '../../services/predicate';
 import { EuiContextMenuItem, EuiContextMenuPanel } from '../context_menu';
 import { EuiPopover } from '../popover';
 import { EuiButtonIcon } from '../button';
@@ -69,12 +68,9 @@ export const CollapsedItemActions = <T extends {}>({
           </EuiContextMenuItem>
         );
       } else {
-        const buttonIcon = action.icon;
-        let icon;
-        if (buttonIcon) {
-          icon = isString(buttonIcon) ? buttonIcon : buttonIcon(item);
-        }
-
+        const icon = action.icon
+          ? callWithItemIfFunction(item)(action.icon)
+          : undefined;
         const buttonContent = callWithItemIfFunction(item)(action.name);
         const toolTipContent = callWithItemIfFunction(item)(action.description);
         const href = callWithItemIfFunction(item)(action.href);

diff --git a/src/components/basic_table/default_item_action.tsx b/src/components/basic_table/default_item_action.tsx
@@ -8,7 +8,6 @@
 
 import React, { ReactElement, ReactNode, MouseEvent, useCallback } from 'react';
 
-import { isString } from '../../services/predicate';
 import {
   EuiButtonEmpty,
   EuiButtonIcon,
@@ -51,26 +50,20 @@ export const DefaultItemAction = <T extends object>({
     [action.onClick, item]
   );
 
-  const buttonColor = action.color;
-  let color: EuiButtonIconProps['color'] = 'primary';
-  if (buttonColor) {
-    color = isString(buttonColor) ? buttonColor : buttonColor(item);
-  }
-
-  const buttonIcon = action.icon;
-  let icon;
-  if (buttonIcon) {
-    icon = isString(buttonIcon) ? buttonIcon : buttonIcon(item);
-  }
-
-  let button;
+  const color: EuiButtonIconProps['color'] = action.color
+    ? callWithItemIfFunction(item)(action.color)
+    : 'primary';
+  const icon = action.icon
+    ? callWithItemIfFunction(item)(action.icon)
+    : undefined;
   const actionContent = callWithItemIfFunction(item)(action.name);
   const tooltipContent = callWithItemIfFunction(item)(action.description);
   const href = callWithItemIfFunction(item)(action.href);
   const dataTestSubj = callWithItemIfFunction(item)(action['data-test-subj']);
 
   const ariaLabelId = useGeneratedHtmlId();
   let ariaLabelledBy: ReactNode;
+  let button;
 
   if (action.type === 'icon') {
     if (!icon) {