Merge branch 'bugfixes' into 'develop'
Fix pipeline, fix emoji selector position See merge request soapbox-pub/soapbox!2278
This commit is contained in:
commit
01952c8fad
3 changed files with 6 additions and 3 deletions
|
@ -1,9 +1,8 @@
|
|||
import { Portal } from '@reach/portal';
|
||||
import React, { useState, useEffect, useRef } from 'react';
|
||||
|
||||
import { simpleEmojiReact } from 'soapbox/actions/emoji-reacts';
|
||||
import { openModal } from 'soapbox/actions/modals';
|
||||
import { EmojiSelector } from 'soapbox/components/ui';
|
||||
import { EmojiSelector, Portal } from 'soapbox/components/ui';
|
||||
import { useAppDispatch, useAppSelector, useOwnAccount, useSoapboxConfig } from 'soapbox/hooks';
|
||||
import { isUserTouching } from 'soapbox/is-mobile';
|
||||
import { getReactForStatus } from 'soapbox/utils/emoji-reacts';
|
||||
|
|
|
@ -43,6 +43,8 @@ interface IEmojiSelector {
|
|||
placement?: Placement
|
||||
/** Whether the selector should be visible. */
|
||||
visible?: boolean
|
||||
/** X/Y offset of the floating picker. */
|
||||
offset?: [number, number]
|
||||
/** Whether to allow any emoji to be chosen. */
|
||||
all?: boolean
|
||||
}
|
||||
|
@ -54,6 +56,7 @@ const EmojiSelector: React.FC<IEmojiSelector> = ({
|
|||
onReact,
|
||||
placement = 'top',
|
||||
visible = false,
|
||||
offset = [-10, 0],
|
||||
all = true,
|
||||
}): JSX.Element => {
|
||||
const soapboxConfig = useSoapboxConfig();
|
||||
|
@ -80,7 +83,7 @@ const EmojiSelector: React.FC<IEmojiSelector> = ({
|
|||
{
|
||||
name: 'offset',
|
||||
options: {
|
||||
offset: [-10, 12],
|
||||
offset,
|
||||
},
|
||||
},
|
||||
],
|
||||
|
|
|
@ -41,6 +41,7 @@ function ChatMessageReactionWrapper(props: IChatMessageReactionWrapper) {
|
|||
referenceElement={referenceElement}
|
||||
onReact={handleSelect}
|
||||
onClose={() => setIsOpen(false)}
|
||||
offset={[-10, 12]}
|
||||
all={false}
|
||||
/>
|
||||
</React.Fragment>
|
||||
|
|
Loading…
Reference in a new issue