Skip to content

Commit 23a047b

Browse files
committed
fix: add grabbing state to cursor, add z-index when grabbing so element does not 'duck' under existing ones
1 parent f0d9c71 commit 23a047b

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

Diff for: core/app/components/FormBuilder/FormBuilder.tsx

-2
Original file line numberDiff line numberDiff line change
@@ -329,8 +329,6 @@ export function FormBuilder({ pubForm, id, stages }: Props) {
329329
})
330330
);
331331

332-
console.log(payload);
333-
334332
return (
335333
<TokenProvider tokens={tokens}>
336334
<FormBuilderProvider

Diff for: core/app/components/FormBuilder/FormElement.tsx

+7-3
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ type FormElementProps = {
2525
};
2626

2727
export const FormElement = ({ element, index, isEditing, isDisabled }: FormElementProps) => {
28-
const { attributes, listeners, setNodeRef, transform, transition } = useSortable({
28+
const { attributes, listeners, isDragging, setNodeRef, transform, transition } = useSortable({
2929
id: element.id,
3030
disabled: isDisabled,
3131
});
@@ -78,7 +78,8 @@ export const FormElement = ({ element, index, isEditing, isDisabled }: FormEleme
7878
"group flex min-h-[76px] flex-1 flex-shrink-0 items-center justify-between gap-3 self-stretch rounded border border-l-[12px] border-solid border-gray-200 border-l-emerald-100 bg-white p-3 pr-4",
7979
isEditing && "border-sky-500 border-l-blue-500",
8080
isDisabled && "cursor-auto opacity-50",
81-
element.deleted && "border-l-red-200"
81+
element.deleted && "border-l-red-200",
82+
isDragging && "z-10 cursor-grabbing"
8283
)}
8384
>
8485
<div className="flex flex-1 flex-shrink-0 flex-wrap justify-start gap-0.5">
@@ -110,7 +111,10 @@ export const FormElement = ({ element, index, isEditing, isDisabled }: FormEleme
110111
aria-label="Drag handle"
111112
disabled={isDisabled || element.deleted}
112113
variant="ghost"
113-
className="p-1.5 opacity-0 group-focus-within:opacity-100 group-hover:opacity-100"
114+
className={cn(
115+
"p-1.5 opacity-0 group-focus-within:opacity-100 group-hover:opacity-100",
116+
isDragging ? "cursor-grabbing" : "cursor-grab"
117+
)}
114118
{...listeners}
115119
{...attributes}
116120
tabIndex={0}

0 commit comments

Comments
 (0)