From ec3b6e320e081b21970ac8f21e561574167f0c17 Mon Sep 17 00:00:00 2001 From: Daxesh Vadgama Date: Thu, 6 Jun 2024 21:48:15 +1000 Subject: [PATCH 1/2] fixed renderControls order --- CHANGELOG.md | 1 + src/shapes/ActiveSelection.ts | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 563e1cb96f7..00cb86c3689 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## [next] +- fix(_renderControls): fixed render order so group controls are rendered over child objects - types(): Make event type explicit - non generic, and fix pattern fromObject type [#9907](https://github.com/fabricjs/fabric.js/pull/9907) ## [6.0.0-rc2] diff --git a/src/shapes/ActiveSelection.ts b/src/shapes/ActiveSelection.ts index d30668e4493..474d65f0cec 100644 --- a/src/shapes/ActiveSelection.ts +++ b/src/shapes/ActiveSelection.ts @@ -237,7 +237,6 @@ export class ActiveSelection extends Group { ) { ctx.save(); ctx.globalAlpha = this.isMoving ? this.borderOpacityWhenMoving : 1; - super._renderControls(ctx, styleOverride); const options = { hasControls: false, ...childrenOverride, @@ -246,6 +245,7 @@ export class ActiveSelection extends Group { for (let i = 0; i < this._objects.length; i++) { this._objects[i]._renderControls(ctx, options); } + super._renderControls(ctx, styleOverride); ctx.restore(); } } From c5126bffa227240299266c055acf51d51b9e65f2 Mon Sep 17 00:00:00 2001 From: Andrea Bogazzi Date: Mon, 10 Jun 2024 09:33:14 +0200 Subject: [PATCH 2/2] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 53a15a0e391..efea02ab91f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ ## [next] -- fix(_renderControls): fixed render order so group controls are rendered over child objects +- fix(_renderControls): fixed render order so group controls are rendered over child objects [#9914](https://github.com/fabricjs/fabric.js/pull/9914) - fix(filters): RemoveColor has missing getFragmentSource method ( typo ) [#9911](https://github.com/fabricjs/fabric.js/pull/9911) - types(): Make event type explicit - non generic, and fix pattern fromObject type [#9907](https://github.com/fabricjs/fabric.js/pull/9907)