File tree 2 files changed +13
-8
lines changed
2 files changed +13
-8
lines changed Original file line number Diff line number Diff line change @@ -6,8 +6,8 @@ export const UA = inBrowser && window.navigator.userAgent.toLowerCase();
6
6
export const isIE = UA && / m s i e | t r i d e n t / . test ( UA ) ;
7
7
export const isIE9 = UA && UA . indexOf ( 'msie 9.0' ) > 0 ;
8
8
export const isEdge = UA && UA . indexOf ( 'edge/' ) > 0 ;
9
- export const isAndroid = ( UA && UA . indexOf ( 'android' ) > 0 ) || ( weexPlatform === 'android' ) ;
10
- export const isIOS = ( UA && / i p h o n e | i p a d | i p o d | i o s / . test ( UA ) ) || ( weexPlatform === 'ios' ) ;
9
+ export const isAndroid = ( UA && UA . indexOf ( 'android' ) > 0 ) || weexPlatform === 'android' ;
10
+ export const isIOS = ( UA && / i p h o n e | i p a d | i p o d | i o s / . test ( UA ) ) || weexPlatform === 'ios' ;
11
11
export const isChrome = UA && / c h r o m e \/ \d + / . test ( UA ) && ! isEdge ;
12
12
export const isPhantomJS = UA && / p h a n t o m j s / . test ( UA ) ;
13
13
export const isFF = UA && UA . match ( / f i r e f o x \/ ( \d + ) / ) ;
Original file line number Diff line number Diff line change @@ -51,6 +51,7 @@ import {
51
51
} from './util' ;
52
52
import { SelectPropTypes } from './PropTypes' ;
53
53
import contains from '../_util/Dom/contains' ;
54
+ import { isIE , isEdge } from '../_util/env' ;
54
55
55
56
Vue . use ( ref , { name : 'ant-ref' } ) ;
56
57
const SELECT_EMPTY_VALUE_KEY = 'RC_SELECT_EMPTY_VALUE_KEY' ;
@@ -623,13 +624,17 @@ const Select = {
623
624
} ,
624
625
inputBlur ( e ) {
625
626
const target = e . relatedTarget || document . activeElement ;
627
+
628
+ // https://github.com/vueComponent/ant-design-vue/issues/999
629
+ // https://github.com/vueComponent/ant-design-vue/issues/1223
626
630
if (
627
- e . relatedTarget === this . $refs . arrow ||
628
- ( target &&
629
- this . selectTriggerRef &&
630
- this . selectTriggerRef . getInnerMenu ( ) &&
631
- this . selectTriggerRef . getInnerMenu ( ) . $el === target ) ||
632
- contains ( e . target , target )
631
+ ( isIE || isEdge ) &&
632
+ ( e . relatedTarget === this . $refs . arrow ||
633
+ ( target &&
634
+ this . selectTriggerRef &&
635
+ this . selectTriggerRef . getInnerMenu ( ) &&
636
+ this . selectTriggerRef . getInnerMenu ( ) . $el === target ) ||
637
+ contains ( e . target , target ) )
633
638
) {
634
639
e . target . focus ( ) ;
635
640
e . preventDefault ( ) ;
You can’t perform that action at this time.
0 commit comments