Merge

Author: youda97

.storybook/preview.scss

@@ -1,4 +1,4 @@
-@import "~carbon-components/scss/globals/scss/styles.scss";
+@import "~carbon-components/css/carbon-components.min.css";
 
 body {
 	margin: 20px;

.storybook/tsconfig.json

@@ -5,7 +5,7 @@
 		"emitDecoratorMetadata": true,
 		"experimentalDecorators": true,
 		"lib": [
-			"es2015",
+			"es2016",
 			"dom"
 		],
 		"sourceMap": true,

package-lock.json

@@ -13,12 +13,16 @@
     "test:watch": "karma start --auto-watch --no-single-run",
     "utils:add": "git subtree add --prefix=src/utils [email protected]:peretz/utils.git master --squash",
     "utils:update": "git subtree pull --prefix=src/utils [email protected]:peretz/utils.git master --squash",
-    "prepush": "bash scripts/prepush.sh",
     "build-storybook": "build-storybook -c .storybook -s .storybook/public -o dist/docs/storybook",
     "semantic-release": "semantic-release",
-    "commitmsg": "commitlint -E GIT_PARAMS",
     "commit": "git-cz"
   },
+  "husky": {
+    "hooks": {
+      "pre-push": "bash scripts/prepush.sh",
+      "commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
+    }
+  },
   "release": {
     "pkgRoot": "dist"
   },
@@ -63,7 +67,7 @@
     "core-js": "^2.5.3",
     "rxjs": "^6.0.0",
     "zone.js": "^0.8.26",
-    "carbon-components": "^9.1.13"
+    "carbon-components": "^9.20.0"
   },
   "devDependencies": {
     "@angular-devkit/build-angular": "0.7.1",
@@ -93,7 +97,7 @@
     "@types/node": "8.5.2",
     "angular2-template-loader": "0.6.2",
     "babel-core": "6.26.3",
-    "carbon-components": "9.1.13",
+    "carbon-components": "9.20.0",
     "codelyzer": "4.0.2",
     "commitizen": "2.10.1",
     "core-js": "2.5.5",
@@ -108,7 +112,7 @@
     "gulp-tap": "1.0.1",
     "html-loader": "0.5.5",
     "html-webpack-plugin": "3.2.0",
-    "husky": "0.14.3",
+    "husky": "^1.1.2",
     "jasmine-core": "3.1.0",
     "karma": "2.0.2",
     "karma-chrome-launcher": "2.2.0",

package.json

@@ -29,17 +29,19 @@ import {
 	`
 })
 export class AccordionItem {
-	static accodionItemCount = 0;
-	@Input() title = `Title ${AccordionItem.accodionItemCount}`;
-	@HostBinding("class.bx--accordion__item--active") @Input() expanded = false;
-	@Input() id = `accordion-item-${AccordionItem.accodionItemCount}`;
+	static accordionItemCount = 0;
+	@Input() title = `Title ${AccordionItem.accordionItemCount}`;
+	@Input() id = `accordion-item-${AccordionItem.accordionItemCount}`;
 	@Output() selected = new EventEmitter();
 
-	@HostBinding("class") itemClass = "bx--accordion__item";
-	@HostBinding("style.display") @HostBinding("attr.role") itemType = "list-item";
+	@HostBinding("class.bx--accordion__item") itemClass = true;
+	@HostBinding("class.bx--accordion__item--active") @Input() expanded = false;
+	@HostBinding("style.display") itemType = "list-item";
+	@HostBinding("attr.role") role = "heading";
+	@HostBinding("attr.aria-level") @Input() ariaLevel = 3;
 
 	constructor() {
-		AccordionItem.accodionItemCount++;
+		AccordionItem.accordionItemCount++;
 	}
 
 	public toggleExpanded() {

src/accordion/accordion-item.component.ts

@@ -17,7 +17,8 @@ import {
 	merge
 } from "rxjs";
 import { throttleTime } from "rxjs/operators";
-import position from "../utils/position";
+// the AbsolutePosition is required to import the declaration correctly
+import position, { AbsolutePosition } from "./../utils/position";
 import { cycleTabs } from "./../common/tab.service";
 import { DialogConfig } from "./dialog-config.interface";
 

src/dialog/dialog.component.ts

@@ -51,7 +51,7 @@
 		"TOOLTIP": {
 			"CLOSE": "Close tooltip"
 		},
-		"POPOVER" : {
+		"POPOVER": {
 			"CLOSE": "Close popover"
 		}
 	},
@@ -65,12 +65,19 @@
 			"RESET_SEARCH": "Reset search"
 		}
 	},
-	"MODAL" : {
+	"MODAL": {
 		"CLOSE": "Close modal"
 	},
-	"OVERFLOW_MENU" : {
+	"OVERFLOW_MENU": {
 		"OVERFLOW": "Overflow"
 	},
+	"PAGINATION": {
+		"ITEMS_PER_PAGE": "Items per page:",
+		"OPEN_LIST_OF_OPTIONS": "Open list of options",
+		"ITEMS_INDICES": "{{startItemIndex}}-{{endItemIndex}} of {{totalDataLength}} items",
+		"BACKWARD": "Backward",
+		"FORWARD": "Forward"
+	},
 	"SIDENAV": {
 		"NAV_LABEL": "Side navigation"
 	},

src/i18n/en.json

@@ -5,7 +5,7 @@ import { Directive, HostBinding } from "@angular/core";
  *
  * Example:
  *
- * ```hmtl
+ * ```html
  * <input ibmText/>
  * ```
  *

src/input/input.directive.ts

@@ -6,15 +6,18 @@ import { CommonModule } from "@angular/common";
 // imports
 import { LabelComponent } from "./label.component";
 import { TextInput } from "./input.directive";
+import { TextArea } from "./text-area.directive";
 
 @NgModule({
 	declarations: [
 		LabelComponent,
-		TextInput
+		TextInput,
+		TextArea
 	],
 	exports: [
 		LabelComponent,
-		TextInput
+		TextInput,
+		TextArea
 	],
 	imports: [
 		CommonModule,

src/input/input.module.ts

@@ -22,4 +22,8 @@ storiesOf("Input", module).addDecorator(
 		template: `
 			<input ibmText placeholder="Optional placeholder text"/>
 		`
+	})).add("TextArea", () => ({
+		template: `
+		<textarea ibmTextArea placeholder="Optional placeholder text" rows="4" cols="50"></textarea>
+		`
 	}));