diff --git a/apps/roam/src/components/canvas/DiscourseNodeUtil.tsx b/apps/roam/src/components/canvas/DiscourseNodeUtil.tsx index ddd45fbd1..5322374e7 100644 --- a/apps/roam/src/components/canvas/DiscourseNodeUtil.tsx +++ b/apps/roam/src/components/canvas/DiscourseNodeUtil.tsx @@ -21,7 +21,7 @@ import { toDomPrecision, TLAnyShapeUtilConstructor, } from "tldraw"; -import React, { useState, useEffect, useRef, useMemo } from "react"; +import React, { useEffect, useRef, useMemo } from "react"; import { useExtensionAPI } from "roamjs-components/components/ExtensionApiContext"; import isLiveBlock from "roamjs-components/queries/isLiveBlock"; import updateBlock from "roamjs-components/writes/updateBlock"; @@ -41,7 +41,6 @@ import { loadImage } from "~/utils/loadImage"; import { getRelationColor } from "./DiscourseRelationShape/DiscourseRelationUtil"; import { getPersonalSetting } from "~/components/settings/utils/accessors"; import { PERSONAL_KEYS } from "~/components/settings/utils/settingKeys"; -import DiscourseContextOverlay from "~/components/DiscourseContextOverlay"; import { getDiscourseNodeColors } from "~/utils/getDiscourseNodeColors"; import { render as renderToast } from "roamjs-components/components/Toast"; import { RenderRoamBlockString } from "~/utils/roamReactComponents"; @@ -449,16 +448,9 @@ export class DiscourseNodeUtil extends BaseBoxShapeUtil { const { canvasSettings: { alias = "", "key-image": isKeyImage = "" } = {}, } = discourseContext.nodes[getDiscourseNodeTypeId({ shape })] || {}; - // eslint-disable-next-line react-hooks/rules-of-hooks - const isOverlayEnabled = useMemo( - () => getPersonalSetting([PERSONAL_KEYS.overlayInCanvas]), - [], - ); const isEditing = this.editor.getEditingShapeId() === shape.id; // eslint-disable-next-line react-hooks/rules-of-hooks - const [overlayMounted, setOverlayMounted] = useState(false); - // eslint-disable-next-line react-hooks/rules-of-hooks const dialogRenderedRef = useRef(false); // Detect discourse node tags in block text for blck-node shapes @@ -613,7 +605,6 @@ export class DiscourseNodeUtil extends BaseBoxShapeUtil { maxHeight: shape.props.h, boxSizing: "border-box", }} - onPointerEnter={() => setOverlayMounted(true)} >
{ fontSize: FONT_SIZES[shape.props.size], }} > - {overlayMounted && isOverlayEnabled && ( -
e.stopPropagation()} - > - -
- )} {showEmbeddedRoamBlock ? (
- { - void setSetting(DISCOURSE_CONTEXT_OVERLAY_IN_CANVAS_KEY, checked); - }} - /> ([ [pathKey([PERSONAL_KEYS.disableSidebarOpen]), "disable-sidebar-open"], [pathKey([PERSONAL_KEYS.hideFeedbackButton]), "hide-feedback-button"], [pathKey([PERSONAL_KEYS.autoCanvasRelations]), "auto-canvas-relations"], - [ - pathKey([PERSONAL_KEYS.overlayInCanvas]), - "discourse-context-overlay-in-canvas", - ], [pathKey([PERSONAL_KEYS.streamlineStyling]), "streamline-styling"], [pathKey([PERSONAL_KEYS.disableProductDiagnostics]), "disallow-diagnostics"], [pathKey([PERSONAL_KEYS.discourseToolShortcut]), "discourse-tool-shortcut"], diff --git a/apps/roam/src/components/settings/utils/settingKeys.ts b/apps/roam/src/components/settings/utils/settingKeys.ts index 1dcec7bf0..ef5a46b45 100644 --- a/apps/roam/src/components/settings/utils/settingKeys.ts +++ b/apps/roam/src/components/settings/utils/settingKeys.ts @@ -23,7 +23,6 @@ export const PERSONAL_KEYS = { disableSidebarOpen: "Disable sidebar open", hideFeedbackButton: "Hide feedback button", autoCanvasRelations: "Auto canvas relations", - overlayInCanvas: "Overlay in canvas", streamlineStyling: "Streamline styling", disableProductDiagnostics: "Disable product diagnostics", discourseToolShortcut: "Discourse tool shortcut", diff --git a/apps/roam/src/components/settings/utils/zodSchema.example.ts b/apps/roam/src/components/settings/utils/zodSchema.example.ts index 58fc827da..68705d672 100644 --- a/apps/roam/src/components/settings/utils/zodSchema.example.ts +++ b/apps/roam/src/components/settings/utils/zodSchema.example.ts @@ -363,7 +363,6 @@ const personalSettings: PersonalSettings = { "Node search menu trigger": "//", "Discourse tool shortcut": { modifiers: 0, key: "d" }, "Discourse context overlay": true, - "Overlay in canvas": false, "Text selection popup": true, "Disable sidebar open": false, "Hide feedback button": false, @@ -395,7 +394,6 @@ const defaultPersonalSettings: PersonalSettings = { "Node search menu trigger": "", "Discourse tool shortcut": { modifiers: 0, key: "" }, "Discourse context overlay": false, - "Overlay in canvas": false, "Text selection popup": true, "Disable sidebar open": false, "Hide feedback button": false, diff --git a/apps/roam/src/components/settings/utils/zodSchema.ts b/apps/roam/src/components/settings/utils/zodSchema.ts index 7f6e0d592..9fb5cf7a3 100644 --- a/apps/roam/src/components/settings/utils/zodSchema.ts +++ b/apps/roam/src/components/settings/utils/zodSchema.ts @@ -248,7 +248,6 @@ export const PersonalSettingsSchema = z.object({ .default({ modifiers: 0, key: "" }), "Discourse context overlay": z.boolean().default(false), "Reified relation triples": z.boolean().default(true), - "Overlay in canvas": z.boolean().default(false), "Text selection popup": z.boolean().default(true), "Disable sidebar open": z.boolean().default(false), "Hide feedback button": z.boolean().default(false), diff --git a/apps/roam/src/data/userSettings.ts b/apps/roam/src/data/userSettings.ts index 9954dd3b3..6cc478438 100644 --- a/apps/roam/src/data/userSettings.ts +++ b/apps/roam/src/data/userSettings.ts @@ -6,8 +6,6 @@ export const QUERY_BUILDER_SETTINGS_KEY = "query-builder-settings"; export const AUTO_CANVAS_RELATIONS_KEY = "auto-canvas-relations"; export const DISCOURSE_TOOL_SHORTCUT_KEY = "discourse-tool-shortcut"; export const CANVAS_NODE_SHORTCUTS_KEY = "canvas-node-shortcuts"; -export const DISCOURSE_CONTEXT_OVERLAY_IN_CANVAS_KEY = - "discourse-context-overlay-in-canvas"; export const STREAMLINE_STYLING_KEY = "streamline-styling"; export const DISALLOW_DIAGNOSTICS = "disallow-diagnostics"; export const USE_STORED_RELATIONS = "use-reified-relations"; // "use-reified-relations" is legacy terminology, but we keep it for backwards compatibility