Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add panelmode & make width auto, min-width 300px. #4

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add panelmode & make width auto, min-width 300px. #4

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ef7e535
Add panelmode & make width auto, min-width 300px.
johnteee Sep 12, 2019
acc39e2
Merge pull request #1 from TeaEntityLab/johnteee-patch-1
johnteee Sep 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 40 additions & 38 deletions Drawer.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<section v-if="enabled">
<section v-if="enabled" ref="rootEl">
<aside class="sidebar" :style="style" ref="element">
<slot></slot>
</aside>
Expand All @@ -8,7 +8,7 @@
</template>
<script>
export default{
props:['direction','exist'],
props:['direction','exist','panelmode'],
data(){
return {
auto_speed:'0.3s',
Expand Down Expand Up @@ -47,7 +47,7 @@
document.addEventListener('touchend',(e) =>{this.handleEnd(e)});
document.addEventListener('touchcancel',(e) =>{this.handleEnd(e)});
window.addEventListener('resize', (e) =>{this.setVisibality(e)}, true);
this.overlay.addEventListener('transitionend',(e) =>{this.handleZindex(e)},false);
this.overlay.addEventListener('transitionend',(e) =>{this.handleZindex(e)},false);
this.overlay.addEventListener('click',(e) =>{this.close()},false);
this.setVisibality();
},
Expand All @@ -62,7 +62,7 @@
handleStart(e){
this.startTime = new Date().getTime();
this.startPos = e.targetTouches[0].pageX;
this.element.style.transitionDuration = this.manual_speed;
this.element.style.transitionDuration = this.manual_speed;
},
handleMove(e){
let gesture = this.gesture(e);
Expand All @@ -74,14 +74,14 @@
if(this.translate < 0){
this.element.style.transform = 'translate3d('+ this.translate +'px,0,0)';
}else{
this.open();
this.open();
}
}else{
this.translate = -(screen.width-this.element.offsetWidth-e.touches[0].pageX);
if(this.translate > 0){
this.element.style.transform = 'translate3d('+ this.translate +'px,0,0)';
}else{
this.open();
this.open();
}
}
this.overlayOpacity(percent/100);
Expand All @@ -91,29 +91,26 @@
let speed = this.speed(e);
let gesture = this.gesture(e);
let valid = this.validate(this.direction,gesture);

if(valid){
if(speed>0.6){
if(!this.active){
this.open();
this.open();
}else{
this.close();
this.close();
}
}else{
if(this.element.offsetWidth/2>Math.abs(this.translate)){
this.open();
this.open();
}else{
this.close();

this.close();
}
}
}
}

},
handleZindex(){
let opacity = window.getComputedStyle(this.overlay).getPropertyValue('opacity');
if(opacity<=0){
this.overlay.style.zIndex = -999;
this.overlay.style.zIndex = -999;
}
},
validate(direction,gesture){
Expand All @@ -126,15 +123,15 @@
return false;
}
}
if((document.querySelector('.sidebar.active') && !this.active) || !this.visible){
if((this.$refs.rootEl.querySelector('.sidebar.active') && !this.active) || !this.visible){
return false;
}
return true;
},
overlayOpacity(opacity){
this.overlay.style.opacity = opacity;
if(opacity > 0){
this.overlay.style.zIndex = 999;
this.overlay.style.zIndex = 999;
}
},
gesture(e){
Expand All @@ -148,33 +145,37 @@
}else{
return directions[0];
}

},

open(){
this.translate = 0;
this.element.style.transform = 'translate3d('+this.translate+',0,0)';
this.element.style.transitionDuration = this.auto_speed;
this.overlayOpacity(1);
this.lock(document.querySelector('html'));
this.lock(document.querySelector('body'));
this.element.classList.add('active');
this.active = true;

if (this.panelmode === undefined) {
this.overlayOpacity(1);
this.lock(document.querySelector('html'));
this.lock(document.querySelector('body'));
}
this.active = true;

this.element.classList.add('active');
},
close(){
if(this.direction=='left'){
this.translate = '-'+this.element.offsetWidth+'px';
}else{
this.translate = this.element.offsetWidth+'px';
}
this.element.style.transform = 'translate3d('+this.translate+',0,0)';
this.element.style.transitionDuration = this.auto_speed;
this.overlayOpacity(0);
this.element.style.transform = 'translate3d('+this.translate+',0,0)';
this.element.style.transitionDuration = this.auto_speed;

if (this.panelmode === undefined) {
this.overlayOpacity(0);
this.unlock(document.querySelector('html'));
this.unlock(document.querySelector('body'));
this.element.classList.remove('active');
}
this.element.classList.remove('active');
this.active = false;

},
speed(e){
let time = new Date().getTime() - this.startTime;
Expand All @@ -189,7 +190,7 @@
if(direction == 'left'){
test = ['swipeleft','swiperight']
}else{
test = ['swiperight','swipeleft']
test = ['swiperight','swipeleft']
}
if(this.active && gesture == test[0]){
percentage = 100-Math.round(Math.abs(this.translate)/this.element.offsetWidth*100);
Expand All @@ -212,9 +213,9 @@
unlock(element){
element.style.removeProperty('overflow');
element.style.removeProperty('touch-action');
}
}
}
}
}
</script>
<style scoped>
div.overlay{
Expand All @@ -234,11 +235,12 @@
will-change: transform;
height: 100%;
top: 0px;
transition:transform 0.3s ease;
transition:transform 0.3s ease;
background:#fff;
width: 300px;
overflow-y: auto;
overflow-x: hidden;
word-wrap: break-word;
width: auto;
min-width: 300px;
overflow-y: auto;
overflow-x: hidden;
word-wrap: break-word;
}
</style>
</style>