From 8534cabc0a0ab7bee5914c27c3d6c45e16d383c6 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Wed, 13 Jul 2022 20:41:39 -0500
Subject: [PATCH] Fix ComposeForm collapsing when clicking within emoji picker

---
 app/soapbox/features/compose/components/compose_form.js        | 2 +-
 .../features/emoji/components/emoji_picker_dropdown.tsx        | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/soapbox/features/compose/components/compose_form.js b/app/soapbox/features/compose/components/compose_form.js
index ac816850a..e7ba24e6a 100644
--- a/app/soapbox/features/compose/components/compose_form.js
+++ b/app/soapbox/features/compose/components/compose_form.js
@@ -124,7 +124,7 @@ class ComposeForm extends ImmutablePureComponent {
       // FIXME: Make this less brittle
       this.getClickableArea(),
       document.querySelector('.privacy-dropdown__dropdown'),
-      document.querySelector('.emoji-picker-dropdown__menu'),
+      document.querySelector('em-emoji-picker'),
       document.getElementById('modal-overlay'),
     ].some(element => element?.contains(e.target));
   }
diff --git a/app/soapbox/features/emoji/components/emoji_picker_dropdown.tsx b/app/soapbox/features/emoji/components/emoji_picker_dropdown.tsx
index 6845a2957..639c9ca64 100644
--- a/app/soapbox/features/emoji/components/emoji_picker_dropdown.tsx
+++ b/app/soapbox/features/emoji/components/emoji_picker_dropdown.tsx
@@ -1,4 +1,3 @@
-import classNames from 'classnames';
 import { supportsPassiveEvents } from 'detect-passive-events';
 import React, { useEffect, useState, useLayoutEffect } from 'react';
 import { createPortal } from 'react-dom';
@@ -208,7 +207,7 @@ const EmojiPickerDropdown: React.FC<IEmojiPickerDropdown> = ({ custom_emojis, fr
 
       {createPortal(
         <div
-          className={classNames({ 'z-1000': true })}
+          className='z-50'
           ref={setPopperElement}
           style={style}
           {...attributes.popper}