Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 13 additions & 3 deletions packages/app/src/AppNav.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ export default function AppNav() {
setRemoveFullyErased,
activeObject,
erasable,
erasableBackground,
toggleErasableBackground,
toggleErasable,
} = useStore();

Expand Down Expand Up @@ -60,7 +62,6 @@ export default function AppNav() {
label={<Typography variant="caption">Action</Typography>}
labelPlacement="bottom"
/>

<FormControlLabel
control={
<Switch
Expand All @@ -75,7 +76,16 @@ export default function AppNav() {
}
labelPlacement="bottom"
/>

<FormControlLabel
control={
<Switch
checked={!!erasableBackground}
onChange={(e) => toggleErasableBackground(e.target.checked)}
/>
}
label={<Typography variant="caption">Erasable background</Typography>}
labelPlacement="bottom"
/>
{activeObject && (
<FormControlLabel
control={
Expand All @@ -84,7 +94,7 @@ export default function AppNav() {
value={erasable}
onChange={(e, value) =>
toggleErasable(
value === 'deep' ? value : Boolean(Number(value))
value === 'deep' ? value : Boolean(Number(value)),
)
}
exclusive
Expand Down
25 changes: 14 additions & 11 deletions packages/app/src/Fabric.tsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
import { EraserBrush } from '@erase2d/fabric';
import * as fabric from 'fabric';
import { useCallback, useEffect, useRef } from 'react';
import { useCallback, useEffect } from 'react';
import { Canvas } from '../src/Canvas';
import { useIsTransparentWorker } from '../src/useIsTransparentWorker';
import { useStore } from './Store';

export default function FabricPage() {
const { tool, removeFullyErased, setActiveObject } = useStore();
const ref = useRef<fabric.Canvas>(null);
const { canvas: ref, tool, removeFullyErased, setActiveObject } = useStore();
const isTransparent = useIsTransparentWorker();

const onLoad = useCallback(
Expand Down Expand Up @@ -109,10 +108,14 @@ export default function FabricPage() {
originX: 'center',
originY: 'center',
}),
}
},
),
];

const img = document.createElement('img');
img.src = 'https://cdn.viva.org.uk/wp-content/uploads/2020/08/Horses.jpg';
canvas.backgroundImage = new fabric.FabricImage(img, { erasable: false });

canvas.add(
rect,
...(!!group
Expand All @@ -124,7 +127,7 @@ export default function FabricPage() {
}),
]
: objects),
circle
circle,
);

const animate = (toState: number) => {
Expand All @@ -137,12 +140,12 @@ export default function FabricPage() {
easing: toState
? fabric.util.ease.easeInOutQuad
: fabric.util.ease.easeInOutSine,
}
},
);
};
animate(1);
},
[ref]
[ref],
);

useEffect(() => {
Expand All @@ -159,7 +162,7 @@ export default function FabricPage() {
canvas.isDrawingMode = tool !== 'select';
return canvas.on(
'path:created',
({ path }) => tool === 'draw' && (path.erasable = true)
({ path }) => tool === 'draw' && (path.erasable = true),
);
}, [ref, tool]);

Expand All @@ -180,8 +183,8 @@ export default function FabricPage() {
console.log(res);
const transparent = await Promise.all(
e.detail.targets.map(
async (target) => [target, await isTransparent(target)] as const
)
async (target) => [target, await isTransparent(target)] as const,
),
);
const fullyErased = transparent
.filter(([, transparent]) => transparent)
Expand All @@ -201,7 +204,7 @@ export default function FabricPage() {
const disposers = (
['selection:created', 'selection:updated', 'selection:cleared'] as const
).map((ev) =>
canvas.on(ev, () => setActiveObject(canvas.getActiveObject()))
canvas.on(ev, () => setActiveObject(canvas.getActiveObject())),
);
return () => disposers.forEach((d) => d());
}, [ref, tool]);
Expand Down
23 changes: 21 additions & 2 deletions packages/app/src/Store.tsx
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
import type { FabricObject } from 'fabric';
import { Canvas, type FabricObject } from 'fabric';
import {
createContext,
useCallback,
useContext,
useEffect,
useRef,
useState,
} from 'react';
import type { Tool } from '../src/tool';

export function useStoreData() {
const canvas = useRef<Canvas | null>(null);
const [tool, setTool] = useState<Tool>('erase');
const [removeFullyErased, setRemoveFullyErased] = useState(true);
const [activeObject, setActiveObject] = useState<FabricObject>();
Expand All @@ -25,17 +27,34 @@ export function useStoreData() {
setErasable(erasable);
tool !== 'erase' && tool !== 'undo' && setTool('erase');
},
[activeObject, setErasable, tool]
[activeObject, setErasable, tool],
);
const [erasableBackground, setErasableBackground] = useState<
boolean | 'deep' | undefined
>();
const toggleErasableBackground = useCallback(
(erasable: boolean | 'deep') => {
const bg = canvas.current?.backgroundImage;
if (!bg) {
return;
}
bg.erasable = erasable;
setErasableBackground(erasable);
},
[setErasable, tool],
);

return {
canvas,
tool,
setTool,
removeFullyErased,
setRemoveFullyErased,
activeObject,
setActiveObject,
erasable,
erasableBackground,
toggleErasableBackground,
toggleErasable,
};
}
Expand Down
2 changes: 1 addition & 1 deletion packages/fabric/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

export { ClippingGroup } from './src/ClippingGroup';
export {
EraserBrush,
eraseCanvasDrawable,
eraseObject,
EraserBrush,
type ErasingEvent,
type ErasingEventType,
} from './src/EraserBrush';
Expand Down