Merge 5018aae into a3db874

.soycriticrc.json

@@ -1,8 +1,15 @@
 {
-  "callToImportRegex": "(\\S+)",
-  "callToImportReplace": "{$1|param}",
+  "callToImport": [
+    {
+      "regex": "(\\S+)",
+      "replace": "{$1|param}"
+    },
+    {
+      "regex": "(\\S+)",
+      "replace": "{$1}"
+    }
+  ],
   "implicitParams": {
-    "Clay*": ["elementClasses", "visible"],
     "Chart*": ["loading"]
   }
 }

package.json

@@ -9,7 +9,7 @@
     "jest": "jest",
     "lerna": "lerna bootstrap -- --no-optional --no-package-lock",
     "lint": "eslint packages/clay-*/src/*.js packages/clay-*/src/**/*.js && npm run mcritic",
-    "mcritic": "mcritic packages/ --ignore '**/{browserslist-config-clay-components,generator-metal-clay,clay-dropdown,clay-alert,clay-card-grid,clay-list,clay-management-toolbar,clay-card,clay-table,node_modules}/**'",
+    "mcritic": "mcritic packages/ --ignore '**/{browserslist-config-clay-components,generator-metal-clay,node_modules}/**'",
     "precommit": "lint-staged",
     "prettier": "prettier-eslint packages/clay-*/src/*.js packages/clay-*/src/**/*.js",
     "start": "http-server . -p 4000",
@@ -28,7 +28,7 @@
     "lint-staged": "^4.0.0",
     "metal-a11y-checker": "^1.0.5",
     "metal-jest-serializer": "^1.0.1",
-    "metal-soy-critic": "^2.3.0",
+    "metal-soy-critic": "^2.4.0",
     "prettier-eslint-cli": "^4.3.2"
   },
   "jest": {

packages/clay-card-grid/src/ClayCardGrid.js

@@ -1,4 +1,13 @@
-import 'clay-card';
+/* eslint-disable */
+import {
+	ClayCard,
+	ClayFileCard,
+	ClayHorizontalCard,
+	ClayImageCard,
+	ClayUserCard
+} from 'clay-card';
+/* eslint-enable */
+
 import Component from 'metal-component';
 import defineWebComponent from 'metal-web-component';
 import Soy from 'metal-soy';

packages/clay-card/src/ClayCard.js

@@ -1,12 +1,15 @@
+/* eslint-disable */
+import { ClayActionsDropdown } from 'clay-dropdown';
+/* eslint-disable */
+
 import 'clay-checkbox';
-import 'clay-dropdown';
 import 'clay-label';
 import 'clay-link';
 import 'clay-sticker';
+import { Config } from 'metal-state';
 import Component from 'metal-component';
 import defineWebComponent from 'metal-web-component';
 import Soy from 'metal-soy';
-import {Config} from 'metal-state';
 
 import actionItemsValidator from './action_items_validator';
 import templates from './ClayCard.soy.js';
@@ -91,7 +94,7 @@ ClayCard.STATE = {
 		'primary',
 		'secondary',
 		'success',
-		'warning',
+		'warning'
 	]).value('primary'),
 
 	/**
@@ -172,8 +175,8 @@ ClayCard.STATE = {
 				'info',
 				'secondary',
 				'success',
-				'warning',
-			]).value('secondary'),
+				'warning'
+			]).value('secondary')
 		})
 	),
 
@@ -220,12 +223,12 @@ ClayCard.STATE = {
 	 * @type {!string}
 	 * @default undefined
 	 */
-	title: Config.string().required(),
+	title: Config.string().required()
 };
 
 defineWebComponent('clay-card', ClayCard);
 
 Soy.register(ClayCard, templates);
 
-export {ClayCard};
+export { ClayCard };
 export default ClayCard;

packages/clay-card/src/ClayFileCard.soy

@@ -44,6 +44,7 @@
         {param events: ['itemToggled': $handleItemToggled_ ] /}
         {param fileType: $fileType /}
         {param fileTypeStyle: $fileTypeStyle /}
+        {param href: $href /}
         {param icon: $icon ?: 'documents-and-media' /}
         {param id: $id /}
         {param inputName: $inputName /}
@@ -55,7 +56,6 @@
         {param spritemap: $spritemap /}
         {param subtitle: $subtitle /}
         {param title: $title /}
-        {param href: $href /}
     {/call}
 {/template}
 

packages/clay-card/src/ClayHorizontalCard.js

@@ -1,11 +1,14 @@
+/* eslint-disable */
+import { ClayActionsDropdown } from 'clay-dropdown';
+/* eslint-disable */
+
 import 'clay-checkbox';
-import 'clay-dropdown';
 import 'clay-link';
 import 'clay-sticker';
+import { Config } from 'metal-state';
 import Component from 'metal-component';
 import defineWebComponent from 'metal-web-component';
 import Soy from 'metal-soy';
-import {Config} from 'metal-state';
 
 import actionItemsValidator from './action_items_validator';
 import templates from './ClayHorizontalCard.soy.js';
@@ -136,12 +139,12 @@ ClayHorizontalCard.STATE = {
 	 * @type {!string}
 	 * @default undefined
 	 */
-	title: Config.string().required(),
+	title: Config.string().required()
 };
 
 defineWebComponent('clay-horizontal-card', ClayHorizontalCard);
 
 Soy.register(ClayHorizontalCard, templates);
 
-export {ClayHorizontalCard};
+export { ClayHorizontalCard };
 export default ClayHorizontalCard;

packages/clay-card/src/ClayUserCard.js

@@ -1,11 +1,14 @@
+/* eslint-disable */
+import { ClayActionsDropdown } from 'clay-dropdown';
+/* eslint-disable */
+
+import './ClayCard';
 import 'clay-link';
-import 'clay-dropdown';
 import 'clay-sticker';
-import './ClayCard';
+import { Config } from 'metal-state';
 import Component from 'metal-component';
 import defineWebComponent from 'metal-web-component';
 import Soy from 'metal-soy';
-import {Config} from 'metal-state';
 
 import actionItemsValidator from './action_items_validator';
 import templates from './ClayUserCard.soy.js';
@@ -180,13 +183,13 @@ ClayUserCard.STATE = {
 		'primary',
 		'secondary',
 		'success',
-		'warning',
-	]).value('primary'),
+		'warning'
+	]).value('primary')
 };
 
 defineWebComponent('clay-user-card', ClayUserCard);
 
 Soy.register(ClayUserCard, templates);
 
-export {ClayUserCard};
+export { ClayUserCard };
 export default ClayUserCard;

packages/clay-dropdown/src/ClayDropdownBase.soy

@@ -73,6 +73,7 @@
 			{param active: $item.active /}
 			{param checked: $item.checked /}
 			{param disabled: $item.disabled /}
+			{param href: $item.href /}
 			{param icon: $item.icon /}
 			{param inputName: $item.inputName /}
 			{param inputValue: $item.inputValue /}
@@ -82,7 +83,6 @@
 			{param label: $item.label ?: '' /}
 			{param separator: $item.separator /}
 			{param spritemap: $spritemap /}
-			{param href: $item.href /}
 		{/delcall}
 	{/foreach}
 {/template}
@@ -372,6 +372,7 @@
 	{@param? active: bool}
 	{@param? checked: bool}
 	{@param? disabled: bool}
+	{@param? href: string}
 	{@param? icon: string}
 	{@param? inputName: string}
 	{@param? inputValue: string}
@@ -380,7 +381,6 @@
 	{@param? itemsIconAlignment: string}
 	{@param? separator: bool}
 	{@param? spritemap: string}
-	{@param? href: string}
 
 	{if $label != ''}
 		{if $isInList}

packages/clay-list/src/ClayListItem.js

@@ -1,14 +1,16 @@
+/* eslint-disable */
+import { ClayActionsDropdown } from 'clay-dropdown';
+/* eslint-disable */
+
 import 'clay-checkbox';
-import 'clay-dropdown';
 import 'clay-icon';
 import 'clay-label';
 import 'clay-link';
 import 'clay-sticker';
-
+import { Config } from 'metal-state';
 import Component from 'metal-component';
 import defineWebComponent from 'metal-web-component';
 import Soy from 'metal-soy';
-import {Config} from 'metal-state';
 
 import templates from './ClayListItem.soy.js';
 
@@ -46,7 +48,7 @@ ClayListItem.STATE = {
 			icon: Config.string(),
 			label: Config.string().required(),
 			quickAction: Config.bool(),
-			separator: Config.bool().value(false),
+			separator: Config.bool().value(false)
 		})
 	),
 
@@ -128,8 +130,8 @@ ClayListItem.STATE = {
 				'info',
 				'secondary',
 				'success',
-				'warning',
-			]).value('secondary'),
+				'warning'
+			]).value('secondary')
 		})
 	),
 
@@ -167,12 +169,12 @@ ClayListItem.STATE = {
 	 * @type {?string|undefined}
 	 * @default undefined
 	 */
-	title: Config.string().required(),
+	title: Config.string().required()
 };
 
 defineWebComponent('clay-list-item', ClayListItem);
 
 Soy.register(ClayListItem, templates);
 
-export {ClayListItem};
+export { ClayListItem };
 export default ClayListItem;

packages/clay-management-toolbar/src/ClayManagementToolbar.js

@@ -1,10 +1,13 @@
+/* eslint-disable */
+import { ClayActionsDropdown } from 'clay-dropdown';
+/* eslint-disable */
+
 import 'clay-button';
 import 'clay-checkbox';
-import 'clay-dropdown';
+import { Config } from 'metal-state';
 import Component from 'metal-component';
 import defineWebComponent from 'metal-web-component';
 import Soy from 'metal-soy';
-import {Config} from 'metal-state';
 
 import templates from './ClayManagementToolbar.soy.js';
 
@@ -15,7 +18,7 @@ let filterItemShape = {
 	inputValue: Config.string(),
 	label: Config.string().required(),
 	separator: Config.bool().value(false),
-	type: Config.oneOf(['checkbox', 'group', 'radiogroup']),
+	type: Config.oneOf(['checkbox', 'group', 'radiogroup'])
 };
 
 const filterItemsValidator = Config.arrayOf(Config.shapeOf(filterItemShape));
@@ -29,7 +32,7 @@ let actionItemShape = {
 	label: Config.string().required(),
 	quickAction: Config.bool(),
 	separator: Config.bool().value(false),
-	type: Config.oneOf(['group', 'item']).value('item'),
+	type: Config.oneOf(['group', 'item']).value('item')
 };
 
 const actionItemsValidator = Config.arrayOf(Config.shapeOf(actionItemShape));
@@ -82,7 +85,7 @@ class ClayManagementToolbar extends Component {
 	 */
 	handleSortingButtonClicked_() {
 		this.emit('sortingButtonClicked', {
-			sortingOrder: this.sortingOrder,
+			sortingOrder: this.sortingOrder
 		});
 	}
 }
@@ -187,14 +190,14 @@ ClayManagementToolbar.STATE = {
 			active: Config.bool().value(false),
 			disabled: Config.bool().value(false),
 			icon: Config.string().required(),
-			label: Config.string().required(),
+			label: Config.string().required()
 		})
-	),
+	)
 };
 
 defineWebComponent('clay-management-toolbar', ClayManagementToolbar);
 
 Soy.register(ClayManagementToolbar, templates);
 
-export {ClayManagementToolbar};
+export { ClayManagementToolbar };
 export default ClayManagementToolbar;

packages/clay-management-toolbar/src/ClayManagementToolbar.soy

@@ -264,8 +264,8 @@
 						{param elementClasses: 'nav-btn nav-btn-monospaced' /}
 						{param events: ['click': $handlePlusButtonClicked_ ] /}
 						{param icon: 'plus' /}
-						{param spritemap: $spritemap /}
 						{param ref: 'plusButton' /}
+						{param spritemap: $spritemap /}
 					{/call}
 				</li>
 			</ul>

packages/clay-table/src/ClayTable.js

@@ -1,14 +1,17 @@
+/* eslint-disable */
+import { ClayActionsDropdown } from 'clay-dropdown';
+/* eslint-disable */
+
 import 'clay-button';
 import 'clay-checkbox';
-import 'clay-dropdown';
 import 'clay-label';
 import 'clay-link';
 import 'clay-progress-bar';
-import {Config} from 'metal-state';
-import {EventHandler} from 'metal-events';
+import { Config } from 'metal-state';
+import { EventHandler } from 'metal-events';
 import Component from 'metal-component';
-import dom from 'metal-dom';
 import defineWebComponent from 'metal-web-component';
+import dom from 'metal-dom';
 import Soy from 'metal-soy';
 
 import templates from './ClayTable.soy.js';
@@ -145,7 +148,7 @@ ClayTable.STATE = {
 			fieldName: Config.string().required(),
 			label: Config.string(),
 			sortable: Config.bool(),
-			sortingOrder: Config.oneOf(['asc', 'desc']),
+			sortingOrder: Config.oneOf(['asc', 'desc'])
 		})
 	).required(),
 
@@ -183,12 +186,12 @@ ClayTable.STATE = {
 	 * @type {?string|undefined}
 	 * @default undefined
 	 */
-	spritemap: Config.string(),
+	spritemap: Config.string()
 };
 
 defineWebComponent('clay-table', ClayTable);
 
 Soy.register(ClayTable, templates);
 
-export {ClayTable};
+export { ClayTable };
 export default ClayTable;