update popper.js

fix #1990
This commit is contained in:
huanghong 2018-03-15 00:07:11 +08:00
parent 44420acb68
commit 130ea92a19
5 changed files with 69 additions and 45 deletions

View file

@ -3,7 +3,8 @@
* */
import Vue from 'vue';
const isServer = Vue.prototype.$isServer;
const Popper = isServer ? function() {} : require('popper.js'); // eslint-disable-line
// const Popper = isServer ? function() {} : require('popper.js'); // eslint-disable-line
import Popper from 'popper.js';
export default {
props: {
@ -29,8 +30,11 @@ export default {
type: Object,
default () {
return {
gpuAcceleration: false,
boundariesElement: 'body' // todo 暂时注释,发现在 vue 2 里方向暂时可以自动识别了,待验证(还是有问题的)
modifiers: {
computeStyle:{
gpuAcceleration: false,
}
}
};
}
},
@ -57,7 +61,6 @@ export default {
this.updatePopper();
this.$emit('on-popper-show');
} else {
this.destroyPopper();
this.$emit('on-popper-hide');
}
this.$emit('input', val);
@ -81,14 +84,21 @@ export default {
}
options.placement = this.placement;
options.offset = this.offset;
this.popperJS = new Popper(reference, popper, options);
this.popperJS.onCreate(popper => {
this.resetTransformOrigin(popper);
if (options.modifiers) {
options.modifiers = {};
}
if (options.modifiers.offset) {
options.modifiers.offset = {};
}
options.modifiers.offset = this.offset;
options.onCreate =()=>{
this.$nextTick(this.updatePopper);
this.$emit('created', this);
});
};
this.popperJS = new Popper(reference, popper, options);
},
updatePopper() {
if (isServer) return;
@ -99,19 +109,6 @@ export default {
if (this.visible) return;
this.popperJS.destroy();
this.popperJS = null;
},
destroyPopper() {
if (isServer) return;
if (this.popperJS) {
this.resetTransformOrigin(this.popperJS);
}
},
resetTransformOrigin(popper) {
if (isServer) return;
let placementMap = {top: 'bottom', bottom: 'top', left: 'right', right: 'left'};
let placement = popper._popper.getAttribute('x-placement').split('-')[0];
let origin = placementMap[placement];
popper._popper.style.transformOrigin = ['top', 'bottom'].indexOf(placement) > -1 ? `center ${ origin }` : `${ origin } center`;
}
},
beforeDestroy() {