π¬ 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(editor): reorder step cards from a handle so description text stays selectable
Luis Ortizd538b2dad0ae
diff --git a/src/ui/shared/BlockCard.tsx b/src/ui/shared/BlockCard.tsxindex df7c056..bce91f7 100644--- a/src/ui/shared/BlockCard.tsx+++ b/src/ui/shared/BlockCard.tsx@@ -6,12 +6,7 @@ import { updateCallout } from '@/core/guides/service';import type { CalloutVariant, Step } from '@/core/guides/types';import { Tooltip, TooltipContent, TooltipTrigger } from '@/ui/components/ui/tooltip';import ConfirmDialog from '@/ui/shared/ConfirmDialog';--interface DragHandleProps {- onDragStart: (e: React.DragEvent) => void;- onDragOver: (e: React.DragEvent) => void;- onDragEnd: () => void;-}+import { DragGrip, type DragHandleProps, useCardDrag } from '@/ui/shared/card-drag';interface BlockCardProps {step: Step;@@ -37,6 +32,7 @@ export default function BlockCard({setDescription(step.description);}, [step.description]);+ const cardDrag = useCardDrag(dragHandleProps);const isHeading = step.blockType === 'heading';const accent = calloutAccent(step);const variant = step.calloutVariant ?? 'info';@@ -57,8 +53,7 @@ export default function BlockCard({return (<div- draggable={!!dragHandleProps}- onDragStart={dragHandleProps?.onDragStart}+ {...cardDrag}onDragOver={(e) => {e.preventDefault();dragHandleProps?.onDragOver(e);@@ -97,6 +92,7 @@ export default function BlockCard({</div>{!readOnly && (<div className="flex items-center gap-1 mt-1">+ {dragHandleProps && <DragGrip />}{!isHeading &&CALLOUT_VARIANTS.map((option) => (<Tooltip key={option}>diff --git a/src/ui/shared/card-drag.tsx b/src/ui/shared/card-drag.tsxnew file mode 100644index 0000000..3ff05fa--- /dev/null+++ b/src/ui/shared/card-drag.tsx@@ -0,0 +1,37 @@+import { GripVertical } from 'lucide-react';+import { useRef } from 'react';++export interface DragHandleProps {+ onDragStart: (e: React.DragEvent) => void;+ onDragOver: (e: React.DragEvent) => void;+ onDragEnd: () => void;+}++export function useCardDrag(dragHandleProps?: DragHandleProps) {+ const pressedHandle = useRef(false);+ return {+ draggable: !!dragHandleProps,+ onPointerDownCapture: (e: React.PointerEvent) => {+ pressedHandle.current = !!(e.target as Element).closest('[data-drag-handle]');+ },+ onDragStart: (e: React.DragEvent) => {+ if (!pressedHandle.current) {+ e.preventDefault();+ return;+ }+ dragHandleProps?.onDragStart(e);+ },+ };+}++export function DragGrip() {+ return (+ <span+ data-drag-handle=""+ aria-hidden="true"+ className="shrink-0 p-1 -m-1 cursor-grab text-border hover:text-muted-foreground"+ >+ <GripVertical size={14} />+ </span>+ );+}diff --git a/src/ui/sidepanel/StepCard.tsx b/src/ui/sidepanel/StepCard.tsxindex a075ef2..00bc650 100644--- a/src/ui/sidepanel/StepCard.tsx+++ b/src/ui/sidepanel/StepCard.tsx@@ -1,5 +1,5 @@import { Check, Copy, Loader2, Trash2 } from 'lucide-react';-import { useEffect, useRef, useState } from 'react';+import { useEffect, useState } from 'react';import { i18n } from '#imports';import { replaceScreenshot } from '@/core/guides/service';import type { Screenshot, Step } from '@/core/guides/types';@@ -8,15 +8,10 @@ import { logger } from '@/lib/logger';import { Tooltip, TooltipContent, TooltipTrigger } from '@/ui/components/ui/tooltip';import { useAskAi } from '@/ui/shared/AskAi';import ConfirmDialog from '@/ui/shared/ConfirmDialog';+import { DragGrip, type DragHandleProps, useCardDrag } from '@/ui/shared/card-drag';import ImagePlaceholder from '@/ui/shared/ImagePlaceholder';import ScreenshotView from '@/ui/shared/ScreenshotView';-interface DragHandleProps {- onDragStart: (e: React.DragEvent) => void;- onDragOver: (e: React.DragEvent) => void;- onDragEnd: () => void;-}-interface StepCardProps {step: Step;number: number;@@ -50,8 +45,8 @@ export default function StepCard({const [description, setDescription] = useState(step.description);const [dragOver, setDragOver] = useState(false);const [copied, setCopied] = useState(false);- const pressedOnScreenshot = useRef(false);const [confirmDelete, setConfirmDelete] = useState(false);+ const cardDrag = useCardDrag(dragHandleProps);useEffect(() => {setDescription(step.description);@@ -98,21 +93,9 @@ export default function StepCard({dragHandleProps?.onDragOver(e);};- const handleDragStart = (e: React.DragEvent) => {- if (pressedOnScreenshot.current) {- e.preventDefault();- return;- }- dragHandleProps?.onDragStart(e);- };-return (<div- draggable={!!dragHandleProps}- onPointerDownCapture={(e) => {- pressedOnScreenshot.current = !!(e.target as HTMLElement).closest('[data-screenshot-frame]');- }}- onDragStart={handleDragStart}+ {...cardDrag}onDragOver={handleDragOver}onDragLeave={() => setDragOver(false)}onDragEnd={() => {@@ -143,6 +126,7 @@ export default function StepCard({<div className="px-3 pt-2 pb-2"><div className="flex items-center gap-2">+ {dragHandleProps && <DragGrip />}<span className="flex items-center justify-center w-[22px] h-[22px] rounded-full text-[11px] font-bold shrink-0 bg-primary text-primary-foreground">{number}</span>diff --git a/src/ui/sidepanel/__tests__/step-card-drag.test.tsx b/src/ui/sidepanel/__tests__/step-card-drag.test.tsxnew file mode 100644index 0000000..39ecc12--- /dev/null+++ b/src/ui/sidepanel/__tests__/step-card-drag.test.tsx@@ -0,0 +1,54 @@+// @vitest-environment jsdom+import { fireEvent, render } from '@testing-library/react';+import { describe, expect, it, vi } from 'vitest';+import type { Step } from '@/core/guides/types';+import { TooltipProvider } from '@/ui/components/ui/tooltip';++vi.mock('@/core/guides/service', () => ({ replaceScreenshot: vi.fn() }));+vi.mock('@/core/screenshot/render', () => ({ imageDimensions: vi.fn(), renderScreenshot: vi.fn() }));++import StepCard from '../StepCard';++const step: Step = {+ id: 's1',+ guideId: 'g1',+ index: 0,+ description: 'Click the thing',+ action: 'click',+ url: 'https://a.test',+ timestamp: 1,+};++function renderCard() {+ const dragHandleProps = { onDragStart: vi.fn(), onDragOver: vi.fn(), onDragEnd: vi.fn() };+ const { container } = render(+ <TooltipProvider>+ <StepCard+ step={step}+ number={1}+ screenshot={undefined}+ dragHandleProps={dragHandleProps}+ onDescriptionChange={vi.fn()}+ onDelete={vi.fn()}+ />+ </TooltipProvider>,+ );+ const card = container.querySelector('[draggable="true"]') as HTMLElement;+ return { dragHandleProps, card, container };+}++describe('StepCard reordering', () => {+ it('does not start a drag when the press lands on the description', () => {+ const { dragHandleProps, card, container } = renderCard();+ fireEvent.pointerDown(container.querySelector('textarea') as HTMLElement);+ fireEvent.dragStart(card);+ expect(dragHandleProps.onDragStart).not.toHaveBeenCalled();+ });++ it('starts a drag when the press lands on the grip', () => {+ const { dragHandleProps, card, container } = renderCard();+ fireEvent.pointerDown(container.querySelector('[data-drag-handle]') as HTMLElement);+ fireEvent.dragStart(card);+ expect(dragHandleProps.onDragStart).toHaveBeenCalled();+ });+});