Skip to content

Free open-source image editor for the browser

Improve mobile editing

Rodrigo9ebac85e1fb0
diff --git a/src/app/editor/index.tsx b/src/app/editor/index.tsx
index 7126ae2..979819f 100644
--- a/src/app/editor/index.tsx
+++ b/src/app/editor/index.tsx
@@ -2,7 +2,7 @@ import { Canvas } from "vgpu-react";
import type { Source } from "@/app/scene";
import ResizablePanel from "@/components/ui/resizable-panel";
import Spinner from "@/components/ui/spinner";
-import usePanZoom from "@/hooks/use-pan-zoom";
+import { usePanZoom } from "@/hooks/use-pan-zoom";
import type { Target } from "@/lib/decode";
import CanvasRenderer from "./renderer";
import { RendererProvider } from "./renderer/provider";
@@ -16,7 +16,7 @@ function Workspace({ image }: WorkspaceProps) {
return (
<RendererProvider source={image}>
<div
- className="grid min-w-0 flex-1 cursor-grab touch-none place-items-center active:cursor-grabbing"
+ className="grid min-h-0 min-w-0 flex-1 cursor-grab touch-none place-items-center active:cursor-grabbing"
ref={ref}
{...handlers}
>
@@ -35,7 +35,7 @@ export default function Editor({ source }: EditorProps) {
const { image, error } = source;
return (
- <main className="flex h-full">
+ <main className="flex h-dvh flex-col md:flex-row">
{image ? (
<Workspace image={image} />
) : (
diff --git a/src/components/ui/resizable-panel.tsx b/src/components/ui/resizable-panel.tsx
index e3c59c3..930562e 100644
--- a/src/components/ui/resizable-panel.tsx
+++ b/src/components/ui/resizable-panel.tsx
@@ -7,7 +7,7 @@ type ResizablePanelProps = ComponentProps<"aside"> & {
max?: number;
};
-/** Right-side panel resized by dragging its left edge. */
+/** Bottom half on mobile; right-side panel with a draggable left edge on desktop. */
export default function ResizablePanel({
width: initial = 288,
min = 240,
@@ -24,12 +24,15 @@ export default function ResizablePanel({
return (
<aside
- className={cn("relative shrink-0 bg-neutral-800 shadow-ridge", className)}
+ className={cn(
+ "relative h-1/2 shrink-0 bg-neutral-800 shadow-ridge max-md:w-full! max-md:border-t max-md:border-neutral-600 md:h-auto",
+ className,
+ )}
style={{ width, ...style }}
{...props}
>
<div
- className="absolute inset-y-0 -left-1 w-2 cursor-col-resize touch-none after:absolute after:inset-y-0 after:left-1 after:w-px after:bg-black hover:after:bg-neutral-600 after:transition-colors after:duration-200"
+ className="absolute inset-y-0 -left-1 hidden w-2 cursor-col-resize touch-none after:absolute after:inset-y-0 after:left-1 after:w-px after:bg-black hover:after:bg-neutral-600 after:transition-colors after:duration-200 md:block"
onPointerDown={(event) =>
event.currentTarget.setPointerCapture(event.pointerId)
}
diff --git a/src/hooks/use-pan-zoom.ts b/src/hooks/use-pan-zoom.ts
index f1fe5bc..d6bb3e4 100644
--- a/src/hooks/use-pan-zoom.ts
+++ b/src/hooks/use-pan-zoom.ts
@@ -14,6 +14,14 @@ export type View = { zoom: number; pan: Point; percent: number };
const fit: View = { zoom: 1, pan: [0, 0], percent: 0 };
const maxZoom = 8;
+function measureGesture(points: Iterable<Point>) {
+ const [first, second = first] = points;
+ return {
+ center: [(first[0] + second[0]) / 2, (first[1] + second[1]) / 2] as const,
+ distance: Math.hypot(second[0] - first[0], second[1] - first[1]),
+ };
+}
+
/** Keeps the content point under `focal` fixed while changing zoom. */
function zoomAt(view: View, focal: Point, zoom: number): View {
const ratio = Math.min(Math.max(zoom, 1), maxZoom) / view.zoom;
@@ -49,10 +57,11 @@ function clamp(view: View, content: Size, viewport: Size): View {
/**
* Pan and zoom over `content` inside the element given `ref`.
* Zoom 1 is the initial fit: contain, but no larger than real size. `pan` is in CSS px from the viewport center.
- * Wheel pans, ctrl/cmd+wheel (and pinch) zooms at the cursor, drag pans, double-click resets.
+ * Wheel/drag pans, ctrl/cmd+wheel zooms at the cursor, two pointers pinch and pan, double-click resets.
*/
-export default function usePanZoom(content?: Size) {
+export function usePanZoom(content?: Size) {
const ref = useRef<HTMLDivElement>(null);
+ const pointers = useRef(new Map<number, Point>());
const [view, setView] = useState(fit);
const update = useCallback(
@@ -96,15 +105,46 @@ export default function usePanZoom(content?: Size) {
};
}, [update]);
+ const release = (event: PointerEvent<HTMLElement>) =>
+ pointers.current.delete(event.pointerId);
const handlers = {
- onPointerDown: (event: PointerEvent<HTMLElement>) =>
- event.currentTarget.setPointerCapture(event.pointerId),
- onPointerMove: (event: PointerEvent<HTMLElement>) =>
- event.buttons === 1 &&
- update((view) => ({
- ...view,
- pan: [view.pan[0] + event.movementX, view.pan[1] + event.movementY],
- })),
+ onPointerDown: (event: PointerEvent<HTMLElement>) => {
+ if (event.button !== 0 || pointers.current.size === 2) {
+ return;
+ }
+ pointers.current.set(event.pointerId, [event.clientX, event.clientY]);
+ event.currentTarget.setPointerCapture(event.pointerId);
+ },
+ onPointerMove: (event: PointerEvent<HTMLElement>) => {
+ const points = pointers.current;
+ if (!points.has(event.pointerId)) {
+ return;
+ }
+ const previous = measureGesture(points.values());
+ points.set(event.pointerId, [event.clientX, event.clientY]);
+ const next = measureGesture(points.values());
+ const { left, top, width, height } =
+ event.currentTarget.getBoundingClientRect();
+ const focal: Point = [
+ previous.center[0] - left - width / 2,
+ previous.center[1] - top - height / 2,
+ ];
+ const ratio =
+ previous.distance > 0 ? next.distance / previous.distance : 1;
+ update((view) => {
+ const zoomed = zoomAt(view, focal, view.zoom * ratio);
+ return {
+ ...zoomed,
+ pan: [
+ zoomed.pan[0] + next.center[0] - previous.center[0],
+ zoomed.pan[1] + next.center[1] - previous.center[1],
+ ],
+ };
+ });
+ },
+ onPointerUp: release,
+ onPointerCancel: release,
+ onLostPointerCapture: release,
onDoubleClick: () => setView(fit),
};