Merge pull request #17385 from opf/bug/59907-user-hovercard-is-showin…

…g-behind-the-meeting-participants-overlay [#59907] fix: User hovercard behind Meeting participants overlay
opf · Dec 9, 2024 · e0db79d · e0db79d
2 parents f8494bc + 5652c7f
commit e0db79d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/app/components/users/hover_card_component.sass b/app/components/users/hover_card_component.sass
@@ -6,7 +6,7 @@
 // modal overlay will darken the background while the hover card is active, since its semi-transparent bg shading is
 // added on top of the other dialog background shaders. We don't want an additional spot modal background here,
 // so we disable it for this edge case.
-.controller-projects.action-index
+.controller-projects.action-index, .controller-meetings.action-show
   .spot-modal-overlay:not(:has(.op-user-hover-card))
     background: transparent
 

diff --git a/modules/meeting/app/components/meetings/side_panel/participants_dialog.html.erb b/modules/meeting/app/components/meetings/side_panel/participants_dialog.html.erb
@@ -17,6 +17,7 @@
           class: 'Overlay-form'
         ) do |f|
           flex_layout(mt: 3) do |form_container|
+
             form_container.with_row do
               flex_layout(justify_content: :flex_end) do |header|
                 header.with_column(style: "width: 90px;", text_align: :center) do
@@ -47,7 +48,8 @@
                             existing_participant.with_column(flex: 1, classes: 'ellipsis') do
                               render(Users::AvatarComponent.new(
                                 user: participant.user,
-                                classes: 'op-principal_flex'
+                                classes: 'op-principal_flex',
+                                hover_card: { active: true, target: :custom }
                               ))
                             end
                             existing_participant.with_column(style: "width: 90px;", text_align: :center) do
@@ -84,7 +86,8 @@
                         new_participant.with_column(flex: 1, classes: 'ellipsis') do
                           render(Users::AvatarComponent.new(
                             user:,
-                            classes: 'op-principal_flex'
+                            classes: 'op-principal_flex',
+                            hover_card: { active: true, target: :custom }
                           ))
                         end
 
@@ -109,6 +112,10 @@
                 end
               end
             end
+
+            form_container.with_row do
+              helpers.angular_component_tag 'opce-custom-modal-overlay'
+            end
           end
         end
       end