From 85004fa40ee9c77c55d08167c388a1132bd79f65 Mon Sep 17 00:00:00 2001
From: upsiflu <upsiflu@gmail.com>
Date: Tue, 17 Dec 2024 23:17:41 +0100
Subject: [PATCH] feat(ui): enable color props on Popover and Modal

---
 front/src/components/ui/Modal.vue    | 18 +++++++++++++++---
 front/src/components/ui/Popover.vue  |  7 ++++---
 front/src/components/ui/popover.scss |  5 ++---
 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/front/src/components/ui/Modal.vue b/front/src/components/ui/Modal.vue
index 83ff901d3..c91f5ad25 100644
--- a/front/src/components/ui/Modal.vue
+++ b/front/src/components/ui/Modal.vue
@@ -1,8 +1,13 @@
 <script setup lang="ts">
+import { type ColorProps, type DefaultProps, propsToColor } from '~/composables/colors';
+
 import Button from '~/components/ui/Button.vue'
 import Spacer from '~/components/ui/layout/Spacer.vue'
 
-const { title, overPopover = false } = defineProps<{ title:string, overPopover?:true }>()
+const { title, overPopover = false, ...colorProps } = defineProps<{
+  title:string,
+  overPopover?:true
+} & (ColorProps | DefaultProps) >()
 const isOpen = defineModel<boolean>({ default:false })
 
 // TODO:
@@ -14,8 +19,15 @@ const isOpen = defineModel<boolean>({ default:false })
 <template>
   <Teleport to="body">
     <Transition mode="out-in">
-      <div v-if="isOpen" @click.exact.stop="isOpen = false" class="funkwhale overlay">
-        <div @click.stop class="funkwhale modal" :class="[$slots.alert && 'has-alert', overPopover && 'over-popover']" >
+      <div v-if="isOpen"
+        @click.exact.stop="isOpen = false"
+        class="funkwhale overlay"
+      >
+        <div @click.stop
+          class="funkwhale modal raised"
+          :class="[$slots.alert && 'has-alert', overPopover && 'over-popover']"
+          v-bind="propsToColor(colorProps)"
+        >
           <h2>
             {{ title }}
             <Button icon="bi-x-lg" ghost @click="isOpen = false" />
diff --git a/front/src/components/ui/Popover.vue b/front/src/components/ui/Popover.vue
index 09bfc5b8f..53e9e1a2e 100644
--- a/front/src/components/ui/Popover.vue
+++ b/front/src/components/ui/Popover.vue
@@ -7,9 +7,10 @@ import { POPOVER_INJECTION_KEY, POPOVER_CONTEXT_INJECTION_KEY } from '~/injectio
 import { type ColorProps, type DefaultProps, propsToColor } from '~/composables/colors';
 
 const open = defineModel('open', { default: false })
+
 const { positioning = 'vertical', ...colorProps }  = defineProps<{
   positioning?:'horizontal' | 'vertical'
-} & ColorProps & DefaultProps>()
+} & (ColorProps | DefaultProps)>()
 
 // Template refs
 const popover = ref()
@@ -116,7 +117,6 @@ watch(open, (isOpen) => {
   <div
     ref="slot"
     class="funkwhale popover-container"
-    v-bind="propsToColor({ solid:true, ...colorProps })"
   >
     <slot
       :isOpen="open"
@@ -136,7 +136,8 @@ watch(open, (isOpen) => {
         ref="popover"
         :style="position"
         :class="{ 'is-mobile': isMobile }"
-        class="funkwhale popover"
+        class="funkwhale popover secondary"
+         v-bind="propsToColor(colorProps)"
       >
         <slot name="items" />
       </div>
diff --git a/front/src/components/ui/popover.scss b/front/src/components/ui/popover.scss
index bfefdf506..4d2145b52 100644
--- a/front/src/components/ui/popover.scss
+++ b/front/src/components/ui/popover.scss
@@ -1,5 +1,5 @@
 .funkwhale.popover-container {
-  display: contents;
+  width: max-content;
 }
 
 .funkwhale.popover-outer {
@@ -18,7 +18,7 @@
 .funkwhale {
   &.popover {
     border: 1px solid var(--fw-border-color);
-    background: var(--background-color);
+    background-color: var(--background-color);
 
     hr {
       border-bottom: 1px solid var(--fw-border-color);
@@ -72,7 +72,6 @@
       border-radius: var(--fw-border-radius);
       white-space: nowrap;
 
-
       > .bi:first-child {
         margin-right: 16px;
       }