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

Jump to bottom

fix(elevator): 修复滚动后无法点击问题 #2603 #2645

Merged
merged 2 commits into from
Nov 9, 2023
Merged

fix(elevator): 修复滚动后无法点击问题 #2603 #2645

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6e15436
fix(elevator): 修复滚动后无法点击问题 #2603
eiinu Nov 9, 2023
557982a
test: update
eiinu Nov 9, 2023
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
1 change: 1 addition & 0 deletions src/packages/__VUE/elevator/__tests__/index.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ const indexList = [
test('should render elevator list height after height props to be 200', () => {
const wrapper = mount(Elevator, {
props: {
indexList,
height: 200
}
});
Expand Down
13 changes: 0 additions & 13 deletions src/packages/__VUE/elevator/index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,6 @@
}
}
}
.nut-elevator__list__fixed__wrapper {
position: absolute;
top: 0;
left: 0;
width: 100%;
}
&__fixed {
width: 100%;
position: absolute;
Expand All @@ -78,13 +72,6 @@
box-sizing: border-box;
box-shadow: $elevator-list-fixed-box-shadow;
z-index: 1;
&--mini {
position: sticky;
top: -1px;
}
}
&--mini {
position: static;
}
}
&__code--current {
Expand Down
20 changes: 5 additions & 15 deletions src/packages/__VUE/elevator/index.taro.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<view :class="classes">
<view class="nut-elevator">
<nut-scroll-view
ref="listview"
class="nut-elevator__list nut-elevator__list--mini"
Expand All @@ -10,11 +10,6 @@
:style="{ height: isNaN(+height) ? height : `${height}px` }"
@scroll="listViewScroll"
>
<view v-show="scrollY > 0" :style="fixedStyle" class="nut-elevator__list__fixed__wrapper">
<view v-if="isSticky" class="nut-elevator__list__fixed nut-elevator__list__fixed--mini">
<span class="nut-elevator__fixed-title">{{ indexList[currentIndex][acceptKey] }}</span>
</view>
</view>
<view
v-for="(item, index) in indexList"
:key="item[acceptKey]"
Expand All @@ -36,6 +31,9 @@
</view>
</view>
</nut-scroll-view>
<view v-show="scrollY > 2 && isSticky" class="nut-elevator__list__fixed">
<view class="nut-elevator__list__fixed-title">{{ indexList[currentIndex][acceptKey] }}</view>
</view>
<view v-show="scrollStart" v-if="indexList.length > 0" class="nut-elevator__code--current">
{{ indexList[codeIndex][acceptKey] }}
</view>
Expand All @@ -59,7 +57,7 @@ import { computed, reactive, toRefs, nextTick, ref, Ref, watch, PropType } from
import { createComponent } from '@/packages/utils/create';
import { useExpose } from '@/packages/utils/useExpose/index';
import { ElevatorData } from './type';
const { componentName, create } = createComponent('elevator');
const { create } = createComponent('elevator');

import Taro from '@tarojs/taro';
import ScrollView from '../scroll-view/index.taro.vue';
Expand Down Expand Up @@ -118,13 +116,6 @@ export default create({
scrollY: 0
});

const classes = computed(() => {
const prefixCls = componentName;
return {
[prefixCls]: true
};
});

const clientHeight = computed(() => {
return listview.value.clientHeight;
});
Expand Down Expand Up @@ -239,7 +230,6 @@ export default create({
);

return {
classes,
...toRefs(state),
clientHeight,
fixedStyle,
Expand Down
29 changes: 8 additions & 21 deletions src/packages/__VUE/elevator/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<view :class="classes">
<view class="nut-elevator">
<view ref="listview" class="nut-elevator__list" :style="{ height: isNaN(+height) ? height : `${height}px` }">
<view v-for="item in indexList" :key="item[acceptKey]" :ref="setListGroup" class="nut-elevator__list__item">
<view class="nut-elevator__list__item__code">{{ item[acceptKey] }}</view>
Expand All @@ -16,9 +16,9 @@
<slot v-else :item="subitem"></slot>
</view>
</view>
<view v-show="scrollY > 0" v-if="isSticky" class="nut-elevator__list__fixed" :style="fixedStyle">
<span class="nut-elevator__fixed-title">{{ indexList[currentIndex][acceptKey] }}</span>
</view>
</view>
<view v-show="scrollY > 0 && isSticky" class="nut-elevator__list__fixed">
<view class="nut-elevator__list__fixed-title">{{ indexList[currentIndex][acceptKey] }}</view>
</view>
<view v-show="scrollStart" v-if="indexList.length" class="nut-elevator__code--current">{{
indexList[codeIndex][acceptKey]
Expand All @@ -43,7 +43,7 @@ import { computed, reactive, toRefs, nextTick, ref, Ref, watch, onMounted, PropT
import { createComponent } from '@/packages/utils/create';
import { useExpose } from '@/packages/utils/useExpose/index';
import { ElevatorData } from './type';
const { componentName, create } = createComponent('elevator');
const { create } = createComponent('elevator');

export default create({
props: {
Expand Down Expand Up @@ -95,19 +95,6 @@ export default create({
fixedTop: 0
});

const classes = computed(() => {
const prefixCls = componentName;
return {
[prefixCls]: true
};
});

const fixedStyle = computed(() => {
return {
transform: `translate3d(0, ${state.scrollY + state.fixedTop}px, 0)`
};
});

const clientHeight = computed(() => {
return listview.value.clientHeight;
});
Expand Down Expand Up @@ -196,7 +183,9 @@ export default create({
};

onMounted(() => {
listview.value.addEventListener('scroll', listViewScroll);
if (listview.value) {
listview.value.addEventListener('scroll', listViewScroll);
}
});

useExpose({
Expand Down Expand Up @@ -232,9 +221,7 @@ export default create({
);

return {
classes,
...toRefs(state),
fixedStyle,
clientHeight,
setListGroup,
listview,
Expand Down