Merge branch 'master' of github.com:salesforce/design-system-react

Author: interactivellama

components/tree/private/branch.jsx

@@ -114,10 +114,7 @@ const handleKeyDownUp = (event, props) => {
 
 const handleKeyDownRight = (event, props) => {
 	if (props.node.expanded) {
-		if (
-			this.props.getNodes(props.node) &&
-			this.props.getNodes(props.node).length > 0
-		) {
+		if (props.getNodes(props.node) && props.getNodes(props.node).length > 0) {
 			handleKeyDownDown(event, props);
 		}
 	} else {
@@ -134,11 +131,14 @@ const handleKeyDownLeft = (event, props) => {
 		);
 		const index = nodes.indexOf(props.parent);
 		if (index !== -1) {
-			props.onExpand(event, {
-				node: props.parent,
-				select: true,
-				expand: !props.parent.expanded,
-				treeIndex: props.flattenedNodes[index].treeIndex,
+			props.onExpand({
+				event,
+				data: {
+					node: props.parent,
+					select: true,
+					expand: !props.parent.expanded,
+					treeIndex: props.flattenedNodes[index].treeIndex,
+				},
 			});
 		}
 	}

components/utilities/utility-icon/index.jsx

@@ -68,7 +68,7 @@ const UtilityIcon = (
 	return inlineData ? (
 		<Svg data={inlineData} name={name} {...rest} />
 	) : (
-		<svg {...rest}>
+		<svg key={`${name}_${category}`} {...rest}>
 			<use xlinkHref={modifiedPath} />
 		</svg>
 	);