diff --git a/packages/core/src/components/button/abstractButton.tsx b/packages/core/src/components/button/abstractButton.tsx index 22ed43216b..f854f34691 100644 --- a/packages/core/src/components/button/abstractButton.tsx +++ b/packages/core/src/components/button/abstractButton.tsx @@ -185,10 +185,12 @@ export abstract class AbstractButton, - , - (!Utils.isReactNodeEmpty(text) || !Utils.isReactNodeEmpty(children)) && ( + // The icon is purely decorative if text is provided + , + maybeHasText && ( {text} {children} diff --git a/packages/core/src/components/callout/callout.tsx b/packages/core/src/components/callout/callout.tsx index 2f87fbb24c..f05b38cec8 100644 --- a/packages/core/src/components/callout/callout.tsx +++ b/packages/core/src/components/callout/callout.tsx @@ -78,7 +78,7 @@ export class Callout extends AbstractPureComponent2 { return (
- {iconName && } + {iconName && } {title &&

{title}

} {children}
diff --git a/packages/core/src/components/dialog/dialog.tsx b/packages/core/src/components/dialog/dialog.tsx index 27cc3ebf25..9efaee3e33 100644 --- a/packages/core/src/components/dialog/dialog.tsx +++ b/packages/core/src/components/dialog/dialog.tsx @@ -165,7 +165,7 @@ export class Dialog extends AbstractPureComponent2 { } return (
- +

{title}

{this.maybeRenderCloseButton()}
diff --git a/packages/core/src/components/forms/inputGroup.tsx b/packages/core/src/components/forms/inputGroup.tsx index f3226a540c..03e6e39068 100644 --- a/packages/core/src/components/forms/inputGroup.tsx +++ b/packages/core/src/components/forms/inputGroup.tsx @@ -269,7 +269,7 @@ export class InputGroup extends AbstractPureComponent2 ); } else if (leftIcon != null) { - return ; + return ; } return undefined; diff --git a/packages/core/src/components/menu/menuItem.tsx b/packages/core/src/components/menu/menuItem.tsx index f06baacac6..a13ebb0c84 100644 --- a/packages/core/src/components/menu/menuItem.tsx +++ b/packages/core/src/components/menu/menuItem.tsx @@ -166,7 +166,7 @@ export class MenuItem extends AbstractPureComponent2, + , {text} , diff --git a/packages/core/src/components/non-ideal-state/nonIdealState.tsx b/packages/core/src/components/non-ideal-state/nonIdealState.tsx index e4b405e034..2d39b618d7 100644 --- a/packages/core/src/components/non-ideal-state/nonIdealState.tsx +++ b/packages/core/src/components/non-ideal-state/nonIdealState.tsx @@ -75,7 +75,7 @@ export class NonIdealState extends AbstractPureComponent2 { } else { return (
- +
); } diff --git a/packages/core/src/components/tree/treeNode.tsx b/packages/core/src/components/tree/treeNode.tsx index b811f1956f..8bc8fefce3 100644 --- a/packages/core/src/components/tree/treeNode.tsx +++ b/packages/core/src/components/tree/treeNode.tsx @@ -141,7 +141,7 @@ export class TreeNode extends React.Component> {
  • {this.maybeRenderCaret()} - + {label} {this.maybeRenderSecondaryLabel()}