Fixes #1285 - Fixes ClayLabel Event Consistency

liferay · Nov 7, 2018 · 3e0a585 · 3e0a585
1 parent 279f5b7
commit 3e0a585
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/packages/clay-label/package.json b/packages/clay-label/package.json
@@ -28,10 +28,10 @@
     "metal"
   ],
   "dependencies": {
+    "clay-component": "^2.3.4",
     "clay-button": "^2.3.4",
     "clay-link": "^2.3.4",
     "metal": "^2.16.0",
-    "metal-component": "^2.16.0",
     "metal-soy": "^2.16.0",
     "metal-state": "^2.16.0",
     "metal-web-component": "^2.16.0"

diff --git a/packages/clay-label/src/ClayLabel.js b/packages/clay-label/src/ClayLabel.js
@@ -1,23 +1,31 @@
 import 'clay-button';
 import 'clay-link';
-import Component from 'metal-component';
+import {Config} from 'metal-state';
+import ClayComponent from 'clay-component';
 import defineWebComponent from 'metal-web-component';
 import Soy from 'metal-soy';
-import {Config} from 'metal-state';
 
 import templates from './ClayLabel.soy.js';
 
 /**
  * Metal Clay Label component.
- * @extends Component
+ * @extends ClayComponent
  */
-class ClayLabel extends Component {
+class ClayLabel extends ClayComponent {
 	/**
 	 * Handle `click` button and emit event `close`.
+	 * @param {!Event} event
 	 * @protected
+	 * @return {Boolean} If the event has been prevented or not.
 	 */
-	_handleCloseButtonClick() {
-		this.emit('close');
+	_handleCloseButtonClick(event) {
+		return !this.emit({
+			data: {
+				label: this.label,
+			},
+			name: 'close',
+			originalEvent: event,
+		});
 	}
 }