From 8770afa211424a09c447eccb7f6892ff08de4bb7 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sat, 4 Apr 2026 12:25:07 +0300 Subject: [PATCH] fix(ckeditor): changes in icon package structure --- apps/client/src/widgets/type_widgets/text/toolbar.ts | 2 +- packages/ckeditor5-math/src/ui/mainformview.ts | 3 +-- packages/ckeditor5/src/extra_slash_commands.ts | 6 +----- .../ckeditor5/src/plugins/file_upload/progressbarview.ts | 4 ++-- 4 files changed, 5 insertions(+), 10 deletions(-) diff --git a/apps/client/src/widgets/type_widgets/text/toolbar.ts b/apps/client/src/widgets/type_widgets/text/toolbar.ts index ae008d43de..b5ef750a1f 100644 --- a/apps/client/src/widgets/type_widgets/text/toolbar.ts +++ b/apps/client/src/widgets/type_widgets/text/toolbar.ts @@ -1,6 +1,6 @@ import utils from "../../../services/utils.js"; import options from "../../../services/options.js"; -import IconAlignCenter from "@ckeditor/ckeditor5-icons/theme/icons/align-center.svg?raw"; +import { IconAlignCenter } from "@ckeditor/ckeditor5-icons"; const TEXT_FORMATTING_GROUP = { label: "Text formatting", diff --git a/packages/ckeditor5-math/src/ui/mainformview.ts b/packages/ckeditor5-math/src/ui/mainformview.ts index 52d3b05120..c5989cfbd4 100644 --- a/packages/ckeditor5-math/src/ui/mainformview.ts +++ b/packages/ckeditor5-math/src/ui/mainformview.ts @@ -1,6 +1,5 @@ import { ButtonView, FocusCycler, FocusTracker, KeystrokeHandler, LabelView, submitHandler, SwitchButtonView, View, ViewCollection, type FocusableView, type Locale } from 'ckeditor5'; -import IconCheck from "@ckeditor/ckeditor5-icons/theme/icons/check.svg?raw"; -import IconCancel from "@ckeditor/ckeditor5-icons/theme/icons/cancel.svg?raw"; +import { IconCheck, IconCancel } from "@ckeditor/ckeditor5-icons"; import { extractDelimiters, hasDelimiters } from '../utils.js'; import MathView, { type MathViewOptions } from './mathview.js'; import MathInputView from './mathinputview.js'; diff --git a/packages/ckeditor5/src/extra_slash_commands.ts b/packages/ckeditor5/src/extra_slash_commands.ts index 142ce50523..ee6068dc3d 100644 --- a/packages/ckeditor5/src/extra_slash_commands.ts +++ b/packages/ckeditor5/src/extra_slash_commands.ts @@ -1,11 +1,7 @@ import type { Editor } from 'ckeditor5'; import type { SlashCommandEditorConfig } from 'ckeditor5-premium-features'; import { icons as footnoteIcons } from '@triliumnext/ckeditor5-footnotes'; -import IconPageBreak from "@ckeditor/ckeditor5-icons/theme/icons/page-break.svg?raw"; -import IconAlignLeft from "@ckeditor/ckeditor5-icons/theme/icons/align-left.svg?raw"; -import IconAlignCenter from "@ckeditor/ckeditor5-icons/theme/icons/align-center.svg?raw"; -import IconAlignRight from "@ckeditor/ckeditor5-icons/theme/icons/align-right.svg?raw"; -import IconAlignJustify from "@ckeditor/ckeditor5-icons/theme/icons/align-justify.svg?raw"; +import { IconPageBreak, IconAlignLeft, IconAlignCenter, IconAlignRight, IconAlignJustify } from "@ckeditor/ckeditor5-icons"; import bxInfoCircle from "boxicons/svg/regular/bx-info-circle.svg?raw"; import bxBulb from "boxicons/svg/regular/bx-bulb.svg?raw"; import bxCommentError from "boxicons/svg/regular/bx-comment-error.svg?raw"; diff --git a/packages/ckeditor5/src/plugins/file_upload/progressbarview.ts b/packages/ckeditor5/src/plugins/file_upload/progressbarview.ts index 24d5a1a356..2e48f361de 100644 --- a/packages/ckeditor5/src/plugins/file_upload/progressbarview.ts +++ b/packages/ckeditor5/src/plugins/file_upload/progressbarview.ts @@ -1,4 +1,4 @@ -import cancelIcon from '@ckeditor/ckeditor5-core/theme/icons/cancel.svg?raw'; +import { IconCancel } from '@ckeditor/ckeditor5-icons'; import { ButtonView, Locale, toUnit, View } from 'ckeditor5'; const toPx = toUnit('%'); @@ -54,7 +54,7 @@ export default class ProgressBarView extends View { _createCancelButton(locale: Locale) { const view = new ButtonView(locale); view.set({ - icon: cancelIcon, + icon: IconCancel, tooltip: true, label: 'Cancel', //@ts-expect-error Object literal may only specify known properties, and 'attributes' does not exist in type