Merge pull request 'Fix multiple bugs related to saving' (#8) from dev into master

Reviewed-on: https://git.siklos-chaneru.duckdns.org/Siklos/svg-layout-designer-react/pulls/8

src/App.tsx

@@ -9,6 +9,7 @@ import { Configuration } from './Interfaces/Configuration';
 export interface IHistoryState {
   MainContainer: IContainerModel | null,
   SelectedContainer: IContainerModel | null,
+  SelectedContainerId: string,
   TypeCounters: Record<string, number>
 }
 
@@ -157,12 +158,11 @@ export async function fetchConfiguration(): Promise<Configuration> {
 function Revive(editorState: IEditorState): void {
   const history = editorState.history;
   for (const state of history) {
-    if (state.MainContainer === null) {
+    if (state.MainContainer === null || state.MainContainer === undefined) {
       continue;
     }
 
     const it = MakeIterator(state.MainContainer);
-    state.SelectedContainer = state.MainContainer;
     for (const container of it) {
       const parentId = container.properties.parentId;
       if (parentId === null) {
@@ -175,5 +175,12 @@ function Revive(editorState: IEditorState): void {
       }
       container.parent = parent;
     }
+
+    const selected = findContainerById(state.MainContainer, state.SelectedContainerId);
+    if (selected === undefined) {
+      state.SelectedContainer = null;
+      continue;
+    }
+    state.SelectedContainer = selected;
   }
 }

src/Editor.tsx

@@ -6,7 +6,7 @@ import { ElementsSidebar } from './Components/ElementsSidebar/ElementsSidebar';
 import { Configuration } from './Interfaces/Configuration';
 import { SVG } from './Components/SVG/SVG';
 import { History } from './Components/History/History';
-import { ContainerModel, IContainerModel, MakeIterator } from './Components/SVG/Elements/ContainerModel';
+import { ContainerModel, findContainerById, IContainerModel, MakeIterator } from './Components/SVG/Elements/ContainerModel';
 import Properties from './Interfaces/Properties';
 import { IHistoryState } from './App';
 
@@ -18,7 +18,7 @@ interface IEditorProps {
 
 export interface IEditorState {
   isSidebarOpen: boolean,
-  isSVGSidebarOpen: boolean,
+  isElementsSidebarOpen: boolean,
   isHistoryOpen: boolean,
   history: Array<IHistoryState>,
   historyCurrentStep: number,
@@ -34,7 +34,7 @@ class Editor extends React.Component<IEditorProps> {
     super(props);
     this.state = {
       isSidebarOpen: true,
-      isSVGSidebarOpen: false,
+      isElementsSidebarOpen: false,
       isHistoryOpen: false,
       configuration: Object.assign({}, props.configuration),
       history: [...props.history],
@@ -59,7 +59,7 @@ class Editor extends React.Component<IEditorProps> {
    */
   public ToggleElementsSidebar() {
     this.setState({
-      isSVGSidebarOpen: !this.state.isSVGSidebarOpen
+      isElementsSidebarOpen: !this.state.isElementsSidebarOpen
     } as IEditorState);
   }
 
@@ -79,11 +79,24 @@ class Editor extends React.Component<IEditorProps> {
   public SelectContainer(container: ContainerModel) {
     const history = this.getCurrentHistory();
     const current = history[history.length - 1];
+
+    if (current.MainContainer === null) {
+      throw new Error('[SelectContainer] Tried to select a container while there is no main container!');
+    }
+
+    const mainContainerClone = structuredClone(current.MainContainer);
+    const SelectedContainer = findContainerById(mainContainerClone, container.properties.id);
+
+    if (SelectedContainer === undefined) {
+      throw new Error('[SelectContainer] Cannot find container among children of main container!');
+    }
+
     this.setState({
       history: history.concat([{
-        MainContainer: current.MainContainer,
-        TypeCounters: current.TypeCounters,
-        SelectedContainer: container
+        MainContainer: mainContainerClone,
+        TypeCounters: Object.assign({}, current.TypeCounters),
+        SelectedContainer,
+        SelectedContainerId: SelectedContainer.properties.id
       }]),
       historyCurrentStep: history.length
     } as IEditorState);
@@ -110,30 +123,25 @@ class Editor extends React.Component<IEditorProps> {
     }
 
     if (parent === null) {
-      const clone: IContainerModel = structuredClone(current.SelectedContainer);
-      (clone.properties as any)[key] = value;
+      const selectedContainerClone: IContainerModel = structuredClone(current.SelectedContainer);
+      (selectedContainerClone.properties as any)[key] = value;
       this.setState({
         history: history.concat([{
-          SelectedContainer: clone,
-          MainContainer: clone,
-          TypeCounters: current.TypeCounters
+          SelectedContainer: selectedContainerClone,
+          SelectedContainerId: selectedContainerClone.properties.id,
+          MainContainer: selectedContainerClone,
+          TypeCounters: Object.assign({}, current.TypeCounters)
         }]),
         historyCurrentStep: history.length
       } as IEditorState);
       return;
     }
 
-    const clone: IContainerModel = structuredClone(current.MainContainer);
-    const it = MakeIterator(clone);
-    let container: ContainerModel | null = null;
-    for (const child of it) {
-      if (child.properties.id === current.SelectedContainer.properties.id) {
-        container = child as ContainerModel;
-        break;
-      }
-    }
+    const mainContainerClone: IContainerModel = structuredClone(current.MainContainer);
+    const it = MakeIterator(mainContainerClone);
+    const container: ContainerModel | undefined = findContainerById(current.MainContainer, current.SelectedContainer.properties.id);
 
-    if (container === null) {
+    if (container === null || container === undefined) {
       throw new Error('[OnPropertyChange] Container model was not found among children of the main container!');
     }
 
@@ -143,8 +151,9 @@ class Editor extends React.Component<IEditorProps> {
       {
         history: history.concat([{
           SelectedContainer: container,
-          MainContainer: clone,
-          TypeCounters: current.TypeCounters
+          SelectedContainerId: container.properties.id,
+          MainContainer: mainContainerClone,
+          TypeCounters: Object.assign({}, current.TypeCounters)
         }]),
         historyCurrentStep: history.length
       } as IEditorState);
@@ -230,7 +239,8 @@ class Editor extends React.Component<IEditorProps> {
       history: history.concat([{
         MainContainer: clone,
         TypeCounters: newCounters,
-        SelectedContainer: parent
+        SelectedContainer: parent,
+        SelectedContainerId: parent.properties.id
       }]),
       historyCurrentStep: history.length
     } as IEditorState);
@@ -259,6 +269,13 @@ class Editor extends React.Component<IEditorProps> {
    */
   render() {
     const current = this.getCurrentHistoryState();
+    let buttonRightOffsetClasses = 'right-12';
+    if (this.state.isElementsSidebarOpen || this.state.isHistoryOpen) {
+      buttonRightOffsetClasses = 'right-72';
+    }
+    if (this.state.isHistoryOpen && this.state.isElementsSidebarOpen) {
+      buttonRightOffsetClasses = 'right-[544px]';
+    }
     return (
       <div className="App font-sans h-full">
         <Sidebar
@@ -277,7 +294,7 @@ class Editor extends React.Component<IEditorProps> {
         <ElementsSidebar
           MainContainer={current.MainContainer}
           SelectedContainer={current.SelectedContainer}
-          isOpen={this.state.isSVGSidebarOpen}
+          isOpen={this.state.isElementsSidebarOpen}
           isHistoryOpen={this.state.isHistoryOpen}
           onClick={() => this.ToggleElementsSidebar()}
           onPropertyChange={(key: string, value: string) => this.OnPropertyChange(key, value)}
@@ -307,7 +324,7 @@ class Editor extends React.Component<IEditorProps> {
           { current.MainContainer }
         </SVG>
         <button
-          className='fixed transition-all right-12 bottom-10 w-14 h-14 p-2 align-middle items-center justify-center rounded-full bg-blue-500 hover:bg-blue-800'
+          className={`fixed transition-all ${buttonRightOffsetClasses} bottom-10 w-14 h-14 p-2 align-middle items-center justify-center rounded-full bg-blue-500 hover:bg-blue-800`}
           title='Export as JSON'
           onClick={() => this.SaveEditor()}
         >
@@ -321,6 +338,10 @@ class Editor extends React.Component<IEditorProps> {
 const getCircularReplacer = () => {
   const seen = new WeakSet();
   return (key: any, value: object | null) => {
+    if (key === 'parent') {
+      return;
+    }
+
     if (typeof value === 'object' && value !== null) {
       if (seen.has(value)) {
         return;