Build your personal knowledge base with Trilium Notes
TypeScript electronelectron-appknowledge-baseknowledge-graphknowledge-managementknowledge-management-graphlocal-firstnote-managmentnote-takernote-takingnotebooknotesnotes-apppersonal-knowledge-basepersonal-wikiscriptableself-hostedself-hostingwiki
refactor(code): remove the unused editor background plumbing
Elian Doran843777e6e1ef
diff --git a/apps/client/src/widgets/type_widgets/code/BackendLog.tsx b/apps/client/src/widgets/type_widgets/code/BackendLog.tsxindex aa0c71bbd4..f8442e469a 100644--- a/apps/client/src/widgets/type_widgets/code/BackendLog.tsx+++ b/apps/client/src/widgets/type_widgets/code/BackendLog.tsx@@ -10,7 +10,7 @@ import { useNote, useNoteLabelOptionalBool, useTriliumEvent } from "../../react/import { TypeWidgetProps } from "../type_widget";import { CodeEditor } from "./Code";-export default function BackendLog({ ntxId, parentComponent }: TypeWidgetProps) {+export default function BackendLog({ ntxId }: TypeWidgetProps) {const [ content, setContent ] = useState<string>();const editorRef = useRef<CodeMirror>(null);const note = useNote("_backendLog");@@ -47,7 +47,7 @@ export default function BackendLog({ ntxId, parentComponent }: TypeWidgetProps)<div className="backend-log-editor-container"><CodeEditoreditorRef={editorRef}- ntxId={ntxId} parentComponent={parentComponent}+ ntxId={ntxId}content={content ?? ""}mime={MIME_TYPE_TRILIUM_LOG}readOnlydiff --git a/apps/client/src/widgets/type_widgets/code/Code.tsx b/apps/client/src/widgets/type_widgets/code/Code.tsxindex bb649e7e87..9e00c37c47 100644--- a/apps/client/src/widgets/type_widgets/code/Code.tsx+++ b/apps/client/src/widgets/type_widgets/code/Code.tsx@@ -17,12 +17,7 @@ import { TypeWidgetProps } from "../type_widget";import CodeMirror, { CodeMirrorProps } from "./CodeMirror";import { useSnippetSlashCommands } from "./snippets";-interface CodeEditorProps {- /** By default, the code editor will try to match the color of the scrolling container to match the one from the theme for a full-screen experience. If the editor is embedded, it makes sense not to have this behaviour. */- noBackgroundChange?: boolean;-}--export interface EditableCodeProps extends TypeWidgetProps, Omit<CodeEditorProps, "onContentChanged"> {+export interface EditableCodeProps extends TypeWidgetProps {// if true, the update will be debounced to prevent excessive updates. Especially useful if the editor is linked to a live preview.debounceUpdate?: boolean;lineWrapping?: boolean;@@ -37,7 +32,7 @@ export interface EditableCodeProps extends TypeWidgetProps, Omit<CodeEditorPropseditorRef?: Ref<VanillaCodeMirror>;}-export function ReadOnlyCode({ note, viewScope, ntxId, noteContext, parentComponent, editorRef }: TypeWidgetProps & { editorRef?: Ref<VanillaCodeMirror> }) {+export function ReadOnlyCode({ note, viewScope, ntxId, noteContext, editorRef }: TypeWidgetProps & { editorRef?: Ref<VanillaCodeMirror> }) {const [ content, setContent ] = useState("");const blob = useNoteBlob(note);// Read reactively so switching the language from the dropdown re-highlights live, rather than@@ -64,7 +59,7 @@ export function ReadOnlyCode({ note, viewScope, ntxId, noteContext, parentComponreturn (<CodeEditor- ntxId={ntxId} parentComponent={parentComponent}+ ntxId={ntxId}editorRef={editorRef}className="note-detail-readonly-code-content"content={content}@@ -157,7 +152,7 @@ export function EditableCode({ note, ntxId, noteContext, debounceUpdate, parentCreturn (<CodeEditor- ntxId={ntxId} parentComponent={parentComponent}+ ntxId={ntxId}editorRef={combinedEditorRef} containerRef={containerRef}mime={mime ?? "text/plain"}customRequestHandler={customRequestHandler != null}@@ -182,7 +177,7 @@ export function EditableCode({ note, ntxId, noteContext, debounceUpdate, parentC);}-export function CodeEditor({ parentComponent, ntxId, containerRef: externalContainerRef, editorRef: externalEditorRef, mime, onInitialized, lineWrapping, noBackgroundChange, ...editorProps }: CodeEditorProps & CodeMirrorProps & Pick<TypeWidgetProps, "parentComponent" | "ntxId">) {+export function CodeEditor({ ntxId, containerRef: externalContainerRef, editorRef: externalEditorRef, mime, onInitialized, lineWrapping, ...editorProps }: CodeMirrorProps & Pick<TypeWidgetProps, "ntxId">) {const codeEditorRef = useRef<VanillaCodeMirror>(null);const containerRef = useSyncedRef(externalContainerRef);const initialized = useRef($.Deferred());@@ -199,24 +194,12 @@ export function CodeEditor({ parentComponent, ntxId, containerRef: externalConta? (colorScheme === "dark" ? darkTheme : lightTheme): codeNoteTheme;- // React to background color.- const [ backgroundColor, setBackgroundColor ] = useState<string>();- useEffect(() => {- if (!backgroundColor || noBackgroundChange) return;- parentComponent?.$widget.closest(".scrolling-container").css("--code-background-color", backgroundColor);- }, [ backgroundColor ]);-// React to theme changes.useEffect(() => {if (codeEditorRef.current && effectiveTheme.startsWith(DEFAULT_PREFIX)) {const theme = getThemeById(effectiveTheme.substring(DEFAULT_PREFIX.length));if (theme) {- codeEditorRef.current.setTheme(theme).then(() => {- const editor = containerRef.current?.querySelector(".cm-editor");- if (!editor) return;- const style = window.getComputedStyle(editor);- setBackgroundColor(style.backgroundColor);- });+ codeEditorRef.current.setTheme(theme);}}}, [ codeEditorRef, effectiveTheme ]);diff --git a/apps/client/src/widgets/type_widgets/code/code.css b/apps/client/src/widgets/type_widgets/code/code.cssindex 00107127e0..dcaad4cf6b 100644--- a/apps/client/src/widgets/type_widgets/code/code.css+++ b/apps/client/src/widgets/type_widgets/code/code.css@@ -22,15 +22,6 @@height: 100%;padding: 0 !important;}--.note-detail:not(.full-height) {- > .note-detail-code .note-detail-code-editor,- > .note-detail-readonly-code .note-detail-readonly-code-content {- border-end-start-radius: var(--center-pane-border-radius);- border-end-end-radius: var(--center-pane-border-radius);- overflow: hidden;- }-}/* #endregion *//* #region Backend log */@@ -48,3 +39,12 @@.note-split.type-code .note-list {margin-top: 1em;}++.note-detail:not(.full-height) {+ > .note-detail-code .note-detail-code-editor,+ > .note-detail-readonly-code .note-detail-readonly-code-content {+ border-end-start-radius: var(--center-pane-border-radius);+ border-end-end-radius: var(--center-pane-border-radius);+ overflow: hidden;+ }+}diff --git a/apps/client/src/widgets/type_widgets/helpers/SplitEditor.tsx b/apps/client/src/widgets/type_widgets/helpers/SplitEditor.tsxindex a104c9f1b0..12fca12130 100644--- a/apps/client/src/widgets/type_widgets/helpers/SplitEditor.tsx+++ b/apps/client/src/widgets/type_widgets/helpers/SplitEditor.tsx@@ -82,7 +82,6 @@ export default function SplitEditor({ note, noteContext, error, previewStale, spnoteContext={noteContext}lineWrapping={false}updateInterval={750} debounceUpdate- noBackgroundChange{...editorProps}/>)}</div>