Merge pull request #1396 from matuzalemsteles/issue-1393

Fixes #1393 - Replace itemSelected in favor of itemClicked
liferay · Dec 17, 2018 · 80c5759 · 80c5759
2 parents 0bf54e8 + 3e409a8
commit 80c5759
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 49 deletions.
diff --git a/packages/clay-dropdown/src/ClayActionsDropdown.js b/packages/clay-dropdown/src/ClayActionsDropdown.js
@@ -54,20 +54,6 @@ class ClayActionsDropdown extends ClayComponent {
 		});
 	}
 
-	/**
-	 * Continues the propagation of the item clicked event
-	 * @param {!Event} event
-	 * @protected
-	 * @return {Boolean} If the event has been prevented or not.
-	 */
-	_handleItemSelected(event) {
-		return !this.emit({
-			data: event.data,
-			name: 'itemSelected',
-			originalEvent: event,
-		});
-	}
-
 	/**
 	 * Continues the propagation of the toggle event.
 	 * @param {!Event} event

diff --git a/packages/clay-dropdown/src/ClayActionsDropdown.soy b/packages/clay-dropdown/src/ClayActionsDropdown.soy
@@ -8,7 +8,6 @@
 	{@param spritemap: string}
 	{@param? _handleButtonClick: any}
 	{@param? _handleItemClick: any}
-	{@param? _handleItemSelected: any}
 	{@param? button: ?}
 	{@param? caption: string}
 	{@param? disabled: bool}
@@ -43,7 +42,6 @@
 		{param events: [
 			'buttonClicked': $_handleButtonClick,
 			'itemClicked': $_handleItemClick,
-			'itemSelected': $_handleItemSelected,
 			'toggle': $toggle
 		]/}
 		{param expanded: $expanded /}

diff --git a/packages/clay-dropdown/src/ClayCreationMenuDropdown.js b/packages/clay-dropdown/src/ClayCreationMenuDropdown.js
@@ -54,20 +54,6 @@ class ClayCreationMenuDropdown extends ClayComponent {
 		});
 	}
 
-	/**
-	 * Continues the propagation of the enter key event
-	 * @param {!Event} event
-	 * @protected
-	 * @return {Boolean} If the event has been prevented or not.
-	 */
-	_handleItemSelected(event) {
-		return !this.emit({
-			data: event.data,
-			name: 'itemSelected',
-			originalEvent: event,
-		});
-	}
-
 	/**
 	 * Continues the propagation of the toggle event.
 	 * @param {!Event} event

diff --git a/packages/clay-dropdown/src/ClayCreationMenuDropdown.soy b/packages/clay-dropdown/src/ClayCreationMenuDropdown.soy
@@ -7,7 +7,6 @@
 	{@param spritemap: string}
 	{@param? _handleButtonClick: any}
 	{@param? _handleItemClick: any}
-	{@param? _handleItemSelected: any}
 	{@param? disabled: bool}
 	{@param? elementClasses: string}
 	{@param? expanded: bool}
@@ -207,7 +206,6 @@
 		{param events: [
 			'buttonClicked': $_handleButtonClick,
 			'itemClicked': $_handleItemClick,
-			'itemSelected': $_handleItemSelected,
 			'toggle': $toggle
 		] /}
 		{param expanded: $expanded /}

diff --git a/packages/clay-dropdown/src/ClayDropdown.js b/packages/clay-dropdown/src/ClayDropdown.js
@@ -54,20 +54,6 @@ class ClayDropdown extends ClayComponent {
 		});
 	}
 
-	/**
-	 * Continues the propagation of the enter key event
-	 * @param {!Event} event
-	 * @protected
-	 * @return {Boolean} If the event has been prevented or not.
-	 */
-	_handleItemSelected(event) {
-		return !this.emit({
-			data: event.data,
-			name: 'itemSelected',
-			originalEvent: event,
-		});
-	}
-
 	/**
 	 * Continues the propagation of the toggle event.
 	 * @param {!Event} event

diff --git a/packages/clay-dropdown/src/ClayDropdown.soy b/packages/clay-dropdown/src/ClayDropdown.soy
@@ -8,7 +8,6 @@
 	{@param spritemap: string}
 	{@param? _handleButtonClick: any}
 	{@param? _handleItemClick: any}
-	{@param? _handleItemSelected: any}
 	{@param? button: ?}
 	{@param? disabled: bool}
 	{@param? elementClasses: string}
@@ -54,7 +53,6 @@
 		{param events: [
 			'buttonClicked': $_handleButtonClick,
 			'itemClicked': $_handleItemClick,
-			'itemSelected': $_handleItemSelected,
 			'toggle': $toggle
 		]/}
 		{param expanded: $expanded /}

diff --git a/packages/clay-dropdown/src/ClayDropdownBase.js b/packages/clay-dropdown/src/ClayDropdownBase.js
@@ -295,7 +295,7 @@ class ClayDropdownBase extends ClayComponent {
 			data: {
 				item: flatten(this.items).find(item => item.active),
 			},
-			name: 'itemSelected',
+			name: 'itemClicked',
 			originalEvent: event,
 		});
 	}