Button: content of inner button should not be replaced (T1211763) (#2…

…7062)
DevExpress · Apr 4, 2024 · 707aefe · 707aefe
1 parent d501e82
commit 707aefe
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/packages/devextreme/js/renovation/component_wrapper/button.ts b/packages/devextreme/js/renovation/component_wrapper/button.ts
@@ -92,7 +92,7 @@ export default class ButtonWrapper extends Component {
   _initMarkup(): void {
     super._initMarkup();
 
-    const $content = (this.$element() as unknown as dxElementWrapper).find('.dx-button-content');
+    const $content = (this.$element() as unknown as dxElementWrapper).find('.dx-button-content').first();
     const $template = $content.children().filter('.dx-template-wrapper');
     const $input = $content.children().filter('.dx-button-submit-input');
 

diff --git a/packages/devextreme/testing/tests/Renovation/button.tests.js b/packages/devextreme/testing/tests/Renovation/button.tests.js
@@ -90,4 +90,21 @@ QUnit.module('Props: template', {
 
         assert.strictEqual(element.find('.dx-button-submit-input').length, 1, 'render submit input');
     });
+
+    QUnit.test('content of inner button should not be replaced (T1211763)', function(assert) {
+        const $element = this.Button({
+            template() {
+                const $templateWrapper = $('<div>').addClass('dx-template-wrapper');
+
+                $('<div id="innerButton">').dxButton({
+                    text: 'button content'
+                }).appendTo($templateWrapper);
+
+                return $templateWrapper;
+            }
+        });
+        const $innerButton = $element.find('#innerButton');
+
+        assert.notStrictEqual($innerButton.children().length, 0, 'inner button content is not empty');
+    });
 });