Merge pull request #461 from carloslancha/ClayDropdownListMarkup

Use new markup for ClayDropdown | Fixes #425 and #450
liferay · Jan 25, 2018 · 8c5e7fe · 8c5e7fe
2 parents 01784d9 + 1797b04
commit 8c5e7fe
Show file tree

Hide file tree

Showing 14 changed files with 1,518 additions and 1,479 deletions.
diff --git a/packages/clay-dataset-display/src/__tests__/__snapshots__/ClayDatasetDisplay.js.snap b/packages/clay-dataset-display/src/__tests__/__snapshots__/ClayDatasetDisplay.js.snap
diff --git a/packages/clay-dropdown/demos/a11y.html b/packages/clay-dropdown/demos/a11y.html
@@ -286,7 +286,6 @@ <h4>Actions Dropdown with events in items</h4>
 				],
 				spritemap: spritemap,
 				label: 'Trigger Label',
-				type: 'form',
 			},
 			'#checkboxes-block'
 		);
@@ -343,7 +342,6 @@ <h4>Actions Dropdown with events in items</h4>
 				],
 				spritemap: spritemap,
 				label: 'Trigger Label',
-				type: 'form',
 			},
 			'#radios-block'
 		);
@@ -531,7 +529,6 @@ <h4>Actions Dropdown with events in items</h4>
 				],
 				spritemap: spritemap,
 				label: 'Trigger Label',
-				type: 'form',
 			},
 			'#button-block'
 		);
@@ -633,7 +630,6 @@ <h4>Actions Dropdown with events in items</h4>
 				],
 				spritemap: spritemap,
 				label: 'Trigger Label',
-				type: 'form',
 			},
 			'#complex-block'
 		);

diff --git a/packages/clay-dropdown/demos/index.html b/packages/clay-dropdown/demos/index.html
@@ -286,7 +286,6 @@ <h4>Actions Dropdown with events in items</h4>
 				],
 				spritemap: spritemap,
 				label: 'Trigger Label',
-				type: 'form',
 			},
 			'#checkboxes-block'
 		);
@@ -343,7 +342,6 @@ <h4>Actions Dropdown with events in items</h4>
 				],
 				spritemap: spritemap,
 				label: 'Trigger Label',
-				type: 'form',
 			},
 			'#radios-block'
 		);
@@ -531,7 +529,6 @@ <h4>Actions Dropdown with events in items</h4>
 				],
 				spritemap: spritemap,
 				label: 'Trigger Label',
-				type: 'form',
 			},
 			'#button-block'
 		);
@@ -633,7 +630,6 @@ <h4>Actions Dropdown with events in items</h4>
 				],
 				spritemap: spritemap,
 				label: 'Trigger Label',
-				type: 'form',
 			},
 			'#complex-block'
 		);

diff --git a/packages/clay-dropdown/src/ClayDropdown.js b/packages/clay-dropdown/src/ClayDropdown.js
@@ -149,15 +149,6 @@ ClayDropdown.STATE = {
 	 * @default undefined
 	 */
 	triggerClasses: Config.string(),
-
-	/**
-	 * Type of the dropdown menu.
-	 * @instance
-	 * @memberof ClayDropdown
-	 * @type {?string}
-	 * @default list
-	 */
-	type: Config.oneOf(['form', 'list']).value('list'),
 };
 
 defineWebComponent('clay-dropdown', ClayDropdown);

diff --git a/packages/clay-dropdown/src/ClayDropdown.soy b/packages/clay-dropdown/src/ClayDropdown.soy
@@ -18,7 +18,6 @@
 	{@param? searchable: bool}
 	{@param? style: string}
 	{@param? triggerClasses: string}
-	{@param? type: string}
 
   {let $trigger kind="html"}
     {if $icon}
@@ -57,6 +56,5 @@
     {param spritemap: $spritemap /}
     {param style: $style /}
     {param triggerClasses: $triggerClasses /}
-    {param type: $type /}
   {/call}
 {/template}
diff --git a/packages/clay-dropdown/src/ClayDropdownBase.js b/packages/clay-dropdown/src/ClayDropdownBase.js
@@ -335,15 +335,6 @@ ClayDropdownBase.STATE = {
 	 * @default undefined
 	 */
 	triggerClasses: Config.string(),
-
-	/**
-	 * Type of the dropdown menu.
-	 * @instance
-	 * @memberof ClayDropdownBase
-	 * @type {?string}
-	 * @default list
-	 */
-	type: Config.oneOf(['form', 'list']).value('list'),
 };
 
 Soy.register(ClayDropdownBase, templates);