From 350db4503280846f604b4d88da25ab35840631a9 Mon Sep 17 00:00:00 2001 From: NoriDev Date: Tue, 30 May 2023 17:15:29 +0900 Subject: [PATCH] =?UTF-8?q?fix(client/friendly):=20=E3=83=95=E3=83=AD?= =?UTF-8?q?=E3=83=BC=E3=83=86=E3=82=A3=E3=83=B3=E3=82=B0=E3=83=A1=E3=83=8B?= =?UTF-8?q?=E3=83=A5=E3=83=BC=E3=82=92=E9=95=B7=E6=8A=BC=E3=81=97=E3=81=97?= =?UTF-8?q?=E3=81=9F=E3=81=A8=E3=81=8D=E3=81=AB=E3=83=97=E3=83=AD=E3=83=95?= =?UTF-8?q?=E3=82=A3=E3=83=BC=E3=83=AB=E7=94=BB=E5=83=8F=E3=82=92=E3=83=89?= =?UTF-8?q?=E3=83=A9=E3=83=83=E3=82=B0=E3=81=A7=E3=81=8D=E3=82=8B=E5=95=8F?= =?UTF-8?q?=E9=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG_CHERRYPICK.md | 1 + packages/frontend/src/components/MkImgWithBlurhash.vue | 8 +++++++- .../frontend/src/components/global/CPAvatar-Friendly.vue | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGELOG_CHERRYPICK.md b/CHANGELOG_CHERRYPICK.md index 9ec392546d..4d7ab35c12 100644 --- a/CHANGELOG_CHERRYPICK.md +++ b/CHANGELOG_CHERRYPICK.md @@ -41,6 +41,7 @@ - 노트 작성 폼의 디자인 개선 - 헤더에 뒤로 가기 버튼 추가 - Fix: (Friendly) 위젯 영역에 safe-area-inset-bottom이 적용되지 않음 +- Fix: (Friendly) 플로팅 메뉴를 길게 눌렀을 때 프로필 이미지를 드래그 할 수 있는 문제 - Fix: 위젯 편집 시 헤더 이외의 영역을 눌렀을 때 위젯 설정이 뜨는 문제 - Fix: 위젯 편집 종료 버튼이 여러 개 있는 문제 - Fix: 일부 옵션 변경 시 페이지를 새로 고치도록 diff --git a/packages/frontend/src/components/MkImgWithBlurhash.vue b/packages/frontend/src/components/MkImgWithBlurhash.vue index 38406cc0be..229b5983eb 100644 --- a/packages/frontend/src/components/MkImgWithBlurhash.vue +++ b/packages/frontend/src/components/MkImgWithBlurhash.vue @@ -10,7 +10,7 @@ :leaveFromClass="defaultStore.state.animation && props.transition?.leaveFromClass || undefined" > - + @@ -66,6 +66,7 @@ const props = withDefaults(defineProps<{ width?: number; cover?: boolean; forceBlurhash?: boolean; + noDrag?: boolean; }>(), { transition: null, src: null, @@ -75,6 +76,7 @@ const props = withDefaults(defineProps<{ width: 64, cover: true, forceBlurhash: false, + noDrag: false, }); const viewId = uuid(); @@ -238,5 +240,9 @@ onUnmounted(() => { .img { object-fit: contain; + + &.noDrag { + -webkit-user-drag: none; + } } diff --git a/packages/frontend/src/components/global/CPAvatar-Friendly.vue b/packages/frontend/src/components/global/CPAvatar-Friendly.vue index 4ddaeb0dae..167f8ee669 100644 --- a/packages/frontend/src/components/global/CPAvatar-Friendly.vue +++ b/packages/frontend/src/components/global/CPAvatar-Friendly.vue @@ -1,6 +1,6 @@