From d2a99ef72dbcc309d4a7c969273d7eac370d6b08 Mon Sep 17 00:00:00 2001
From: neo773 <62795688+neo773@users.noreply.github.com>
Date: Mon, 13 Apr 2026 21:31:50 +0530
Subject: [PATCH] Fix VariablePicker and Fullscreen Icon overlap in
 FormAdvancedTextFieldInput (#19614)

fixes

<img width="659" height="386" alt="image"
src="https://github.com/user-attachments/assets/c9755574-6830-464d-8abf-7741188f84dd"
/>
---
 .../components/FormAdvancedTextFieldInput.tsx       | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormAdvancedTextFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormAdvancedTextFieldInput.tsx
index 38e6385fb5..f5aac9a3c0 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormAdvancedTextFieldInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormAdvancedTextFieldInput.tsx
@@ -46,10 +46,15 @@ const StyledAdvancedTextFieldInnerContainer = styled.div`
   width: 100%;
 `;
 
-const StyledEditorActionButtonContainer = styled.div`
+const StyledEditorActionButtonContainer = styled.div<{
+  hasVariablePicker?: boolean;
+}>`
   margin-top: ${themeCssVariables.spacing[1]};
   position: absolute;
-  right: ${themeCssVariables.spacing[1]};
+  right: ${({ hasVariablePicker }) =>
+    hasVariablePicker
+      ? `calc(${themeCssVariables.spacing[7]} + ${themeCssVariables.spacing[2]})`
+      : themeCssVariables.spacing[1]};
   top: ${themeCssVariables.spacing[0]};
   z-index: 1;
 `;
@@ -214,7 +219,9 @@ export const FormAdvancedTextFieldInput = ({
               )}
 
               {enableFullScreen && (
-                <StyledEditorActionButtonContainer>
+                <StyledEditorActionButtonContainer
+                  hasVariablePicker={isDefined(VariablePicker) && !readonly}
+                >
                   {!readonly && !isFullScreen && (
                     <LightIconButton
                       Icon={IconMaximize}