fix(NcColorPicker): close popover on submit event

Signed-off-by: Maksim Sukharev <[email protected]>
nextcloud-libraries · Dec 27, 2024 · 1bf28f7 · 1bf28f7
1 parent 7e601ad
commit 1bf28f7
Show file tree

Hide file tree

Showing 2 changed files with 57 additions and 54 deletions.
diff --git a/src/components/NcColorPicker/NcColorPicker.vue b/src/components/NcColorPicker/NcColorPicker.vue
@@ -71,7 +71,7 @@ export default {
 <template>
 	<div class="container1">
 		<NcButton @click="open = !open"> Click Me </NcButton>
-		<NcColorPicker :model-value="color" @update:model-value="updateColor" :shown.sync="open" @submit="open = false" v-slot="{ attrs }">
+		<NcColorPicker :model-value="color" @update:model-value="updateColor" :shown.sync="open" v-slot="{ attrs }">
 			<div v-bind="attrs" :style="{'background-color': color}" class="color1" />
 		</NcColorPicker>
 	</div>
@@ -150,57 +150,59 @@ export default {
 		<template #trigger="slotProps">
 			<slot v-bind="slotProps" />
 		</template>
-		<div role="dialog"
-			class="color-picker"
-			aria-modal="true"
-			:aria-label="t('Color picker')"
-			:class="{ 'color-picker--advanced-fields': advanced && advancedFields }">
-			<Transition name="slide" mode="out-in">
-				<div v-if="!advanced" class="color-picker__simple">
-					<label v-for="({ color, name }, index) in normalizedPalette"
-						:key="index"
-						:style="{ backgroundColor: color }"
-						class="color-picker__simple-color-circle"
-						:class="{ 'color-picker__simple-color-circle--active' : color === currentColor }">
-						<Check v-if="color === currentColor" :size="20" :fill-color="contrastColor" />
-						<input type="radio"
-							class="hidden-visually"
-							:aria-label="name"
-							:name="`color-picker-${uid}`"
-							:checked="color === currentColor"
-							@click="pickColor(color)">
-					</label>
+		<template #default="slotProps">
+			<div role="dialog"
+				class="color-picker"
+				aria-modal="true"
+				:aria-label="t('Color picker')"
+				:class="{ 'color-picker--advanced-fields': advanced && advancedFields }">
+				<Transition name="slide" mode="out-in">
+					<div v-if="!advanced" class="color-picker__simple">
+						<label v-for="({ color, name }, index) in normalizedPalette"
+							:key="index"
+							:style="{ backgroundColor: color }"
+							class="color-picker__simple-color-circle"
+							:class="{ 'color-picker__simple-color-circle--active' : color === currentColor }">
+							<Check v-if="color === currentColor" :size="20" :fill-color="contrastColor" />
+							<input type="radio"
+								class="hidden-visually"
+								:aria-label="name"
+								:name="`color-picker-${uid}`"
+								:checked="color === currentColor"
+								@click="pickColor(color)">
+						</label>
+					</div>
+					<Chrome v-else
+						v-model="currentColor"
+						class="color-picker__advanced"
+						:disable-alpha="true"
+						:disable-fields="!advancedFields"
+						@input="pickColor" />
+				</Transition>
+				<div v-if="!paletteOnly" class="color-picker__navigation">
+					<NcButton v-if="advanced"
+						type="tertiary"
+						:aria-label="ariaBack"
+						@click="handleBack">
+						<template #icon>
+							<ArrowLeft :size="20" />
+						</template>
+					</NcButton>
+					<NcButton v-else
+						type="tertiary"
+						:aria-label="ariaMore"
+						@click="handleMoreSettings">
+						<template #icon>
+							<DotsHorizontal :size="20" />
+						</template>
+					</NcButton>
+					<NcButton type="primary"
+						@click="handleConfirm(slotProps.hide)">
+						{{ t('Choose') }}
+					</NcButton>
 				</div>
-				<Chrome v-else
-					v-model="currentColor"
-					class="color-picker__advanced"
-					:disable-alpha="true"
-					:disable-fields="!advancedFields"
-					@input="pickColor" />
-			</Transition>
-			<div v-if="!paletteOnly" class="color-picker__navigation">
-				<NcButton v-if="advanced"
-					type="tertiary"
-					:aria-label="ariaBack"
-					@click="handleBack">
-					<template #icon>
-						<ArrowLeft :size="20" />
-					</template>
-				</NcButton>
-				<NcButton v-else
-					type="tertiary"
-					:aria-label="ariaMore"
-					@click="handleMoreSettings">
-					<template #icon>
-						<DotsHorizontal :size="20" />
-					</template>
-				</NcButton>
-				<NcButton type="primary"
-					@click="handleConfirm">
-					{{ t('Choose') }}
-				</NcButton>
 			</div>
-		</div>
+		</template>
 	</NcPopover>
 </template>
 
@@ -363,13 +365,14 @@ export default {
 
 		/**
 		 * Submit a picked colour and close picker
+		 * @param {Function} hideCallback callback to close popover
 		 */
-		handleConfirm() {
+		handleConfirm(hideCallback) {
 			/**
 			 * Emits a hexadecimal string e.g. '#ffffff'
 			 */
 			this.$emit('submit', this.currentColor)
-			this.handleClose()
+			hideCallback()
 
 			this.advanced = false
 		},

diff --git a/src/components/NcPopover/NcPopover.vue b/src/components/NcPopover/NcPopover.vue
@@ -157,8 +157,8 @@ See: https://developer.mozilla.org/en-US/docs/Web/Accessibility/ARIA/Attributes/
 		</NcPopoverTriggerProvider>
 
 		<!-- This will be the content of the popover -->
-		<template #popper>
-			<slot />
+		<template #popper="slotProps">
+			<slot name="default" v-bind="slotProps" />
 		</template>
 	</Dropdown>
 </template>