Skip to content

The open alternative to Salesforce, designed for AI.

fix(front): focus new Field widget and open side panel on add (#20777)

Weiko224376233b2e
diff --git a/packages/twenty-front/src/modules/page-layout/hooks/useCreateRecordPageFieldWidget.ts b/packages/twenty-front/src/modules/page-layout/hooks/useCreateRecordPageFieldWidget.ts
index 939e581d6bd..b0af18db9a1 100644
--- a/packages/twenty-front/src/modules/page-layout/hooks/useCreateRecordPageFieldWidget.ts
+++ b/packages/twenty-front/src/modules/page-layout/hooks/useCreateRecordPageFieldWidget.ts
@@ -3,14 +3,17 @@ import { isDefined } from 'twenty-shared/utils';
import { usePageLayoutContentContext } from '@/page-layout/contexts/PageLayoutContentContext';
import { useCurrentPageLayoutOrThrow } from '@/page-layout/hooks/useCurrentPageLayoutOrThrow';
import { pageLayoutDraftComponentState } from '@/page-layout/states/pageLayoutDraftComponentState';
+import { pageLayoutEditingWidgetIdComponentState } from '@/page-layout/states/pageLayoutEditingWidgetIdComponentState';
import { addWidgetToTab } from '@/page-layout/utils/addWidgetToTab';
import { createDefaultFieldWidget } from '@/page-layout/utils/createDefaultFieldWidget';
import { useFieldWidgetEligibleFields } from '@/page-layout/widgets/field/hooks/useFieldWidgetEligibleFields';
import { getFieldWidgetDefaultDisplayMode } from '@/page-layout/widgets/field/utils/getFieldWidgetDisplayModeConfig';
+import { useNavigatePageLayoutSidePanel } from '@/side-panel/pages/page-layout/hooks/useNavigatePageLayoutSidePanel';
import { useTargetRecord } from '@/ui/layout/contexts/useTargetRecord';
import { useAtomComponentStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateCallbackState';
import { useStore } from 'jotai';
import { useCallback } from 'react';
+import { SidePanelPages } from 'twenty-shared/types';
import { v4 as uuidv4 } from 'uuid';
import { WidgetConfigurationType } from '~/generated-metadata/graphql';
@@ -33,6 +36,12 @@ export const useCreateRecordPageFieldWidget = () => {
pageLayoutDraftComponentState,
);
+ const pageLayoutEditingWidgetIdState = useAtomComponentStateCallbackState(
+ pageLayoutEditingWidgetIdComponentState,
+ );
+
+ const { navigatePageLayoutSidePanel } = useNavigatePageLayoutSidePanel();
+
const store = useStore();
const createRecordPageFieldWidget = useCallback(() => {
@@ -82,11 +91,21 @@ export const useCreateRecordPageFieldWidget = () => {
...prev,
tabs: addWidgetToTab(prev.tabs, tabId, newWidget),
}));
+
+ store.set(pageLayoutEditingWidgetIdState, widgetId);
+
+ navigatePageLayoutSidePanel({
+ sidePanelPage: SidePanelPages.RecordPageFieldSettings,
+ focusTitleInput: true,
+ resetNavigationStack: true,
+ });
}, [
allFieldWidgetFields,
currentPageLayout.tabs,
+ navigatePageLayoutSidePanel,
objectMetadataItem.id,
pageLayoutDraftState,
+ pageLayoutEditingWidgetIdState,
store,
tabId,
]);