Skip to content

Fixed search input colours and click outside to close #1973

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
weylandswart wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fixed search input colours and click outside to close #1973

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion packages/koenig-lexical/src/components/ui/EmojiPickerPortal.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@ import Portal from './Portal';
import PropTypes from 'prop-types';
import React from 'react';
import defaultData from '@emoji-mart/data';
import {useClickOutside} from '../../hooks/useClickOutside';

const EmojiPickerPortal = ({
onEmojiClick,
onClickOutside,
positionRef,
data = defaultData,
autoFocus = true,
Expand All @@ -30,6 +32,7 @@ const EmojiPickerPortal = ({
...props
}) => {
const [position, setPosition] = React.useState(null);
const pickerRef = React.useRef(null);
const {darkMode} = React.useContext(KoenigComposerContext);

const shiftPixels = 35; // how many pixels we want to move it up when it's at the bottom of the screen
Expand Down Expand Up @@ -59,6 +62,8 @@ const EmojiPickerPortal = ({
};
}, [handleScroll]);

useClickOutside(!!onClickOutside, pickerRef, onClickOutside);

if (!position) {
return null;
}
Expand Down Expand Up @@ -101,7 +106,7 @@ const EmojiPickerPortal = ({

return (
<Portal>
<div className='z-20 mr-9 mt-10 rounded-md bg-white' data-testid="emoji-picker-container" style={style} onClick={handleClick}>
<div ref={pickerRef} className='z-20 mr-9 mt-10 rounded-md bg-white' data-testid="emoji-picker-container" style={style} onClick={handleClick}>
<div className=''>
<Picker // https://github.com/missive/emoji-mart#-picker
data={data}
Expand All @@ -118,6 +123,7 @@ export default EmojiPickerPortal;

EmojiPickerPortal.propTypes = {
onEmojiClick: PropTypes.func.isRequired,
onClickOutside: PropTypes.func,
positionRef: PropTypes.object,
data: PropTypes.array,
autoFocus: PropTypes.bool,
Expand Down
2 changes: 1 addition & 1 deletion packages/koenig-lexical/src/components/ui/cards/CalloutCard.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ export function CalloutCard({
isEditing && showEmojiPicker && (
<EmojiPickerPortal
positionRef={emojiButtonRef}
togglePortal={toggleEmojiPicker}
onClickOutside={() => setShowEmojiPicker(false)}
onEmojiClick={changeEmoji} />
)
}
Expand Down
4 changes: 2 additions & 2 deletions packages/koenig-lexical/src/styles/components/koenig-lexical.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
/* --grey-950 */
--rgb-background: 35, 41, 47;
/* --grey-300 */
--rgb-color: 221, 225, 229;
--rgb-color: 255, 255, 255;
/* --grey-900 */
--rgb-input: 57, 64, 71;
}
Expand Down Expand Up @@ -92,7 +92,7 @@ em-emoji-picker {
/* --background-rgb: 85, 170, 255; */
--font-size: 13px;
--rgb-accent: 57, 64, 71;
--rgb-color: 174, 183, 193;
--rgb-color: 57, 64, 71;
--em-rgb-accent: (255,0,0)
/* --rgb-input: 255, 235, 235; */;
--shadow: 0 0 1px rgba(0,0,0,.05), 0 5px 18px rgba(0,0,0,.08);
Expand Down
Loading