Skip to content

The Open Source DocuSign Alternative.

fix: auto select field on drop (#3028)

David Nguyen977d07330b97
diff --git a/apps/remix/app/components/general/envelope-editor/envelope-editor-fields-page-renderer.tsx b/apps/remix/app/components/general/envelope-editor/envelope-editor-fields-page-renderer.tsx
index db8f6ffbb..5cbd4addf 100644
--- a/apps/remix/app/components/general/envelope-editor/envelope-editor-fields-page-renderer.tsx
+++ b/apps/remix/app/components/general/envelope-editor/envelope-editor-fields-page-renderer.tsx
@@ -49,6 +49,13 @@ export const EnvelopeEditorFieldsPageRenderer = ({ pageData }: { pageData: PageR
const [isFieldChanging, setIsFieldChanging] = useState(false);
const [pendingFieldCreation, setPendingFieldCreation] = useState<Konva.Rect | null>(null);
+ /**
+ * Whether the field was automatically selected on creation (drag-drop or marquee).
+ *
+ * We purposefully supress the floating toolbar for newly created fields.
+ */
+ const [isAutoSelectedField, setIsAutoSelectedField] = useState(false);
+
const { stage, pageLayer, konvaContainer, scaledViewport, unscaledViewport } = usePageRenderer(
({ stage, pageLayer }) => createPageCanvas(stage, pageLayer),
pageData,
@@ -521,13 +528,48 @@ export const EnvelopeEditorFieldsPageRenderer = ({ pageData }: { pageData: PageR
setSelectedFields(liveSelectedFieldGroups);
}
+ // Mirror the editor's single selected field onto the canvas (Konva) selection.
+ //
+ // `addField` already marks a newly created field as the selected field, so this
+ // makes a field placed via the palette (drag-drop) or marquee creation show its
+ // resize handles immediately -- no second click needed. It also clears the canvas
+ // selection when the selected field is cleared (e.g. when the author starts
+ // placing another field), so the floating action toolbar can't intercept the next
+ // placement click. Runs after the render loop above so the field's group exists.
+ const selectedFormId = editorFields.selectedField?.formId ?? null;
+ const isSingleCanvasSelection = selectedKonvaFieldGroups.length === 1;
+
+ if (selectedFormId && localPageFields.some((field) => field.formId === selectedFormId)) {
+ const isAlreadySelected = isSingleCanvasSelection && selectedKonvaFieldGroups[0].id() === selectedFormId;
+
+ if (!isAlreadySelected) {
+ const fieldGroupToSelect = pageLayer.current.findOne(`#${selectedFormId}`);
+
+ if (fieldGroupToSelect instanceof Konva.Group) {
+ setSelectedFields([fieldGroupToSelect], { isAutoSelect: true });
+ }
+ }
+ } else if (selectedFormId === null && isSingleCanvasSelection) {
+ setSelectedFields([]);
+ }
+
// Rerender the transformer
interactiveTransformer.current?.forceUpdate();
pageLayer.current.batchDraw();
- }, [localPageFields, selectedKonvaFieldGroups, overlappingFieldFormIds, isFieldChanging]);
+ }, [
+ localPageFields,
+ selectedKonvaFieldGroups,
+ overlappingFieldFormIds,
+ isFieldChanging,
+ editorFields.selectedField?.formId,
+ ]);
+
+ const setSelectedFields = (nodes: Konva.Node[], options?: { isAutoSelect?: boolean }) => {
+ // Any explicit (user-driven) selection shows the action toolbar; only auto-selection
+ // on field creation suppresses it.
+ setIsAutoSelectedField(Boolean(options?.isAutoSelect));
- const setSelectedFields = (nodes: Konva.Node[]) => {
// eslint-disable-next-line @typescript-eslint/consistent-type-assertions
const fieldGroups = nodes.filter(
(node) => node.hasName('field-group') && Boolean(node.getStage()) && Boolean(node.getParent()),
@@ -663,25 +705,30 @@ export const EnvelopeEditorFieldsPageRenderer = ({ pageData }: { pageData: PageR
return (
<>
- {selectedKonvaFieldGroups.length > 0 && interactiveTransformer.current && !isFieldChanging && (
- <FieldActionButtons
- handleDuplicateSelectedFields={duplicatedSelectedFields}
- handleDuplicateSelectedFieldsOnAllPages={duplicatedSelectedFieldsOnAllPages}
- handleDeleteSelectedFields={deletedSelectedFields}
- handleChangeRecipient={changeSelectedFieldsRecipients}
- handleChangeFieldType={changeSelectedFieldsType}
- selectedFieldFormId={selectedKonvaFieldGroups.map((field) => field.id())}
- style={{
- position: 'absolute',
- top: interactiveTransformer.current.y() + interactiveTransformer.current.getClientRect().height + 5 + 'px',
- left: interactiveTransformer.current.x() + interactiveTransformer.current.getClientRect().width / 2 + 'px',
- transform: 'translateX(-50%)',
- gap: '8px',
- pointerEvents: 'auto',
- zIndex: 50,
- }}
- />
- )}
+ {selectedKonvaFieldGroups.length > 0 &&
+ interactiveTransformer.current &&
+ !isFieldChanging &&
+ !isAutoSelectedField && (
+ <FieldActionButtons
+ handleDuplicateSelectedFields={duplicatedSelectedFields}
+ handleDuplicateSelectedFieldsOnAllPages={duplicatedSelectedFieldsOnAllPages}
+ handleDeleteSelectedFields={deletedSelectedFields}
+ handleChangeRecipient={changeSelectedFieldsRecipients}
+ handleChangeFieldType={changeSelectedFieldsType}
+ selectedFieldFormId={selectedKonvaFieldGroups.map((field) => field.id())}
+ style={{
+ position: 'absolute',
+ top:
+ interactiveTransformer.current.y() + interactiveTransformer.current.getClientRect().height + 5 + 'px',
+ left:
+ interactiveTransformer.current.x() + interactiveTransformer.current.getClientRect().width / 2 + 'px',
+ transform: 'translateX(-50%)',
+ gap: '8px',
+ pointerEvents: 'auto',
+ zIndex: 50,
+ }}
+ />
+ )}
{pendingFieldCreation && (
<div
diff --git a/packages/app-tests/e2e/envelope-editor-v2/envelope-fields.spec.ts b/packages/app-tests/e2e/envelope-editor-v2/envelope-fields.spec.ts
index b4130a358..f9c3515d4 100644
--- a/packages/app-tests/e2e/envelope-editor-v2/envelope-fields.spec.ts
+++ b/packages/app-tests/e2e/envelope-editor-v2/envelope-fields.spec.ts
@@ -46,6 +46,7 @@ const updateExternalId = async (surface: TEnvelopeEditorSurface, externalId: str
if (!surface.isEmbedded) {
await expectToastTextToBeVisible(surface.root, 'Envelope updated');
+ await surface.root.getByTestId('toast-close').click();
}
};