Skip to content

Commit 2df4860

Browse files
caoxichengcaoxicheng
andauthored
chore: fix animation.disabled triggering condition (#7739)
Co-authored-by: caoxicheng <caoxicheng@ewaresoft.com>
1 parent d261d70 commit 2df4860

12 files changed

Lines changed: 14 additions & 14 deletions

File tree

components/auto-complete/autocomplete.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ export type AutocompleteDataSource = Array<AutocompleteDataSourceItem | string |
6262
[nzNoAnimation]="noAnimation?.nzNoAnimation"
6363
@slideMotion
6464
(@slideMotion.done)="onAnimationEvent($event)"
65-
[@.disabled]="noAnimation?.nzNoAnimation"
65+
[@.disabled]="!!noAnimation?.nzNoAnimation"
6666
>
6767
<div style="max-height: 256px; overflow-y: auto; overflow-anchor: none;">
6868
<div style="display: flex; flex-direction: column;">

components/cascader/cascader.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ const defaultDisplayRender = (labels: string[]): string => labels.join(' / ');
140140
class="ant-select-dropdown ant-cascader-dropdown ant-select-dropdown-placement-bottomLeft"
141141
[class.ant-cascader-dropdown-rtl]="dir === 'rtl'"
142142
[@slideMotion]="'enter'"
143-
[@.disabled]="noAnimation?.nzNoAnimation"
143+
[@.disabled]="!!noAnimation?.nzNoAnimation"
144144
[nzNoAnimation]="noAnimation?.nzNoAnimation"
145145
(mouseenter)="onTriggerMouseEnter()"
146146
(mouseleave)="onTriggerMouseLeave($event)"

components/collapse/collapse-panel.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ const NZ_CONFIG_MODULE_NAME: NzConfigKey = 'collapsePanel';
6060
<div
6161
class="ant-collapse-content"
6262
[class.ant-collapse-content-active]="nzActive"
63-
[@.disabled]="noAnimation?.nzNoAnimation"
63+
[@.disabled]="!!noAnimation?.nzNoAnimation"
6464
[@collapseMotion]="nzActive ? 'expanded' : 'hidden'"
6565
>
6666
<div class="ant-collapse-content-box">

components/dropdown/dropdown-menu.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ export type NzPlacementType = 'bottomLeft' | 'bottomCenter' | 'bottomRight' | 't
5353
[ngStyle]="nzOverlayStyle"
5454
@slideMotion
5555
(@slideMotion.done)="onAnimationEvent($event)"
56-
[@.disabled]="noAnimation?.nzNoAnimation"
56+
[@.disabled]="!!noAnimation?.nzNoAnimation"
5757
[nzNoAnimation]="noAnimation?.nzNoAnimation"
5858
(mouseenter)="setMouseState(true)"
5959
(mouseleave)="setMouseState(false)"

components/menu/submenu.component.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ const listOfHorizontalPositions = [
8585
nz-submenu-inline-child
8686
[mode]="mode"
8787
[nzOpen]="nzOpen"
88-
[@.disabled]="noAnimation?.nzNoAnimation"
88+
[@.disabled]="!!noAnimation?.nzNoAnimation"
8989
[nzNoAnimation]="noAnimation?.nzNoAnimation"
9090
[menuClass]="nzMenuClassName"
9191
[templateOutlet]="subMenuTemplate"
@@ -110,7 +110,7 @@ const listOfHorizontalPositions = [
110110
[isMenuInsideDropDown]="isMenuInsideDropDown"
111111
[templateOutlet]="subMenuTemplate"
112112
[menuClass]="nzMenuClassName"
113-
[@.disabled]="noAnimation?.nzNoAnimation"
113+
[@.disabled]="!!noAnimation?.nzNoAnimation"
114114
[nzNoAnimation]="noAnimation?.nzNoAnimation"
115115
(subMenuMouseState)="setMouseEnterState($event)"
116116
></div>

components/popconfirm/popconfirm.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ export class NzPopconfirmDirective extends NzTooltipBaseDirective {
157157
[ngClass]="_classMap"
158158
[class.ant-popover-rtl]="dir === 'rtl'"
159159
[ngStyle]="nzOverlayStyle"
160-
[@.disabled]="noAnimation?.nzNoAnimation"
160+
[@.disabled]="!!noAnimation?.nzNoAnimation"
161161
[nzNoAnimation]="noAnimation?.nzNoAnimation"
162162
[@zoomBigMotion]="'active'"
163163
>

components/popover/popover.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ export class NzPopoverDirective extends NzTooltipBaseDirective {
115115
[class.ant-popover-rtl]="dir === 'rtl'"
116116
[ngClass]="_classMap"
117117
[ngStyle]="nzOverlayStyle"
118-
[@.disabled]="noAnimation?.nzNoAnimation"
118+
[@.disabled]="!!noAnimation?.nzNoAnimation"
119119
[nzNoAnimation]="noAnimation?.nzNoAnimation"
120120
[@zoomBigMotion]="'active'"
121121
>

components/select/select.component.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ export type NzSelectSizeType = 'large' | 'default' | 'small';
105105
[open]="nzOpen"
106106
[disabled]="nzDisabled"
107107
[mode]="nzMode"
108-
[@.disabled]="noAnimation?.nzNoAnimation"
108+
[@.disabled]="!!noAnimation?.nzNoAnimation"
109109
[nzNoAnimation]="noAnimation?.nzNoAnimation"
110110
[maxTagPlaceholder]="nzMaxTagPlaceholder"
111111
[removeIcon]="nzRemoveIcon"
@@ -164,7 +164,7 @@ export type NzSelectSizeType = 'large' | 'default' | 'small';
164164
[class.ant-select-dropdown-placement-bottomRight]="dropDownPosition === 'bottomRight'"
165165
[class.ant-select-dropdown-placement-topRight]="dropDownPosition === 'topRight'"
166166
[@slideMotion]="'enter'"
167-
[@.disabled]="noAnimation?.nzNoAnimation"
167+
[@.disabled]="!!noAnimation?.nzNoAnimation"
168168
[nzNoAnimation]="noAnimation?.nzNoAnimation"
169169
[listOfContainerItem]="listOfContainerItem"
170170
[menuItemSelectedIcon]="nzMenuItemSelectedIcon"

components/tooltip/tooltip.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ export class NzTooltipDirective extends NzTooltipBaseDirective {
109109
[class.ant-tooltip-rtl]="dir === 'rtl'"
110110
[ngClass]="_classMap"
111111
[ngStyle]="nzOverlayStyle"
112-
[@.disabled]="noAnimation?.nzNoAnimation"
112+
[@.disabled]="!!noAnimation?.nzNoAnimation"
113113
[nzNoAnimation]="noAnimation?.nzNoAnimation"
114114
[@zoomBigMotion]="'active'"
115115
>

components/tree-select/tree-select.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ const TREE_SELECT_DEFAULT_CLASS = 'ant-select-dropdown ant-select-tree-dropdown'
8989
<div
9090
[@slideMotion]="'enter'"
9191
[ngClass]="dropdownClassName"
92-
[@.disabled]="noAnimation?.nzNoAnimation"
92+
[@.disabled]="!!noAnimation?.nzNoAnimation"
9393
[nzNoAnimation]="noAnimation?.nzNoAnimation"
9494
[class.ant-select-dropdown-placement-bottomLeft]="dropDownPosition === 'bottom'"
9595
[class.ant-select-dropdown-placement-topLeft]="dropDownPosition === 'top'"

0 commit comments

Comments
 (0)