fix: revert closeOnBlur changes

This commit is contained in:
Antonella Sgarlatta
2021-05-07 17:46:08 -03:00
parent 6a6e1708d6
commit dd5873b513
4 changed files with 9 additions and 27 deletions

View File

@@ -12,18 +12,20 @@ import {
type Props = {
appState: AppState;
closeOnBlur: (event: { relatedTarget: EventTarget | null }) => void;
blurLocked: boolean;
setLockCloseOnBlur: (lock: boolean) => void;
};
export const NotesOptions = observer(
({ appState, closeOnBlur, blurLocked, setLockCloseOnBlur }: Props) => {
({ appState, closeOnBlur, setLockCloseOnBlur }: Props) => {
const [tagsMenuOpen, setTagsMenuOpen] = useState(false);
const [tagsMenuPosition, setTagsMenuPosition] = useState({
top: 0,
right: 0,
});
const [shouldTrashNotes, setShouldTrashNotes] = useState(false);
const [lockedBlurAction, setLockedBlurAction] = useState<
Promise<void> | null
>(null);
const [shouldRunLockedBlurAction, setShouldRunLockedBlurAction] = useState(false);
const notes = Object.values(appState.notes.selectedNotes);
const hidePreviews = !notes.some((note) => !note.hidePreview);
@@ -41,23 +43,6 @@ export const NotesOptions = observer(
'cursor-pointer hover:bg-contrast color-text bg-transparent px-3 ' +
'text-left';
useEffect(() => {
const openTrashAlert = async () => {
if (shouldTrashNotes && blurLocked) {
setShouldTrashNotes(false);
await appState.notes.setTrashSelectedNotes(!trashed, trashButtonRef);
setLockCloseOnBlur(false);
}
};
openTrashAlert();
}, [
appState.notes,
blurLocked,
setLockCloseOnBlur,
shouldTrashNotes,
trashed,
]);
return (
<>
<Switch
@@ -186,7 +171,8 @@ export const NotesOptions = observer(
onBlur={closeOnBlur}
className={`${buttonClass} py-1.5`}
onClick={async () => {
setShouldTrashNotes(true);
setLockCloseOnBlur(true);
await appState.notes.setTrashSelectedNotes(!trashed, trashButtonRef);
setLockCloseOnBlur(true);
}}
>