Skip to content

feat: 滚动模式下添加 auto scroll 以及优化移动端 slider 的 touch 交互 #185

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

Open
MikeQ233 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat: 滚动模式下添加 auto scroll 以及优化移动端 slider 的 touch 交互 #185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
202 changes: 150 additions & 52 deletions core/components/AlbumScrollView.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,47 +1,29 @@
<template>
<div class="album-scroll-view">
<div class="preload">
<img :src="src" width="100" height="144" v-for="src of preloadImgs" :key="src">
</div>
<!-- scroll view -->
<awesome-scroll-view
ref="scrollView"
class="scroll-view"
v-if="imgPageInfos.length > 0"
:on-scroll-stopped="onScrollStopped"
@topIn="changeTopBar(true)"
@topLeave="changeTopBar(false)">
<h1>{{ title }}</h1>
<pagination
v-if="volumeSum != 1"
class="top-pagination"
:cur-index="curVolume"
:page-sum="volumeSum"
@change="selectVol"
/>
<div
class="page-container"
ref="pageContainers"
v-for="(imgPageInfo, i) of volImgPageInfos"
:key="imgPageInfo.id"
:style="{'width':`${widthScale}%`,'padding-bottom':`${widthScale * (imgPageInfo.preciseHeightOfWidth ? imgPageInfo.preciseHeightOfWidth : imgPageInfo.heightOfWidth)}%`,'margin': `${scrolledPageMargin}px auto`}">
<page-view
:index="imgPageInfo.index"
:active="nearbyArray.indexOf(index(i)) > -1"
:albumId="albumId"
v-on:update-img-page-info="updateImgPageInfo"
:data="imgPageInfo">
</page-view>
<div class="album-scroll-view">
<div class="preload">
<img :src="src" width="100" height="144" v-for="src of preloadImgs" :key="src">
</div>
<pagination
v-if="volumeSum != 1"
class="bottom-pagination"
:curIndex="curVolume"
:pageSum="volumeSum"
@change="selectVol"
/>
</awesome-scroll-view>
</div>
<!-- scroll view -->
<awesome-scroll-view ref="scrollView" class="scroll-view" v-if="imgPageInfos.length > 0"
:on-scroll-stopped="onScrollStopped" @topIn="changeTopBar(true)" @topLeave="changeTopBar(false)">
<h1>{{ title }}</h1>
<pagination v-if="volumeSum != 1" class="top-pagination" :cur-index="curVolume" :page-sum="volumeSum"
@change="selectVol" />
<div class="page-container" ref="pageContainers" v-for="(imgPageInfo, i) of volImgPageInfos"
:key="imgPageInfo.id"
:style="{ 'width': `${widthScale}%`, 'padding-bottom': `${widthScale * (imgPageInfo.preciseHeightOfWidth ? imgPageInfo.preciseHeightOfWidth : imgPageInfo.heightOfWidth)}%`, 'margin': `${scrolledPageMargin}px auto` }">
<page-view :index="imgPageInfo.index" :active="nearbyArray.indexOf(index(i)) > -1" :albumId="albumId"
v-on:update-img-page-info="updateImgPageInfo" :data="imgPageInfo">
</page-view>
</div>
<pagination v-if="volumeSum != 1" class="bottom-pagination" :curIndex="curVolume" :pageSum="volumeSum"
@change="selectVol" />
</awesome-scroll-view>
<div class="auto-scroll-button" @click="autoScrollButtonClick">A</div>
<pop-slider v-if='showAutoScrollSlider' class="scroll-speed-slider" :active="true" :min="0" :max="2"
:step="0.01" :init="scrollSpeed" :close="autoScrollButtonClick" :is-float="true"
@change="updateAutoScrollSpeed" />
</div>
</template>

<script>
Expand All @@ -51,6 +33,7 @@ import TopBar from './TopBar.vue';
import Logger from '../utils/Logger.js';
import Pagination from './widget/Pagination.vue';
import PageView from './PageView.vue';
import PopSlider from './widget/PopSlider.vue';
import SettingService from '../service/SettingService.ts';
import * as tags from '../assets/value/tags';

Expand Down Expand Up @@ -80,22 +63,32 @@ export default {
data() {
return {
scrollTop: 0,
preloadImgs: []
preloadImgs: [],

// for auto scroll animation
showAutoScrollSlider: false,
scrollSpeed: 0,
requestId: 0,
};
},

components: {
AwesomeScrollView,
TopBar,
Pagination,
PageView
PageView,
PopSlider
},

async created() {
setTimeout(() => this.setIndex({ val: this.curIndex.val, updater: tags.SCROLL_VIEW_VOL }), 200);
document.addEventListener('keydown', this.watchKeyboard);
},

beforeDestroy() {
this.cancelAutoScroll();
},

destroyed() {
document.removeEventListener('keydown', this.watchKeyboard);
},
Expand All @@ -111,7 +104,7 @@ export default {
volumePreloadCount: 'volumePreloadCount',
showMoreSettings: 'showMoreSettings',
showTopBar: 'showTopBar',
scrolledPageMargin: 'scrolledPageMargin'
scrolledPageMargin: 'scrolledPageMargin',
}),

// return a indexes array. the index is index of page, determining the show of pages.
Expand Down Expand Up @@ -139,7 +132,7 @@ export default {

watch: {
centerIndex: {
handler: async function(val, oldVal) {
handler: async function (val, oldVal) {
if (this.curIndex.updater !== tags.SCROLL_VIEW && this.$refs.pageContainers) {
// sync index
if (this.curIndex.val === this.volFirstIndex) {
Expand Down Expand Up @@ -182,14 +175,14 @@ export default {
this.setIndex({ val: index, updater: tags.SCROLL_VIEW });
}
}
}
},
},

methods: {
...mapActions(['setIndex', 'toggleTopBar']),

range(start, count) {
return Array.apply(0, Array(count)).map(function(element, index) {
return Array.apply(0, Array(count)).map(function (element, index) {
return index + start;
});
},
Expand Down Expand Up @@ -269,6 +262,77 @@ export default {

updateImgPageInfo(index, newImgPageInfo) {
this.$set(this.imgPageInfos, index, newImgPageInfo);
},

autoScrollButtonClick() {
this.showAutoScrollSlider = !this.showAutoScrollSlider;
},

updateAutoScrollSpeed(val) {
this.scrollSpeed = val;
if (this.scrollSpeed > 0) {
if (this.requestId === 0) {
this.scheduleAutoScroll();
}
} else {
this.cancelAutoScroll();
}
},

cancelAutoScroll() {
if (this.requestId !== 0) {
window.cancelAnimationFrame(this.requestId);
this.requestId = 0;
}
},

outOfViewPortCheckUtil() {
const setInterval = 200; // hardcoded here, check every 0.2s
let timeElapsed = 0;
return (deltaTime) => {
timeElapsed += deltaTime;
if (timeElapsed >= setInterval) {
timeElapsed = 0;
const rect = this.$refs.scrollView.$refs.asv.getBoundingClientRect();
const visible = rect.top >= 0 &&
rect.left >= 0 &&
rect.bottom <= (window.innerHeight || document.documentElement.clientHeight) &&
rect.right <= (window.innerWidth || document.documentElement.clientWidth)
if (!visible) {
this.updateAutoScrollSpeed(0);
}
}
}
},

scheduleAutoScroll() {
const container = this.$refs.scrollView.$refs.asv;
const thisVal = this;
// just to make sure we have cancelled the previously scheduled update.
this.cancelAutoScroll();

const checkOutOfViewPortAndStop = this.outOfViewPortCheckUtil();
let start = undefined;
let scrollValue = 0;
this.requestId = window.requestAnimationFrame(function scroll(timeStamp) {
if (start === undefined) {
start = timeStamp;
}
const deltaTime = timeStamp - start; // in milliseconds
start = timeStamp;
// accumulate scroll value here since only whole numbers are accepted
scrollValue += thisVal.scrollSpeed * (deltaTime / 5);
const integerPart = Math.trunc(scrollValue);
if (integerPart >= 1) {
container.scrollTop += integerPart;
// update scrollTop to trigger page load, see watch scrollTop.
thisVal.scrollTop = container.scrollTop;
scrollValue -= integerPart;
}
thisVal.requestId = window.requestAnimationFrame(scroll);
// check after the update is scheduled
checkOutOfViewPortAndStop(deltaTime);
});
}
}
};
Expand All @@ -277,11 +341,38 @@ export default {
<style lang="scss" scoped>
@import '../style/_responsive';
@import '../style/_variables';

.album-scroll-view {
position: relative;
flex-direction: column;
align-items: center;
> .preload {

.scroll-speed-slider {
position: absolute;
bottom: 5%;
top: unset;
left: 50%;
transform: translateX(-50%);
-webkit-user-select: none;
user-select: none;
}

.auto-scroll-button {
width: 25px;
height: 25px;
border-radius: 50%;
position: absolute;
bottom: 50px;
right: 50px;
background: #28af60;
display: flex;
justify-content: center;
align-items: center;
opacity: 15%;
cursor: pointer;
}

>.preload {
position: absolute;
top: 0;
left: 0;
Expand All @@ -290,31 +381,38 @@ export default {
z-index: -10;
opacity: 0;
}
> .scroll-view {

>.scroll-view {
height: 100%;
width: 100%;

h1 {
color: #c9cacf;
padding: 10px 20px;
font-size: 18px;
text-align: center;
margin-top: 60px;
}
> .top-pagination {

>.top-pagination {
margin-top: 15px;
margin-bottom: 15px;
}
> .bottom-pagination {

>.bottom-pagination {
margin-top: 15px;
margin-bottom: 30px;
}

.page-container {
transition: all 0.3s ease;
height: 0;
position: relative;

&:first-of-type {
margin-top: 35px;
}

&:last-of-type {
margin-bottom: 35px;
}
Expand Down
27 changes: 26 additions & 1 deletion core/components/widget/Slider.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
<template>
<div class="slider"
@mousedown="handleMouseDown"
@touchmove="handleTouchMove"
@touchstart="handleTouchStart"
@touchend="handleTouchEnd"
@click="handleClick"
ref="slider">
<div class="track"></div>
Expand Down Expand Up @@ -71,6 +74,28 @@ export default {
}
e.preventDefault();
},
handleTouchStart(e) {
const touch = e.touches[0];
this.isHolding = true;
const rect = e.target.getBoundingClientRect();
this.handleClick({offsetX: touch.pageX - rect.left});
this.oldMouseX = touch.clientX;
this.oldVal = this.val;
this.widthRatio = this.getWidthRatio();
e.preventDefault();
},
handleTouchMove(e) {
const touch = e.touches[0];
if (this.isHolding) {
const x = this.oldVal + (touch.clientX - this.oldMouseX) / this.widthRatio;
this.onChange(x);
}
e.preventDefault();
},
handleTouchEnd(e) {
this.isHolding = false;
e.preventDefault();
},
handleClick(e) {
const x = this.min + e.offsetX / this.getWidthRatio();
this.onChange(x);
Expand All @@ -84,7 +109,7 @@ export default {
this.$emit('change', this.val);
},
getStepPrecision(val) {
return String(String(this.step).match('.[0-9]')).length - 1;
return String(String(this.step).match('.[0-9][0-9]')).length - 1;
},
getValByStep(x) {
for (let i = this.min; i <= this.max; i = i + this.step) {
Expand Down