Skip to content

fix(NcModal): don't close modals if they were filled #11941

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

Merged
Antreesy merged 1 commit into from
Mar 27, 2024
Merged

fix(NcModal): don't close modals if they were filled #11941

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions src/components/NewConversationDialog/NewConversationDialog.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
<!-- New group form -->
<NcModal v-show="page !== 2"
class="new-group-conversation"
:close-on-click-outside="!isFilled"
:container="container"
@close="closeModal">
<h2 class="new-group-conversation__header">
Expand Down Expand Up @@ -227,6 +228,11 @@ export default {
|| this.conversationName.length > CONVERSATION.MAX_NAME_LENGTH
|| this.newConversation.description.length > CONVERSATION.MAX_DESCRIPTION_LENGTH
},

isFilled() {
return JSON.stringify(this.newConversation) !== JSON.stringify(NEW_CONVERSATION)
|| this.listable !== CONVERSATION.LISTABLE.NONE || this.isAvatarEdited
},
},

watch: {
Expand Down
5 changes: 5 additions & 0 deletions src/components/NewMessage/NewMessagePollEditor.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@

<template>
<NcModal size="small"
:close-on-click-outside="!isFilled"
:container="container"
v-on="$listeners">
<div class="poll-editor">
Expand Down Expand Up @@ -133,6 +134,10 @@ export default {
container() {
return this.$store.getters.getMainContainerSelector()
},

isFilled() {
return !!this.pollQuestion || this.pollOptions.some(option => option)
},
},

methods: {
Expand Down
1 change: 1 addition & 0 deletions src/components/NewMessage/NewMessageUploadEditor.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
<NcModal v-if="showModal"
ref="modal"
:size="isVoiceMessage ? 'small' : 'normal'"
:close-on-click-outside="false"
:container="container"
@close="handleDismiss">
<div class="upload-editor"
Expand Down