Skip to content

A fully open source & end-to-end encrypted note taking alternative to Evernote.

editor: add special readonly mode for toolbar (#3913)

Muhammad Ali8a6b97c7574b
diff --git a/apps/web/src/components/editor/index.tsx b/apps/web/src/components/editor/index.tsx
index 42615a451..8a191043a 100644
--- a/apps/web/src/components/editor/index.tsx
+++ b/apps/web/src/components/editor/index.tsx
@@ -557,7 +557,7 @@ function EditorChrome(
<Box
id="editorToolbar"
sx={{
- display: readonly ? "none" : "flex",
+ display: "flex",
bg: "background",
position: "sticky",
top: 0,
diff --git a/packages/editor/src/toolbar/tool-definitions.ts b/packages/editor/src/toolbar/tool-definitions.ts
index d90c8e615..4b268eacd 100644
--- a/packages/editor/src/toolbar/tool-definitions.ts
+++ b/packages/editor/src/toolbar/tool-definitions.ts
@@ -375,6 +375,16 @@ export const MOBILE_STATIC_TOOLBAR_GROUPS: ToolbarDefinition = [
[...STATIC_TOOLBAR_GROUPS[0], "previewAttachment"]
];
+export const READONLY_MOBILE_STATIC_TOOLBAR_GROUPS: ToolbarDefinition = [
+ [
+ "imageSettings",
+ "attachmentSettings",
+ "linkSettings",
+ "webclipSettings",
+ "previewAttachment"
+ ]
+];
+
const defaultPresets: Record<"default" | "minimal", ToolbarDefinition> = {
default: [
[
diff --git a/packages/editor/src/toolbar/toolbar.tsx b/packages/editor/src/toolbar/toolbar.tsx
index 2ec8f089a..73e9606a7 100644
--- a/packages/editor/src/toolbar/toolbar.tsx
+++ b/packages/editor/src/toolbar/toolbar.tsx
@@ -21,7 +21,8 @@ import { Flex, FlexProps } from "@theme-ui/components";
import {
getDefaultPresets,
STATIC_TOOLBAR_GROUPS,
- MOBILE_STATIC_TOOLBAR_GROUPS
+ MOBILE_STATIC_TOOLBAR_GROUPS,
+ READONLY_MOBILE_STATIC_TOOLBAR_GROUPS
} from "./tool-definitions";
import { useEffect, useMemo } from "react";
import { Editor } from "../types";
@@ -57,7 +58,9 @@ export function Toolbar(props: ToolbarProps) {
const toolbarTools = useMemo(
() =>
isMobile
- ? [...MOBILE_STATIC_TOOLBAR_GROUPS, ...tools]
+ ? editor?.current?.isEditable
+ ? [...MOBILE_STATIC_TOOLBAR_GROUPS, ...tools]
+ : READONLY_MOBILE_STATIC_TOOLBAR_GROUPS
: [...STATIC_TOOLBAR_GROUPS, ...tools],
[tools, isMobile]
);
diff --git a/packages/editor/src/toolbar/tools/attachment.tsx b/packages/editor/src/toolbar/tools/attachment.tsx
index b284434f3..e37571ef1 100644
--- a/packages/editor/src/toolbar/tools/attachment.tsx
+++ b/packages/editor/src/toolbar/tools/attachment.tsx
@@ -38,7 +38,11 @@ export function AttachmentSettings(props: ToolProps) {
{...props}
autoCloseOnUnmount
popupId="attachmentSettings"
- tools={["downloadAttachment", "removeAttachment"]}
+ tools={
+ editor.isEditable
+ ? ["downloadAttachment"]
+ : ["downloadAttachment", "removeAttachment"]
+ }
/>
);
}
diff --git a/packages/editor/src/toolbar/tools/image.tsx b/packages/editor/src/toolbar/tools/image.tsx
index 99d8e19d6..7f1db764d 100644
--- a/packages/editor/src/toolbar/tools/image.tsx
+++ b/packages/editor/src/toolbar/tools/image.tsx
@@ -42,20 +42,22 @@ export function ImageSettings(props: ToolProps) {
autoCloseOnUnmount
popupId="imageSettings"
tools={
- findSelectedNode(editor, "image")?.attrs?.float
- ? [
- "downloadAttachment",
- "imageAlignLeft",
- "imageAlignRight",
- "imageProperties"
- ]
- : [
- "downloadAttachment",
- "imageAlignLeft",
- "imageAlignCenter",
- "imageAlignRight",
- "imageProperties"
- ]
+ editor.isEditable
+ ? findSelectedNode(editor, "image")?.attrs?.float
+ ? [
+ "downloadAttachment",
+ "imageAlignLeft",
+ "imageAlignRight",
+ "imageProperties"
+ ]
+ : [
+ "downloadAttachment",
+ "imageAlignLeft",
+ "imageAlignCenter",
+ "imageAlignRight",
+ "imageProperties"
+ ]
+ : ["downloadAttachment"]
}
/>
);
diff --git a/packages/editor/src/toolbar/tools/link.tsx b/packages/editor/src/toolbar/tools/link.tsx
index 039cba17d..99f07ff50 100644
--- a/packages/editor/src/toolbar/tools/link.tsx
+++ b/packages/editor/src/toolbar/tools/link.tsx
@@ -34,7 +34,6 @@ export function LinkSettings(props: ToolProps) {
const { editor } = props;
const isBottom = useToolbarLocation() === "bottom";
if (!editor.isActive("link") || !isBottom) return null;
- if (!editor.isEditable && isBottom) return null;
return (
<MoreTools
@@ -42,7 +41,11 @@ export function LinkSettings(props: ToolProps) {
autoOpen
autoCloseOnUnmount
popupId="linkSettings"
- tools={["openLink", "editLink", "removeLink", "copyLink"]}
+ tools={
+ editor.isEditable
+ ? ["openLink", "editLink", "removeLink", "copyLink"]
+ : ["openLink", "copyLink"]
+ }
/>
);
}