[v5] [core] feat: use CaretRight component in TreeNode (#6235)

palantir · Jun 22, 2023 · b3dd004 · b3dd004 · adidahiya · Jun 22, 2023
1 parent 41d5874
commit b3dd004
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/packages/core/src/components/icon/icon.tsx b/packages/core/src/components/icon/icon.tsx
@@ -24,7 +24,7 @@ import { Classes, DISPLAYNAME_PREFIX, IntentProps, MaybeElement, Props, removeNo
 // re-export for convenience, since some users won't be importing from or have a direct dependency on the icons package
 export { IconName, IconSize };
 
-export type IconHTMLAttributes = Omit<React.HTMLAttributes<HTMLElement>, "children" | "title">;
+export type IconHTMLAttributes = Omit<React.HTMLAttributes<HTMLElement | SVGSVGElement>, "children" | "title">;
 
 export interface IconProps extends IntentProps, Props, SVGIconProps, IconHTMLAttributes {
     /**

diff --git a/packages/core/src/components/tree/treeNode.tsx b/packages/core/src/components/tree/treeNode.tsx
@@ -17,6 +17,8 @@
 import classNames from "classnames";
 import * as React from "react";
 
+import { ChevronRight } from "@blueprintjs/icons";
+
 import { Classes, DISPLAYNAME_PREFIX } from "../../common";
 import { Collapse } from "../collapse/collapse";
 import { Icon } from "../icon/icon";
@@ -100,13 +102,11 @@ export class TreeNode<T = {}> extends React.Component<TreeNodeProps<T>> {
                 Classes.TREE_NODE_CARET,
                 isExpanded ? Classes.TREE_NODE_CARET_OPEN : Classes.TREE_NODE_CARET_CLOSED,
             );
-            const onClick = disabled === true ? undefined : this.handleCaretClick;
             return (
-                <Icon
+                <ChevronRight
                     title={isExpanded ? "Collapse group" : "Expand group"}
                     className={caretClasses}
-                    onClick={onClick}
-                    icon={"chevron-right"}
+                    onClick={disabled === true ? undefined : this.handleCaretClick}
                 />
             );
         }

diff --git a/packages/icons/src/svgIconProps.ts b/packages/icons/src/svgIconProps.ts
@@ -19,7 +19,9 @@ import * as React from "react";
  * Interface used for generated icon components which already have their name and path defined
  * (through the rendered Handlebars template).
  */
-export interface SVGIconProps extends React.RefAttributes<any> {
+export interface SVGIconProps
+    extends React.RefAttributes<any>,
+        Omit<React.DOMAttributes<HTMLElement | SVGSVGElement>, "children" | "dangerouslySetInnerHTML"> {
     /** A space-delimited list of class names to pass along to the SVG element. */
     className?: string;