Merge branch 'master' into tag-components

Author: zvonimirfras

src/icon/icon.directive.ts

@@ -91,7 +91,8 @@ export class IconDirective implements AfterViewInit, OnChanges {
 			"aria-label": this.ariaLabel,
 			"aria-labelledby": this.ariaLabelledBy,
 			"aria-hidden": this.ariaHidden,
-			focusable: this.isFocusable.toString()
+			focusable: this.isFocusable.toString(),
+			fill: icon.attrs.fill
 		});
 
 		const attrKeys = Object.keys(attributes);

src/link/index.ts

@@ -1,2 +1,3 @@
 export * from "./link.directive";
+export * from "./link-icon.directive";
 export * from "./link.module";

src/link/link-icon.directive.ts

@@ -0,0 +1,8 @@
+import { Directive, HostBinding } from "@angular/core";
+
+@Directive({
+	selector: "[ibmLinkIcon], [cdsLinkIcon]"
+})
+export class LinkIconDirective {
+	@HostBinding("class.cds--link__icon") iconClass = true;
+}

src/link/link.module.ts

@@ -2,13 +2,16 @@ import { NgModule } from "@angular/core";
 import { CommonModule } from "@angular/common";
 
 import { Link } from "./link.directive";
+import { LinkIconDirective } from "./link-icon.directive";
 
 @NgModule({
 	declarations: [
-		Link
+		Link,
+		LinkIconDirective
 	],
 	exports: [
-		Link
+		Link,
+		LinkIconDirective
 	],
 	imports: [
 		CommonModule

src/link/link.stories.ts

@@ -3,11 +3,13 @@
 import { moduleMetadata, Meta } from "@storybook/angular";
 import { LinkModule, Link } from "./";
 
+import { IconModule } from "../icon";
+
 export default {
 	title: "Components/Link",
 	decorators: [
 		moduleMetadata({
-			imports: [LinkModule]
+			imports: [LinkModule, IconModule]
 		})
 	],
 	component: Link
@@ -24,3 +26,22 @@ Basic.args = {
 	disabled: false,
 	inline: false
 };
+
+const IconTemplate = (args) => ({
+	props: args,
+	template: `
+		<a
+			href="#"
+			cdsLink
+			[disabled]="disabled"
+			[inline]="inline">
+			Link
+			<svg cdsLinkIcon cdsIcon="close" size="16"></svg>
+		</a>
+	`
+});
+export const WithIcon = IconTemplate.bind({});
+WithIcon.args = {
+	disabled: false,
+	inline: false
+};

src/list/list.directive.ts

@@ -1,4 +1,9 @@
-import { Directive, ElementRef, HostBinding } from "@angular/core";
+import {
+	Directive,
+	ElementRef,
+	HostBinding,
+	Input
+} from "@angular/core";
 
 /**
  * Applies either ordered or unordered styling to the list container it is applied to.
@@ -33,5 +38,10 @@ export class List {
 		return !!(this.elementRef.nativeElement.parentElement && this.elementRef.nativeElement.parentElement.tagName === "LI");
 	}
 
+	/**
+	 * Set to `true` to make list expressive
+	 */
+	@Input() @HostBinding("class.cds--list--expressive") isExpressive = false;
+
 	constructor(protected elementRef: ElementRef) {}
 }

src/list/list.stories.ts

@@ -13,20 +13,23 @@ export default {
 	parameters: {
 		layout: "centered"
 	},
+	args: {
+		isExpressive: false
+	},
 	component: List
 } as Meta;
 
 const Template = (args) => ({
 	props: args,
 	template: `
 		<p>Ordered List</p>
-		<ol cdsList>
+		<ol cdsList [isExpressive]="isExpressive">
 			<li cdsListItem>One</li>
 			<li cdsListItem>Two</li>
 			<li cdsListItem>Three</li>
 		</ol>
 		<p>Unordered List</p>
-		<ul cdsList>
+		<ul cdsList [isExpressive]="isExpressive">
 			<li cdsListItem>One</li>
 			<li cdsListItem>Two</li>
 			<li cdsListItem>Three</li>
@@ -39,7 +42,7 @@ const NestingTemplate = (args) => ({
 	props: args,
 	template: `
 		<p>Ordered List</p>
-		<ol cdsList>
+		<ol cdsList [isExpressive]="isExpressive">
 			<li cdsListItem>
 				One
 				<ol cdsList>
@@ -52,10 +55,10 @@ const NestingTemplate = (args) => ({
 			<li cdsListItem>Three</li>
 		</ol>
 		<p>Unordered List</p>
-		<ul cdsList>
+		<ul cdsList [isExpressive]="isExpressive">
 			<li cdsListItem>
 				One
-				<ul cdsList>
+				<ul cdsList [isExpressive]="isExpressive">
 					<li cdsListItem>Nested one</li>
 					<li cdsListItem>Nested two</li>
 					<li cdsListItem>Nested three</li>

src/tiles/clickable-tile-icon.directive.ts

@@ -0,0 +1,8 @@
+import { Directive, HostBinding } from "@angular/core";
+
+@Directive({
+	selector: "[cdsClickableTileIcon], [ibmClickableTileIcon]"
+})
+export class ClickableTileIconDirective {
+	@HostBinding("class.cds--tile--icon") icon = true;
+}

src/tiles/clickable-tile.stories.ts

@@ -2,13 +2,18 @@
 
 import { moduleMetadata, Meta } from "@storybook/angular";
 import { LayerModule } from "../layer";
+import { IconModule } from "../icon";
 import { TilesModule, ClickableTile } from "./";
 
 export default {
 	title: "Components/Tiles/Clickable",
 	decorators: [
 		moduleMetadata({
-			imports: [TilesModule, LayerModule]
+			imports: [
+				TilesModule,
+				LayerModule,
+				IconModule
+			]
 		})
 	],
 	component: ClickableTile
@@ -22,6 +27,11 @@ const Template = (args) => ({
 			[href]="href"
 			target="_blank">
 			Click the tile to open the Carbon Design System
+			<svg
+				cdsClickableTileIcon
+				cdsIcon="caret--right"
+				size="16">
+			</svg>
 		</cds-clickable-tile>
 	`
 });

src/tiles/index.ts

@@ -1,3 +1,4 @@
+export * from "./clickable-tile-icon.directive";
 export * from "./clickable-tile.component";
 export * from "./expandable-tile.component";
 export * from "./expandable-tile-above.directive";