fix(Cascader): don't find Popper

hug-sun · Nov 22, 2020 · c9a3308 · c9a3308
1 parent 53c6cda
commit c9a3308
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git a/packages/cascader/Cascader.vue b/packages/cascader/Cascader.vue
@@ -215,7 +215,9 @@ export default {
     'change',
     'expand-change',
     'active-item-change',
-    'visible-change'
+    'visible-change',
+    'focus',
+    'blur'
   ],
 
   props: {

diff --git a/packages/popover/vue-popper.js b/packages/popover/vue-popper.js
@@ -9,7 +9,7 @@ import {
 import { PopupManager } from '../../src/utils/popup'
 
 // const PopperJS = require('element-ui/src/utils/popper')
-import PopperJS from '../../src/utils/new-popper'
+import { Popper } from '../../src/utils/new-popper'
 // const PopperJS = Vue.prototype.$isServer ? function() {} : require('./popper')
 const stop = (e) => e.stopPropagation()
 
@@ -118,7 +118,7 @@ function useVuePopper(props, { emit, slots, referenceEl }) {
     options.placement = currentPlacement.value
     options.offset = offset.value
     options.arrowOffset = arrowOffset.value
-    popperJS.value = new PopperJS(referenceRef, popperRef, options)
+    popperJS.value = new Popper(referenceRef, popperRef, options)
     popperJS.value.onCreate(() => {
       emit('created', instance.proxy)
       resetTransformOrigin()

diff --git a/src/use/popper.js b/src/use/popper.js
@@ -8,7 +8,7 @@ import {
 } from 'vue'
 import { PopupManager } from '../../src/utils/popup'
 // const PopperJS = require('element-ui/src/utils/popper')
-import PopperJS from '../../src/utils/new-popper'
+import { Popper } from '../../src/utils/new-popper'
 const stop = (e) => e.stopPropagation()
 
 const popperProps = {
@@ -111,7 +111,7 @@ function usePopper(props, { emit, slots }, { referenceElm, popperElm }) {
     options.placement = currentPlacement.value
     options.offset = offset.value
     options.arrowOffset = arrowOffset.value
-    popperJS.value = new PopperJS(referenceRef, popperRef, options)
+    popperJS.value = new Popper(referenceRef, popperRef, options)
     popperJS.value.onCreate(() => {
       emit('created', instance.proxy)
       resetTransformOrigin()

diff --git a/src/utils/new-popper.js b/src/utils/new-popper.js
@@ -111,7 +111,7 @@ var DEFAULTS = {
  * @param {Boolean} [options.removeOnDestroy=false]
  *      Set to true if you want to automatically remove the popper when you call the `destroy` method.
  */
-export default function Popper(reference, popper, options) {
+export function Popper(reference, popper, options) {
   this._reference = reference.jquery ? reference[0] : reference
   this.state = {}
 

diff --git a/src/utils/vue-popper.js b/src/utils/vue-popper.js
@@ -1,6 +1,6 @@
 import { PopupManager } from '../../src/utils/popup'
 
-import * as PopperJS from './popper'
+import { Popper } from '../utils/new-popper'
 // const PopperJS = Vue.prototype.$isServer ? function() {} : require('./popper')
 const stop = (e) => e.stopPropagation()
 
@@ -104,7 +104,7 @@ export default {
       options.placement = this.currentPlacement
       options.offset = this.offset
       options.arrowOffset = this.arrowOffset
-      this.popperJS = new PopperJS(reference, popper, options)
+      this.popperJS = new Popper(reference, popper, options)
       this.popperJS.onCreate(() => {
         this.$emit('created', this)
         this.resetTransformOrigin()