Skip to content

fix(NcModal): properly handle modal name size #8263

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
susnux wants to merge 1 commit into
base: main
Choose a base branch
from
+22 −6
Open

fix(NcModal): properly handle modal name size #8263

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
28 changes: 22 additions & 6 deletions src/components/NcModal/NcModal.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import type { Slot } from 'vue'
import { mdiChevronLeft, mdiChevronRight, mdiClose, mdiPause, mdiPlay } from '@mdi/js'
import { useIntervalFn, useSwipe } from '@vueuse/core'
import { createFocusTrap } from 'focus-trap'
import { computed, nextTick, onMounted, onUnmounted, ref, toRef, useTemplateRef, warn, watch, watchEffect } from 'vue'
import { computed, nextTick, onMounted, onUnmounted, ref, toRef, useSlots, useTemplateRef, warn, watch, watchEffect } from 'vue'
import NcActions from '../NcActions/NcActions.vue'
import NcButton from '../NcButton/NcButton.vue'
import NcIconSvgWrapper from '../NcIconSvgWrapper/NcIconSvgWrapper.vue'
Expand Down Expand Up @@ -253,6 +253,22 @@ useHotKey(['ArrowLeft', 'ArrowRight'], (event) => {
}
}, { allowInModal: true })

const slots = useSlots()
const numHeaderActions = computed(() => {
let actions = 0
if (props.hasNext && props.enableSlideshow) {
actions++
}
if (!props.noClose && props.closeButtonOutside) {
actions++
}
if (slots.actions) {
actions++
}

return actions
})

// for developers we should add a warning if used with invalid props combination
onMounted(() => {
if (!props.name && !props.labelId) {
Expand Down Expand Up @@ -585,7 +601,7 @@ function clearFocusTrap() {
// the circle animation loop
display: flex !important;
align-items: center;
justify-content: center;
justify-content: space-between;
width: 100%;
height: var(--header-height);
overflow: hidden;
Expand All @@ -594,7 +610,7 @@ function clearFocusTrap() {
&__name {
overflow-x: hidden;
width: 100%;
padding: 0 calc(var(--default-clickable-area) * 3) 0 12px; // maximum actions is 3
padding-inline: 12px 0;
transition: padding ease 100ms;
white-space: nowrap;
text-overflow: ellipsis;
Expand All @@ -605,17 +621,17 @@ function clearFocusTrap() {
// On wider screens the name can be centered
@media only screen and (min-width: $breakpoint-mobile) {
&__name {
padding-inline-start: calc(var(--default-clickable-area) * 3); // maximum actions is 3
// On wider screens the name is centered, so we need to compensate for the actions to make the name really centered
padding-inline-start: calc(var(--header-height) * v-bind('numHeaderActions'));
text-align: center;
}
}

.icons-menu {
position: absolute;
inset-inline-end: 0;
display: flex;
align-items: center;
justify-content: flex-end;
align-self: flex-end;

.header-close {
display: flex;
Expand Down
Loading