Button: onClick function should be triggered when custom template is used Enter, Space keys are pressed in Angular & Vue (T1260670, T1260357) (DevExpress#29461)

Author: EugeniyKiyashko

packages/devextreme/js/__internal/ui/button/button.tsx

@@ -80,7 +80,6 @@ export class Button extends InfernoWrapperComponent<ButtonProps> {
     this.onInactive = this.onInactive.bind(this);
     this.onWidgetClick = this.onWidgetClick.bind(this);
     this.keyDown = this.keyDown.bind(this);
-    this.emitClickEvent = this.emitClickEvent.bind(this);
   }
 
   createEffects(): InfernoEffect[] {
@@ -165,17 +164,15 @@ export class Button extends InfernoWrapperComponent<ButtonProps> {
     if (result?.cancel) {
       return result;
     }
+
     if (keyName === 'space' || which === 'space' || keyName === 'enter' || which === 'enter') {
       originalEvent.preventDefault();
-      this.emitClickEvent();
+
+      this.onWidgetClick(originalEvent);
     }
     return undefined;
   }
 
-  emitClickEvent(): void {
-    this.contentRef.current!.click();
-  }
-
   get aria(): Record<string, string> {
     const {
       icon,

packages/devextreme/testing/tests/DevExpress.ui.widgets/button.tests.js

@@ -401,24 +401,6 @@ QUnit.module('Button', function() {
             assert.equal(clickFired, 2, 'press space on button call click action');
         });
 
-        QUnit.test('click event is fired on "enter" press', function(assert) {
-            const $element = $('#button').dxButton({
-                focusStateEnabled: true
-            });
-            const handler = sinon.spy();
-
-            $element.on('click', handler);
-
-            const keyboard = keyboardMock($element);
-
-            $element.trigger('focusin');
-            keyboard.keyDown('enter');
-            assert.strictEqual(handler.callCount, 1, 'press enter on button call click action');
-
-            keyboard.keyDown('space');
-            assert.strictEqual(handler.callCount, 2, 'press space on button call click action');
-        });
-
         QUnit.test('arguments on key press', function(assert) {
             const clickHandler = sinon.spy();