Skip to content

armgit / mimik

Public Imported from GitHub
0

🎬 A browser extension and desktop app that turns your clicks into step-by-step guides with annotated screenshots 📖

feat(editor): consolidate editor chrome and pulse the click target

Luis Ortiz13a1fb91b2b6
diff --git a/src/locales/en.yml b/src/locales/en.yml
index 1b5e4d2..b900260 100644
--- a/src/locales/en.yml
+++ b/src/locales/en.yml
@@ -162,13 +162,9 @@ screenshotView:
zoomOut: Zoom out
saved: Saved
editMenu: Edit screenshot
- clickTarget: Click target
- editClickTarget: "Edit click target"
downloadEdited: "Edited image"
downloadOriginal: "Original image"
- annotate: Annotate
- redact: Redact
- crop: Crop
+ edit: "Edit"
replaceImage: Replace image
replaceHint: "Choose a new image for this step"
replaceDrop: "Click to browse or drop an image here"
diff --git a/src/locales/es.yml b/src/locales/es.yml
index ff6399e..2dab26d 100644
--- a/src/locales/es.yml
+++ b/src/locales/es.yml
@@ -162,13 +162,9 @@ screenshotView:
zoomOut: Alejar
saved: Guardado
editMenu: Editar captura
- clickTarget: Objetivo de clic
- editClickTarget: "Editar objetivo de clic"
downloadEdited: "Imagen editada"
downloadOriginal: "Imagen original"
- annotate: Anotar
- redact: Ocultar
- crop: Recortar
+ edit: "Editar"
replaceImage: Reemplazar imagen
replaceHint: "Elige una nueva imagen para este paso"
replaceDrop: "Haz clic para buscar o suelta una imagen aquí"
diff --git a/src/locales/fr.yml b/src/locales/fr.yml
index 9a0c62b..65b2eea 100644
--- a/src/locales/fr.yml
+++ b/src/locales/fr.yml
@@ -162,13 +162,9 @@ screenshotView:
zoomOut: "Zoom arrière"
saved: "Enregistré"
editMenu: "Modifier la capture"
- clickTarget: "Cible de clic"
- editClickTarget: "Modifier la cible de clic"
downloadEdited: "Image modifiée"
downloadOriginal: "Image originale"
- annotate: "Annoter"
- redact: "Masquer"
- crop: "Recadrer"
+ edit: "Modifier"
replaceImage: "Remplacer l'image"
replaceHint: "Choisissez une nouvelle image pour cette étape"
replaceDrop: "Cliquez pour parcourir ou déposez une image ici"
diff --git a/src/locales/pt-BR.yml b/src/locales/pt-BR.yml
index e73d81b..7f9d1ad 100644
--- a/src/locales/pt-BR.yml
+++ b/src/locales/pt-BR.yml
@@ -162,13 +162,9 @@ screenshotView:
zoomOut: Diminuir zoom
saved: Salvo
editMenu: Editar captura
- clickTarget: Alvo de clique
- editClickTarget: "Editar alvo de clique"
downloadEdited: "Imagem editada"
downloadOriginal: "Imagem original"
- annotate: Anotar
- redact: Ocultar
- crop: Recortar
+ edit: "Editar"
replaceImage: Substituir imagem
replaceHint: "Escolha uma nova imagem para esta etapa"
replaceDrop: "Clique para procurar ou solte uma imagem aqui"
diff --git a/src/ui/shared/AnnotationEditor.tsx b/src/ui/shared/AnnotationEditor.tsx
index c944e80..13d1f43 100644
--- a/src/ui/shared/AnnotationEditor.tsx
+++ b/src/ui/shared/AnnotationEditor.tsx
@@ -230,6 +230,7 @@ export default function AnnotationEditor({ screenshot, tool, onDone, onCancel }:
const [targetPicker, setTargetPicker] = useState(false);
const [hovering, setHovering] = useState(false);
const [anchor, setAnchor] = useState<{ x: number; y: number } | null>(null);
+ const [hue, setHue] = useState(0);
const [grabbing, setGrabbing] = useState(false);
const [mode, setMode] = useState<EditorMode>(initialModeFor(tool));
const [fill, setFill] = useState('transparent');
@@ -344,6 +345,17 @@ export default function AnnotationEditor({ screenshot, tool, onDone, onCancel }:
setAnchor({ x: b.x + b.width / 2, y: b.y + b.height });
}, [selectedId]);
+ useEffect(() => {
+ if (window.matchMedia('(prefers-reduced-motion: reduce)').matches) return;
+ let raf = 0;
+ const loop = () => {
+ setHue((h) => (h + 3) % 360);
+ raf = requestAnimationFrame(loop);
+ };
+ raf = requestAnimationFrame(loop);
+ return () => cancelAnimationFrame(raf);
+ }, []);
+
useEffect(() => {
if (!textEditor) return;
const id = requestAnimationFrame(() => textInputRef.current?.focus());
@@ -358,7 +370,10 @@ export default function AnnotationEditor({ screenshot, tool, onDone, onCancel }:
ctx.clearRect(0, 0, canvas.width, canvas.height);
ctx.drawImage(bitmap, 0, 0, canvas.width, canvas.height);
- for (const a of annotations) drawAnnotation(ctx, a, 0, 0);
+ for (const a of annotations) {
+ const pulsing = a.type === 'target' && a.id !== selectedId;
+ drawAnnotation(ctx, pulsing ? { ...a, color: `hsl(${hue} 85% 58%)` } : a, 0, 0);
+ }
if (draft) {
ctx.save();
ctx.globalAlpha = 0.7;
@@ -403,7 +418,7 @@ export default function AnnotationEditor({ screenshot, tool, onDone, onCancel }:
}
ctx.restore();
}
- }, [annotations, draft, cropDraft, selectedId, bitmap, getScale, mode, viewport]);
+ }, [annotations, draft, cropDraft, selectedId, bitmap, getScale, mode, viewport, hue]);
const handlePointerDown = (e: React.PointerEvent<HTMLCanvasElement>) => {
e.currentTarget.setPointerCapture(e.pointerId);
@@ -729,47 +744,6 @@ export default function AnnotationEditor({ screenshot, tool, onDone, onCancel }:
return (
<div className="fixed inset-0 z-50 bg-black/80 flex flex-col">
- <div className="px-4 py-2.5 bg-primary flex items-center justify-between shrink-0">
- <span className="text-xs font-medium text-primary-foreground">{i18n.t('annotationEditor.title')}</span>
- <div className="flex items-center gap-1.5">
- <button
- type="button"
- onClick={undo}
- disabled={past.length === 0}
- title={i18n.t('annotationEditor.undo')}
- className="flex items-center justify-center w-7 h-7 rounded-lg text-primary-foreground hover:bg-primary-foreground/15 disabled:opacity-30"
- >
- <Undo2 size={13} />
- </button>
- <button
- type="button"
- onClick={redo}
- disabled={future.length === 0}
- title={i18n.t('annotationEditor.redo')}
- className="flex items-center justify-center w-7 h-7 rounded-lg text-primary-foreground hover:bg-primary-foreground/15 disabled:opacity-30"
- >
- <Redo2 size={13} />
- </button>
- <div className="w-px h-5 bg-primary-foreground/15 mx-1" />
- <button
- type="button"
- onClick={onCancel}
- className="flex items-center gap-1 px-3 py-1.5 text-[11px] font-semibold text-primary-foreground rounded-lg border border-primary-foreground/10 bg-primary-foreground/[0.06] hover:bg-destructive/15 hover:text-destructive transition-colors"
- >
- <X size={12} />
- {i18n.t('common.cancel')}
- </button>
- <button
- type="button"
- onClick={handleDone}
- disabled={saving}
- className="flex items-center gap-1 px-3 py-1.5 text-[11px] font-bold text-primary bg-primary-foreground rounded-lg hover:bg-primary-foreground/90 transition-colors disabled:opacity-50"
- >
- <Check size={12} />
- {i18n.t('annotationEditor.done')}
- </button>
- </div>
- </div>
<div className="flex-1 flex overflow-hidden">
<div className="flex-1 flex items-center justify-center overflow-auto p-6">
<div className="relative inline-block">
@@ -1087,25 +1061,66 @@ export default function AnnotationEditor({ screenshot, tool, onDone, onCancel }:
</div>
)}
- <div className="flex items-center gap-2">
- {MODES.map(({ id, icon: Icon, labelKey }) => (
+ <div className="flex items-center gap-3 w-full justify-between">
+ <div className="flex items-center gap-1">
<button
- key={id}
type="button"
- onClick={() => {
- setMode(id);
- setSelectedId(null);
- }}
- className={`flex flex-col items-center justify-center gap-1 w-[74px] h-[60px] rounded-xl border transition-colors ${
- mode === id
- ? 'bg-secondary border-accent text-accent'
- : 'bg-card border-border text-foreground hover:bg-secondary/50'
- }`}
+ onClick={undo}
+ disabled={past.length === 0}
+ title={i18n.t('annotationEditor.undo')}
+ className="flex items-center justify-center w-8 h-8 rounded-lg text-foreground hover:bg-secondary disabled:opacity-30"
+ >
+ <Undo2 size={15} />
+ </button>
+ <button
+ type="button"
+ onClick={redo}
+ disabled={future.length === 0}
+ title={i18n.t('annotationEditor.redo')}
+ className="flex items-center justify-center w-8 h-8 rounded-lg text-foreground hover:bg-secondary disabled:opacity-30"
>
- <Icon size={17} />
- <span className="text-[11px] font-semibold">{i18n.t(labelKey)}</span>
+ <Redo2 size={15} />
</button>
- ))}
+ </div>
+ <div className="flex items-center gap-2">
+ {MODES.map(({ id, icon: Icon, labelKey }) => (
+ <button
+ key={id}
+ type="button"
+ onClick={() => {
+ setMode(id);
+ setSelectedId(null);
+ }}
+ className={`flex flex-col items-center justify-center gap-1 w-[74px] h-[60px] rounded-xl border transition-colors ${
+ mode === id
+ ? 'bg-secondary border-accent text-accent'
+ : 'bg-card border-border text-foreground hover:bg-secondary/50'
+ }`}
+ >
+ <Icon size={17} />
+ <span className="text-[11px] font-semibold">{i18n.t(labelKey)}</span>
+ </button>
+ ))}
+ </div>
+ <div className="flex items-center gap-1.5">
+ <button
+ type="button"
+ onClick={onCancel}
+ className="flex items-center gap-1 px-3 h-8 text-[12px] font-semibold text-foreground rounded-lg border border-border hover:bg-secondary"
+ >
+ <X size={13} />
+ {i18n.t('common.cancel')}
+ </button>
+ <button
+ type="button"
+ onClick={handleDone}
+ disabled={saving}
+ className="flex items-center gap-1 px-3.5 h-8 text-[12px] font-bold text-primary-foreground bg-accent rounded-lg hover:bg-accent/90 disabled:opacity-50"
+ >
+ <Check size={13} />
+ {i18n.t('annotationEditor.done')}
+ </button>
+ </div>
</div>
</div>
</div>
diff --git a/src/ui/shared/ScreenshotView.tsx b/src/ui/shared/ScreenshotView.tsx
index cb3ab89..608b984 100644
--- a/src/ui/shared/ScreenshotView.tsx
+++ b/src/ui/shared/ScreenshotView.tsx
@@ -1,12 +1,11 @@
-import { Crop, Download, EyeOff, Highlighter, ImageUp, Pencil, Target, Trash2, ZoomIn, ZoomOut } from 'lucide-react';
+import { Download, ImageUp, Pencil, Trash2, ZoomIn, ZoomOut } from 'lucide-react';
import { useEffect, useRef, useState } from 'react';
import { i18n } from '#imports';
import { deleteScreenshot, updateScreenshotBlob, updateScreenshotEdits } from '@/core/guides/service';
import type { Screenshot, ScreenshotBounds } from '@/core/guides/types';
-import { panBy, resolveTarget, resolveViewport, zoomBy } from '@/core/screenshot/geometry';
+import { panBy, resolveViewport, zoomBy } from '@/core/screenshot/geometry';
import { renderScreenshot } from '@/core/screenshot/render';
-import type { ClickTarget, ScreenshotEdits } from '@/core/screenshot/types';
-import { DEFAULT_TARGET_COLOR } from '@/core/screenshot/types';
+import type { ScreenshotEdits } from '@/core/screenshot/types';
import {
DropdownMenu,
DropdownMenuContent,
@@ -44,8 +43,6 @@ const SAVED_MESSAGE_MS = 1500;
const ZOOM_IN_FACTOR = 1.25;
const ZOOM_OUT_FACTOR = 0.8;
const VIEWPORT_EPSILON = 0.5;
-const TARGET_WIDTH_RATIO = 0.3;
-const TARGET_HEIGHT_RATIO = 0.15;
const FRAME_EASING = 'cubic-bezier(0.22, 1, 0.36, 1)';
const FRAME_TRANSITION = `width 0.4s ${FRAME_EASING}, height 0.4s ${FRAME_EASING}, left 0.4s ${FRAME_EASING}, top 0.4s ${FRAME_EASING}`;
@@ -56,22 +53,6 @@ function withFullViewport(screenshot: Screenshot): Screenshot {
};
}
-function defaultTargetRect(screenshot: Screenshot): ClickTarget {
- const dpr = screenshot.pixelRatio || 1;
- const width = screenshot.width / dpr;
- const height = screenshot.height / dpr;
- const w = width * TARGET_WIDTH_RATIO;
- const h = height * TARGET_HEIGHT_RATIO;
- return {
- x: (width - w) / 2,
- y: (height - h) / 2,
- width: w,
- height: h,
- border: 'dashed',
- color: DEFAULT_TARGET_COLOR,
- };
-}
-
export default function ScreenshotView({
screenshot,
className = '',
@@ -240,16 +221,6 @@ export default function ScreenshotView({
if (drag.moved) scheduleSave(effectiveEdits ?? {});
};
- const handleClickTarget = () => {
- const nextEdits: ScreenshotEdits = {
- ...effectiveEdits,
- target: resolveTarget(effectiveScreenshot) ?? defaultTargetRect(effectiveScreenshot),
- };
- setEditsOverride(nextEdits);
- scheduleSave(nextEdits);
- onOpenEditor?.('target');
- };
-
const handleAltChange = (value: string) => {
setAltDraft(value);
const nextEdits: ScreenshotEdits = { ...effectiveEdits, alt: value };
@@ -400,21 +371,9 @@ export default function ScreenshotView({
</button>
</DropdownMenuTrigger>
<DropdownMenuContent align="end" onClick={(e) => e.stopPropagation()}>
- <DropdownMenuItem onSelect={handleClickTarget}>
- <Target size={14} />
- {i18n.t(effectiveEdits?.target ? 'screenshotView.editClickTarget' : 'screenshotView.clickTarget')}
- </DropdownMenuItem>
<DropdownMenuItem onSelect={() => onOpenEditor?.('annotate')}>
- <Highlighter size={14} />
- {i18n.t('screenshotView.annotate')}
- </DropdownMenuItem>
- <DropdownMenuItem onSelect={() => onOpenEditor?.('redact')}>
- <EyeOff size={14} />
- {i18n.t('screenshotView.redact')}
- </DropdownMenuItem>
- <DropdownMenuItem onSelect={() => onOpenEditor?.('crop')}>
- <Crop size={14} />
- {i18n.t('screenshotView.crop')}
+ <Pencil size={14} />
+ {i18n.t('screenshotView.edit')}
</DropdownMenuItem>
<DropdownMenuSeparator />
<DropdownMenuItem onSelect={() => setReplaceOpen(true)}>