Skip to content

Commit 068122d

Browse files
committed
Fixed remaining packages export names to pass export validation.
1 parent e14fa5b commit 068122d

File tree

21 files changed

+75
-70
lines changed

21 files changed

+75
-70
lines changed

packages/ckeditor5-code-block/src/codeblockediting.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import {
2020
type UpcastElementEvent,
2121
type UpcastTextEvent,
2222
type ModelElement,
23-
type SelectionChangeRangeEvent
23+
type ModelSelectionChangeRangeEvent
2424
} from 'ckeditor5/src/engine.js';
2525
import { ClipboardPipeline, type ClipboardContentInsertionEvent } from 'ckeditor5/src/clipboard.js';
2626

@@ -318,7 +318,7 @@ export class CodeBlockEditing extends Plugin {
318318

319319
let lastFocusedCodeBlock: ModelElement | null = null;
320320

321-
model.document.selection.on<SelectionChangeRangeEvent>( 'change:range', () => {
321+
model.document.selection.on<ModelSelectionChangeRangeEvent>( 'change:range', () => {
322322
const focusParent = model.document.selection.focus!.parent;
323323

324324
if ( !ui || lastFocusedCodeBlock === focusParent || !focusParent.is( 'element' ) ) {

packages/ckeditor5-engine/src/controller/editingcontroller.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ import { type ModelTextProxy } from '../model/textproxy.js';
4040
import type { ModelDocumentChangeEvent } from '../model/document.js';
4141
import type { Marker } from '../model/markercollection.js';
4242
import type { StylesProcessor } from '../view/stylesmap.js';
43-
import type { ViewDocumentSelectionChangeEvent } from '../view/observer/selectionobserver.js';
43+
import type { ViewDocumentObserverSelectionChangeEvent } from '../view/observer/selectionobserver.js';
4444

4545
// @if CK_DEBUG_ENGINE // const { dumpTrees, initDocumentDumping } = require( '../dev-utils/utils' );
4646

@@ -116,7 +116,7 @@ export class EditingController extends /* #__PURE__ */ ObservableMixin() {
116116
}, { priority: 'low' } );
117117

118118
// Convert selection from the view to the model when it changes in the view.
119-
this.listenTo<ViewDocumentSelectionChangeEvent>( this.view.document, 'selectionChange',
119+
this.listenTo<ViewDocumentObserverSelectionChangeEvent>( this.view.document, 'selectionChange',
120120
convertSelectionChange( this.model, this.mapper )
121121
);
122122

packages/ckeditor5-engine/src/index.ts

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,8 @@ export {
6969
type DowncastAddHighlightCallback,
7070
type DowncastHighlightDescriptorCreatorFunction,
7171
type DowncastRemoveHighlightCallback,
72-
type DowncastMarkerDataCreatorFunction
72+
type DowncastMarkerDataCreatorFunction,
73+
type DowncastAttributeCreatorFunction
7374
} from './conversion/downcasthelpers.js';
7475

7576
export type {
@@ -213,7 +214,6 @@ export type {
213214
ModelModifySelectionEvent,
214215
ModelCanEditAtEvent
215216
} from './model/model.js';
216-
export type { ModelSelectionChangeRangeEvent as SelectionChangeRangeEvent } from './model/selection.js';
217217

218218
// View.
219219
export { ViewDataTransfer, type ViewDropEffect, type ViewEffectAllowed } from './view/datatransfer.js';
@@ -247,7 +247,7 @@ export { ViewRawElement } from './view/rawelement.js';
247247
export { ViewUIElement } from './view/uielement.js';
248248
export { ViewDocumentFragment } from './view/documentfragment.js';
249249
export type { ViewElementDefinition, ViewElementObjectDefinition } from './view/elementdefinition.js';
250-
export { ViewDocumentSelection } from './view/documentselection.js';
250+
export { ViewDocumentSelection, type ViewDocumentSelectionChangeEvent } from './view/documentselection.js';
251251
export type { ViewItem } from './view/item.js';
252252
export { ViewNode, type ViewNodeChangeEvent } from './view/node.js';
253253
export {
@@ -298,7 +298,7 @@ export {
298298

299299
export {
300300
SelectionObserver,
301-
type ViewDocumentSelectionEventData
301+
type ViewDocumentObserverSelectionEventData
302302
} from './view/observer/selectionobserver.js';
303303

304304
export { CompositionObserver, type ViewDocumentCompositionEventData } from './view/observer/compositionobserver.js';
@@ -366,7 +366,10 @@ export type {
366366
} from './view/observer/touchobserver.js';
367367
export type { ViewDocumentTabEvent } from './view/observer/tabobserver.js';
368368
export type { ViewDocumentClickEvent } from './view/observer/clickobserver.js';
369-
export type { ViewDocumentSelectionChangeEvent, ViewDocumentSelectionChangeDoneEvent } from './view/observer/selectionobserver.js';
369+
export type {
370+
ViewDocumentObserverSelectionChangeEvent,
371+
ViewDocumentObserverSelectionChangeDoneEvent
372+
} from './view/observer/selectionobserver.js';
370373

371374
// View / Styles.
372375
export {

packages/ckeditor5-engine/src/view/observer/fakeselectionobserver.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ import type { ViewDocumentArrowKeyEvent } from './arrowkeysobserver.js';
1212
import { ViewSelection } from '../selection.js';
1313
import { type EditingView } from '../view.js';
1414
import type {
15-
ViewDocumentSelectionChangeEvent,
16-
ViewDocumentSelectionChangeDoneEvent,
17-
ViewDocumentSelectionEventData
15+
ViewDocumentObserverSelectionChangeEvent,
16+
ViewDocumentObserverSelectionChangeDoneEvent,
17+
ViewDocumentObserverSelectionEventData
1818
} from './selectionobserver.js';
1919
import { keyCodes } from '@ckeditor/ckeditor5-utils';
2020
import { debounce, type DebouncedFunction } from 'es-toolkit/compat';
@@ -30,7 +30,7 @@ export class FakeSelectionObserver extends Observer {
3030
/**
3131
* Fires debounced event `selectionChangeDone`. It uses `es-toolkit#debounce` method to delay function call.
3232
*/
33-
private readonly _fireSelectionChangeDoneDebounced: DebouncedFunction<( data: ViewDocumentSelectionEventData ) => void>;
33+
private readonly _fireSelectionChangeDoneDebounced: DebouncedFunction<( data: ViewDocumentObserverSelectionEventData ) => void>;
3434

3535
/**
3636
* Creates new FakeSelectionObserver instance.
@@ -39,7 +39,7 @@ export class FakeSelectionObserver extends Observer {
3939
super( view );
4040

4141
this._fireSelectionChangeDoneDebounced = debounce( data => {
42-
this.document.fire<ViewDocumentSelectionChangeDoneEvent>( 'selectionChangeDone', data );
42+
this.document.fire<ViewDocumentObserverSelectionChangeDoneEvent>( 'selectionChangeDone', data );
4343
}, 200 );
4444
}
4545

@@ -110,7 +110,7 @@ export class FakeSelectionObserver extends Observer {
110110
};
111111

112112
// Fire dummy selection change event.
113-
this.document.fire<ViewDocumentSelectionChangeEvent>( 'selectionChange', data );
113+
this.document.fire<ViewDocumentObserverSelectionChangeEvent>( 'selectionChange', data );
114114

115115
// Call` #_fireSelectionChangeDoneDebounced` every time when `selectionChange` event is fired.
116116
// This function is debounced what means that `selectionChangeDone` event will be fired only when

packages/ckeditor5-engine/src/view/observer/selectionobserver.ts

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ export class SelectionObserver extends Observer {
6767
/**
6868
* Fires debounced event `selectionChangeDone`. It uses `es-toolkit#debounce` method to delay function call.
6969
*/
70-
private readonly _fireSelectionChangeDoneDebounced: DebouncedFunction<( data: ViewDocumentSelectionEventData ) => void>;
70+
private readonly _fireSelectionChangeDoneDebounced: DebouncedFunction<( data: ViewDocumentObserverSelectionEventData ) => void>;
7171

7272
/**
7373
* When called, starts clearing the {@link #_loopbackCounter} counter in time intervals. When the number of selection
@@ -103,7 +103,7 @@ export class SelectionObserver extends Observer {
103103
this.domConverter = view.domConverter;
104104

105105
this._fireSelectionChangeDoneDebounced = debounce( data => {
106-
this.document.fire<ViewDocumentSelectionChangeDoneEvent>( 'selectionChangeDone', data );
106+
this.document.fire<ViewDocumentObserverSelectionChangeDoneEvent>( 'selectionChangeDone', data );
107107
}, 200 );
108108

109109
this._clearInfiniteLoopInterval = setInterval( () => this._clearInfiniteLoop(), 1000 );
@@ -339,7 +339,7 @@ export class SelectionObserver extends Observer {
339339
// Just re-render it, no need to fire any events, etc.
340340
this.view.forceRender();
341341
} else {
342-
const data: ViewDocumentSelectionEventData = {
342+
const data: ViewDocumentObserverSelectionEventData = {
343343
oldSelection: this.selection,
344344
newSelection: newViewSelection,
345345
domSelection
@@ -353,7 +353,7 @@ export class SelectionObserver extends Observer {
353353
// @if CK_DEBUG_TYPING // }
354354

355355
// Prepare data for new selection and fire appropriate events.
356-
this.document.fire<ViewDocumentSelectionChangeEvent>( 'selectionChange', data );
356+
this.document.fire<ViewDocumentObserverSelectionChangeEvent>( 'selectionChange', data );
357357

358358
// Call `#_fireSelectionChangeDoneDebounced` every time when `selectionChange` event is fired.
359359
// This function is debounced what means that `selectionChangeDone` event will be fired only when
@@ -372,9 +372,9 @@ export class SelectionObserver extends Observer {
372372
}
373373

374374
/**
375-
* The value of {@link ~ViewDocumentSelectionChangeEvent} and {@link ~ViewDocumentSelectionChangeDoneEvent} events.
375+
* The value of {@link ~ViewDocumentObserverSelectionChangeEvent} and {@link ~ViewDocumentObserverSelectionChangeDoneEvent} events.
376376
*/
377-
export type ViewDocumentSelectionEventData = {
377+
export type ViewDocumentObserverSelectionEventData = {
378378

379379
/**
380380
* Old View selection which is {@link module:engine/view/document~ViewDocument#selection}.
@@ -404,9 +404,9 @@ export type ViewDocumentSelectionEventData = {
404404
* @see module:engine/view/observer/selectionobserver~SelectionObserver
405405
* @eventName module:engine/view/document~ViewDocument#selectionChange
406406
*/
407-
export type ViewDocumentSelectionChangeEvent = {
407+
export type ViewDocumentObserverSelectionChangeEvent = {
408408
name: 'selectionChange';
409-
args: [ ViewDocumentSelectionEventData ];
409+
args: [ ViewDocumentObserverSelectionEventData ];
410410
};
411411

412412
/**
@@ -420,7 +420,7 @@ export type ViewDocumentSelectionChangeEvent = {
420420
* @see module:engine/view/observer/selectionobserver~SelectionObserver
421421
* @eventName module:engine/view/document~ViewDocument#selectionChangeDone
422422
*/
423-
export type ViewDocumentSelectionChangeDoneEvent = {
423+
export type ViewDocumentObserverSelectionChangeDoneEvent = {
424424
name: 'selectionChangeDone';
425-
args: [ ViewDocumentSelectionEventData ];
425+
args: [ ViewDocumentObserverSelectionEventData ];
426426
};

packages/ckeditor5-engine/src/view/view.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,15 @@ import {
4242
env,
4343
ObservableMixin,
4444
scrollViewportToShowTarget,
45-
type ObservableChangeEvent
45+
type ObservableChangeEvent,
46+
type IfTrue
4647
} from '@ckeditor/ckeditor5-utils';
4748
import { injectUiElementHandling } from './uielement.js';
4849
import { injectQuirksHandling } from './filler.js';
4950

5051
import { cloneDeep } from 'es-toolkit/compat';
5152

52-
type IfTrue<T> = T extends true ? true : never;
53+
// type IfTrue<T> = T extends true ? true : never;
5354
type DomRange = globalThis.Range;
5455

5556
/**

packages/ckeditor5-fullscreen/src/fullscreencommand.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ import { Command, type Editor } from 'ckeditor5/src/core.js';
1111
import type { ClassicEditor } from '@ckeditor/ckeditor5-editor-classic';
1212
import type { DecoupledEditor } from '@ckeditor/ckeditor5-editor-decoupled';
1313

14-
import { AbstractEditorHandler } from './handlers/abstracteditorhandler.js';
15-
import { ClassicEditorHandler } from './handlers/classiceditorhandler.js';
16-
import { DecoupledEditorHandler } from './handlers/decouplededitorhandler.js';
14+
import { FullscreenAbstractEditorHandler } from './handlers/abstracteditorhandler.js';
15+
import { FullscreenClassicEditorHandler } from './handlers/classiceditorhandler.js';
16+
import { FullscreenDecoupledEditorHandler } from './handlers/decouplededitorhandler.js';
1717

1818
/**
1919
* A command toggling the fullscreen mode.
@@ -43,7 +43,7 @@ export class FullscreenCommand extends Command {
4343
* } );
4444
* ```
4545
*/
46-
public fullscreenHandler: AbstractEditorHandler;
46+
public fullscreenHandler: FullscreenAbstractEditorHandler;
4747

4848
/**
4949
* @inheritDoc
@@ -59,11 +59,11 @@ export class FullscreenCommand extends Command {
5959
// Currently only `ClassicEditor` and `DecoupledEditor` are supported. For other editor types, you should create a custom handler
6060
// that extends `AbstractEditorHandler` and replace `fullscreenHandler` with it.
6161
if ( isClassicEditor( editor ) ) {
62-
this.fullscreenHandler = new ClassicEditorHandler( editor );
62+
this.fullscreenHandler = new FullscreenClassicEditorHandler( editor );
6363
} else if ( isDecoupledEditor( editor ) ) {
64-
this.fullscreenHandler = new DecoupledEditorHandler( editor );
64+
this.fullscreenHandler = new FullscreenDecoupledEditorHandler( editor );
6565
} else {
66-
this.fullscreenHandler = new AbstractEditorHandler( editor );
66+
this.fullscreenHandler = new FullscreenAbstractEditorHandler( editor );
6767
}
6868
}
6969

packages/ckeditor5-fullscreen/src/handlers/abstracteditorhandler.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ const DIALOG_OFFSET = 28;
7373
*
7474
* This class is exported to allow for custom extensions.
7575
*/
76-
export class AbstractEditorHandler {
76+
export class FullscreenAbstractEditorHandler {
7777
/**
7878
* Maps placeholder names to placeholder elements and moved elements.
7979
*/

packages/ckeditor5-fullscreen/src/handlers/classiceditorhandler.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
import { MenuBarView } from 'ckeditor5/src/ui.js';
1111
import type { ClassicEditor } from '@ckeditor/ckeditor5-editor-classic';
1212

13-
import { AbstractEditorHandler } from './abstracteditorhandler.js';
13+
import { FullscreenAbstractEditorHandler } from './abstracteditorhandler.js';
1414

1515
/**
1616
* The classic editor fullscreen mode handler.
1717
*/
18-
export class ClassicEditorHandler extends AbstractEditorHandler {
18+
export class FullscreenClassicEditorHandler extends FullscreenAbstractEditorHandler {
1919
/**
2020
* An editor instance.
2121
*/

packages/ckeditor5-fullscreen/src/handlers/decouplededitorhandler.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99

1010
import type { DecoupledEditor } from '@ckeditor/ckeditor5-editor-decoupled';
1111

12-
import { AbstractEditorHandler } from './abstracteditorhandler.js';
12+
import { FullscreenAbstractEditorHandler } from './abstracteditorhandler.js';
1313

1414
/**
1515
* The decoupled editor fullscreen mode handler.
1616
*/
17-
export class DecoupledEditorHandler extends AbstractEditorHandler {
17+
export class FullscreenDecoupledEditorHandler extends FullscreenAbstractEditorHandler {
1818
/**
1919
* An editor instance.
2020
*/

0 commit comments

Comments
 (0)