Merged PR 320: #7697 - Remplacer par

Il faut juste que je confirme avec Eric le fonctionnement de l'index (pour l'insertion de l'element dupliqué) au même endroit

+ Peut être ajouté un guard si le nombre d'element autorisé dans un type n'est pas le même que l'element remplaçant

Related work items: #7687

src/Components/Bar/Bar.tsx

@@ -17,6 +17,7 @@ import { BarIcon } from './BarIcon';
 import { Text } from '../Text/Text';
 
 interface IBarProps {
+  className: string
   isComponentsOpen: boolean
   isSymbolsOpen: boolean
   isHistoryOpen: boolean
@@ -33,7 +34,7 @@ export const BAR_WIDTH = 64; // 4rem
 
 export function Bar(props: IBarProps): JSX.Element {
   return (
-    <div className='bar'>
+    <div className={`bar ${props.className}`}>
       <BarIcon
         isActive={props.isComponentsOpen}
         title={Text({ textId: '@Components' })}

src/Components/Components/Components.tsx

@@ -1,4 +1,4 @@
-import { EyeIcon, EyeSlashIcon } from '@heroicons/react/24/outline';
+import { EyeIcon, EyeSlashIcon, XCircleIcon } from '@heroicons/react/24/outline';
 import * as React from 'react';
 import { IAvailableContainer } from '../../Interfaces/IAvailableContainer';
 import { ICategory } from '../../Interfaces/ICategory';
@@ -6,11 +6,15 @@ import { IContainerModel } from '../../Interfaces/IContainerModel';
 import { TruncateString } from '../../utils/stringtools';
 import { Category } from '../Category/Category';
 import { Text } from '../Text/Text';
+import { IReplaceContainer } from '../../Interfaces/IReplaceContainer';
+import { Dispatch } from 'react';
 
 interface IComponentsProps {
   selectedContainer: IContainerModel | undefined
   componentOptions: IAvailableContainer[]
   categories: ICategory[]
+  replaceContainer: IReplaceContainer
+  setReplaceContainer: Dispatch<React.SetStateAction<IReplaceContainer>>
   buttonOnClick: (type: string) => void
 }
 
@@ -62,6 +66,10 @@ export function Components(props: IComponentsProps): JSX.Element {
       disabled = config.Blacklist?.find(type => type === componentOption.Type) !== undefined ?? false;
     }
 
+    if (props.replaceContainer.isReplacing && componentOption.Category !== props.replaceContainer.category) {
+      disabled = true;
+    }
+
     if (disabled && hideDisabled) {
       return;
     }
@@ -96,6 +104,15 @@ export function Components(props: IComponentsProps): JSX.Element {
   return (
     <div className='h-full'>
       <div className='hover:bg-slate-300 h-7 text-right pr-1 pl-1'>
+        {props.replaceContainer.isReplacing && <button
+          onClick={() => {
+            props.setReplaceContainer({ isReplacing: false, id: undefined, category: undefined });
+          }}
+          className='h-full hover:bg-slate-400 rounded-lg p-1'
+        >
+          <XCircleIcon className='heroicon'></XCircleIcon>
+        </button>
+        }
         <button
           onClick={() => { setHideDisabled(!hideDisabled); }}
           className='h-full hover:bg-slate-400 rounded-lg p-1'
@@ -117,4 +134,4 @@ export function Components(props: IComponentsProps): JSX.Element {
       </div>
     </div>
   );
-};
+}

src/Components/Editor/Actions/ContainerOperations.ts

@@ -8,6 +8,8 @@ import Swal from 'sweetalert2';
 import { PropertyType } from '../../../Enums/PropertyType';
 import { TransformX, TransformY } from '../../../utils/svg';
 import { Orientation } from '../../../Enums/Orientation';
+import { AddContainers } from './AddContainer';
+import { IConfiguration } from '../../../Interfaces/IConfiguration';
 
 /**
  * Select a container
@@ -133,6 +135,58 @@ export function DeleteContainer(
   return history;
 }
 
+/**
+ * Replace a container
+ * @param containerId containerId of the container to delete
+ * @param newContainerId
+ * @param configuration
+ * @param fullHistory History of the editor
+ * @param historyCurrentStep Current step
+ * @returns New history
+ */
+export function ReplaceByContainer(
+  containerId: string,
+  newContainerId: string,
+  configuration: IConfiguration,
+  fullHistory: IHistoryState[],
+  historyCurrentStep: number
+): IHistoryState[] {
+  const history = GetCurrentHistory(fullHistory, historyCurrentStep);
+  const current = history[history.length - 1];
+
+  const containerToReplace = FindContainerById(current.containers, containerId);
+  if (containerToReplace === undefined) {
+    return history;
+  }
+
+  const containerParent = FindContainerById(current.containers, containerToReplace.properties.parentId);
+  if (containerParent === undefined) {
+    return history;
+  }
+
+  const historyAdd = AddContainers(
+    containerParent.children.indexOf(containerId),
+    [{ Type: newContainerId }],
+    containerParent.properties.id,
+    configuration, fullHistory, historyCurrentStep
+  );
+
+  const historyDelete = DeleteContainer(containerId, historyAdd.history, historyCurrentStep + 1);
+  const currentDelete = historyDelete[historyDelete.length - 1];
+
+  fullHistory.push({
+    lastAction: `Replace ${containerId} by ${newContainerId}`,
+    mainContainer: currentDelete.mainContainer,
+    containers: currentDelete.containers,
+    selectedContainerId: currentDelete.selectedContainerId,
+    typeCounters: Object.assign({}, currentDelete.typeCounters),
+    symbols: current.symbols,
+    selectedSymbolId: current.selectedSymbolId
+  });
+
+  return fullHistory;
+}
+
 /**
  * Returns the next container that will be selected
  * after the selectedContainer is removed.

src/Components/Editor/Actions/ContextMenuActions.ts

@@ -16,6 +16,7 @@ import { AddContainers } from './AddContainer';
 import { DeleteContainer } from './ContainerOperations';
 import { DeleteSymbol } from './SymbolOperations';
 import { Text } from '../../Text/Text';
+import { IReplaceContainer } from '../../../Interfaces/IReplaceContainer';
 
 export function InitActions(
   menuActions: Map<string, IMenuAction[]>,
@@ -23,7 +24,8 @@ export function InitActions(
   history: IHistoryState[],
   historyCurrentStep: number,
   setNewHistory: (newHistory: IHistoryState[]) => void,
-  setHistoryCurrentStep: Dispatch<SetStateAction<number>>
+  setHistoryCurrentStep: Dispatch<SetStateAction<number>>,
+  setIsReplacingContainer: Dispatch<SetStateAction<IReplaceContainer>>
 ): void {
   menuActions.set(
     '',
@@ -56,9 +58,24 @@ export function InitActions(
   menuActions.set(
     'elements-sidebar-row',
     [{
+      text: Text({ textId: '@ReplaceByContainer' }),
+      title: Text({ textId: '@ReplaceByContainerTitle' }),
+      shortcut: '<kbd>R</kbd>',
+      action: (target: HTMLElement) => {
+        const targetContainer = FindContainerById(history[historyCurrentStep].containers, target.id);
+        const targetAvailableContainer = configuration.AvailableContainers.find((availableContainer) => availableContainer.Type === targetContainer?.properties.type);
+
+        if (targetAvailableContainer === undefined) {
+          return;
+        }
+
+        setIsReplacingContainer({ isReplacing: true, id: target.id, category: targetAvailableContainer.Category });
+      }
+    }, {
       text: Text({ textId: '@DeleteContainer' }),
       title: Text({ textId: '@DeleteContainerTitle' }),
       shortcut: '<kbd>Suppr</kbd>',
+
       action: (target: HTMLElement) => {
         const id = target.id;
         const newHistory = DeleteContainer(

src/Components/Editor/Actions/Shortcuts.ts

@@ -7,7 +7,8 @@ export function OnKey(
   history: IHistoryState[],
   historyCurrentStep: number,
   setHistoryCurrentStep: Dispatch<SetStateAction<number>>,
-  deleteAction: () => void
+  deleteAction: () => void,
+  resetState: () => void
 ): void {
   if (!ENABLE_SHORTCUTS) {
     return;
@@ -27,5 +28,7 @@ export function OnKey(
     setHistoryCurrentStep(historyCurrentStep + 1);
   } else if (event.key === 'Delete') {
     deleteAction();
+  } else if (event.key === 'Escape') {
+    resetState();
   }
 }

src/Components/Editor/Editor.tsx

@@ -1,9 +1,9 @@
-import React, { Dispatch, SetStateAction, useEffect, useRef } from 'react';
+import React, { type Dispatch, type SetStateAction, useEffect, useRef } from 'react';
 import './Editor.scss';
-import { IConfiguration } from '../../Interfaces/IConfiguration';
+import { type IConfiguration } from '../../Interfaces/IConfiguration';
-import { IHistoryState } from '../../Interfaces/IHistoryState';
+import { type IHistoryState } from '../../Interfaces/IHistoryState';
 import { UI } from '../UI/UI';
-import { SelectContainer, DeleteContainer, OnPropertyChange } from './Actions/ContainerOperations';
+import { SelectContainer, DeleteContainer, OnPropertyChange, ReplaceByContainer } from './Actions/ContainerOperations';
 import { SaveEditorAsJSON, SaveEditorAsSVG } from './Actions/Save';
 import { OnKey } from './Actions/Shortcuts';
 import { UseCustomEvents, UseEditorListener } from '../../Events/EditorEvents';
@@ -13,6 +13,7 @@ import { FindContainerById } from '../../utils/itertools';
 import { Menu } from '../Menu/Menu';
 import { InitActions } from './Actions/ContextMenuActions';
 import { AddContainerToSelectedContainer, AddContainer } from './Actions/AddContainer';
+import { type IReplaceContainer } from '../../Interfaces/IReplaceContainer';
 
 interface IEditorProps {
   root: Element | Document
@@ -25,16 +26,18 @@ function UseShortcuts(
   history: IHistoryState[],
   historyCurrentStep: number,
   setHistoryCurrentStep: Dispatch<SetStateAction<number>>,
-  deleteAction: () => void
+  deleteAction: () => void,
+  resetState: () => void
 ): void {
   useEffect(() => {
     function OnKeyUp(event: KeyboardEvent): void {
-      return OnKey(
+      OnKey(
         event,
         history,
         historyCurrentStep,
         setHistoryCurrentStep,
-        deleteAction
+        deleteAction,
+        resetState
       );
     }
 
@@ -62,13 +65,20 @@ function UseNewHistoryState(
   };
 }
 
+
 export function Editor(props: IEditorProps): JSX.Element {
   // States
   const [history, setHistory] = React.useState<IHistoryState[]>(structuredClone(props.history));
   const [historyCurrentStep, setHistoryCurrentStep] = React.useState<number>(props.historyCurrentStep);
+  const [replaceContainer, setReplaceContainer] = React.useState<IReplaceContainer>({ isReplacing: false, id: undefined, category: undefined });
+
   const editorRef = useRef<HTMLDivElement>(null);
   const setNewHistory = UseNewHistoryState(setHistory, setHistoryCurrentStep);
 
+  function ResetState(): void {
+    setReplaceContainer({ isReplacing: false, id: undefined, category: undefined });
+  }
+
   // Events
   UseShortcuts(
     history,
@@ -79,7 +89,8 @@ export function Editor(props: IEditorProps): JSX.Element {
       setNewHistory(
         DeleteContainer(current.selectedContainerId, history, historyCurrentStep)
       );
-    }
+    },
+    ResetState
   );
   UseCustomEvents(
     props.root,
@@ -104,7 +115,8 @@ export function Editor(props: IEditorProps): JSX.Element {
     history,
     historyCurrentStep,
     setNewHistory,
-    setHistoryCurrentStep
+    setHistoryCurrentStep,
+    setReplaceContainer
   );
 
   // Render
@@ -113,37 +125,54 @@ export function Editor(props: IEditorProps): JSX.Element {
   const selected = FindContainerById(current.containers, current.selectedContainerId);
 
   return (
-    <div ref={editorRef} className="Editor font-sans h-full">
+    <div ref={editorRef} className="Editor font-sans h-full ">
       <UI
         editorState={{
           configuration: props.configuration,
           history,
           historyCurrentStep
         }}
-        selectContainer={(container) => setNewHistory(
+        replaceContainer={replaceContainer}
+        selectContainer={(container) => {
+          setNewHistory(
             SelectContainer(
               container,
               history,
               historyCurrentStep
-          ))}
+            ));
-        deleteContainer={(containerId: string) => setNewHistory(
+        }}
+        deleteContainer={(containerId: string) => {
+          setNewHistory(
             DeleteContainer(
               containerId,
               history,
               historyCurrentStep
-          ))}
+            ));
-        onPropertyChange={(key, value, type) => setNewHistory(
+        }}
+        onPropertyChange={(key, value, type) => {
+          setNewHistory(
             OnPropertyChange(
               key, value, type,
               selected,
               history,
               historyCurrentStep
-          ))}
+            ));
-        addContainer={(type) => {
+        }}
+        addOrReplaceContainer={(type) => {
           if (selected === null || selected === undefined) {
             return;
           }
-
+          if (replaceContainer.isReplacing && replaceContainer.id !== undefined) {
+            const newHistory = ReplaceByContainer(
+              replaceContainer.id,
+              type,
+              configuration,
+              history,
+              historyCurrentStep
+            );
+            setReplaceContainer({ isReplacing: false, id: undefined, category: undefined });
+            setNewHistory(newHistory);
+          } else {
             setNewHistory(AddContainerToSelectedContainer(
               type,
               selected,
@@ -151,8 +180,10 @@ export function Editor(props: IEditorProps): JSX.Element {
               history,
               historyCurrentStep
             ));
+          }
         }}
-        addContainerAt={(index, type, parent) => setNewHistory(
+        addContainerAt={(index, type, parent) => {
+          setNewHistory(
             AddContainer(
               index,
               type,
@@ -161,39 +192,51 @@ export function Editor(props: IEditorProps): JSX.Element {
               history,
               historyCurrentStep
             )
-        )}
+          );
-        addSymbol={(type) => setNewHistory(
+        }}
+        addSymbol={(type) => {
+          setNewHistory(
             AddSymbol(
               type,
               configuration,
               history,
               historyCurrentStep
-          ))}
+            ));
-        onSymbolPropertyChange={(key, value) => setNewHistory(
+        }}
+        onSymbolPropertyChange={(key, value) => {
+          setNewHistory(
             OnSymbolPropertyChange(
               key, value,
               history,
               historyCurrentStep
-          ))}
+            ));
-        selectSymbol={(symbolId) => setNewHistory(
+        }}
+        selectSymbol={(symbolId) => {
+          setNewHistory(
             SelectSymbol(
               symbolId,
               history,
               historyCurrentStep
-          ))}
+            ));
-        deleteSymbol={(symbolId) => setNewHistory(
+        }}
+        deleteSymbol={(symbolId) => {
+          setNewHistory(
             DeleteSymbol(
               symbolId,
               history,
               historyCurrentStep
-          ))}
+            ));
-        saveEditorAsJSON={() => SaveEditorAsJSON(
+        }}
+        saveEditorAsJSON={() => {
+          SaveEditorAsJSON(
             history,
             historyCurrentStep,
             configuration
-        )}
+          );
-        saveEditorAsSVG={() => SaveEditorAsSVG()}
+        }}
-        loadState={(move) => setHistoryCurrentStep(move)}
+        saveEditorAsSVG={() => { SaveEditorAsSVG(); }}
+        loadState={(move) => { setHistoryCurrentStep(move); }}
+        setReplaceContainer={setReplaceContainer}
       />
       <Menu
         getListener={() => editorRef.current}

src/Components/Menu/Menu.tsx

@@ -21,6 +21,7 @@ export interface IMenuAction {
 
   /** function to be called on button click */
   action: (target: HTMLElement) => void
+
 }
 
 function UseMouseEvents(
@@ -139,7 +140,7 @@ function AddClassSpecificActions(
         onClick={() => action.action(target)} />);
     });
     children.push(<hr key={`contextmenu-hr-${count}`} className='border-slate-400' />);
-  };
+  }
   return count;
 }
 

src/Components/UI/UI.tsx

@@ -17,13 +17,16 @@ import { FindContainerById } from '../../utils/itertools';
 import { type IEditorState } from '../../Interfaces/IEditorState';
 import { GetCurrentHistoryState } from '../Editor/Editor';
 import { Text } from '../Text/Text';
+import { IReplaceContainer } from '../../Interfaces/IReplaceContainer';
+import { Dispatch } from 'react';
 
 export interface IUIProps {
   editorState: IEditorState
+  replaceContainer: IReplaceContainer
   selectContainer: (containerId: string) => void
   deleteContainer: (containerId: string) => void
   onPropertyChange: (key: string, value: string | number | boolean | number[], type?: PropertyType) => void
-  addContainer: (type: string) => void
+  addOrReplaceContainer: (type: string) => void
   addContainerAt: (index: number, type: string, parent: string) => void
   addSymbol: (type: string) => void
   onSymbolPropertyChange: (key: string, value: string | number | boolean) => void
@@ -32,6 +35,8 @@ export interface IUIProps {
   saveEditorAsJSON: () => void
   saveEditorAsSVG: () => void
   loadState: (move: number) => void
+  setReplaceContainer: Dispatch<React.SetStateAction<IReplaceContainer>>
+
 }
 
 export enum SidebarType {
@@ -59,7 +64,7 @@ function UseSetOrToggleSidebar(
   };
 }
 
-export function UI({ editorState, ...methods }: IUIProps): JSX.Element {
+export function UI({ editorState, replaceContainer, setReplaceContainer, ...methods }: IUIProps): JSX.Element {
   const [selectedSidebar, setSelectedSidebar] = React.useState<SidebarType>(SidebarType.Components);
 
   const [messages, setMessages] = React.useState<IMessage[]>([]);
@@ -101,12 +106,14 @@ export function UI({ editorState, ...methods }: IUIProps): JSX.Element {
   switch (selectedSidebar) {
     case SidebarType.Components:
       leftSidebarTitle = Text({ textId: '@Components' });
+
       leftChildren = <Components
         selectedContainer={selectedContainer}
         componentOptions={configuration.AvailableContainers}
         categories={configuration.Categories}
-        buttonOnClick={methods.addContainer}
+        buttonOnClick={methods.addOrReplaceContainer}
-      />;
+        replaceContainer={replaceContainer}
+        setReplaceContainer={setReplaceContainer}/>;
       rightSidebarTitle = Text({ textId: '@Elements' });
       rightChildren = <ElementsSideBar
         containers={current.containers}
@@ -126,8 +133,9 @@ export function UI({ editorState, ...methods }: IUIProps): JSX.Element {
         selectedContainer={selectedContainer}
         componentOptions={configuration.AvailableContainers}
         categories={configuration.Categories}
-        buttonOnClick={methods.addContainer}
+        buttonOnClick={methods.addOrReplaceContainer}
-      />;
+        replaceContainer={replaceContainer}
+        setReplaceContainer={setReplaceContainer}/>;
       rightSidebarTitle = Text({ textId: '@Elements' });
       rightChildren = <ElementsSideBar
         containers={current.containers}
@@ -243,12 +251,14 @@ export function UI({ editorState, ...methods }: IUIProps): JSX.Element {
     isLeftSidebarOpenClasses.add('left-sidebar-single');
   }
 
+  const clickRestrictionsClasses = replaceContainer.isReplacing ? 'pointer-events-none opacity-50' : '';
   const isComponentsOpen = selectedSidebar === SidebarType.Components || selectedSidebar === SidebarType.ComponentsExpanded;
   const isSymbolsOpen = selectedSidebar === SidebarType.Symbols || selectedSidebar === SidebarType.SymbolsExpanded;
 
   return (
     <>
       <Bar
+        className={clickRestrictionsClasses}
         isComponentsOpen={isComponentsOpen}
         isSymbolsOpen={isSymbolsOpen}
         isHistoryOpen={selectedSidebar === SidebarType.History}
@@ -285,7 +295,7 @@ export function UI({ editorState, ...methods }: IUIProps): JSX.Element {
         { leftChildren }
       </Sidebar>
       <Viewer
-        className={`${[...viewerMarginClasses.values()].join(' ')} w-full h-full`}
+        className={`${clickRestrictionsClasses} ${[...viewerMarginClasses.values()].join(' ')} w-full h-full`}
         current={current}
         isComponentsOpen={isComponentsOpen}
         isSymbolsOpen={isSymbolsOpen}
@@ -295,7 +305,7 @@ export function UI({ editorState, ...methods }: IUIProps): JSX.Element {
         margin={marginSidebar}
       />
       <Sidebar
-        className={`right-sidebar ${isRightSidebarOpenClasses}`}
+        className={`right-sidebar ${isRightSidebarOpenClasses} ${clickRestrictionsClasses}`}
         title={rightSidebarTitle}
       >
         { rightChildren }

src/Components/Viewer/Viewer.tsx

@@ -14,7 +14,7 @@ import { useState } from 'react';
 import { type ISymbolModel } from '../../Interfaces/ISymbolModel';
 
 interface IViewerProps {
-  className?: string
+  className: string
   current: IHistoryState
   selectedContainer: IContainerModel | undefined
   selectContainer: (containerId: string) => void
@@ -133,7 +133,7 @@ export function Viewer({
     return (
       <Canvas
         draw={Draw}
-        className='ml-16'
+        className={`ml-16 ${className}`}
         width={window.innerWidth - BAR_WIDTH}
         height={window.innerHeight}
       />

src/Interfaces/IReplaceContainer.ts

@@ -0,0 +1,5 @@
+export interface IReplaceContainer {
+  id: string | undefined
+  isReplacing: boolean
+  category: string | undefined
+}