summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorかっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>2024-09-23 21:53:51 +0900
committerGitHub <noreply@github.com>2024-09-23 21:53:51 +0900
commitcd247b99ee673887d30be3c39ecd0a07eb823cb0 (patch)
treed802ec6e071f0f12642abd0823c4d975e4c3720b
parentrefactor(frontend): popupMenuの項目作成時に三項演算子をなるべ... (diff)
downloadsharkey-cd247b99ee673887d30be3c39ecd0a07eb823cb0.tar.gz
sharkey-cd247b99ee673887d30be3c39ecd0a07eb823cb0.tar.bz2
sharkey-cd247b99ee673887d30be3c39ecd0a07eb823cb0.zip
fix(frontend): MkRangeのタッチ操作時にtooltipが複数重なって表示されないように (#14548)
* fix: directiveでのtooltip表示との競合を解消 (#265) (cherry picked from commit 6d15d379a76b1b153ec2996e22bf0fc29ced5fda) * code style * Update Changelog * record origin * fix: ホバー時にもツールチップが出るように --------- Co-authored-by: CaffeinePower <86540016+cffnpwr@users.noreply.github.com> Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
-rw-r--r--CHANGELOG.md2
-rw-r--r--packages/frontend/src/components/MkRange.vue54
2 files changed, 47 insertions, 9 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3e28c6bf01..60712fbf4e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,8 @@
- Enhance: ScratchpadにUIインスペクターを追加
- Fix: サーバーメトリクスが2つ以上あるとリロード直後の表示がおかしくなる問題を修正
- Fix: 月の違う同じ日はセパレータが表示されないのを修正
+- Fix: タッチ画面でレンジスライダーを操作するとツールチップが複数表示される問題を修正
+ (Cherry-picked from https://github.com/taiyme/misskey/pull/265)
- Fix: 縦横比が極端なカスタム絵文字を表示する際にレイアウトが崩れる箇所があるのを修正
(Cherry-picked from https://github.com/MisskeyIO/misskey/pull/725)
- Fix: 設定変更時のリロード確認ダイアログが複数個表示されることがある問題を修正
diff --git a/packages/frontend/src/components/MkRange.vue b/packages/frontend/src/components/MkRange.vue
index 1eae642937..cfaaa67d58 100644
--- a/packages/frontend/src/components/MkRange.vue
+++ b/packages/frontend/src/components/MkRange.vue
@@ -5,7 +5,9 @@ SPDX-License-Identifier: AGPL-3.0-only
<template>
<div class="timctyfi" :class="{ disabled, easing }">
- <div class="label"><slot name="label"></slot></div>
+ <div class="label">
+ <slot name="label"></slot>
+ </div>
<div v-adaptive-border class="body">
<div ref="containerEl" class="container">
<div class="track">
@@ -14,15 +16,25 @@ SPDX-License-Identifier: AGPL-3.0-only
<div v-if="steps && showTicks" class="ticks">
<div v-for="i in (steps + 1)" class="tick" :style="{ left: (((i - 1) / steps) * 100) + '%' }"></div>
</div>
- <div ref="thumbEl" v-tooltip="textConverter(finalValue)" class="thumb" :style="{ left: thumbPosition + 'px' }" @mousedown="onMousedown" @touchstart="onMousedown"></div>
+ <div
+ ref="thumbEl"
+ class="thumb"
+ :style="{ left: thumbPosition + 'px' }"
+ @mouseenter.passive="onMouseenter"
+ @mousedown="onMousedown"
+ @touchstart="onMousedown"
+ ></div>
</div>
</div>
- <div class="caption"><slot name="caption"></slot></div>
+ <div class="caption">
+ <slot name="caption"></slot>
+ </div>
</div>
</template>
<script lang="ts" setup>
-import { computed, defineAsyncComponent, onMounted, onUnmounted, ref, watch, shallowRef } from 'vue';
+import { computed, defineAsyncComponent, onMounted, onUnmounted, ref, shallowRef, watch } from 'vue';
+import { isTouchUsing } from '@/scripts/touch.js';
import * as os from '@/os.js';
const props = withDefaults(defineProps<{
@@ -101,12 +113,36 @@ const steps = computed(() => {
}
});
+const tooltipForDragShowing = ref(false);
+const tooltipForHoverShowing = ref(false);
+
+function onMouseenter() {
+ if (isTouchUsing) return;
+
+ tooltipForHoverShowing.value = true;
+
+ const { dispose } = os.popup(defineAsyncComponent(() => import('@/components/MkTooltip.vue')), {
+ showing: computed(() => tooltipForHoverShowing.value && !tooltipForDragShowing.value),
+ text: computed(() => {
+ return props.textConverter(finalValue.value);
+ }),
+ targetElement: thumbEl,
+ }, {
+ closed: () => dispose(),
+ });
+
+ thumbEl.value!.addEventListener('mouseleave', () => {
+ tooltipForHoverShowing.value = false;
+ }, { once: true, passive: true });
+}
+
function onMousedown(ev: MouseEvent | TouchEvent) {
ev.preventDefault();
- const tooltipShowing = ref(true);
+ tooltipForDragShowing.value = true;
+
const { dispose } = os.popup(defineAsyncComponent(() => import('@/components/MkTooltip.vue')), {
- showing: tooltipShowing,
+ showing: tooltipForDragShowing,
text: computed(() => {
return props.textConverter(finalValue.value);
}),
@@ -137,7 +173,7 @@ function onMousedown(ev: MouseEvent | TouchEvent) {
const onMouseup = () => {
document.head.removeChild(style);
- tooltipShowing.value = false;
+ tooltipForDragShowing.value = false;
window.removeEventListener('mousemove', onDrag);
window.removeEventListener('touchmove', onDrag);
window.removeEventListener('mouseup', onMouseup);
@@ -261,12 +297,12 @@ function onMousedown(ev: MouseEvent | TouchEvent) {
> .container {
> .track {
> .highlight {
- transition: width 0.2s cubic-bezier(0,0,0,1);
+ transition: width 0.2s cubic-bezier(0, 0, 0, 1);
}
}
> .thumb {
- transition: left 0.2s cubic-bezier(0,0,0,1);
+ transition: left 0.2s cubic-bezier(0, 0, 0, 1);
}
}
}