Skip to content

Feature/fabric7 #3

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

Open
jnweiger wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Feature/fabric7 #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
74573e3
for fabric 7.x compatbilitiy, claude.ai suggests:
jnweiger Jun 1, 2026
47954c6
porting to fabric 7.4.0
jnweiger Jun 1, 2026
1c3de22
Merge branch 'main' into feature/fabric7
jnweiger Jun 25, 2026
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
37 changes: 16 additions & 21 deletions frontend/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion frontend/package.json.md5
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
edac85e67d049bbe42b2202df93191c4
edac85e67d049bbe42b2202df93191c4
21 changes: 12 additions & 9 deletions frontend/src/components/Workspace.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ const Workspace = forwardRef<WorkspaceRef, WorkspaceProps>(({ activeLaser, onCol
const lowerCanvas = fabricCanvas.current.getElement();
const upperCanvas = (fabricCanvas.current as any).upperCanvasEl as HTMLCanvasElement | undefined;


fabricCanvas.current.backgroundColor = background as any;
fabricCanvas.current.requestRenderAll();

Expand Down Expand Up @@ -200,12 +201,14 @@ const Workspace = forwardRef<WorkspaceRef, WorkspaceProps>(({ activeLaser, onCol
if (!obj) return;

obj.setCoords();
if (!obj.aCoords) return;
const coords = obj.getCoords();
if (!coords || coords.length < 4) return;
const [tl, tr, br, bl] = coords;

const minX = Math.min(obj.aCoords.tl.x, obj.aCoords.tr.x, obj.aCoords.bl.x, obj.aCoords.br.x);
const minY = Math.min(obj.aCoords.tl.y, obj.aCoords.tr.y, obj.aCoords.bl.y, obj.aCoords.br.y);
const maxX = Math.max(obj.aCoords.tl.x, obj.aCoords.tr.x, obj.aCoords.bl.x, obj.aCoords.br.x);
const maxY = Math.max(obj.aCoords.tl.y, obj.aCoords.tr.y, obj.aCoords.bl.y, obj.aCoords.br.y);
const minX = Math.min(tl.x, tr.x, bl.x, br.x);
const minY = Math.min(tl.y, tr.y, bl.y, br.y);
const maxX = Math.max(tl.x, tr.x, bl.x, br.x);
const maxY = Math.max(tl.y, tr.y, bl.y, br.y);

let left = obj.left || 0;
let top = obj.top || 0;
Expand Down Expand Up @@ -316,14 +319,14 @@ const Workspace = forwardRef<WorkspaceRef, WorkspaceProps>(({ activeLaser, onCol
} catch {}
}
};
extractHex(obj.stroke);
extractHex(obj.fill);
extractHex(obj?.stroke as string | undefined);
extractHex(obj?.fill as string | fabric.TFiller | undefined);
});
onColorsDetected(Array.from(uniqueColors));
}

const obj = fabric.util.groupSVGElements(objects, options);
const obj = fabric.util.groupSVGElements(objects.filter((o): o is fabric.FabricObject => o !== null), options);

obj.set({
left: 0,
top: 0,
Expand Down
Loading