diff --git a/apps/client/src/widgets/FloatingButtonsDefinitions.tsx b/apps/client/src/widgets/FloatingButtonsDefinitions.tsx index efc60482e..651f82f05 100644 --- a/apps/client/src/widgets/FloatingButtonsDefinitions.tsx +++ b/apps/client/src/widgets/FloatingButtonsDefinitions.tsx @@ -64,7 +64,15 @@ export const MOBILE_FLOATING_BUTTONS: FloatingButtonsList = [ RelationMapButtons, ExportImageButtons, Backlinks -] +]; + +/** + * Floating buttons that should be hidden in popup editor (Quick edit). + */ +export const POPUP_HIDDEN_FLOATING_BUTTONS: FloatingButtonsList = [ + InAppHelpButton, + ToggleReadOnlyButton +]; function RefreshBackendLogButton({ note, parentComponent, noteContext, isDefaultViewMode }: FloatingButtonContext) { const isEnabled = (note.noteId === "_backendLog" || note.type === "render") && isDefaultViewMode; @@ -102,7 +110,7 @@ function ToggleReadOnlyButton({ note, viewType, isDefaultViewMode }: FloatingBut function EditButton({ note, noteContext }: FloatingButtonContext) { const [animationClass, setAnimationClass] = useState(""); const {isReadOnly, enableEditing} = useIsNoteReadOnly(note, noteContext); - + const isReadOnlyInfoBarDismissed = false; // TODO useEffect(() => { diff --git a/apps/client/src/widgets/dialogs/PopupEditor.tsx b/apps/client/src/widgets/dialogs/PopupEditor.tsx index 1db0b24bd..eeec76a9c 100644 --- a/apps/client/src/widgets/dialogs/PopupEditor.tsx +++ b/apps/client/src/widgets/dialogs/PopupEditor.tsx @@ -1,4 +1,4 @@ -import { useContext, useEffect, useRef, useState } from "preact/hooks"; +import { useContext, useEffect, useMemo, useRef, useState } from "preact/hooks"; import Modal from "../react/Modal"; import "./PopupEditor.css"; import { useNoteContext, useTriliumEvent } from "../react/hooks"; @@ -13,13 +13,18 @@ import StandaloneRibbonAdapter from "../ribbon/components/StandaloneRibbonAdapte import FormattingToolbar from "../ribbon/FormattingToolbar"; import PromotedAttributes from "../PromotedAttributes"; import FloatingButtons from "../FloatingButtons"; -import { DESKTOP_FLOATING_BUTTONS, MOBILE_FLOATING_BUTTONS } from "../FloatingButtonsDefinitions"; +import { DESKTOP_FLOATING_BUTTONS, MOBILE_FLOATING_BUTTONS, POPUP_HIDDEN_FLOATING_BUTTONS } from "../FloatingButtonsDefinitions"; import utils from "../../services/utils"; export default function PopupEditor() { const [ shown, setShown ] = useState(false); const parentComponent = useContext(ParentComponent); const [ noteContext, setNoteContext ] = useState(new NoteContext("_popup-editor")); + const isMobile = utils.isMobile(); + const items = useMemo(() => { + const baseItems = isMobile ? MOBILE_FLOATING_BUTTONS : DESKTOP_FLOATING_BUTTONS; + return baseItems.filter(item => !POPUP_HIDDEN_FLOATING_BUTTONS.includes(item)); + }, [ isMobile ]); useTriliumEvent("openInPopup", async ({ noteIdOrPath }) => { const noteContext = new NoteContext("_popup-editor"); @@ -54,7 +59,7 @@ export default function PopupEditor() { > - +