From fa96569ef21cf6f90892cf7cb12b244d1f7f9005 Mon Sep 17 00:00:00 2001
From: Bianca Nenciu <nbianca@users.noreply.github.com>
Date: Mon, 20 Mar 2023 18:17:04 +0200
Subject: [PATCH] FIX: Do not show user tips over composer (#20708)

---
 app/assets/javascripts/discourse/app/lib/user-tips.js | 3 +++
 app/assets/stylesheets/common/base/user-tips.scss     | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/app/assets/javascripts/discourse/app/lib/user-tips.js b/app/assets/javascripts/discourse/app/lib/user-tips.js
index df27654a90e..bc1ceea1758 100644
--- a/app/assets/javascripts/discourse/app/lib/user-tips.js
+++ b/app/assets/javascripts/discourse/app/lib/user-tips.js
@@ -24,6 +24,7 @@ export function showUserTip(options) {
     hideOnClick: false,
     trigger: "manual",
     theme: "user-tips",
+    zIndex: "",
 
     // It must be interactive to make buttons work.
     interactive: true,
@@ -55,6 +56,8 @@ export function showUserTip(options) {
       </div>`,
 
     onCreate(instance) {
+      instance.popper.classList.add("user-tip");
+
       instance.popper
         .querySelector(".btn-dismiss")
         .addEventListener("click", (event) => {
diff --git a/app/assets/stylesheets/common/base/user-tips.scss b/app/assets/stylesheets/common/base/user-tips.scss
index ae1f511825a..e1cea033358 100644
--- a/app/assets/stylesheets/common/base/user-tips.scss
+++ b/app/assets/stylesheets/common/base/user-tips.scss
@@ -1,3 +1,7 @@
+.user-tip {
+  z-index: z("composer", "content") - 1;
+}
+
 .user-tip-container {
   min-width: 300px;
   padding: 0.5em;