From a3b487009218849f350baa99448fb11590ddfa70 Mon Sep 17 00:00:00 2001 From: Sabda Yagra Date: Fri, 23 Jan 2026 18:47:24 +0700 Subject: [PATCH] fix: merge dev-1 --- .../(admin)/admin/tenants/[id]/edit/page.tsx | 2 +- components/icons.tsx | 34 +++++------ .../ckeditor5-utils/src/collection.d.ts | 5 -- .../@ckeditor/ckeditor5-utils/src/diff.d.ts | 4 -- .../ckeditor5-utils/src/difftochanges.d.ts | 4 -- .../ckeditor5-utils/src/dom/emittermixin.d.ts | 6 -- .../ckeditor5-utils/src/dom/position.d.ts | 4 -- .../ckeditor5-utils/src/emittermixin.d.ts | 7 --- .../ckeditor5-utils/src/fastdiff.d.ts | 5 -- .../ckeditor5-utils/src/focustracker.d.ts | 7 --- .../@ckeditor/ckeditor5-utils/src/index.d.ts | 60 ------------------- .../src/inserttopriorityarray.d.ts | 4 -- .../ckeditor5-utils/src/keyboard.d.ts | 4 -- .../ckeditor5-utils/src/keystrokehandler.d.ts | 6 -- .../@ckeditor/ckeditor5-utils/src/locale.d.ts | 6 -- .../ckeditor5-utils/src/observablemixin.d.ts | 5 -- .../src/translation-service.d.ts | 11 +--- .../ckeditor5-widget/src/widgetresize.d.ts | 7 --- .../src/widgetresize/resizer.d.ts | 5 -- .../src/widgetresize/resizerstate.d.ts | 4 -- 20 files changed, 21 insertions(+), 169 deletions(-) diff --git a/app/[locale]/(admin)/admin/tenants/[id]/edit/page.tsx b/app/[locale]/(admin)/admin/tenants/[id]/edit/page.tsx index 5352dcb..2ed7974 100644 --- a/app/[locale]/(admin)/admin/tenants/[id]/edit/page.tsx +++ b/app/[locale]/(admin)/admin/tenants/[id]/edit/page.tsx @@ -6,6 +6,7 @@ import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card"; import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs"; import { ChevronLeftIcon, + EditIcon, SaveIcon, SettingsIcon, UsersIcon, @@ -63,7 +64,6 @@ import { import { PlusIcon, DeleteIcon } from "@/components/icons"; import { errorAutoClose, successAutoClose } from "@/lib/swal"; import { close, loading } from "@/config/swal"; -import { EditIcon } from "lucide-react"; export default function EditTenantPage() { const router = useRouter(); diff --git a/components/icons.tsx b/components/icons.tsx index f67a611..3ae1f3c 100644 --- a/components/icons.tsx +++ b/components/icons.tsx @@ -2977,23 +2977,23 @@ export const ModuleIcon = ({ size = 24, width, height, ...props }: IconSvgProps) ); -// export const EditIcon = ({ size = 24, width, height, ...props }: IconSvgProps) => ( -// -// -// -// -// ); +export const EditIcon = ({ size = 24, width, height, ...props }: IconSvgProps) => ( + + + + +); export const WorkflowIcon = ({ size = 24, width, height, ...props }: IconSvgProps) => ( >>>>>> b6bde7722e19d08349e7b7b7d23bc6a4aef9d5ae }; /** * Collections are ordered sets of objects. Items in the collection can be retrieved by their indexes diff --git a/vendor/ckeditor5/node_modules/@ckeditor/ckeditor5-utils/src/diff.d.ts b/vendor/ckeditor5/node_modules/@ckeditor/ckeditor5-utils/src/diff.d.ts index f5354bf..8a997e1 100644 --- a/vendor/ckeditor5/node_modules/@ckeditor/ckeditor5-utils/src/diff.d.ts +++ b/vendor/ckeditor5/node_modules/@ckeditor/ckeditor5-utils/src/diff.d.ts @@ -22,11 +22,7 @@ */ declare function diff(a: ArrayLike, b: ArrayLike, cmp?: (a: T, b: T) => boolean): Array; declare namespace diff { -<<<<<<< HEAD var fastDiff: typeof import("@ckeditor/ckeditor5-utils/src/fastdiff.js").default; -======= - var fastDiff: typeof import("./fastdiff.js").default; ->>>>>>> b6bde7722e19d08349e7b7b7d23bc6a4aef9d5ae } export default diff; /** diff --git a/vendor/ckeditor5/node_modules/@ckeditor/ckeditor5-utils/src/difftochanges.d.ts b/vendor/ckeditor5/node_modules/@ckeditor/ckeditor5-utils/src/difftochanges.d.ts index e55d5c5..85174f9 100644 --- a/vendor/ckeditor5/node_modules/@ckeditor/ckeditor5-utils/src/difftochanges.d.ts +++ b/vendor/ckeditor5/node_modules/@ckeditor/ckeditor5-utils/src/difftochanges.d.ts @@ -2,11 +2,7 @@ * @license Copyright (c) 2003-2024, CKSource Holding sp. z o.o. All rights reserved. * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license */ -<<<<<<< HEAD import type { DiffResult } from '@ckeditor/ckeditor5-utils/src/diff.js'; -======= -import type { DiffResult } from './diff.js'; ->>>>>>> b6bde7722e19d08349e7b7b7d23bc6a4aef9d5ae /** * @module utils/difftochanges */ diff --git a/vendor/ckeditor5/node_modules/@ckeditor/ckeditor5-utils/src/dom/emittermixin.d.ts b/vendor/ckeditor5/node_modules/@ckeditor/ckeditor5-utils/src/dom/emittermixin.d.ts index 8cf0f7f..f4548c0 100644 --- a/vendor/ckeditor5/node_modules/@ckeditor/ckeditor5-utils/src/dom/emittermixin.d.ts +++ b/vendor/ckeditor5/node_modules/@ckeditor/ckeditor5-utils/src/dom/emittermixin.d.ts @@ -5,15 +5,9 @@ /** * @module utils/dom/emittermixin */ -<<<<<<< HEAD import { type Emitter, type CallbackOptions, type BaseEvent, type GetCallback } from '@ckeditor/ckeditor5-utils/src/emittermixin.js'; import type EventInfo from '@ckeditor/ckeditor5-utils/src/eventinfo.js'; import type { Constructor, Mixed } from '@ckeditor/ckeditor5-utils/src/mix.js'; -======= -import { type Emitter, type CallbackOptions, type BaseEvent, type GetCallback } from '../emittermixin.js'; -import type EventInfo from '../eventinfo.js'; -import type { Constructor, Mixed } from '../mix.js'; ->>>>>>> b6bde7722e19d08349e7b7b7d23bc6a4aef9d5ae /** * Mixin that injects the DOM events API into its host. It provides the API * compatible with {@link module:utils/emittermixin~Emitter}. diff --git a/vendor/ckeditor5/node_modules/@ckeditor/ckeditor5-utils/src/dom/position.d.ts b/vendor/ckeditor5/node_modules/@ckeditor/ckeditor5-utils/src/dom/position.d.ts index 7887c77..a1d8ca4 100644 --- a/vendor/ckeditor5/node_modules/@ckeditor/ckeditor5-utils/src/dom/position.d.ts +++ b/vendor/ckeditor5/node_modules/@ckeditor/ckeditor5-utils/src/dom/position.d.ts @@ -2,11 +2,7 @@ * @license Copyright (c) 2003-2024, CKSource Holding sp. z o.o. All rights reserved. * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license */ -<<<<<<< HEAD import Rect, { type RectSource } from '@ckeditor/ckeditor5-utils/src/dom/rect.js'; -======= -import Rect, { type RectSource } from './rect.js'; ->>>>>>> b6bde7722e19d08349e7b7b7d23bc6a4aef9d5ae /** * Calculates the `position: absolute` coordinates of a given element so it can be positioned with respect to the * target in the visually most efficient way, taking various restrictions like viewport or limiter geometry diff --git a/vendor/ckeditor5/node_modules/@ckeditor/ckeditor5-utils/src/emittermixin.d.ts b/vendor/ckeditor5/node_modules/@ckeditor/ckeditor5-utils/src/emittermixin.d.ts index 7873273..6e146d9 100644 --- a/vendor/ckeditor5/node_modules/@ckeditor/ckeditor5-utils/src/emittermixin.d.ts +++ b/vendor/ckeditor5/node_modules/@ckeditor/ckeditor5-utils/src/emittermixin.d.ts @@ -5,17 +5,10 @@ /** * @module utils/emittermixin */ -<<<<<<< HEAD import EventInfo from '@ckeditor/ckeditor5-utils/src/eventinfo.js'; import { type PriorityString } from '@ckeditor/ckeditor5-utils/src/priorities.js'; import type { Constructor, Mixed } from '@ckeditor/ckeditor5-utils/src/mix.js'; import '@ckeditor/ckeditor5-utils/src/version.js'; -======= -import EventInfo from './eventinfo.js'; -import { type PriorityString } from './priorities.js'; -import type { Constructor, Mixed } from './mix.js'; -import './version.js'; ->>>>>>> b6bde7722e19d08349e7b7b7d23bc6a4aef9d5ae /** * Mixin that injects the {@link ~Emitter events API} into its host. * diff --git a/vendor/ckeditor5/node_modules/@ckeditor/ckeditor5-utils/src/fastdiff.d.ts b/vendor/ckeditor5/node_modules/@ckeditor/ckeditor5-utils/src/fastdiff.d.ts index a269250..283f24f 100644 --- a/vendor/ckeditor5/node_modules/@ckeditor/ckeditor5-utils/src/fastdiff.d.ts +++ b/vendor/ckeditor5/node_modules/@ckeditor/ckeditor5-utils/src/fastdiff.d.ts @@ -2,13 +2,8 @@ * @license Copyright (c) 2003-2024, CKSource Holding sp. z o.o. All rights reserved. * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license */ -<<<<<<< HEAD import type { DiffResult } from '@ckeditor/ckeditor5-utils/src/diff.js'; import type { Change } from '@ckeditor/ckeditor5-utils/src/difftochanges.js'; -======= -import type { DiffResult } from './diff.js'; -import type { Change } from './difftochanges.js'; ->>>>>>> b6bde7722e19d08349e7b7b7d23bc6a4aef9d5ae /** * @module utils/fastdiff */ diff --git a/vendor/ckeditor5/node_modules/@ckeditor/ckeditor5-utils/src/focustracker.d.ts b/vendor/ckeditor5/node_modules/@ckeditor/ckeditor5-utils/src/focustracker.d.ts index e0dda60..ebcd392 100644 --- a/vendor/ckeditor5/node_modules/@ckeditor/ckeditor5-utils/src/focustracker.d.ts +++ b/vendor/ckeditor5/node_modules/@ckeditor/ckeditor5-utils/src/focustracker.d.ts @@ -2,17 +2,10 @@ * @license Copyright (c) 2003-2024, CKSource Holding sp. z o.o. All rights reserved. * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license */ -<<<<<<< HEAD declare const FocusTracker_base: import("@ckeditor/ckeditor5-utils/src/mix.js").Mixed<{ new (): import("@ckeditor/ckeditor5-utils/src/observablemixin.js").Observable; prototype: import("@ckeditor/ckeditor5-utils/src/observablemixin.js").Observable; }, import("@ckeditor/ckeditor5-utils/src/dom/emittermixin.js").DomEmitter>; -======= -declare const FocusTracker_base: import("./mix.js").Mixed<{ - new (): import("./observablemixin.js").Observable; - prototype: import("./observablemixin.js").Observable; -}, import("./dom/emittermixin.js").DomEmitter>; ->>>>>>> b6bde7722e19d08349e7b7b7d23bc6a4aef9d5ae /** * Allows observing a group of `Element`s whether at least one of them is focused. * diff --git a/vendor/ckeditor5/node_modules/@ckeditor/ckeditor5-utils/src/index.d.ts b/vendor/ckeditor5/node_modules/@ckeditor/ckeditor5-utils/src/index.d.ts index 77d6b18..a746c94 100644 --- a/vendor/ckeditor5/node_modules/@ckeditor/ckeditor5-utils/src/index.d.ts +++ b/vendor/ckeditor5/node_modules/@ckeditor/ckeditor5-utils/src/index.d.ts @@ -5,7 +5,6 @@ /** * @module utils */ -<<<<<<< HEAD export { default as env } from '@ckeditor/ckeditor5-utils/src/env.js'; export { default as diff, type DiffResult } from '@ckeditor/ckeditor5-utils/src/diff.js'; export { default as fastDiff } from '@ckeditor/ckeditor5-utils/src/fastdiff.js'; @@ -63,62 +62,3 @@ export { default as verifyLicense } from '@ckeditor/ckeditor5-utils/src/verifyli export { default as wait } from '@ckeditor/ckeditor5-utils/src/wait.js'; export * from '@ckeditor/ckeditor5-utils/src/unicode.js'; export { default as version, releaseDate } from '@ckeditor/ckeditor5-utils/src/version.js'; -======= -export { default as env } from './env.js'; -export { default as diff, type DiffResult } from './diff.js'; -export { default as fastDiff } from './fastdiff.js'; -export { default as diffToChanges } from './difftochanges.js'; -export { default as mix } from './mix.js'; -export type { Constructor, Mixed } from './mix.js'; -export { default as EmitterMixin, type Emitter, type BaseEvent, type CallbackOptions, type EmitterMixinDelegateChain, type GetCallback, type GetCallbackOptions, type GetEventInfo, type GetNameOrEventInfo } from './emittermixin.js'; -export { default as EventInfo } from './eventinfo.js'; -export { default as ObservableMixin, type Observable, type DecoratedMethodEvent, type ObservableChangeEvent, type ObservableSetEvent } from './observablemixin.js'; -export { default as CKEditorError, logError, logWarning } from './ckeditorerror.js'; -export { default as ElementReplacer } from './elementreplacer.js'; -export { default as abortableDebounce, type AbortableFunc } from './abortabledebounce.js'; -export { default as count } from './count.js'; -export { default as compareArrays } from './comparearrays.js'; -export { default as createElement } from './dom/createelement.js'; -export { default as Config } from './config.js'; -export { default as isIterable } from './isiterable.js'; -export { default as DomEmitterMixin, type DomEmitter } from './dom/emittermixin.js'; -export { default as findClosestScrollableAncestor } from './dom/findclosestscrollableancestor.js'; -export { default as global } from './dom/global.js'; -export { default as getAncestors } from './dom/getancestors.js'; -export { default as getDataFromElement } from './dom/getdatafromelement.js'; -export { default as getBorderWidths } from './dom/getborderwidths.js'; -export { default as isText } from './dom/istext.js'; -export { default as Rect, type RectSource } from './dom/rect.js'; -export { default as ResizeObserver } from './dom/resizeobserver.js'; -export { default as setDataInElement } from './dom/setdatainelement.js'; -export { default as toUnit } from './dom/tounit.js'; -export { default as indexOf } from './dom/indexof.js'; -export { default as insertAt } from './dom/insertat.js'; -export { default as isComment } from './dom/iscomment.js'; -export { default as isNode } from './dom/isnode.js'; -export { default as isRange } from './dom/isrange.js'; -export { default as isValidAttributeName } from './dom/isvalidattributename.js'; -export { default as isVisible } from './dom/isvisible.js'; -export { getOptimalPosition, type Options as PositionOptions, type PositioningFunction, type DomPoint } from './dom/position.js'; -export { default as remove } from './dom/remove.js'; -export * from './dom/scroll.js'; -export * from './keyboard.js'; -export * from './language.js'; -export { default as Locale, type LocaleTranslate, type Translations } from './locale.js'; -export { default as Collection, type CollectionAddEvent, type CollectionChangeEvent, type CollectionRemoveEvent } from './collection.js'; -export { default as first } from './first.js'; -export { default as FocusTracker } from './focustracker.js'; -export { default as KeystrokeHandler } from './keystrokehandler.js'; -export { default as toArray, type ArrayOrItem, type ReadonlyArrayOrItem } from './toarray.js'; -export { default as toMap } from './tomap.js'; -export { default as priorities, type PriorityString } from './priorities.js'; -export { default as retry, exponentialDelay } from './retry.js'; -export { default as insertToPriorityArray } from './inserttopriorityarray.js'; -export { default as spliceArray } from './splicearray.js'; -export { default as uid } from './uid.js'; -export { default as delay, type DelayedFunc } from './delay.js'; -export { default as verifyLicense } from './verifylicense.js'; -export { default as wait } from './wait.js'; -export * from './unicode.js'; -export { default as version, releaseDate } from './version.js'; ->>>>>>> b6bde7722e19d08349e7b7b7d23bc6a4aef9d5ae diff --git a/vendor/ckeditor5/node_modules/@ckeditor/ckeditor5-utils/src/inserttopriorityarray.d.ts b/vendor/ckeditor5/node_modules/@ckeditor/ckeditor5-utils/src/inserttopriorityarray.d.ts index 3e5de7c..3d008e4 100644 --- a/vendor/ckeditor5/node_modules/@ckeditor/ckeditor5-utils/src/inserttopriorityarray.d.ts +++ b/vendor/ckeditor5/node_modules/@ckeditor/ckeditor5-utils/src/inserttopriorityarray.d.ts @@ -2,11 +2,7 @@ * @license Copyright (c) 2003-2024, CKSource Holding sp. z o.o. All rights reserved. * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license */ -<<<<<<< HEAD import { type PriorityString } from '@ckeditor/ckeditor5-utils/src/priorities.js'; -======= -import { type PriorityString } from './priorities.js'; ->>>>>>> b6bde7722e19d08349e7b7b7d23bc6a4aef9d5ae /** * @module utils/inserttopriorityarray */ diff --git a/vendor/ckeditor5/node_modules/@ckeditor/ckeditor5-utils/src/keyboard.d.ts b/vendor/ckeditor5/node_modules/@ckeditor/ckeditor5-utils/src/keyboard.d.ts index b6fd2bd..3892bb3 100644 --- a/vendor/ckeditor5/node_modules/@ckeditor/ckeditor5-utils/src/keyboard.d.ts +++ b/vendor/ckeditor5/node_modules/@ckeditor/ckeditor5-utils/src/keyboard.d.ts @@ -7,11 +7,7 @@ * * @module utils/keyboard */ -<<<<<<< HEAD import type { LanguageDirection } from '@ckeditor/ckeditor5-utils/src/language.js'; -======= -import type { LanguageDirection } from './language.js'; ->>>>>>> b6bde7722e19d08349e7b7b7d23bc6a4aef9d5ae /** * An object with `keyName => keyCode` pairs for a set of known keys. * diff --git a/vendor/ckeditor5/node_modules/@ckeditor/ckeditor5-utils/src/keystrokehandler.d.ts b/vendor/ckeditor5/node_modules/@ckeditor/ckeditor5-utils/src/keystrokehandler.d.ts index ae0883c..98d1b70 100644 --- a/vendor/ckeditor5/node_modules/@ckeditor/ckeditor5-utils/src/keystrokehandler.d.ts +++ b/vendor/ckeditor5/node_modules/@ckeditor/ckeditor5-utils/src/keystrokehandler.d.ts @@ -2,15 +2,9 @@ * @license Copyright (c) 2003-2024, CKSource Holding sp. z o.o. All rights reserved. * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license */ -<<<<<<< HEAD import type { Emitter } from '@ckeditor/ckeditor5-utils/src/emittermixin.js'; import { type KeystrokeInfo } from '@ckeditor/ckeditor5-utils/src/keyboard.js'; import type { PriorityString } from '@ckeditor/ckeditor5-utils/src/priorities.js'; -======= -import type { Emitter } from './emittermixin.js'; -import { type KeystrokeInfo } from './keyboard.js'; -import type { PriorityString } from './priorities.js'; ->>>>>>> b6bde7722e19d08349e7b7b7d23bc6a4aef9d5ae /** * Keystroke handler allows registering callbacks for given keystrokes. * diff --git a/vendor/ckeditor5/node_modules/@ckeditor/ckeditor5-utils/src/locale.d.ts b/vendor/ckeditor5/node_modules/@ckeditor/ckeditor5-utils/src/locale.d.ts index 7706f9f..bd8a4a8 100644 --- a/vendor/ckeditor5/node_modules/@ckeditor/ckeditor5-utils/src/locale.d.ts +++ b/vendor/ckeditor5/node_modules/@ckeditor/ckeditor5-utils/src/locale.d.ts @@ -5,15 +5,9 @@ /** * @module utils/locale */ -<<<<<<< HEAD import { type ArrayOrItem } from '@ckeditor/ckeditor5-utils/src/toarray.js'; import { type Message } from '@ckeditor/ckeditor5-utils/src/translation-service.js'; import { type LanguageDirection } from '@ckeditor/ckeditor5-utils/src/language.js'; -======= -import { type ArrayOrItem } from './toarray.js'; -import { type Message } from './translation-service.js'; -import { type LanguageDirection } from './language.js'; ->>>>>>> b6bde7722e19d08349e7b7b7d23bc6a4aef9d5ae /** * Represents the localization services. */ diff --git a/vendor/ckeditor5/node_modules/@ckeditor/ckeditor5-utils/src/observablemixin.d.ts b/vendor/ckeditor5/node_modules/@ckeditor/ckeditor5-utils/src/observablemixin.d.ts index b324820..07572e4 100644 --- a/vendor/ckeditor5/node_modules/@ckeditor/ckeditor5-utils/src/observablemixin.d.ts +++ b/vendor/ckeditor5/node_modules/@ckeditor/ckeditor5-utils/src/observablemixin.d.ts @@ -5,13 +5,8 @@ /** * @module utils/observablemixin */ -<<<<<<< HEAD import { type Emitter } from '@ckeditor/ckeditor5-utils/src/emittermixin.js'; import type { Constructor, Mixed } from '@ckeditor/ckeditor5-utils/src/mix.js'; -======= -import { type Emitter } from './emittermixin.js'; -import type { Constructor, Mixed } from './mix.js'; ->>>>>>> b6bde7722e19d08349e7b7b7d23bc6a4aef9d5ae /** * A mixin that injects the "observable properties" and data binding functionality described in the * {@link ~Observable} interface. diff --git a/vendor/ckeditor5/node_modules/@ckeditor/ckeditor5-utils/src/translation-service.d.ts b/vendor/ckeditor5/node_modules/@ckeditor/ckeditor5-utils/src/translation-service.d.ts index 1989318..122fb0e 100644 --- a/vendor/ckeditor5/node_modules/@ckeditor/ckeditor5-utils/src/translation-service.d.ts +++ b/vendor/ckeditor5/node_modules/@ckeditor/ckeditor5-utils/src/translation-service.d.ts @@ -5,16 +5,11 @@ /** * @module utils/translation-service */ -<<<<<<< HEAD -import type { Translations } from '@ckeditor/ckeditor5-utils/src/locale.js'; -import { type ArrayOrItem } from '@ckeditor/ckeditor5-utils/src/toarray.js'; -======= import type { Translations } from './locale.js'; import { type ArrayOrItem } from './toarray.js'; ->>>>>>> b6bde7722e19d08349e7b7b7d23bc6a4aef9d5ae -declare global { - var CKEDITOR_TRANSLATIONS: Translations; -} +// declare global { +// var CKEDITOR_TRANSLATIONS: Translations; +// } /** * Adds translations to existing ones or overrides the existing translations. These translations will later * be available for the {@link module:utils/locale~Locale#t `t()`} function. diff --git a/vendor/ckeditor5/node_modules/@ckeditor/ckeditor5-widget/src/widgetresize.d.ts b/vendor/ckeditor5/node_modules/@ckeditor/ckeditor5-widget/src/widgetresize.d.ts index 8a582b0..5750aed 100644 --- a/vendor/ckeditor5/node_modules/@ckeditor/ckeditor5-widget/src/widgetresize.d.ts +++ b/vendor/ckeditor5/node_modules/@ckeditor/ckeditor5-widget/src/widgetresize.d.ts @@ -5,17 +5,10 @@ /** * @module widget/widgetresize */ -<<<<<<< HEAD import Resizer from '@ckeditor/ckeditor5-widget/src/widgetresize/resizer.js'; import { Plugin, type Editor } from '@ckeditor/ckeditor5-core'; import { type Element, type ViewContainerElement } from '@ckeditor/ckeditor5-engine'; import '@ckeditor/ckeditor5-widget/theme/widgetresize.css'; -======= -import Resizer from './widgetresize/resizer.js'; -import { Plugin, type Editor } from '@ckeditor/ckeditor5-core'; -import { type Element, type ViewContainerElement } from '@ckeditor/ckeditor5-engine'; -import '../theme/widgetresize.css'; ->>>>>>> b6bde7722e19d08349e7b7b7d23bc6a4aef9d5ae /** * The widget resize feature plugin. * diff --git a/vendor/ckeditor5/node_modules/@ckeditor/ckeditor5-widget/src/widgetresize/resizer.d.ts b/vendor/ckeditor5/node_modules/@ckeditor/ckeditor5-widget/src/widgetresize/resizer.d.ts index c364971..a0809e9 100644 --- a/vendor/ckeditor5/node_modules/@ckeditor/ckeditor5-widget/src/widgetresize/resizer.d.ts +++ b/vendor/ckeditor5/node_modules/@ckeditor/ckeditor5-widget/src/widgetresize/resizer.d.ts @@ -3,13 +3,8 @@ * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license */ import { Rect, type DecoratedMethodEvent } from '@ckeditor/ckeditor5-utils'; -<<<<<<< HEAD import ResizeState from '@ckeditor/ckeditor5-widget/src/widgetresize/resizerstate.js'; import type { ResizerOptions } from '@ckeditor/ckeditor5-widget/src/widgetresize.js'; -======= -import ResizeState from './resizerstate.js'; -import type { ResizerOptions } from '../widgetresize.js'; ->>>>>>> b6bde7722e19d08349e7b7b7d23bc6a4aef9d5ae declare const Resizer_base: { new (): import("@ckeditor/ckeditor5-utils").Observable; prototype: import("@ckeditor/ckeditor5-utils").Observable; diff --git a/vendor/ckeditor5/node_modules/@ckeditor/ckeditor5-widget/src/widgetresize/resizerstate.d.ts b/vendor/ckeditor5/node_modules/@ckeditor/ckeditor5-widget/src/widgetresize/resizerstate.d.ts index 28095b6..360ddb9 100644 --- a/vendor/ckeditor5/node_modules/@ckeditor/ckeditor5-widget/src/widgetresize/resizerstate.d.ts +++ b/vendor/ckeditor5/node_modules/@ckeditor/ckeditor5-widget/src/widgetresize/resizerstate.d.ts @@ -2,11 +2,7 @@ * @license Copyright (c) 2003-2024, CKSource Holding sp. z o.o. All rights reserved. * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license */ -<<<<<<< HEAD import type { ResizerOptions } from '@ckeditor/ckeditor5-widget/src/widgetresize.js'; -======= -import type { ResizerOptions } from '../widgetresize.js'; ->>>>>>> b6bde7722e19d08349e7b7b7d23bc6a4aef9d5ae declare const ResizeState_base: { new (): import("@ckeditor/ckeditor5-utils").Observable; prototype: import("@ckeditor/ckeditor5-utils").Observable;