chore(TS): finalize interactivity #8404

ShaMan123 · 2022-10-31T01:06:23Z

Motivation

Description

Finalize migrating interactivity and controls since we did it in parallel
#8400 #8401

Changes

_setCornerCoords => _calcCornerCoords
__corner type is not 0 anymore, string or undefined

Gist

In Action

github-actions · 2022-10-31T01:07:46Z

Build Stats

file / KB (diff)	bundled	minified
fabric	937.760 (+0.144)	295.748 (-0.035)

This reverts commit f3a4ce3.

github-actions · 2022-10-31T01:29:13Z

Coverage after merging finalize-interactivity into master will be

83.17%

Coverage Report

File	Stmts	Branches	Funcs	Lines	Uncovered Lines
index.ts	100%	100%	100%	100%
src
cache.ts	96.97%	90%	100%	100%	56
config.ts	77.27%	66.67%	66.67%	84.62%	130, 138–140, 151–153
constants.ts	100%	100%	100%	100%
env.ts	72.73%	53.33%	100%	79.17%	22, 22–23, 23, 23, 25, 25, 27, 29, 31–32, 62
intersection.class.ts	100%	100%	100%	100%
pattern.class.ts	92.19%	85.71%	100%	96.30%	118, 124, 135, 144, 96
point.class.ts	100%	100%	100%	100%
shadow.class.ts	98.48%	96%	100%	100%	156
typedefs.ts	100%	100%	100%	100%
src/brushes
base_brush.class.ts	100%	100%	100%	100%
circle_brush.class.ts	0%	0%	0%	0%	100, 102–104, 113, 113, 113, 115, 117, 119–121, 123–126, 134, 141, 143, 28–29, 37–41, 45–49, 56–59, 67–71, 73, 81, 81, 81, 81, 81–82, 84, 84, 84–87, 89, 97–98
pattern_brush.class.ts	97.06%	87.50%	100%	100%	21
pencil_brush.class.ts	91.81%	85.42%	100%	93.52%	122–123, 152, 152–154, 276, 280, 285–286, 68–69, 84–85
spray_brush.class.ts	0%	0%	0%	0%	100–101, 103–104, 112, 112, 112, 112, 112–113, 115–116, 123–124, 126, 128–132, 141, 145–146, 146, 154, 154, 154–157, 159–162, 166–167, 169, 171–174, 177, 184–185, 187, 189–190, 192, 199–200, 202–203, 206, 206, 213, 213, 217, 22–23, 25–27, 27, 27–29, 33, 42, 49, 56, 63, 70, 89–91, 99
src/canvas
TextEditingManager.ts	100%	100%	100%	100%
canvas.class.ts	93.68%	90.42%	94%	96.05%	1137, 1137–1138, 1141, 1161, 1161, 1220, 1270–1271, 1292, 1300, 1413–1414, 1416–1417, 1437–1438, 556–557, 562, 572, 705–706, 708–709, 709, 709, 755–756, 817–818, 871–873, 903, 908–909, 938–939
canvas_events.ts	78.83%	76.63%	83.33%	79.69%	1012–1013, 1013, 1013–1015, 1017–1018, 1018, 1018, 1020, 1028, 1028, 1028–1030, 1030, 1030, 1036–1037, 1045–1046, 1046, 1046–1047, 1052, 1054, 1085–1087, 1090–1091, 1095–1096, 1213–1215, 1218–1219, 1292, 1412, 1506–1507, 1513, 1517–1518, 1534, 1556, 1603, 1608, 1656, 175, 200, 309–310, 313–317, 322, 345–346, 351–356, 376, 376, 376–377, 377, 377–378, 386, 391–392, 392, 392–393, 395, 404, 410–411, 411, 411, 454, 462, 466, 466, 466, 466, 466–467, 469, 551–552, 552, 552–553, 559, 559, 559–561, 581, 583, 583, 583–584, 584, 584, 587, 587, 587–588, 591, 600–601, 603–604, 606, 606–607, 609–610, 622–623, 623, 623–624, 626–630, 636, 643, 683, 683, 683, 685, 687–691, 697, 703, 703, 703–704, 706, 709, 714, 727, 754, 811–812, 812, 812–813, 815, 818–819, 819, 819–820, 822–823, 826, 826–828, 831–832, 902, 914, 921, 942, 974, 995–996
static_canvas.class.ts	94.80%	89.88%	97.92%	97.01%	1089–1090, 1090, 1090–1091, 1211, 1221, 1275–1276, 1279, 1314–1315, 1393, 1402, 1407, 1456–1457, 1685, 1685–1686, 1735, 1738, 1741, 1741, 1741, 1744, 1747, 1747, 1747, 286–287, 384–385, 387–388, 763, 763–764, 849
src/color
color.class.ts	92.16%	86.49%	100%	94.29%	330–331, 335–336, 339–340, 58, 88–89, 89, 91, 91, 91–92, 94–95
color_map.ts	100%	100%	100%	100%
constants.ts	100%	100%	100%	100%
util.ts	100%	100%	100%	100%
src/controls
changeWidth.ts	100%	100%	100%	100%
control.class.ts	93.90%	88.89%	90.91%	97.73%	235, 319, 319, 354
controls.render.ts	81.63%	78%	100%	84.78%	106, 111, 121, 121, 45, 50, 61, 61, 65–72, 81–82
default_controls.ts	86.67%	66.67%	100%	100%	122, 129
drag.ts	100%	100%	100%	100%
polyControl.ts	6.35%	0%	0%	11.43%	100, 105, 119, 121–124, 124, 127, 134, 17, 25–28, 30, 30, 30, 30, 30, 30, 30, 30, 50–56, 56, 56, 56, 56, 58, 63–64, 66, 76, 82–83, 83, 83–84, 88–90, 90, 90, 90, 90, 92
rotate.ts	20%	12.50%	50%	22.22%	45, 51, 51, 51–52, 55–57, 59, 59, 59, 59, 59–61, 61, 61–63, 65, 65, 65–67, 67, 67–68, 73, 73, 73–74, 76, 78, 80–81
scale.ts	93.41%	92.68%	100%	93.59%	129–130, 132–134, 148–149, 181–183, 42
scaleSkew.ts	78.79%	64.29%	100%	85.71%	27, 29, 29, 29, 31, 33, 35
skew.ts	91.03%	79.31%	100%	97.67%	130–131, 162–163, 170, 176, 178
util.ts	100%	100%	100%	100%
wrapWithFireEvent.ts	100%	100%	100%	100%
wrapWithFixedAnchor.ts	100%	100%	100%	100%
src/filters
2d_backend.class.ts	92%	83.33%	100%	93.75%	35–36
FilterBackend.ts	88.89%	88.89%	100%	85.71%	15–16
WebGLProbe.ts	37.14%	40%	60%	30%	28–30, 30, 30–31, 33–35, 43, 46–48, 48, 48–51, 53, 58
base_filter.class.ts	20.83%	20.83%	33.33%	18.18%

ShaMan123

READY

src/mixins/object_interactivity.mixin.ts

ShaMan123 · 2022-10-31T01:08:17Z

src/controls/control.class.ts

-    fabricObject: FabricObject,
-    currentControl: Control
-  ) {
+  positionHandler(dim: Point, finalMatrix: TMat2D, fabricObject: FabricObject) {


see prev comment

ShaMan123 · 2022-10-31T01:09:28Z

src/mixins/object_interactivity.mixin.ts

-   * @todo evaluate simplification of code switching to circle interaction area at runtime
-   * @private
-   */
-  _setCornerCoords(): void {


refactored into _calcCornerCoords() in a revertable commit 5afe4c6
reasons:

cleaner/readable code

better typed

perf (one less iteration, kept in a contained method since I saw you wrote it might be removed)

since it is private, considered not breaking

ShaMan123 · 2022-10-31T01:09:39Z

src/mixins/object_interactivity.mixin.ts

+   * @todo evaluate simplification of code switching to circle interaction area at runtime
+   * @private
+   */
+  private _calcCornerCoords(control: Control, position: Point) {


see prev comment

ShaMan123 · 2022-10-31T01:10:42Z

src/mixins/object_interactivity.mixin.ts


-type TOCoord = IPoint & {
+type TOCoord = Point & {


I am pretty sure we use it as a Point in fabric

done here instead 9329526

This reverts commit b8b8d5b.

ShaMan123 · 2022-10-31T21:55:07Z

ready

ShaMan123

updated

ShaMan123

@asturur this is waiting too long

ShaMan123

updated from master

ShaMan123 · 2023-01-15T07:39:01Z

src/shapes/Object/InteractiveObject.ts

-    );
+    this.forEachControl((control, key) => {
+      const position = control.positionHandler(dim, finalMatrix, this, control);
+      coords[key] = Object.assign(


using assign since I think we use it as Point as well

i will clarify this with a comment. so it doesn't get swapped with a spread operator

…8404)

ShaMan123 added 6 commits October 31, 2022 02:12

Update rotate.ts

1c9b1cc

__corner=0 => undef

6aa8497

Update controls.render.ts

3f1dc1e

types + typos

53c27e4

dep(): _setCornerCoords => _calcCornerCoords

5afe4c6

fix(): positionHandler signature

b8b8d5b

ShaMan123 added 8 commits October 31, 2022 03:15

Update object.class.ts

f3a4ce3

Revert "Update object.class.ts"

82e0cdf

This reverts commit f3a4ce3.

type _setLineDash

d24d2ac

Update object_interactivity.js

e51a1d1

Update CHANGELOG.md

5fbed03

Update CHANGELOG.md

da35fe3

Update object_interactivity.js

95e27ef

Update object.class.ts

b1e4807

ShaMan123 commented Oct 31, 2022

View reviewed changes

ShaMan123 requested a review from asturur October 31, 2022 01:33

ShaMan123 added 3 commits October 31, 2022 05:09

revert _setLineDash

57fefb1

done here instead 9329526

Merge branch 'master' into finalize-interactivity

1a08a3e

Revert "fix(): positionHandler signature"

9f3d5ea

This reverts commit b8b8d5b.

ShaMan123 and others added 8 commits November 23, 2022 11:56

Merge branch 'master' into finalize-interactivity

2bda07f

Merge branch 'master' into finalize-interactivity

40703d4

fix merge conflict

7b621ad

Update svgParsing.ts

756bcd4

Merge branch 'master' into finalize-interactivity

1ab3062

Merge branch 'master' into finalize-interactivity

5aefe9f

Merge branch 'master' into finalize-interactivity

da37190

Merge branch 'master' into finalize-interactivity

e1f85fc

ShaMan123 commented Dec 19, 2022

View reviewed changes

ShaMan123 added 3 commits December 29, 2022 23:14

Merge branch 'master' into finalize-interactivity

3a73bff

port change

95d69ed

Merge branch 'master' into finalize-interactivity

bbe8b12

ShaMan123 commented Jan 6, 2023

View reviewed changes

ShaMan123 added 7 commits January 6, 2023 10:23

fix imports

acac793

Merge branch 'master' into finalize-interactivity

dbd1e2c

Update defaultValues.ts

88f5f02

Update CHANGELOG.md

bf12a63

Update CHANGELOG.md

8a6474b

optionl

19bfd9b

a bit nicer

4fdbae1

ShaMan123 commented Jan 15, 2023

View reviewed changes

asturur added 4 commits January 16, 2023 12:36

added comment

b110152

Merge branch 'master' into finalize-interactivity

2d1264a

restore import order

50a9bc0

Update CHANGELOG.md

262af53

asturur approved these changes Jan 16, 2023

View reviewed changes

asturur merged commit a3631b6 into master Jan 16, 2023

ShaMan123 deleted the finalize-interactivity branch January 16, 2023 13:00

ShaMan123 added a commit that referenced this pull request Mar 16, 2024

chore(TS): Minor refactor of interactivity and control TS migrations (#…

b932819

…8404)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

chore(TS): finalize interactivity #8404

chore(TS): finalize interactivity #8404

ShaMan123 commented Oct 31, 2022 •

edited

github-actions bot commented Oct 31, 2022 •

edited

github-actions bot commented Oct 31, 2022 •

edited

ShaMan123 left a comment

ShaMan123 Oct 31, 2022

ShaMan123 Oct 31, 2022

ShaMan123 Oct 31, 2022

ShaMan123 Oct 31, 2022

ShaMan123 commented Oct 31, 2022

ShaMan123 left a comment

ShaMan123 left a comment

ShaMan123 left a comment

ShaMan123 Jan 15, 2023

asturur Jan 16, 2023

chore(TS): finalize interactivity #8404

chore(TS): finalize interactivity #8404

Conversation

ShaMan123 commented Oct 31, 2022 • edited

Motivation

Description

Changes

Gist

In Action

github-actions bot commented Oct 31, 2022 • edited

github-actions bot commented Oct 31, 2022 • edited

ShaMan123 left a comment

Choose a reason for hiding this comment

ShaMan123 Oct 31, 2022

Choose a reason for hiding this comment

ShaMan123 Oct 31, 2022

Choose a reason for hiding this comment

ShaMan123 Oct 31, 2022

Choose a reason for hiding this comment

ShaMan123 Oct 31, 2022

Choose a reason for hiding this comment

ShaMan123 commented Oct 31, 2022

ShaMan123 left a comment

Choose a reason for hiding this comment

ShaMan123 left a comment

Choose a reason for hiding this comment

ShaMan123 left a comment

Choose a reason for hiding this comment

ShaMan123 Jan 15, 2023

Choose a reason for hiding this comment

asturur Jan 16, 2023

Choose a reason for hiding this comment

ShaMan123 commented Oct 31, 2022 •

edited

github-actions bot commented Oct 31, 2022 •

edited

github-actions bot commented Oct 31, 2022 •

edited