From b0476c701783e466ce4bb436e5c9af8a36fbec2d Mon Sep 17 00:00:00 2001 From: Adorian Doran Date: Thu, 20 Nov 2025 18:49:47 +0200 Subject: [PATCH] client/note color picker: refactor --- .../{NoteColorPickerMenuItem.css => NoteColorPicker.css} | 0 .../{NoteColorPickerMenuItem.tsx => NoteColorPicker.tsx} | 2 +- apps/client/src/menus/tree_context_menu.ts | 4 ++-- apps/client/src/widgets/collections/board/context_menu.ts | 4 ++-- apps/client/src/widgets/collections/calendar/context_menu.ts | 4 ++-- apps/client/src/widgets/collections/geomap/context_menu.ts | 4 ++-- apps/client/src/widgets/collections/table/context_menu.ts | 4 ++-- 7 files changed, 11 insertions(+), 11 deletions(-) rename apps/client/src/menus/custom-items/{NoteColorPickerMenuItem.css => NoteColorPicker.css} (100%) rename apps/client/src/menus/custom-items/{NoteColorPickerMenuItem.tsx => NoteColorPicker.tsx} (99%) diff --git a/apps/client/src/menus/custom-items/NoteColorPickerMenuItem.css b/apps/client/src/menus/custom-items/NoteColorPicker.css similarity index 100% rename from apps/client/src/menus/custom-items/NoteColorPickerMenuItem.css rename to apps/client/src/menus/custom-items/NoteColorPicker.css diff --git a/apps/client/src/menus/custom-items/NoteColorPickerMenuItem.tsx b/apps/client/src/menus/custom-items/NoteColorPicker.tsx similarity index 99% rename from apps/client/src/menus/custom-items/NoteColorPickerMenuItem.tsx rename to apps/client/src/menus/custom-items/NoteColorPicker.tsx index c74f83919..0c0941adc 100644 --- a/apps/client/src/menus/custom-items/NoteColorPickerMenuItem.tsx +++ b/apps/client/src/menus/custom-items/NoteColorPicker.tsx @@ -1,4 +1,4 @@ -import "./NoteColorPickerMenuItem.css"; +import "./NoteColorPicker.css"; import { t } from "../../services/i18n"; import { useCallback, useEffect, useRef, useState} from "preact/hooks"; import {ComponentChildren} from "preact"; diff --git a/apps/client/src/menus/tree_context_menu.ts b/apps/client/src/menus/tree_context_menu.ts index b02eaf970..35480cfc6 100644 --- a/apps/client/src/menus/tree_context_menu.ts +++ b/apps/client/src/menus/tree_context_menu.ts @@ -1,4 +1,4 @@ -import NoteColorPickerMenuItem from "./custom-items/NoteColorPickerMenuItem.jsx"; +import NoteColorPicker from "./custom-items/NoteColorPicker.jsx"; import treeService from "../services/tree.js"; import froca from "../services/froca.js"; import clipboard from "../services/clipboard.js"; @@ -264,7 +264,7 @@ export default class TreeContextMenu implements SelectMenuItemEventListener { if (notOptionsOrHelp && selectedNotes.length === 1) { - return NoteColorPickerMenuItem({note}); + return NoteColorPicker({note}); } else { return null; } diff --git a/apps/client/src/widgets/collections/board/context_menu.ts b/apps/client/src/widgets/collections/board/context_menu.ts index 551e96a49..c834b4c8d 100644 --- a/apps/client/src/widgets/collections/board/context_menu.ts +++ b/apps/client/src/widgets/collections/board/context_menu.ts @@ -1,5 +1,5 @@ import FNote from "../../../entities/fnote"; -import NoteColorPickerMenuItem from "../../../menus/custom-items/NoteColorPickerMenuItem"; +import NoteColorPicker from "../../../menus/custom-items/NoteColorPicker"; import contextMenu, { ContextMenuEvent } from "../../../menus/context_menu"; import link_context_menu from "../../../menus/link_context_menu"; import attributes from "../../../services/attributes"; @@ -78,7 +78,7 @@ export function openNoteContextMenu(api: Api, event: ContextMenuEvent, note: FNo { kind: "separator" }, { kind: "custom", - componentFn: () => NoteColorPickerMenuItem({note}) + componentFn: () => NoteColorPicker({note}) } ], selectMenuItemHandler: ({ command }) => link_context_menu.handleLinkContextMenuItem(command, note.noteId), diff --git a/apps/client/src/widgets/collections/calendar/context_menu.ts b/apps/client/src/widgets/collections/calendar/context_menu.ts index 5120fcc97..0195d131c 100644 --- a/apps/client/src/widgets/collections/calendar/context_menu.ts +++ b/apps/client/src/widgets/collections/calendar/context_menu.ts @@ -1,4 +1,4 @@ -import NoteColorPickerMenuItem from "../../../menus/custom-items/NoteColorPickerMenuItem"; +import NoteColorPicker from "../../../menus/custom-items/NoteColorPicker"; import FNote from "../../../entities/fnote"; import contextMenu, { ContextMenuEvent } from "../../../menus/context_menu"; import link_context_menu from "../../../menus/link_context_menu"; @@ -40,7 +40,7 @@ export function openCalendarContextMenu(e: ContextMenuEvent, noteId: string, par { kind: "separator" }, { kind: "custom", - componentFn: () => NoteColorPickerMenuItem({note: noteId}) + componentFn: () => NoteColorPicker({note: noteId}) } ], selectMenuItemHandler: ({ command }) => link_context_menu.handleLinkContextMenuItem(command, noteId), diff --git a/apps/client/src/widgets/collections/geomap/context_menu.ts b/apps/client/src/widgets/collections/geomap/context_menu.ts index c4cf6ebf4..f4161fad9 100644 --- a/apps/client/src/widgets/collections/geomap/context_menu.ts +++ b/apps/client/src/widgets/collections/geomap/context_menu.ts @@ -2,7 +2,7 @@ import type { LatLng, LeafletMouseEvent } from "leaflet"; import appContext, { type CommandMappings } from "../../../components/app_context.js"; import contextMenu, { type MenuItem } from "../../../menus/context_menu.js"; import linkContextMenu from "../../../menus/link_context_menu.js"; -import NoteColorPickerMenuItem from "../../../menus/custom-items/NoteColorPickerMenuItem.jsx"; +import NoteColorPicker from "../../../menus/custom-items/NoteColorPicker.jsx"; import { t } from "../../../services/i18n.js"; import { createNewNote } from "./api.js"; import { copyTextWithToast } from "../../../services/clipboard_ext.js"; @@ -23,7 +23,7 @@ export default function openContextMenu(noteId: string, e: LeafletMouseEvent, is { kind: "separator"}, { kind: "custom", - componentFn: () => NoteColorPickerMenuItem({note: noteId}) + componentFn: () => NoteColorPicker({note: noteId}) } ]; } diff --git a/apps/client/src/widgets/collections/table/context_menu.ts b/apps/client/src/widgets/collections/table/context_menu.ts index 1218dbf6c..80b1c93c2 100644 --- a/apps/client/src/widgets/collections/table/context_menu.ts +++ b/apps/client/src/widgets/collections/table/context_menu.ts @@ -7,7 +7,7 @@ import link_context_menu from "../../../menus/link_context_menu.js"; import froca from "../../../services/froca.js"; import branches from "../../../services/branches.js"; import Component from "../../../components/component.js"; -import NoteColorPickerMenuItem from "../../../menus/custom-items/NoteColorPickerMenuItem.jsx"; +import NoteColorPicker from "../../../menus/custom-items/NoteColorPicker.jsx"; import { RefObject } from "preact"; export function useContextMenu(parentNote: FNote, parentComponent: Component | null | undefined, tabulator: RefObject): Partial { @@ -224,7 +224,7 @@ export function showRowContextMenu(parentComponent: Component, e: MouseEvent, ro { kind: "separator"}, { kind: "custom", - componentFn: () => NoteColorPickerMenuItem({note: rowData.noteId}) + componentFn: () => NoteColorPicker({note: rowData.noteId}) } ], selectMenuItemHandler: ({ command }) => link_context_menu.handleLinkContextMenuItem(command, rowData.noteId),