File tree Expand file tree Collapse file tree 2 files changed +3
-2
lines changed Expand file tree Collapse file tree 2 files changed +3
-2
lines changed Original file line number Diff line number Diff line change @@ -169,10 +169,10 @@ const PopupInner = React.forwardRef<PopupInnerRef, PopupInnerProps>(
169
169
const mergedStyle : React . CSSProperties = {
170
170
...stretchStyle ,
171
171
zIndex,
172
- ...style ,
173
172
opacity :
174
173
status === 'motion' || status === 'stable' || ! visible ? undefined : 0 ,
175
174
pointerEvents : status === 'stable' ? undefined : 'none' ,
175
+ ...style ,
176
176
} ;
177
177
178
178
// Align status
Original file line number Diff line number Diff line change @@ -615,7 +615,7 @@ describe('Trigger.Basic', () => {
615
615
616
616
// https://github.com/ant-design/ant-design/issues/21770
617
617
it ( 'support popupStyle, such as zIndex' , ( ) => {
618
- const style = { color : 'red' , zIndex : 9999 , top : 100 } ;
618
+ const style = { color : 'red' , zIndex : 9999 , top : 100 , opacity : 0.93 } ;
619
619
const wrapper = mount (
620
620
< Trigger
621
621
popupVisible
@@ -630,6 +630,7 @@ describe('Trigger.Basic', () => {
630
630
expect ( popupDomNode . style . zIndex ) . toBe ( style . zIndex . toString ( ) ) ;
631
631
expect ( popupDomNode . style . color ) . toBe ( style . color ) ;
632
632
expect ( popupDomNode . style . top ) . toBe ( `${ style . top } px` ) ;
633
+ expect ( popupDomNode . style . opacity ) . toBe ( style . opacity . toString ( ) ) ;
633
634
} ) ;
634
635
635
636
describe ( 'getContainer' , ( ) => {
You can’t perform that action at this time.
0 commit comments