Skip to content

Fix multi-select values in metadata not removable (Safari) #1496

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
Arnei wants to merge 1 commit into
base: r/19.x
Choose a base branch
from
Open

Fix multi-select values in metadata not removable (Safari) #1496

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
29 changes: 14 additions & 15 deletions src/components/shared/wizard/RenderMultiField.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,27 +206,26 @@ const ShowValue = ({
showCheck,
onBlur,
}: {
setEditMode: (e: boolean) => void
setEditMode: (e: boolean) => void
form: FieldProps["form"]
field: FieldProps["field"]
showCheck: boolean,
onBlur: () => void
}) => {
return (
<div
tabIndex={0}
onClick={() => setEditMode(true)}
onFocus={() => setEditMode(true)} // <-- activate edit mode on focus
onKeyDown={e => {
if (e.key === "Enter" || e.key === " ") {
setEditMode(true);
e.preventDefault();
}
}}

onBlur={onBlur}
className="show-edit"
>
<div
tabIndex={0}
onClick={() => setEditMode(true)}
onFocus={() => setEditMode(true)} // <-- activate edit mode on focus
onKeyDown={e => {
if (e.key === "Enter" || e.key === " ") {
setEditMode(true);
e.preventDefault();
}
}}
onBlur={onBlur}
className="show-edit"
>
{field.value instanceof Array && field.value.length !== 0 ? (
<ul>
{field.value.map((item, key) => (
Expand Down
28 changes: 18 additions & 10 deletions src/hooks/wizardHooks.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,16 +113,24 @@ export const useClickOutsideField = (
childRef.current.focus();
}

const handleBlur = (e: FocusEvent) => {
// Check if blur moves to an element outside childRef
if (childRef.current && !childRef.current.contains(e.relatedTarget as Node)) {
setEditMode(false);
}
};

if (childRef.current) {
childRef.current.addEventListener("blur", handleBlur, true); // capture phase
}
/* TODO: Fix handleBlur
This is supposed to handle blur for tab navigation, which it does.
But it also triggers on mouse clicks that are inside the field, causing
unintended blurs and sometimes other elements besides the input element
to not work. A proper fix should properly set edit mode to false when the
field is left via keyboard navigation, but not set edit mode to false when
the user is clicking inside of the field.
*/
// const handleBlur = (e: FocusEvent) => {
// // Check if blur moves to an element outside childRef
// if (childRef.current && !childRef.current.contains(e.relatedTarget as Node)) {
// setEditMode(false);
// }
// };

// if (childRef.current) {
// childRef.current.addEventListener("blur", handleBlur, true); // capture phase
// }

// Adding event listener for detecting click outside
window.addEventListener("mousedown", handleClickOutside);
Expand Down