Skip to content

Commit 5f1f98d

Browse files
Merge pull request #2008 from betagouv/feat/click-outside-close-panel#1993
feat: Conv - Lot 4 Panneau d'affichage des brouillons de recommandation#2004
2 parents 826d27d + d7567a9 commit 5f1f98d

5 files changed

Lines changed: 39 additions & 2 deletions

File tree

recoco/apps/conversations/templates/conversations/messages/fragments/resource_preview_panel.html

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,14 @@
44
{% endcomment %}
55
<template x-if="$store.resourcePreviewPanel.isOpen">
66
<div x-data="{ closePanel() { $store.resourcePreviewPanel.close(); $store.sharedContentsPanel && $store.sharedContentsPanel.reopenIfNeeded(); } }">
7-
<div class="resource-preview-panel" @keydown.escape.window="closePanel()">
7+
<div class="resource-preview-panel__backdrop backdrop-overlay"
8+
@click="closePanel()"></div>
9+
<div class="resource-preview-panel"
10+
role="dialog"
11+
aria-modal="true"
12+
aria-label="Détail de la recommandation"
13+
x-trap.inert="$store.resourcePreviewPanel.isOpen"
14+
@keydown.escape.window="closePanel()">
815
<!-- Header -->
916
<div class="resource-preview-panel__header">
1017
<button type="button"

recoco/apps/conversations/templates/conversations/messages/fragments/shared_contents_panel.html

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,17 @@
55
{% endcomment %}
66
<template x-if="$store.sharedContentsPanel.isOpen">
77
<div>
8+
<div class="shared-contents-panel__backdrop backdrop-overlay"
9+
@click="$store.sharedContentsPanel.close()"></div>
810
<div class="shared-contents-panel"
11+
role="dialog"
12+
aria-modal="true"
13+
aria-labelledby="shared-contents-panel-title"
14+
x-trap.inert="$store.sharedContentsPanel.isOpen"
915
@keydown.escape.window="$store.sharedContentsPanel.close()">
1016
<!-- Header -->
1117
<div class="shared-contents-panel__header">
12-
<h2 class="shared-contents-panel__title">Contenus partagés</h2>
18+
<h2 id="shared-contents-panel-title" class="shared-contents-panel__title">Contenus partagés</h2>
1319
<button type="button"
1420
class="shared-contents-panel__close-btn fr-btn--close fr-btn"
1521
aria-label="Fermer"

recoco/frontend/src/css/DSFR/custom-dsfr.scss

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -541,6 +541,20 @@ form > p {
541541
display: inline;
542542
}
543543

544+
/* ¯¯¯¯¯ *\
545+
BACKDROP
546+
\* ˍˍˍˍˍˍ */
547+
548+
.backdrop-overlay {
549+
position: fixed;
550+
top: 0;
551+
left: 0;
552+
right: 0;
553+
bottom: 0;
554+
background: rgba(0, 0, 0, 0.5);
555+
cursor: pointer;
556+
}
557+
544558
/* ¯¯¯ *\
545559
UTILS
546560
\* ˍˍˍ */

recoco/frontend/src/css/projects/fragments/resource_preview_panel.scss

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
// Resource Preview Panel - Overlay panel for recommendation resource display
22
// Used in conversation page when clicking a recommendation with resource
33

4+
// Backdrop overlay for click-outside-to-close
5+
.resource-preview-panel__backdrop {
6+
z-index: 2099;
7+
}
8+
49
.resource-preview-panel {
510
position: fixed;
611
top: 0;

recoco/frontend/src/css/projects/fragments/shared_contents_panel.scss

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
// Shared Contents Panel - Overlay panel displaying recommendations and files shared in conversation
22
// Used in conversation page, accessible from left panel or above messages
33

4+
// Backdrop overlay for click-outside-to-close
5+
.shared-contents-panel__backdrop {
6+
z-index: 1999;
7+
}
8+
49
.shared-contents-panel {
510
position: fixed;
611
top: 0;

0 commit comments

Comments
 (0)