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.

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

chore(TS): IText behavior mixins #8421

Merged
merged 63 commits into from
Nov 20, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
091a0dc
transform
ShaMan123 Nov 1, 2022
f13a32b
Update CHANGELOG.md
ShaMan123 Nov 1, 2022
02ef9d7
annotate mixins
ShaMan123 Nov 1, 2022
7a7279b
annotate
ShaMan123 Nov 1, 2022
bf6ed06
auto fixes
ShaMan123 Nov 1, 2022
f61c571
c
ShaMan123 Nov 1, 2022
365eceb
mmm
ShaMan123 Nov 3, 2022
3ee236e
absorb ITextBase
ShaMan123 Nov 3, 2022
a501a6e
types
ShaMan123 Nov 3, 2022
38682f3
Update text_style.mixin.ts
ShaMan123 Nov 3, 2022
9d8a72f
Update itext.class.ts
ShaMan123 Nov 3, 2022
7ea2200
Update text.class.ts
ShaMan123 Nov 3, 2022
1f6d494
Update index.js
ShaMan123 Nov 3, 2022
498d43f
Update textbox.class.ts
ShaMan123 Nov 3, 2022
4f2958a
Update text.class.ts
ShaMan123 Nov 3, 2022
14338c0
Update text.js
ShaMan123 Nov 3, 2022
61c9f73
Update itext.class.ts
ShaMan123 Nov 3, 2022
4e224b6
Update itext.class.ts
ShaMan123 Nov 3, 2022
cd77e5d
Update text.js
ShaMan123 Nov 3, 2022
064d09f
revert junk
ShaMan123 Nov 3, 2022
b392cc1
Update text_to_svg.js
ShaMan123 Nov 3, 2022
8980236
Create Untitled-1.json
ShaMan123 Nov 3, 2022
b9916f1
checkout IText mixins
ShaMan123 Nov 3, 2022
c14fd24
Merge branch 'master' into ts-texts-1
ShaMan123 Nov 3, 2022
0d7bc75
cleanup
ShaMan123 Nov 3, 2022
a5e4e12
Update text.class.ts
ShaMan123 Nov 3, 2022
a9cfab7
Update text.class.ts
ShaMan123 Nov 3, 2022
2529938
Update text.class.ts
ShaMan123 Nov 3, 2022
9f3c09a
Update text.class.ts
ShaMan123 Nov 3, 2022
332e1cd
Update text.class.ts
ShaMan123 Nov 3, 2022
f43022b
Update itext.class.ts
ShaMan123 Nov 3, 2022
110f776
Update text.js
ShaMan123 Nov 3, 2022
d7c29a2
Update text.class.ts
ShaMan123 Nov 3, 2022
f3bbe37
Merge branch 'master' into ts-texts
ShaMan123 Nov 3, 2022
7351844
Merge branch 'ts-texts-1' into ts-texts
ShaMan123 Nov 3, 2022
af12bc3
Revert "checkout IText mixins"
ShaMan123 Nov 3, 2022
0c3b9c7
m
ShaMan123 Nov 3, 2022
18068de
Update text.class.ts
ShaMan123 Nov 3, 2022
3a7af42
Merge branch 'ts-texts-1' into ts-texts
ShaMan123 Nov 3, 2022
5364846
Update itext_key_behavior.mixin.ts
ShaMan123 Nov 3, 2022
c66d4fa
many and more
ShaMan123 Nov 3, 2022
233cf54
p
ShaMan123 Nov 3, 2022
845d29e
more
ShaMan123 Nov 3, 2022
3690c20
Update itext_click_behavior.mixin.ts
ShaMan123 Nov 3, 2022
8da8d8a
Update itext_click_behavior.mixin.ts
ShaMan123 Nov 3, 2022
1fefdfe
k
ShaMan123 Nov 3, 2022
5efa491
proto chain
ShaMan123 Nov 3, 2022
cb768ab
m
ShaMan123 Nov 3, 2022
3ac07df
Update index.js
ShaMan123 Nov 3, 2022
6846f95
type
ShaMan123 Nov 3, 2022
74670ac
Update itext_behavior.mixin.ts
ShaMan123 Nov 3, 2022
37ece6d
checkout svg mixin
ShaMan123 Nov 3, 2022
f601a19
remove `setSelectionInBoundaries`
ShaMan123 Nov 9, 2022
8dcb9b9
mv
ShaMan123 Nov 9, 2022
d69dfe4
dead code
ShaMan123 Nov 9, 2022
e924354
stopEvent
ShaMan123 Nov 9, 2022
d0d5243
Merge branch 'master' into ts-texts-mixins
asturur Nov 20, 2022
4dca57b
wrong resolution of conflict
asturur Nov 20, 2022
b94dff4
fix(): wrong stats when changing index
ShaMan123 Nov 4, 2022
0e39b0b
reduced diffs with mater
asturur Nov 20, 2022
3286ff1
var let const
asturur Nov 20, 2022
b48dddc
var let const
asturur Nov 20, 2022
5bb0996
forgot ;
asturur Nov 20, 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
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
size: { fabric: { minified: fs.statSync('dist/fabric.min.js').size, bundled: fs.statSync('dist/fabric.js').size } }
});
- name: checkout src files
run: git checkout origin/master -- src
run: git checkout origin/master -- src index.js HEADER.js
- name: upstream build stats
run: npm run build -- -s
- name: persist
Expand Down
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 text classes/mixins [#8408](https://github.com/fabricjs/fabric.js/pull/8408)
- chore(TS): migrate Collection [#8433](https://github.com/fabricjs/fabric.js/pull/8433)
- ci(): Simplify filestats even more [#8449](https://github.com/fabricjs/fabric.js/pull/8449)
- chore(TS): migrate filter backends [#8403](https://github.com/fabricjs/fabric.js/pull/8403)
Expand Down
3 changes: 0 additions & 3 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,6 @@ import './src/filters/composed_filter.class'; // optional image_filters
import './src/filters/hue_rotation.class'; // optional image_filters
import './src/shapes/text.class'; // optional text
import './src/shapes/itext.class'; // optional itext
import './src/mixins/itext_behavior.mixin'; // optional itext
import './src/mixins/itext_click_behavior.mixin'; // optional itext
import './src/mixins/itext_key_behavior.mixin'; // optional itext
import './src/mixins/itext.svg_export'; // optional itext
import './src/shapes/textbox.class'; // optional textbox
import './src/controls'; // optional interaction
Expand Down
4 changes: 2 additions & 2 deletions src/mixins/canvas_events.mixin.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
//@ts-nocheck

import { stopEvent } from '../util/dom_event';
import { fireEvent } from '../util/fireEvent';

(function (global) {
Expand Down Expand Up @@ -266,8 +267,7 @@ import { fireEvent } from '../util/fireEvent';
addListener(this.upperCanvasEl, 'drag', this._onDragProgress);
return;
}
e.preventDefault();
e.stopPropagation();
stopEvent(e);
},

/**
Expand Down
Loading