moon
/
soapbox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix ComposeForm collapsing when clicking within emoji picker

This commit is contained in:
Alex Gleason 2022-07-13 20:41:39 -05:00
parent a8ebbc15c8
commit 8534cabc0a
No known key found for this signature in database
GPG Key ID: 7211D1F99744FBB7
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/soapbox/features/compose/components/compose_form.js
View File

@ -124,7 +124,7 @@ class ComposeForm extends ImmutablePureComponent {
// FIXME: Make this less brittle // FIXME: Make this less brittle
this.getClickableArea(), this.getClickableArea(),
document.querySelector('.privacy-dropdown__dropdown'), document.querySelector('.privacy-dropdown__dropdown'),
document.querySelector('.emoji-picker-dropdown__menu'), document.querySelector('em-emoji-picker'),
document.getElementById('modal-overlay'), document.getElementById('modal-overlay'),
].some(element => element?.contains(e.target)); ].some(element => element?.contains(e.target));
} }

3
app/soapbox/features/emoji/components/emoji_picker_dropdown.tsx
View File

@ -1,4 +1,3 @@
import classNames from 'classnames';
import { supportsPassiveEvents } from 'detect-passive-events'; import { supportsPassiveEvents } from 'detect-passive-events';
import React, { useEffect, useState, useLayoutEffect } from 'react'; import React, { useEffect, useState, useLayoutEffect } from 'react';
import { createPortal } from 'react-dom'; import { createPortal } from 'react-dom';
@ -208,7 +207,7 @@ const EmojiPickerDropdown: React.FC<IEmojiPickerDropdown> = ({ custom_emojis, fr
{createPortal( {createPortal(
<div <div
className={classNames({ 'z-1000': true })} className='z-50'
ref={setPopperElement} ref={setPopperElement}
style={style} style={style}
{...attributes.popper} {...attributes.popper}