summaryrefslogtreecommitdiff
path: root/packages/client/src/scripts/use-tooltip.ts
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2021-12-05 13:10:19 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2021-12-05 13:10:19 +0900
commitfbe4869d1ed336d3fb7d08d3d2f75710eb0fb1a4 (patch)
tree15b0257d2c6e51d015bf5780e4b2f82147eac351 /packages/client/src/scripts/use-tooltip.ts
parentFix(client): APIコンソールで with credential がオフだとiが付与... (diff)
downloadsharkey-fbe4869d1ed336d3fb7d08d3d2f75710eb0fb1a4.tar.gz
sharkey-fbe4869d1ed336d3fb7d08d3d2f75710eb0fb1a4.tar.bz2
sharkey-fbe4869d1ed336d3fb7d08d3d2f75710eb0fb1a4.zip
fix(client): タッチ機能付きディスプレイを使っていてマウス操作をしている場合に一部機能が動作しない問題を修正
Diffstat (limited to 'packages/client/src/scripts/use-tooltip.ts')
-rw-r--r--packages/client/src/scripts/use-tooltip.ts5
1 files changed, 2 insertions, 3 deletions
diff --git a/packages/client/src/scripts/use-tooltip.ts b/packages/client/src/scripts/use-tooltip.ts
index a9bf6d93db..b88075cdb0 100644
--- a/packages/client/src/scripts/use-tooltip.ts
+++ b/packages/client/src/scripts/use-tooltip.ts
@@ -1,6 +1,5 @@
-import { isScreenTouching } from '@/os';
import { Ref, ref } from 'vue';
-import { isDeviceTouch } from './is-device-touch';
+import { isScreenTouching, isTouchUsing } from './touch';
export function useTooltip(onShow: (showing: Ref<boolean>) => void) {
let isHovering = false;
@@ -14,7 +13,7 @@ export function useTooltip(onShow: (showing: Ref<boolean>) => void) {
// iOS(Androidも?)では、要素をタップした直後に(おせっかいで)mouseoverイベントを発火させたりするため、その対策
// これが無いと、画面に触れてないのにツールチップが出たりしてしまう
- if (isDeviceTouch && !isScreenTouching) return;
+ if (isTouchUsing && !isScreenTouching) return;
const showing = ref(true);
onShow(showing);