feat: remove a link from a Links field (twentyhq#5313)

Closes twentyhq#5117 TO FIX in another PR: right now, the "Vertical Dots" LightIconButton inside the Dropdown menu sometimes needs to be clicked twice to open the nested dropdown, not sure why 🤔 Maybe an `event.preventDefault()` is needed somewhere? <img width="369" alt="image" src="https://github.com/twentyhq/twenty/assets/3098428/dd0c771a-c18d-4eb2-8ed6-b107f56711e9"> --------- Co-authored-by: Jérémy Magrin <[email protected]> Co-authored-by: Charles Bochet <[email protected]>
synapsenet-arena · May 22, 2024 · 4800388 · 4800388
1 parent beaaf33
commit 4800388
Show file tree

Hide file tree

Showing 11 changed files with 159 additions and 63 deletions.
diff --git a/...nt/src/modules/object-record/record-field/meta-types/input/components/LinksFieldInput.tsx b/...nt/src/modules/object-record/record-field/meta-types/input/components/LinksFieldInput.tsx
@@ -4,8 +4,8 @@ import { Key } from 'ts-key-enum';
 import { IconPlus } from 'twenty-ui';
 
 import { useLinksField } from '@/object-record/record-field/meta-types/hooks/useLinksField';
+import { LinksFieldMenuItem } from '@/object-record/record-field/meta-types/input/components/LinksFieldMenuItem';
 import { FieldInputEvent } from '@/object-record/record-field/types/FieldInputEvent';
-import { LinkDisplay } from '@/ui/field/display/components/LinkDisplay';
 import { LightIconButton } from '@/ui/input/button/components/LightIconButton';
 import { DropdownMenu } from '@/ui/layout/dropdown/components/DropdownMenu';
 import { DropdownMenuInput } from '@/ui/layout/dropdown/components/DropdownMenuInput';
@@ -14,6 +14,7 @@ import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownM
 import { MenuItem } from '@/ui/navigation/menu-item/components/MenuItem';
 import { useScopedHotkeys } from '@/ui/utilities/hotkey/hooks/useScopedHotkeys';
 import { useListenClickOutside } from '@/ui/utilities/pointer-event/hooks/useListenClickOutside';
+import { toSpliced } from '~/utils/array/toSpliced';
 import { isDefined } from '~/utils/isDefined';
 
 const StyledDropdownMenu = styled(DropdownMenu)`
@@ -35,7 +36,7 @@ export const LinksFieldInput = ({
 
   const containerRef = useRef<HTMLDivElement>(null);
 
-  const links = useMemo(
+  const links = useMemo<{ url: string; label: string }[]>(
     () =>
       [
         fieldValue.primaryLinkUrl
@@ -53,51 +54,47 @@ export const LinksFieldInput = ({
     ],
   );
 
+  const handleDropdownClose = () => {
+    onCancel?.();
+  };
+
   useListenClickOutside({
     refs: [containerRef],
-    callback: (event) => {
-      event.stopImmediatePropagation();
-
-      const isTargetInput =
-        event.target instanceof HTMLInputElement &&
-        event.target.tagName === 'INPUT';
-
-      if (!isTargetInput) {
-        onCancel?.();
-      }
-    },
+    callback: handleDropdownClose,
   });
 
+  useScopedHotkeys(Key.Escape, handleDropdownClose, hotkeyScope);
+
   const [isInputDisplayed, setIsInputDisplayed] = useState(false);
   const [inputValue, setInputValue] = useState('');
 
-  useScopedHotkeys(Key.Escape, onCancel ?? (() => {}), hotkeyScope);
-
-  const handleSubmit = () => {
+  const handleAddLink = () => {
     if (!inputValue) return;
 
     setIsInputDisplayed(false);
     setInputValue('');
 
-    if (!links.length) {
-      onSubmit?.(() =>
-        persistLinksField({
-          primaryLinkUrl: inputValue,
-          primaryLinkLabel: '',
-          secondaryLinks: [],
-        }),
-      );
+    const nextLinks = [...links, { label: '', url: inputValue }];
+    const [nextPrimaryLink, ...nextSecondaryLinks] = nextLinks;
 
-      return;
-    }
+    onSubmit?.(() =>
+      persistLinksField({
+        primaryLinkUrl: nextPrimaryLink.url ?? '',
+        primaryLinkLabel: nextPrimaryLink.label ?? '',
+        secondaryLinks: nextSecondaryLinks,
+      }),
+    );
+  };
 
+  const handleDeleteLink = (index: number) => {
     onSubmit?.(() =>
       persistLinksField({
         ...fieldValue,
-        secondaryLinks: [
-          ...(fieldValue.secondaryLinks ?? []),
-          { label: '', url: inputValue },
-        ],
+        secondaryLinks: toSpliced(
+          fieldValue.secondaryLinks ?? [],
+          index - 1,
+          1,
+        ),
       }),
     );
   };
@@ -108,9 +105,13 @@ export const LinksFieldInput = ({
         <>
           <DropdownMenuItemsContainer>
             {links.map(({ label, url }, index) => (
-              <MenuItem
+              <LinksFieldMenuItem
                 key={index}
-                text={<LinkDisplay value={{ label, url }} />}
+                dropdownId={`${hotkeyScope}-links-${index}`}
+                isPrimary={index === 0}
+                label={label}
+                onDelete={() => handleDeleteLink(index)}
+                url={url}
               />
             ))}
           </DropdownMenuItemsContainer>
@@ -124,9 +125,9 @@ export const LinksFieldInput = ({
           value={inputValue}
           hotkeyScope={hotkeyScope}
           onChange={(event) => setInputValue(event.target.value)}
-          onEnter={handleSubmit}
+          onEnter={handleAddLink}
           rightComponent={
-            <LightIconButton Icon={IconPlus} onClick={handleSubmit} />
+            <LightIconButton Icon={IconPlus} onClick={handleAddLink} />
           }
         />
       ) : (

diff --git a/...src/modules/object-record/record-field/meta-types/input/components/LinksFieldMenuItem.tsx b/...src/modules/object-record/record-field/meta-types/input/components/LinksFieldMenuItem.tsx
@@ -0,0 +1,77 @@
+import styled from '@emotion/styled';
+import {
+  IconBookmark,
+  IconComponent,
+  IconDotsVertical,
+  IconTrash,
+} from 'twenty-ui';
+
+import { LinkDisplay } from '@/ui/field/display/components/LinkDisplay';
+import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
+import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
+import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown';
+import { MenuItem } from '@/ui/navigation/menu-item/components/MenuItem';
+
+type LinksFieldMenuItemProps = {
+  dropdownId: string;
+  isPrimary?: boolean;
+  label: string;
+  onDelete: () => void;
+  url: string;
+};
+
+const StyledIconBookmark = styled(IconBookmark)`
+  color: ${({ theme }) => theme.font.color.light};
+  height: ${({ theme }) => theme.icon.size.sm}px;
+  width: ${({ theme }) => theme.icon.size.sm}px;
+`;
+
+export const LinksFieldMenuItem = ({
+  dropdownId,
+  isPrimary,
+  label,
+  onDelete,
+  url,
+}: LinksFieldMenuItemProps) => {
+  const { isDropdownOpen } = useDropdown(dropdownId);
+
+  return (
+    <MenuItem
+      text={<LinkDisplay value={{ label, url }} />}
+      isIconDisplayedOnHoverOnly={!isPrimary && !isDropdownOpen}
+      iconButtons={[
+        {
+          Wrapper: isPrimary
+            ? undefined
+            : ({ iconButton }) => (
+                <Dropdown
+                  dropdownId={dropdownId}
+                  dropdownHotkeyScope={{
+                    scope: dropdownId,
+                  }}
+                  dropdownPlacement="right-start"
+                  dropdownStrategy="fixed"
+                  disableBlur
+                  clickableComponent={iconButton}
+                  dropdownComponents={
+                    <DropdownMenuItemsContainer>
+                      <MenuItem
+                        accent="danger"
+                        LeftIcon={IconTrash}
+                        text="Delete"
+                        onClick={onDelete}
+                      />
+                    </DropdownMenuItemsContainer>
+                  }
+                />
+              ),
+          Icon: isPrimary
+            ? (StyledIconBookmark as IconComponent)
+            : IconDotsVertical,
+          accent: 'tertiary',
+          onClick: isPrimary ? undefined : () => {},
+        },
+      ]}
+    />
+  );
+};
diff --git a/packages/twenty-front/src/modules/ui/input/button/components/LightIconButtonGroup.tsx b/packages/twenty-front/src/modules/ui/input/button/components/LightIconButtonGroup.tsx
@@ -1,4 +1,4 @@
-import { MouseEvent } from 'react';
+import { FunctionComponent, MouseEvent, ReactElement } from 'react';
 import styled from '@emotion/styled';
 import { IconComponent } from 'twenty-ui';
 
@@ -14,7 +14,9 @@ export type LightIconButtonGroupProps = Pick<
   'className' | 'size'
 > & {
   iconButtons: {
+    Wrapper?: FunctionComponent<{ iconButton: ReactElement }>;
     Icon: IconComponent;
+    accent?: LightIconButtonProps['accent'];
     onClick?: (event: MouseEvent<any>) => void;
     disabled?: boolean;
   }[];
@@ -26,16 +28,26 @@ export const LightIconButtonGroup = ({
   className,
 }: LightIconButtonGroupProps) => (
   <StyledLightIconButtonGroupContainer className={className}>
-    {iconButtons.map(({ Icon, onClick }, index) => {
-      return (
+    {iconButtons.map(({ Wrapper, Icon, accent, onClick }, index) => {
+      const iconButton = (
         <LightIconButton
           key={`light-icon-button-${index}`}
           Icon={Icon}
+          accent={accent}
           disabled={!onClick}
           onClick={onClick}
           size={size}
         />
       );
+
+      return Wrapper ? (
+        <Wrapper
+          key={`light-icon-button-wrapper-${index}`}
+          iconButton={iconButton}
+        />
+      ) : (
+        iconButton
+      );
     })}
   </StyledLightIconButtonGroupContainer>
 );
diff --git a/...nty-front/src/modules/ui/input/components/internal/date/components/InternalDatePicker.tsx b/...nty-front/src/modules/ui/input/components/internal/date/components/InternalDatePicker.tsx
@@ -460,7 +460,7 @@ export const InternalDatePicker = ({
         />
       </div>
       {clearable && (
-        <StyledButtonContainer onClick={handleClear} isMenuOpen={false}>
+        <StyledButtonContainer onClick={handleClear}>
           <StyledButton LeftIcon={IconCalendarX} text="Clear" />
         </StyledButtonContainer>
       )}

diff --git a/packages/twenty-front/src/modules/ui/layout/dropdown/components/Dropdown.tsx b/packages/twenty-front/src/modules/ui/layout/dropdown/components/Dropdown.tsx
@@ -36,6 +36,7 @@ type DropdownProps = {
   dropdownPlacement?: Placement;
   dropdownMenuWidth?: `${string}px` | `${number}%` | 'auto' | number;
   dropdownOffset?: { x?: number; y?: number };
+  dropdownStrategy?: 'fixed' | 'absolute';
   disableBlur?: boolean;
   onClickOutside?: () => void;
   onClose?: () => void;
@@ -51,6 +52,7 @@ export const Dropdown = ({
   dropdownId,
   dropdownHotkeyScope,
   dropdownPlacement = 'bottom-end',
+  dropdownStrategy = 'absolute',
   dropdownOffset = { x: 0, y: 0 },
   disableBlur = false,
   onClickOutside,
@@ -75,6 +77,7 @@ export const Dropdown = ({
     placement: dropdownPlacement,
     middleware: [flip(), ...offsetMiddlewares],
     whileElementsMounted: autoUpdate,
+    strategy: dropdownStrategy,
   });
 
   const handleHotkeyTriggered = () => {

diff --git a/packages/twenty-front/src/modules/ui/layout/dropdown/components/DropdownMenu.tsx b/packages/twenty-front/src/modules/ui/layout/dropdown/components/DropdownMenu.tsx
@@ -25,8 +25,8 @@ const StyledDropdownMenu = styled.div<{
 
   flex-direction: column;
   z-index: 1;
-  width: ${({ width }) =>
-    width ? `${typeof width === 'number' ? `${width}px` : width}` : '160px'};
+  width: ${({ width = 160 }) =>
+    typeof width === 'number' ? `${width}px` : width};
 `;
 
 export const DropdownMenu = StyledDropdownMenu;
diff --git a/packages/twenty-front/src/modules/ui/layout/dropdown/hooks/useDropdown.ts b/packages/twenty-front/src/modules/ui/layout/dropdown/hooks/useDropdown.ts
@@ -52,7 +52,7 @@ export const useDropdown = (dropdownId?: string) => {
 
   return {
     scopeId,
-    isDropdownOpen: isDropdownOpen,
+    isDropdownOpen,
     closeDropdown,
     toggleDropdown,
     openDropdown,

diff --git a/packages/twenty-front/src/modules/ui/navigation/menu-item/components/MenuItem.tsx b/packages/twenty-front/src/modules/ui/navigation/menu-item/components/MenuItem.tsx
@@ -1,6 +1,7 @@
-import { MouseEvent, ReactNode } from 'react';
+import { FunctionComponent, MouseEvent, ReactElement, ReactNode } from 'react';
 import { IconComponent } from 'twenty-ui';
 
+import { LightIconButtonProps } from '@/ui/input/button/components/LightIconButton';
 import { LightIconButtonGroup } from '@/ui/input/button/components/LightIconButtonGroup';
 
 import { MenuItemLeftContent } from '../internals/components/MenuItemLeftContent';
@@ -11,7 +12,9 @@ import {
 import { MenuItemAccent } from '../types/MenuItemAccent';
 
 export type MenuItemIconButton = {
+  Wrapper?: FunctionComponent<{ iconButton: ReactElement }>;
   Icon: IconComponent;
+  accent?: LightIconButtonProps['accent'];
   onClick?: (event: MouseEvent<any>) => void;
 };
 
@@ -24,23 +27,22 @@ export type MenuItemProps = {
   isTooltipOpen?: boolean;
   className?: string;
   testId?: string;
-  onClick?: (event: MouseEvent<HTMLLIElement>) => void;
+  onClick?: (event: MouseEvent<HTMLDivElement>) => void;
 };
 
 export const MenuItem = ({
   LeftIcon,
   accent = 'default',
   text,
   iconButtons,
-  isTooltipOpen,
   isIconDisplayedOnHoverOnly = true,
   className,
   testId,
   onClick,
 }: MenuItemProps) => {
   const showIconButtons = Array.isArray(iconButtons) && iconButtons.length > 0;
 
-  const handleMenuItemClick = (event: MouseEvent<HTMLLIElement>) => {
+  const handleMenuItemClick = (event: MouseEvent<HTMLDivElement>) => {
     if (!onClick) return;
     event.preventDefault();
     event.stopPropagation();
@@ -54,7 +56,6 @@ export const MenuItem = ({
       onClick={handleMenuItemClick}
       className={className}
       accent={accent}
-      isMenuOpen={!!isTooltipOpen}
       isIconDisplayedOnHoverOnly={isIconDisplayedOnHoverOnly}
     >
       <StyledMenuItemLeftContent>

diff --git a/packages/twenty-front/src/modules/ui/navigation/menu-item/components/MenuItemDraggable.tsx b/packages/twenty-front/src/modules/ui/navigation/menu-item/components/MenuItemDraggable.tsx
@@ -23,7 +23,6 @@ export const MenuItemDraggable = ({
   LeftIcon,
   accent = 'default',
   iconButtons,
-  isTooltipOpen,
   onClick,
   text,
   isDragDisabled = false,
@@ -37,7 +36,6 @@ export const MenuItemDraggable = ({
       onClick={onClick}
       accent={accent}
       className={className}
-      isMenuOpen={!!isTooltipOpen}
       isIconDisplayedOnHoverOnly={isIconDisplayedOnHoverOnly}
     >
       <MenuItemLeftContent