[Core] Fixed not applying intent color for icon inside tree node (#3355)

palantir · Feb 25, 2019 · 7816c70 · 7816c70 · blueprint-bot · Feb 25, 2019
1 parent 221926f
commit 7816c70
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/packages/core/src/common/_mixins.scss b/packages/core/src/common/_mixins.scss
@@ -25,6 +25,10 @@ $pt-dark-intent-text-colors: (
   "danger" : $red5,
 ) !default;
 
+@mixin intent-color($intentName) {
+  color: map-get($pt-intent-colors, $intentName);
+}
+
 @mixin position-all($position, $value) {
   position: $position;
   top: $value;

diff --git a/packages/core/src/components/tree/_tree.scss b/packages/core/src/components/tree/_tree.scss
@@ -47,6 +47,12 @@ $tree-icon-spacing: ($tree-row-height - $pt-icon-size-standard) / 2 !default;
 .#{$ns}-tree {
   #{$icon-classes} {
     color: $pt-icon-color;
+
+    @each $intent, $colors in $pt-intent-colors {
+      &.#{$ns}-intent-#{$intent} {
+        @include intent-color($intent);
+      }
+    }
   }
 }
 

diff --git a/packages/docs-app/src/examples/core-examples/treeExample.tsx b/packages/docs-app/src/examples/core-examples/treeExample.tsx
@@ -6,7 +6,7 @@
 
 import * as React from "react";
 
-import { Classes, Icon, ITreeNode, Position, Tooltip, Tree } from "@blueprintjs/core";
+import { Classes, Icon, Intent, ITreeNode, Position, Tooltip, Tree } from "@blueprintjs/core";
 import { Example, IExampleProps } from "@blueprintjs/docs-theme";
 
 export interface ITreeExampleState {
@@ -93,7 +93,7 @@ const INITIAL_STATE: ITreeNode[] = [
             },
             {
                 id: 3,
-                icon: "tag",
+                icon: <Icon icon="tag" intent={Intent.PRIMARY} className={Classes.TREE_NODE_ICON} />,
                 label: "Organic meditation gluten-free, sriracha VHS drinking vinegar beard man.",
             },
             {