From 9d5a57521e58823f7d8e17c7a9d7776c5e0bc672 Mon Sep 17 00:00:00 2001 From: Aman Harwara Date: Wed, 23 Nov 2022 20:16:43 +0530 Subject: [PATCH] fix: change editor button icon & selection --- .../Components/ChangeEditor/ChangeEditorButton.tsx | 4 +++- .../Components/ChangeEditor/ChangeEditorMenu.tsx | 6 +++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/packages/web/src/javascripts/Components/ChangeEditor/ChangeEditorButton.tsx b/packages/web/src/javascripts/Components/ChangeEditor/ChangeEditorButton.tsx index 42dd7f8ed..ce390953a 100644 --- a/packages/web/src/javascripts/Components/ChangeEditor/ChangeEditorButton.tsx +++ b/packages/web/src/javascripts/Components/ChangeEditor/ChangeEditorButton.tsx @@ -26,7 +26,9 @@ const ChangeEditorButton: FunctionComponent = ({ const [selectedEditor, setSelectedEditor] = useState(() => { return note ? application.componentManager.editorForNote(note) : undefined }) - const [selectedEditorIcon, selectedEditorIconTint] = getIconAndTintForNoteType(selectedEditor?.package_info.note_type) + const [selectedEditorIcon, selectedEditorIconTint] = getIconAndTintForNoteType( + note?.noteType || selectedEditor?.package_info.note_type, + ) const [isClickOutsideDisabled, setIsClickOutsideDisabled] = useState(false) const toggleMenu = useCallback(async () => { diff --git a/packages/web/src/javascripts/Components/ChangeEditor/ChangeEditorMenu.tsx b/packages/web/src/javascripts/Components/ChangeEditor/ChangeEditorMenu.tsx index f9c042934..9b1480194 100644 --- a/packages/web/src/javascripts/Components/ChangeEditor/ChangeEditorMenu.tsx +++ b/packages/web/src/javascripts/Components/ChangeEditor/ChangeEditorMenu.tsx @@ -59,7 +59,11 @@ const ChangeEditorMenu: FunctionComponent = ({ return item.component?.identifier === currentComponent.identifier } - return item.noteType === note?.noteType || (!note?.noteType && item.noteType === NoteType.Plain) + const itemNoteTypeIsSameAsCurrentNoteType = item.noteType === note?.noteType + const noteDoesntHaveTypeAndItemIsPlain = !note?.noteType && item.noteType === NoteType.Plain + const unknownNoteTypeAndItemIsPlain = note?.noteType === NoteType.Unknown && item.noteType === NoteType.Plain + + return itemNoteTypeIsSameAsCurrentNoteType || noteDoesntHaveTypeAndItemIsPlain || unknownNoteTypeAndItemIsPlain }, [currentComponent, note], )