π¬ A browser extension and desktop app that turns your clicks into step-by-step guides with annotated screenshots π
TypeScript browser-extensionchrome-extensiondocumentationfirefox-extensionguide-generatorlocal-firstmanifest-v3privacy-firstproductivityreactscreenshotstep-by-step-guidetutorialtypescriptworkflowwxt
fix(desktop): show each guide's zoom level on its Zoom menu
Luis Ortiz10a5e86c6bab
diff --git a/apps/desktop/src/renderer/GuideZoom.tsx b/apps/desktop/src/renderer/GuideZoom.tsxindex 111ee2a..bdffc59 100644--- a/apps/desktop/src/renderer/GuideZoom.tsx+++ b/apps/desktop/src/renderer/GuideZoom.tsx@@ -1,9 +1,9 @@import { i18n } from '@mimik/core/env';import { getGuide, updateScreenshotEdits } from '@mimik/core/guides/service';-import { MAX_ZOOM, MIN_ZOOM, rezoomEdits, ZOOM_STEP } from '@mimik/core/screenshot/record';+import { currentZoom, MAX_ZOOM, MIN_ZOOM, rezoomEdits, ZOOM_STEP } from '@mimik/core/screenshot/record';import { Select, SelectContent, SelectItem, SelectTrigger } from '@mimik/ui';import { ZoomIn } from 'lucide-react';-import { useState } from 'react';+import { useCallback, useEffect, useState } from 'react';const LEVELS = Array.from({ length: Math.round((MAX_ZOOM - MIN_ZOOM) / ZOOM_STEP) + 1 },@@ -12,6 +12,16 @@ const LEVELS = Array.from(export function GuideZoom({ guideId, onDone }: { guideId: string; onDone: () => void }) {const [busy, setBusy] = useState(false);+ const [current, setCurrent] = useState<number | 'auto' | null>(null);++ const refresh = useCallback(async () => {+ const found = await getGuide(guideId);+ setCurrent(found ? currentZoom(found.screenshots.values()) : null);+ }, [guideId]);++ useEffect(() => {+ refresh();+ }, [refresh]);const apply = async (value: string) => {setBusy(true);@@ -23,6 +33,7 @@ export function GuideZoom({ guideId, onDone }: { guideId: string; onDone: () =>const next = rezoomEdits(shot, level);if (next) await updateScreenshotEdits(shot.id, next);}+ await refresh();onDone();} finally {setBusy(false);@@ -30,13 +41,23 @@ export function GuideZoom({ guideId, onDone }: { guideId: string; onDone: () =>};return (- <Select disabled={busy} onValueChange={apply}>+ <Select+ disabled={busy}+ value={current === null ? '' : String(current)}+ onValueChange={apply}+ onOpenChange={(open) => open && refresh()}+ ><SelectTriggeraria-label={i18n.t('desktop_zoomLevel')}className="h-8 w-auto gap-1.5 rounded-lg border-border bg-card px-3 text-[13px] font-medium text-foreground hover:bg-secondary hover:text-accent"><ZoomIn size={14} />{i18n.t('desktop_zoomGuide')}+ {current !== null && (+ <span className="text-muted-foreground">+ Β· {current === 'auto' ? i18n.t('desktop_zoomAuto') : `${current}Γ`}+ </span>+ )}</SelectTrigger><SelectContent><SelectItem value="auto">{i18n.t('desktop_zoomAuto')}</SelectItem>diff --git a/packages/core/src/screenshot/__tests__/record.test.ts b/packages/core/src/screenshot/__tests__/record.test.tsindex 1dd2ad8..ae398ec 100644--- a/packages/core/src/screenshot/__tests__/record.test.ts+++ b/packages/core/src/screenshot/__tests__/record.test.ts@@ -1,7 +1,14 @@import { describe, expect, it } from 'vitest';import type { ElementMeta } from '@/core/guides/types';import { resolveViewport } from '@/core/screenshot/geometry';-import { autoZoom, clickZoomViewport, rezoomEdits, screenshotForElement, snapZoom } from '@/core/screenshot/record';+import {+ autoZoom,+ clickZoomViewport,+ currentZoom,+ rezoomEdits,+ screenshotForElement,+ snapZoom,+} from '@/core/screenshot/record';const meta: ElementMeta = {textContent: null,@@ -109,7 +116,13 @@ describe('rezoomEdits', () => {});it('leaves a step alone when nothing would change', () => {- expect(rezoomEdits(auto, auto.edits?.zoomLevel ?? 0)).toBeNull();+ expect(rezoomEdits(auto, null)).toBeNull();+ });++ it('records a picked level even when it matches the automatic one', () => {+ const next = rezoomEdits(auto, auto.edits?.zoomLevel ?? 0);+ expect(next?.zoomAuto).toBe(false);+ expect(next?.viewport).toEqual(auto.edits?.viewport);});it('leaves a hand-cropped step alone', () => {@@ -117,3 +130,24 @@ describe('rezoomEdits', () => {expect(rezoomEdits(cropped, 3)).toBeNull();});});++describe('currentZoom', () => {+ const auto = screenshotForElement({ ...bytes, width: 2560, height: 1440, zoom: 'click' }, meta);+ const fixed = screenshotForElement({ ...bytes, width: 2560, height: 1440, zoom: 'click', zoomLevel: 2 }, meta);+ const cropped = { ...fixed, edits: { ...fixed.edits, zoomLevel: undefined, zoomAuto: undefined } };++ it('names the level every app-zoomed step shares', () => {+ expect(currentZoom([auto, auto])).toBe('auto');+ expect(currentZoom([fixed, fixed, cropped])).toBe(2);+ });++ it('names nothing when the steps disagree or none is app-zoomed', () => {+ expect(currentZoom([auto, fixed])).toBeNull();+ expect(currentZoom([cropped])).toBeNull();+ });++ it('reads a step saved before the flag by comparing it with the automatic level', () => {+ const { zoomAuto: _, ...older } = auto.edits ?? {};+ expect(currentZoom([{ ...auto, edits: older }])).toBe('auto');+ });+});diff --git a/packages/core/src/screenshot/record.ts b/packages/core/src/screenshot/record.tsindex 85ff020..0172cd6 100644--- a/packages/core/src/screenshot/record.ts+++ b/packages/core/src/screenshot/record.ts@@ -68,6 +68,7 @@ export function screenshotForElement(bytes: ScreenshotBytes, meta: ElementMeta):...(zoom === 'click'? {zoomLevel: level,+ zoomAuto: zoomLevel === undefined,viewport: clickZoomViewport(rest.width, rest.height, { x: click.x * ratio, y: click.y * ratio }, level),}: {}),@@ -89,10 +90,26 @@ export function rezoomEdits(screenshot: StoredScreenshot, level: number | null):if (!click) return null;const ratio = screenshot.pixelRatio || 1;const next = level ?? autoZoom(screenshot.width, ratio);- if (next === screenshot.edits.zoomLevel) return null;+ if (next === screenshot.edits.zoomLevel && isAutoZoom(screenshot) === (level === null)) return null;return {...screenshot.edits,zoomLevel: next,+ zoomAuto: level === null,viewport: clickZoomViewport(screenshot.width, screenshot.height, { x: click.x * ratio, y: click.y * ratio }, next),};}++function isAutoZoom(screenshot: StoredScreenshot): boolean {+ return (+ screenshot.edits?.zoomAuto ?? screenshot.edits?.zoomLevel === autoZoom(screenshot.width, screenshot.pixelRatio || 1)+ );+}++export function currentZoom(screenshots: Iterable<StoredScreenshot>): number | 'auto' | null {+ const levels = new Set<number | 'auto'>();+ for (const shot of screenshots) {+ if (shot.edits?.zoomLevel === undefined) continue;+ levels.add(isAutoZoom(shot) ? 'auto' : shot.edits.zoomLevel);+ }+ return levels.size === 1 ? [...levels][0] : null;+}diff --git a/packages/core/src/screenshot/types.ts b/packages/core/src/screenshot/types.tsindex 0d1f0bd..cc75bd4 100644--- a/packages/core/src/screenshot/types.ts+++ b/packages/core/src/screenshot/types.ts@@ -150,6 +150,7 @@ export interface CursorMark {export interface ScreenshotEdits {viewport?: ScreenshotBounds;zoomLevel?: number;+ zoomAuto?: boolean;target?: ClickTarget | null;annotations?: Annotation[];cursor?: CursorMark | null;diff --git a/packages/ui/src/annotation/components/AnnotationEditor.tsx b/packages/ui/src/annotation/components/AnnotationEditor.tsxindex ad0bc25..229fc2f 100644--- a/packages/ui/src/annotation/components/AnnotationEditor.tsx+++ b/packages/ui/src/annotation/components/AnnotationEditor.tsx@@ -703,6 +703,7 @@ export function AnnotationEditor({ screenshot, tool, onDone, onCancel }: Annotatif (viewport && viewport !== screenshot.edits?.viewport) {nextEdits.viewport = viewport;nextEdits.zoomLevel = undefined;+ nextEdits.zoomAuto = undefined;} else if (viewport) {nextEdits.viewport = viewport;}