fix: add right margin to <Button kind='inline'/> using icons

packages/code-studio/src/styleguide/Buttons.tsx

@@ -1,8 +1,6 @@
 /* eslint-disable react/jsx-props-no-spreading */
 import React, { Component, ReactElement } from 'react';
-import classNames from 'classnames';
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-import { ButtonOld, SocketedButton } from '@deephaven/components';
+import { Button, ButtonOld, SocketedButton } from '@deephaven/components';
 import { dhTruck } from '@deephaven/icons';
 import { sampleSectionIdAndClasses } from './utils';
 
@@ -95,37 +93,36 @@ class Buttons extends Component<Record<string, never>, ButtonsState> {
       >
         <h5>Inline Buttons</h5>
         Regular btn-inline:
-        <ButtonOld className="btn-inline mx-2">
-          <FontAwesomeIcon icon={dhTruck} />
-        </ButtonOld>
+        <Button className="mx-2" kind="inline" icon={dhTruck} tooltip="test" />
         Toggle button (class active):
-        <ButtonOld
-          className={classNames('btn-inline mx-2', { active: toggle })}
+        <Button
+          className="mx-2"
           onClick={() => {
             this.setState({ toggle: !toggle });
           }}
-        >
-          <FontAwesomeIcon icon={dhTruck} />
-        </ButtonOld>
+          active={toggle}
+          kind="inline"
+          icon={dhTruck}
+          tooltip="test"
+        />
         Disabled:
-        <ButtonOld className="btn-inline mx-2" disabled>
-          <FontAwesomeIcon icon={dhTruck} />
-        </ButtonOld>
+        <Button className="mx-2" kind="inline" disabled>
+          Disabled
+        </Button>
+        With Text:
+        <Button className="mx-2" kind="inline" icon={dhTruck}>
+          <span>Text Button</span>
+        </Button>
         <br />
         <br />
         <span>btn-link-icon (no text):</span>
-        <ButtonOld className="btn-link btn-link-icon px-2">
-          {/* pad and margin horizontally as appropriate for icon shape and spacing, 
-          needs btn-link and btn-link-icon classes. */}
-          <FontAwesomeIcon icon={dhTruck} />
-        </ButtonOld>
+        <Button kind="ghost" icon={dhTruck} tooltip="test" />
         <span className="mx-2">btn-link:</span>
-        <ButtonOld className="btn-link">Text Button</ButtonOld>
+        <Button kind="ghost">Text Button </Button>
         <span className="mx-2">btn-link (text w/ optional with icon):</span>
-        <ButtonOld className="btn-link">
-          <FontAwesomeIcon icon={dhTruck} />
-          Add Item
-        </ButtonOld>
+        <Button kind="ghost" icon={dhTruck}>
+          Text Button
+        </Button>
       </div>
     );
   }

packages/components/src/Button.tsx

@@ -126,6 +126,29 @@ const Button = React.forwardRef<HTMLButtonElement, ButtonProps>(
       );
     }
 
+    // best effort attempt to auto add margin to icon if text is also present
+    if (iconElem != null && children != null) {
+      // check if react children contains a text node to a depth of 2
+      // to exlude poppers/menus, but not button text nested in spans
+      let containsTextNode = false;
+      React.Children.forEach(children, child => {
+        if (typeof child === 'string') {
+          containsTextNode = true;
+        } else if (React.isValidElement(child)) {
+          React.Children.forEach(child.props.children, grandchild => {
+            if (typeof grandchild === 'string') {
+              containsTextNode = true;
+            }
+          });
+        }
+      });
+      if (containsTextNode) {
+        iconElem = React.cloneElement(iconElem, {
+          className: classNames('mr-1', iconElem.props.className),
+        });
+      }
+    }
+
     let tooltipElem: JSX.Element | undefined;
     if (tooltip !== undefined) {
       tooltipElem =
@@ -180,10 +203,10 @@ const Button = React.forwardRef<HTMLButtonElement, ButtonProps>(
     // disabled buttons tooltips need a wrapped element to receive pointer events
     // https://jakearchibald.com/2017/events-and-disabled-form-fields/
 
-    return disabled ? (
+    return disabled && tooltip != null ? (
       <span className="btn-disabled-wrapper">
         {button}
-        {tooltip !== undefined && tooltipElem}
+        {tooltipElem}
       </span>
     ) : (
       button