From 1fb329565fcd520a68ff8760885a3450d088a4f2 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Fri, 19 Sep 2025 17:40:24 +0300 Subject: [PATCH] chore(react/type_widget): move old widgets --- apps/client/src/components/app_context.ts | 4 ++-- apps/client/src/components/note_context.ts | 2 +- apps/client/src/layouts/layout_commons.tsx | 4 ++-- apps/client/src/layouts/mobile_layout.tsx | 2 +- apps/client/src/widgets/NoteDetail.tsx | 3 +++ apps/client/src/widgets/dialogs/add_link.tsx | 2 +- apps/client/src/widgets/dialogs/include_note.tsx | 4 ++-- apps/client/src/widgets/dialogs/popup_editor.ts | 2 +- .../client/src/widgets/{note_detail.ts => note_detail.ts.bak} | 0 apps/client/src/widgets/ribbon/BasicPropertiesTab.tsx | 4 ++-- apps/client/src/widgets/type_widgets/Empty.tsx | 0 .../abstract_code_type_widget.ts | 0 .../abstract_split_type_widget.ts | 0 .../abstract_svg_split_type_widget.ts | 0 .../abstract_text_type_widget.ts | 0 .../src/widgets/{type_widgets => type_widgets_old}/ai_chat.ts | 0 .../{type_widgets => type_widgets_old}/attachment_detail.ts | 0 .../{type_widgets => type_widgets_old}/attachment_list.ts | 0 .../src/widgets/{type_widgets => type_widgets_old}/book.ts | 0 .../src/widgets/{type_widgets => type_widgets_old}/canvas.ts | 0 .../widgets/{type_widgets => type_widgets_old}/canvas_el.tsx | 0 .../{type_widgets => type_widgets_old}/ckeditor/config.ts | 0 .../ckeditor/mobile_editor_toolbar.css | 0 .../ckeditor/mobile_editor_toolbar.tsx | 0 .../{type_widgets => type_widgets_old}/ckeditor/snippets.ts | 0 .../ckeditor/toolbar.spec.ts | 0 .../{type_widgets => type_widgets_old}/ckeditor/toolbar.ts | 0 .../{type_widgets => type_widgets_old}/content/backend_log.ts | 0 .../{type_widgets => type_widgets_old}/content_widget.tsx | 0 .../src/widgets/{type_widgets => type_widgets_old}/doc.ts | 0 .../{type_widgets => type_widgets_old}/editable_code.ts | 0 .../{type_widgets => type_widgets_old}/editable_text.ts | 0 .../src/widgets/{type_widgets => type_widgets_old}/empty.ts | 0 .../src/widgets/{type_widgets => type_widgets_old}/file.ts | 0 .../src/widgets/{type_widgets => type_widgets_old}/image.ts | 0 .../src/widgets/{type_widgets => type_widgets_old}/mermaid.ts | 0 .../widgets/{type_widgets => type_widgets_old}/mind_map.ts | 0 .../src/widgets/{type_widgets => type_widgets_old}/none.ts | 0 .../widgets/{type_widgets => type_widgets_old}/note_map.ts | 0 .../{type_widgets => type_widgets_old}/options/advanced.tsx | 0 .../options/ai_settings.tsx | 0 .../{type_widgets => type_widgets_old}/options/appearance.tsx | 0 .../{type_widgets => type_widgets_old}/options/backup.tsx | 0 .../{type_widgets => type_widgets_old}/options/code_notes.css | 0 .../{type_widgets => type_widgets_old}/options/code_notes.tsx | 0 .../options/components/AutoReadOnlySize.tsx | 0 .../options/components/CheckboxList.tsx | 0 .../options/components/OptionsRow.css | 0 .../options/components/OptionsRow.tsx | 0 .../options/components/OptionsSection.tsx | 0 .../options/components/RelatedSettings.tsx | 0 .../options/components/TimeSelector.tsx | 0 .../{type_widgets => type_widgets_old}/options/etapi.tsx | 0 .../{type_widgets => type_widgets_old}/options/i18n.tsx | 0 .../{type_widgets => type_widgets_old}/options/images.tsx | 0 .../options/multi_factor_authentication.tsx | 0 .../{type_widgets => type_widgets_old}/options/other.tsx | 0 .../{type_widgets => type_widgets_old}/options/password.tsx | 0 .../options/samples/code_note.txt | 0 .../{type_widgets => type_widgets_old}/options/shortcuts.tsx | 0 .../{type_widgets => type_widgets_old}/options/spellcheck.tsx | 0 .../{type_widgets => type_widgets_old}/options/sync.tsx | 0 .../{type_widgets => type_widgets_old}/options/text_notes.tsx | 0 .../{type_widgets => type_widgets_old}/protected_session.ts | 0 .../{type_widgets => type_widgets_old}/read_only_code.ts | 0 .../{type_widgets => type_widgets_old}/read_only_text.ts | 0 .../{type_widgets => type_widgets_old}/relation_map.ts | 0 .../src/widgets/{type_widgets => type_widgets_old}/render.ts | 0 .../widgets/{type_widgets => type_widgets_old}/type_widget.ts | 0 .../widgets/{type_widgets => type_widgets_old}/web_view.ts | 0 70 files changed, 15 insertions(+), 12 deletions(-) rename apps/client/src/widgets/{note_detail.ts => note_detail.ts.bak} (100%) create mode 100644 apps/client/src/widgets/type_widgets/Empty.tsx rename apps/client/src/widgets/{type_widgets => type_widgets_old}/abstract_code_type_widget.ts (100%) rename apps/client/src/widgets/{type_widgets => type_widgets_old}/abstract_split_type_widget.ts (100%) rename apps/client/src/widgets/{type_widgets => type_widgets_old}/abstract_svg_split_type_widget.ts (100%) rename apps/client/src/widgets/{type_widgets => type_widgets_old}/abstract_text_type_widget.ts (100%) rename apps/client/src/widgets/{type_widgets => type_widgets_old}/ai_chat.ts (100%) rename apps/client/src/widgets/{type_widgets => type_widgets_old}/attachment_detail.ts (100%) rename apps/client/src/widgets/{type_widgets => type_widgets_old}/attachment_list.ts (100%) rename apps/client/src/widgets/{type_widgets => type_widgets_old}/book.ts (100%) rename apps/client/src/widgets/{type_widgets => type_widgets_old}/canvas.ts (100%) rename apps/client/src/widgets/{type_widgets => type_widgets_old}/canvas_el.tsx (100%) rename apps/client/src/widgets/{type_widgets => type_widgets_old}/ckeditor/config.ts (100%) rename apps/client/src/widgets/{type_widgets => type_widgets_old}/ckeditor/mobile_editor_toolbar.css (100%) rename apps/client/src/widgets/{type_widgets => type_widgets_old}/ckeditor/mobile_editor_toolbar.tsx (100%) rename apps/client/src/widgets/{type_widgets => type_widgets_old}/ckeditor/snippets.ts (100%) rename apps/client/src/widgets/{type_widgets => type_widgets_old}/ckeditor/toolbar.spec.ts (100%) rename apps/client/src/widgets/{type_widgets => type_widgets_old}/ckeditor/toolbar.ts (100%) rename apps/client/src/widgets/{type_widgets => type_widgets_old}/content/backend_log.ts (100%) rename apps/client/src/widgets/{type_widgets => type_widgets_old}/content_widget.tsx (100%) rename apps/client/src/widgets/{type_widgets => type_widgets_old}/doc.ts (100%) rename apps/client/src/widgets/{type_widgets => type_widgets_old}/editable_code.ts (100%) rename apps/client/src/widgets/{type_widgets => type_widgets_old}/editable_text.ts (100%) rename apps/client/src/widgets/{type_widgets => type_widgets_old}/empty.ts (100%) rename apps/client/src/widgets/{type_widgets => type_widgets_old}/file.ts (100%) rename apps/client/src/widgets/{type_widgets => type_widgets_old}/image.ts (100%) rename apps/client/src/widgets/{type_widgets => type_widgets_old}/mermaid.ts (100%) rename apps/client/src/widgets/{type_widgets => type_widgets_old}/mind_map.ts (100%) rename apps/client/src/widgets/{type_widgets => type_widgets_old}/none.ts (100%) rename apps/client/src/widgets/{type_widgets => type_widgets_old}/note_map.ts (100%) rename apps/client/src/widgets/{type_widgets => type_widgets_old}/options/advanced.tsx (100%) rename apps/client/src/widgets/{type_widgets => type_widgets_old}/options/ai_settings.tsx (100%) rename apps/client/src/widgets/{type_widgets => type_widgets_old}/options/appearance.tsx (100%) rename apps/client/src/widgets/{type_widgets => type_widgets_old}/options/backup.tsx (100%) rename apps/client/src/widgets/{type_widgets => type_widgets_old}/options/code_notes.css (100%) rename apps/client/src/widgets/{type_widgets => type_widgets_old}/options/code_notes.tsx (100%) rename apps/client/src/widgets/{type_widgets => type_widgets_old}/options/components/AutoReadOnlySize.tsx (100%) rename apps/client/src/widgets/{type_widgets => type_widgets_old}/options/components/CheckboxList.tsx (100%) rename apps/client/src/widgets/{type_widgets => type_widgets_old}/options/components/OptionsRow.css (100%) rename apps/client/src/widgets/{type_widgets => type_widgets_old}/options/components/OptionsRow.tsx (100%) rename apps/client/src/widgets/{type_widgets => type_widgets_old}/options/components/OptionsSection.tsx (100%) rename apps/client/src/widgets/{type_widgets => type_widgets_old}/options/components/RelatedSettings.tsx (100%) rename apps/client/src/widgets/{type_widgets => type_widgets_old}/options/components/TimeSelector.tsx (100%) rename apps/client/src/widgets/{type_widgets => type_widgets_old}/options/etapi.tsx (100%) rename apps/client/src/widgets/{type_widgets => type_widgets_old}/options/i18n.tsx (100%) rename apps/client/src/widgets/{type_widgets => type_widgets_old}/options/images.tsx (100%) rename apps/client/src/widgets/{type_widgets => type_widgets_old}/options/multi_factor_authentication.tsx (100%) rename apps/client/src/widgets/{type_widgets => type_widgets_old}/options/other.tsx (100%) rename apps/client/src/widgets/{type_widgets => type_widgets_old}/options/password.tsx (100%) rename apps/client/src/widgets/{type_widgets => type_widgets_old}/options/samples/code_note.txt (100%) rename apps/client/src/widgets/{type_widgets => type_widgets_old}/options/shortcuts.tsx (100%) rename apps/client/src/widgets/{type_widgets => type_widgets_old}/options/spellcheck.tsx (100%) rename apps/client/src/widgets/{type_widgets => type_widgets_old}/options/sync.tsx (100%) rename apps/client/src/widgets/{type_widgets => type_widgets_old}/options/text_notes.tsx (100%) rename apps/client/src/widgets/{type_widgets => type_widgets_old}/protected_session.ts (100%) rename apps/client/src/widgets/{type_widgets => type_widgets_old}/read_only_code.ts (100%) rename apps/client/src/widgets/{type_widgets => type_widgets_old}/read_only_text.ts (100%) rename apps/client/src/widgets/{type_widgets => type_widgets_old}/relation_map.ts (100%) rename apps/client/src/widgets/{type_widgets => type_widgets_old}/render.ts (100%) rename apps/client/src/widgets/{type_widgets => type_widgets_old}/type_widget.ts (100%) rename apps/client/src/widgets/{type_widgets => type_widgets_old}/web_view.ts (100%) diff --git a/apps/client/src/components/app_context.ts b/apps/client/src/components/app_context.ts index ce33d1447..49fab20c0 100644 --- a/apps/client/src/components/app_context.ts +++ b/apps/client/src/components/app_context.ts @@ -21,8 +21,8 @@ import type LoadResults from "../services/load_results.js"; import type { Attribute } from "../services/attribute_parser.js"; import type NoteTreeWidget from "../widgets/note_tree.js"; import type { default as NoteContext, GetTextEditorCallback } from "./note_context.js"; -import type TypeWidget from "../widgets/type_widgets/type_widget.js"; -import type EditableTextTypeWidget from "../widgets/type_widgets/editable_text.js"; +import type TypeWidget from "../widgets/type_widgets_old/type_widget.js"; +import type EditableTextTypeWidget from "../widgets/type_widgets_old/editable_text.js"; import type { NativeImage, TouchBar } from "electron"; import TouchBarComponent from "./touch_bar.js"; import type { CKTextEditor } from "@triliumnext/ckeditor5"; diff --git a/apps/client/src/components/note_context.ts b/apps/client/src/components/note_context.ts index 1bc4e5498..219711738 100644 --- a/apps/client/src/components/note_context.ts +++ b/apps/client/src/components/note_context.ts @@ -9,7 +9,7 @@ import hoistedNoteService from "../services/hoisted_note.js"; import options from "../services/options.js"; import type { ViewScope } from "../services/link.js"; import type FNote from "../entities/fnote.js"; -import type TypeWidget from "../widgets/type_widgets/type_widget.js"; +import type TypeWidget from "../widgets/type_widgets_old/type_widget.js"; import type { CKTextEditor } from "@triliumnext/ckeditor5"; import type CodeMirror from "@triliumnext/codemirror"; import { closeActiveDialog } from "../services/dialog.js"; diff --git a/apps/client/src/layouts/layout_commons.tsx b/apps/client/src/layouts/layout_commons.tsx index 292006011..7f187baa0 100644 --- a/apps/client/src/layouts/layout_commons.tsx +++ b/apps/client/src/layouts/layout_commons.tsx @@ -26,11 +26,11 @@ import PopupEditorDialog from "../widgets/dialogs/popup_editor.js"; import FlexContainer from "../widgets/containers/flex_container.js"; import NoteIconWidget from "../widgets/note_icon"; import PromotedAttributesWidget from "../widgets/promoted_attributes.js"; -import NoteDetailWidget from "../widgets/note_detail.js"; import CallToActionDialog from "../widgets/dialogs/call_to_action.jsx"; import NoteTitleWidget from "../widgets/note_title.jsx"; import { PopupEditorFormattingToolbar } from "../widgets/ribbon/FormattingToolbar.js"; import NoteList from "../widgets/collections/NoteList.jsx"; +import NoteDetail from "../widgets/NoteDetail.jsx"; export function applyModals(rootContainer: RootContainer) { rootContainer @@ -65,7 +65,7 @@ export function applyModals(rootContainer: RootContainer) { .child()) .child() .child(new PromotedAttributesWidget()) - .child(new NoteDetailWidget()) + .child() .child()) .child(); } diff --git a/apps/client/src/layouts/mobile_layout.tsx b/apps/client/src/layouts/mobile_layout.tsx index 1bc944418..a825d8061 100644 --- a/apps/client/src/layouts/mobile_layout.tsx +++ b/apps/client/src/layouts/mobile_layout.tsx @@ -13,7 +13,7 @@ import PromotedAttributesWidget from "../widgets/promoted_attributes.js"; import SidebarContainer from "../widgets/mobile_widgets/sidebar_container.js"; import type AppContext from "../components/app_context.js"; import TabRowWidget from "../widgets/tab_row.js"; -import MobileEditorToolbar from "../widgets/type_widgets/ckeditor/mobile_editor_toolbar.js"; +import MobileEditorToolbar from "../widgets/type_widgets_old/ckeditor/mobile_editor_toolbar.js"; import { applyModals } from "./layout_commons.js"; import FilePropertiesTab from "../widgets/ribbon/FilePropertiesTab.jsx"; import { useNoteContext } from "../widgets/react/hooks.jsx"; diff --git a/apps/client/src/widgets/NoteDetail.tsx b/apps/client/src/widgets/NoteDetail.tsx index c45a11fa7..bdc35bf61 100644 --- a/apps/client/src/widgets/NoteDetail.tsx +++ b/apps/client/src/widgets/NoteDetail.tsx @@ -11,6 +11,9 @@ import NoteContext from "../components/note_context"; */ type ExtendedNoteType = Exclude | "empty" | "readOnlyCode" | "readOnlyText" | "editableText" | "editableCode" | "attachmentDetail" | "attachmentList" | "protectedSession" | "aiChat"; +/** + * The note detail is in charge of rendering the content of a note, by determining its type (e.g. text, code) and using the appropriate view widget. + */ export default function NoteDetail() { const { note, type } = useNoteInfo(); diff --git a/apps/client/src/widgets/dialogs/add_link.tsx b/apps/client/src/widgets/dialogs/add_link.tsx index 97440491d..6128dca94 100644 --- a/apps/client/src/widgets/dialogs/add_link.tsx +++ b/apps/client/src/widgets/dialogs/add_link.tsx @@ -6,7 +6,7 @@ import NoteAutocomplete from "../react/NoteAutocomplete"; import { useRef, useState, useEffect } from "preact/hooks"; import tree from "../../services/tree"; import note_autocomplete, { Suggestion } from "../../services/note_autocomplete"; -import { default as TextTypeWidget } from "../type_widgets/editable_text.js"; +import { default as TextTypeWidget } from "../type_widgets_old/editable_text.js"; import { logError } from "../../services/ws"; import FormGroup from "../react/FormGroup.js"; import { refToJQuerySelector } from "../react/react_utils"; diff --git a/apps/client/src/widgets/dialogs/include_note.tsx b/apps/client/src/widgets/dialogs/include_note.tsx index 911ed0dc0..dc3498430 100644 --- a/apps/client/src/widgets/dialogs/include_note.tsx +++ b/apps/client/src/widgets/dialogs/include_note.tsx @@ -8,7 +8,7 @@ import Button from "../react/Button"; import { Suggestion, triggerRecentNotes } from "../../services/note_autocomplete"; import tree from "../../services/tree"; import froca from "../../services/froca"; -import EditableTextTypeWidget, { type BoxSize } from "../type_widgets/editable_text"; +import EditableTextTypeWidget, { type BoxSize } from "../type_widgets_old/editable_text"; import { useTriliumEvent } from "../react/hooks"; export default function IncludeNoteDialog() { @@ -83,4 +83,4 @@ async function includeNote(notePath: string, textTypeWidget: EditableTextTypeWid } else { textTypeWidget.addIncludeNote(noteId, boxSize); } -} \ No newline at end of file +} diff --git a/apps/client/src/widgets/dialogs/popup_editor.ts b/apps/client/src/widgets/dialogs/popup_editor.ts index 3c06dd5df..0ec6adfeb 100644 --- a/apps/client/src/widgets/dialogs/popup_editor.ts +++ b/apps/client/src/widgets/dialogs/popup_editor.ts @@ -3,7 +3,7 @@ import NoteContext from "../../components/note_context.js"; import { openDialog } from "../../services/dialog.js"; import BasicWidget from "../basic_widget.js"; import Container from "../containers/container.js"; -import TypeWidget from "../type_widgets/type_widget.js"; +import TypeWidget from "../type_widgets_old/type_widget.js"; const TPL = /*html*/`\