Skip to content

Commit

Permalink
chore(TS): migrate object mixins (#8414)
Browse files Browse the repository at this point in the history
Co-authored-by: Andrea Bogazzi <andreabogazzi79@gmail.com>
  • Loading branch information
ShaMan123 and asturur authored Nov 29, 2022
1 parent ac25717 commit fe6d9df
Show file tree
Hide file tree
Showing 18 changed files with 947 additions and 945 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

## [next]

- chore(TS): migrate object mixins to TS [#8414](https://github.com/fabricjs/fabric.js/pull/8414)
- chore(TS): migrate filters [#8474](https://github.com/fabricjs/fabric.js/pull/8474)
- chore(TS): BaseBrush abstract methods [#8428](https://github.com/fabricjs/fabric.js/pull/8428)
- feat(): Add `createObjectDefaultControls` and `createTextboxDefaultControls` to create copies of control sets. [#8415](https://github.com/fabricjs/fabric.js/pull/8415)
Expand Down
16 changes: 7 additions & 9 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,13 @@ import './src/canvas.class'; // optional interaction
import './src/mixins/canvas_events.mixin'; // optional interaction
import './src/mixins/canvas_grouping.mixin'; // optional interaction
import './src/mixins/canvas_dataurl_exporter.mixin';
import './src/mixins/canvas_serialization.mixin'; // optiona serialization
import './src/mixins/canvas_gestures.mixin'; // optional gesturesv
import './src/mixins/object_interactivity.mixin'; // optional interaction
import './src/mixins/object_ancestry.mixin';
import './src/mixins/object_stacking.mixin';
import './src/mixins/object.svg_export';
import './src/mixins/stateful.mixin';
import './src/mixins/animation.mixin'; // optional animation
import './src/mixins/canvas_serialization.mixin'; // optional serialization
import './src/mixins/canvas_gestures.mixin'; // optional gestures
import './src/mixins/canvas_animation.mixin'; // optional animation
import './src/mixins/canvas_straightening.mixin'; // optional animation
import './src/shapes/fabricObject.class';
import './src/mixins/object_stacking.mixin'; // removed in #8461
import './src/mixins/stateful.mixin'; // will die soon
import './src/shapes/line.class';
import './src/shapes/circle.class';
import './src/shapes/triangle.class';
Expand All @@ -34,7 +33,6 @@ import './src/shapes/path.class';
import './src/shapes/group.class';
import './src/shapes/active_selection.class'; // optional interaction
import './src/shapes/image.class';
import './src/mixins/object_straightening.mixin'; // optional objectstraightening
import './src/filters/WebGLProbe'; // optional image_filters
import './src/filters/base_filter.class'; // optional image_filters
import './src/filters/colormatrix_filter.class'; // optional image_filters
Expand Down
9 changes: 6 additions & 3 deletions src/__types__.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { CanvasEvents, ModifierKey } from './EventTypeDefs';
import { CanvasEvents, ModifierKey, StaticCanvasEvents } from './EventTypeDefs';
import type { Observable } from './mixins/observable.mixin';
import type { Point } from './point.class';
import type { FabricObject } from './shapes/fabricObject.class';
import { TMat2D } from './typedefs';

/**
Expand All @@ -10,7 +11,8 @@ export type Canvas = StaticCanvas & {
altActionKey: ModifierKey;
uniScaleKey: ModifierKey;
uniformScaling: boolean;
} & Record<string, any>;
} & Record<string, any> &
Observable<CanvasEvents>;
export type StaticCanvas = Record<string, any> & {
getZoom(): number;
viewportTransform: TMat2D;
Expand All @@ -19,4 +21,5 @@ export type StaticCanvas = Record<string, any> & {
br: Point;
};
getRetinaScaling(): number;
} & Observable<CanvasEvents>;
_objects: FabricObject[];
} & Observable<StaticCanvasEvents>;
258 changes: 0 additions & 258 deletions src/mixins/animation.mixin.ts

This file was deleted.

Loading

0 comments on commit fe6d9df

Please sign in to comment.