Skip to content

UserModal のはみ出ているアイコン部分をクリックしてもモーダルが閉じないように #4748

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
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

UserModal のはみ出ているアイコン部分をクリックしてもモーダルが閉じないように #4748

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9f978db
はみ出している部分をクリックすると閉じないように修正した
Nattuki Dec 8, 2023
2d60226
fix/pr4190
queue113 Aug 10, 2025
53d2b34
fix/4143
queue113 Aug 10, 2025
ad43dad
モーダルのユーザアイコンのカーソルを変更
queue113 Aug 19, 2025
375d732
globalを削除
queue113 Aug 21, 2025
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
7 changes: 6 additions & 1 deletion src/components/Modal/UserModal/UserModal.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<user-icon
v-if="!isMobile"
:user-id="id"
prevent-modal
:prevent-modal="false"
Copy link
Contributor

@uni-kakurenbo uni-kakurenbo Oct 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

suggest

prevent-modal のデフォルト値は false なので、この行を取り除くだけでよいと思います．

Suggested change
:prevent-modal="false"

:class="$style.icon"
:style="styles.icon"
/>
Expand Down Expand Up @@ -112,4 +112,9 @@ const { userDetail } = useUserDetail(props)
margin: auto;
border: 6px solid $theme-background-secondary-border;
}

.icon[role='button'] {
cursor: default;
}

</style>
6 changes: 2 additions & 4 deletions src/components/UI/UserIcon.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,7 @@ const props = withDefaults(
size: 36,
indicatorSize: 10,
preventModal: false,
hasNotification: false,
isInactive: false
Copy link
Contributor

@uni-kakurenbo uni-kakurenbo Oct 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ask

isInactive のデフォルト値が消えているのはどうしてですか？

hasNotification: false
}
)

Expand Down Expand Up @@ -78,8 +77,7 @@ const styles = reactive({
height: `${props.size}px`,
backgroundImage: userIconFileId.value
? `url(${buildUserIconPath(userIconFileId.value)})`
: undefined,
pointerEvents: props.preventModal ? ('none' as const) : undefined
Copy link
Contributor

@uni-kakurenbo uni-kakurenbo Oct 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ask

ここの分岐を取り除く代わりに以下の部分で role を用いた判定に変更しているのはどうしてですか？

https://github.com/traPtitech/traQ_S-UI/pull/4748/files#diff-4485eaaa605dc00a1edbf840841640a00c5ce1b405a26b25280374eea8b173f3R115-R119

: undefined
}))
})

Expand Down
Loading