The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
[forms 3/4] Submit record creation forms with Command or Control Enter (#26064)
Thomas des Francsba3864c6439a
diff --git a/packages/twenty-front/src/modules/side-panel/pages/record-creation-form/components/SidePanelRecordCreationFormPage.tsx b/packages/twenty-front/src/modules/side-panel/pages/record-creation-form/components/SidePanelRecordCreationFormPage.tsxindex b9523b06280..b0047984ba8 100644--- a/packages/twenty-front/src/modules/side-panel/pages/record-creation-form/components/SidePanelRecordCreationFormPage.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/record-creation-form/components/SidePanelRecordCreationFormPage.tsx@@ -1,3 +1,7 @@+import { SIDE_PANEL_FOCUS_ID } from '@/side-panel/constants/SidePanelFocusId';+import { currentFocusIdSelector } from '@/ui/utilities/focus/states/currentFocusIdSelector';+import { useHotkeysOnFocusedElement } from '@/ui/utilities/hotkey/hooks/useHotkeysOnFocusedElement';+import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';import { useObjectMetadataItemById } from '@/object-metadata/hooks/useObjectMetadataItemById';import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';import { RecordFormFieldInputs } from '@/object-record/record-form/components/RecordFormFieldInputs';@@ -14,11 +18,13 @@ import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useimport { useState } from 'react';import { styled } from '@linaria/react';import { t } from '@lingui/core/macro';+import { Key } from 'ts-key-enum';import { type JsonValue } from 'type-fest';import { isDefined } from 'twenty-shared/utils';import { IconPlus } from 'twenty-ui/icon';import { Button } from 'twenty-ui/primitives/input';import { themeCssVariables } from 'twenty-ui/theme-constants';+import { getOsControlSymbol } from 'twenty-ui/utilities';const StyledContainer = styled.div`display: flex;@@ -75,6 +81,7 @@ const SidePanelRecordCreationForm = ({useAtomComponentState(recordCreationFormDraftComponentState);const [isSubmitting, setIsSubmitting] = useState(false);+ const currentFocusId = useAtomStateValue(currentFocusIdSelector);const draftRecord = recordCreationFormDraft ?? initialDraftRecord;@@ -113,8 +120,15 @@ const SidePanelRecordCreationForm = ({goBackFromSidePanel();};+ const containerRef = useHotkeysOnFocusedElement({+ keys: [`${Key.Meta}+${Key.Enter}`, `${Key.Control}+${Key.Enter}`],+ focusId: currentFocusId ?? SIDE_PANEL_FOCUS_ID,+ callback: handleCreateClick,+ dependencies: [currentFocusId, handleCreateClick],+ });+return (- <StyledContainer>+ <StyledContainer ref={containerRef}><StyledContent><RecordFormFieldInputsobjectMetadataItem={objectMetadataItem}@@ -132,6 +146,7 @@ const SidePanelRecordCreationForm = ({size="sm"onClick={handleCreateClick}disabled={isSubmitting}+ hotkeys={[getOsControlSymbol(), '⏎']}data-testid="record-creation-form-create-button"variant="solid"color="accent"diff --git a/packages/twenty-front/src/modules/side-panel/pages/record-creation-form/components/__stories__/RecordCreationFlow.stories.tsx b/packages/twenty-front/src/modules/side-panel/pages/record-creation-form/components/__stories__/RecordCreationFlow.stories.tsxindex 956ca93efd6..c17fb906b1a 100644--- a/packages/twenty-front/src/modules/side-panel/pages/record-creation-form/components/__stories__/RecordCreationFlow.stories.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/record-creation-form/components/__stories__/RecordCreationFlow.stories.tsx@@ -30,11 +30,19 @@ import { type Meta, type StoryObj } from '@storybook/react-vite';import { useStore } from 'jotai';import { graphql, HttpResponse } from 'msw';import { useContext, useEffect, useState } from 'react';-import { expect, fn, userEvent, waitFor, within } from 'storybook/test';+import {+ expect,+ fireEvent,+ fn,+ userEvent,+ waitFor,+ within,+} from 'storybook/test';import { AppPath, OpenRecordIn, SidePanelPages } from 'twenty-shared/types';import { isDefined } from 'twenty-shared/utils';import { Button } from 'twenty-ui/primitives/input';import { ComponentDecorator, RouterDecorator } from 'twenty-ui/testing';+import { getOsControlSymbol } from 'twenty-ui/utilities';import {EngineComponentKey,PageLayoutTabLayoutMode,@@ -312,6 +320,8 @@ const submitCompany = async (canvasElement: HTMLElement, shortcut?: string) => {await userEvent.clear(nameInput);await userEvent.type(nameInput, 'Acme');const createButton = canvas.getByTestId('record-creation-form-create-button');+ await expect(createButton).toHaveTextContent(getOsControlSymbol());+ await expect(createButton).toHaveTextContent('⏎');if (isDefined(shortcut)) {await expect(nameInput).toHaveFocus();await userEvent.keyboard(shortcut);@@ -383,3 +393,42 @@ export const CreateCompanyWithoutObjectContext: Story = {args: { commandOrigin: 'no-object' },play: ({ canvasElement }) => createCompanyFromCommandMenu(canvasElement),};++export const SubmitWithCommandEnter: Story = {+ play: ({ canvasElement }) =>+ submitCompany(canvasElement, '{Meta>}{Enter}{/Meta}'),+};+export const SubmitWithControlEnter: Story = {+ play: ({ canvasElement }) =>+ submitCompany(canvasElement, '{Control>}{Enter}{/Control}'),+};++export const IgnoreNonSubmitKeys: Story = {+ play: async ({ canvasElement }) => {+ const canvas = within(canvasElement);+ await userEvent.click(+ await canvas.findByRole('button', { name: /Create company/ }),+ );+ const input = await canvas.findByRole('textbox');+ await userEvent.click(input);+ await userEvent.keyboard('{Enter}');+ await userEvent.keyboard('{Meta>}{Shift>}{Enter}{/Shift}{/Meta}');+ await userEvent.keyboard('{Control>}{Alt>}{Enter}{/Alt}{/Control}');+ fireEvent.keyDown(input, {+ key: 'Enter',+ code: 'Enter',+ metaKey: true,+ isComposing: true,+ });+ fireEvent.keyDown(input, {+ key: 'Enter',+ code: 'Enter',+ ctrlKey: true,+ keyCode: 229,+ });+ await expect(+ canvas.getByTestId('record-creation-form-create-button'),+ ).toBeVisible();+ await expect(createCompanyRequest).not.toHaveBeenCalled();+ },+};