Skip to content

Fix: the ability to use a custom button via buttonRef prop was broken. #45

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
some1-in-here wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix: the ability to use a custom button via buttonRef prop was broken. #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5693722
fix: ability to use custom button via buttonRef prop
some1-in-here Oct 29, 2023
3992957
fix: during unmounting we may not have the buttonRef.current element.
some1-in-here Oct 31, 2023
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
29 changes: 19 additions & 10 deletions src/components/emoji-picker-button.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,30 @@ import React, { useEffect, useRef, useState } from "react";
* @return {JSX.Element}
*/
function EmojiPickerButton({ showPicker, toggleShowPicker, buttonElement, buttonRef }) {

const [typeButton, setTypeButton] = useState(/** @type {"OWN" | "REF" | "CUSTOM_CONTENT" | "IDLE"} */ "IDLE");
const localButtonRef = useRef(null);
const [showCustomButtonContent, setShowCustomButtonContent] = useState(false);

useEffect(() => {
if ((buttonRef?.current?.childNodes?.length ?? 0) > 2) {
localButtonRef.current.appendChild(buttonRef.current.childNodes[0]);
setShowCustomButtonContent(true);
} else if ((buttonElement?.childNodes?.length ?? 0) > 2) {
if (!buttonRef && !buttonElement) {
setTypeButton("OWN");
return;
}

if (buttonRef && buttonRef.current) {
buttonRef.current.addEventListener("click", toggleShowPicker);
setTypeButton("REF");
return () => {
if (!buttonRef.current) return;
return buttonRef.current.removeEventListener("click", toggleShowPicker);
}
}
else if ((buttonElement?.childNodes?.length ?? 0) >= 2) {
localButtonRef.current.appendChild(buttonElement?.childNodes[0]);
setShowCustomButtonContent(true);
setTypeButton("CUSTOM_CONTENT");
}
}, [buttonElement?.childNodes]);
}, [buttonRef, buttonElement, buttonElement?.childNodes])

return (
return ( typeButton !== "IDLE" && typeButton !== "REF" &&
<button
ref={localButtonRef}
type="button"
Expand All @@ -38,7 +47,7 @@ function EmojiPickerButton({ showPicker, toggleShowPicker, buttonElement, button
}`}
onClick={toggleShowPicker}
>
{!showCustomButtonContent && (
{typeButton === "OWN" && (
<svg
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 24 24"
Expand Down
38 changes: 17 additions & 21 deletions src/components/emoji-picker-wrapper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,6 @@ const EmojiPickerWrapper = props => {
}

/**
*
* @param {React.MouseEvent} event
* @return {'above' | 'below'}
*/
Expand Down Expand Up @@ -150,26 +149,23 @@ const EmojiPickerWrapper = props => {
}, [buttonRef, buttonElement]);

return customButton ? (
(ReactDOM.createPortal(
<>
<EmojiPickerContainer
showPicker={showPicker}
theme={theme}
handleSelectEmoji={handleSelectEmoji}
disableRecent={disableRecent}
customEmojis={customEmojis}
position={emojiPickerPosition}
language={language}
/>
<EmojiPickerButton
showPicker={showPicker}
toggleShowPicker={toggleShowPicker}
buttonElement={customButton}
buttonRef={buttonRef}
/>
</>,
customButton
))
<>
<EmojiPickerContainer
showPicker={showPicker}
theme={theme}
handleSelectEmoji={handleSelectEmoji}
disableRecent={disableRecent}
customEmojis={customEmojis}
position={emojiPickerPosition}
language={language}
/>
<EmojiPickerButton
showPicker={showPicker}
toggleShowPicker={toggleShowPicker}
buttonElement={customButton}
buttonRef={buttonRef}
/>
</>
) : (
(<>
<EmojiPickerContainer
Expand Down