Skip to content

Commit 6a40b0d

Browse files
fix(module:input): render icon when enterButton is an empty string (#9498)
1 parent 45ec83f commit 6a40b0d

2 files changed

Lines changed: 13 additions & 3 deletions

File tree

components/input/input-search.directive.spec.ts

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,15 @@ describe('input-search', () => {
7575
expect(searchButtonElement.classList).toContain('ant-btn-primary');
7676
});
7777

78+
it('should be render search icon when enterButton is an empty string', async () => {
79+
const searchButtonElement: HTMLButtonElement = fixture.nativeElement.querySelector('.ant-input-search-button');
80+
component.enterButton = '';
81+
fixture.detectChanges();
82+
await fixture.whenStable();
83+
const searchIconElement = searchButtonElement.querySelector('.anticon-search');
84+
expect(searchIconElement).toBeTruthy();
85+
});
86+
7887
it('should be apply size classes to search button', async () => {
7988
const searchButtonElement: HTMLButtonElement = fixture.nativeElement.querySelector('.ant-input-search-button');
8089
expect(searchButtonElement).toBeTruthy();

components/input/input-wrapper.component.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,8 @@ import { NZ_INPUT_WRAPPER } from './tokens';
6868
@if (hasAddonAfter()) {
6969
<span class="ant-input-group-addon">
7070
@if (inputSearchDir) {
71-
@let hasEnterButton = inputSearchEnterButton() ?? inputSearchDir.nzEnterButton() !== false;
71+
@let nzEnterButton = inputSearchDir.nzEnterButton();
72+
@let hasEnterButton = inputSearchEnterButton() ?? nzEnterButton !== false;
7273
<button
7374
nz-button
7475
[nzType]="hasEnterButton ? 'primary' : 'default'"
@@ -79,8 +80,8 @@ import { NZ_INPUT_WRAPPER } from './tokens';
7980
(click)="inputSearchDir.search($event)"
8081
>
8182
<ng-content select="[nzInputSearchEnterButton]">
82-
@if (typeof inputSearchDir.nzEnterButton() === 'string') {
83-
{{ inputSearchDir.nzEnterButton() }}
83+
@if (nzEnterButton && typeof nzEnterButton === 'string') {
84+
{{ nzEnterButton }}
8485
} @else {
8586
<nz-icon nzType="search" nzTheme="outline" />
8687
}

0 commit comments

Comments
 (0)