Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ck/12077 mixins #12140

Merged
merged 8 commits into from
Jul 28, 2022
Merged

Ck/12077 mixins #12140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0c4ce2e
Changed mixin style: EmitterMixin
arkflpc Jul 21, 2022
531f406
Changed mixin style: ObservableMixin
arkflpc Jul 21, 2022
91710d4
Changed mixin style: DomEmitterMixin
arkflpc Jul 22, 2022
76ad905
Changed mixin style: Apply new pattern
arkflpc Jul 22, 2022
c7380f2
Changed mixin style: fixed abstract class problem
arkflpc Jul 25, 2022
bcb5948
Merge branch 'master' into ck/12077-mixins
arkflpc Jul 25, 2022
f5996a8
Merge remote-tracking branch 'origin/master' into ck/12077-mixins
arkflpc Jul 28, 2022
6ea6c44
Mixin style: fix after code review
arkflpc Jul 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 4 additions & 9 deletions packages/ckeditor5-utils/src/collection.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,10 @@
* @module utils/collection
*/

import EmitterMixin, { type Emitter } from './emittermixin';
import { Emitter } from './emittermixin';
import CKEditorError from './ckeditorerror';
import uid from './uid';
import isIterable from './isiterable';
import mix from './mix';

/**
* Collections are ordered sets of objects. Items in the collection can be retrieved by their indexes
Expand All @@ -25,7 +24,7 @@ import mix from './mix';
*
* @mixes module:utils/emittermixin~EmitterMixin
*/
class Collection<T extends { [ id in I ]?: string }, I extends string = 'id'> implements Iterable<T> {
export default class Collection<T extends { [ id in I ]?: string }, I extends string = 'id'> extends Emitter implements Iterable<T> {
/**
* The internal list of items in the collection.
*
Expand Down Expand Up @@ -131,6 +130,8 @@ class Collection<T extends { [ id in I ]?: string }, I extends string = 'id'> im
* Items that do not have such a property will be assigned one when added to the collection.
*/
constructor( initialItemsOrOptions: Iterable<T> | { readonly idProperty?: I } = {}, options: { readonly idProperty?: I } = {} ) {
super();

const hasInitialItems = isIterable( initialItemsOrOptions );

if ( !hasInitialItems ) {
Expand Down Expand Up @@ -781,12 +782,6 @@ class Collection<T extends { [ id in I ]?: string }, I extends string = 'id'> im
*/
}

mix( Collection, EmitterMixin );

interface Collection<T, I> extends Emitter {}

export default Collection;

export type AddEvent<T = any> = {
name: 'add';
args: [ item: T, index: number ];
Expand Down
Loading