From a3aa57d98bb6c8226e16fd763fc65354b7105c1a Mon Sep 17 00:00:00 2001
From: Brady Madden <bradymadden97@gmail.com>
Date: Wed, 15 Jan 2020 21:08:52 -0500
Subject: [PATCH] Add AppState to export json to fix various import bugs (#358)

* export background, app state

* review comments
---
 src/actions/actionExport.tsx | 14 +++++++++-----
 src/scene/data.ts            | 17 +++++++++++------
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/src/actions/actionExport.tsx b/src/actions/actionExport.tsx
index 71476b82..ee843a64 100644
--- a/src/actions/actionExport.tsx
+++ b/src/actions/actionExport.tsx
@@ -40,7 +40,7 @@ export const actionChangeExportBackground: Action = {
 export const actionSaveScene: Action = {
   name: "saveScene",
   perform: (elements, appState, value) => {
-    saveAsJSON(elements, appState.name);
+    saveAsJSON(elements, appState);
     return {};
   },
   PanelComponent: ({ updateData }) => (
@@ -56,8 +56,12 @@ export const actionSaveScene: Action = {
 
 export const actionLoadScene: Action = {
   name: "loadScene",
-  perform: (elements, appState, loadedElements) => {
-    return { elements: loadedElements };
+  perform: (
+    elements,
+    appState,
+    { elements: loadedElements, appState: loadedAppState }
+  ) => {
+    return { elements: loadedElements, appState: loadedAppState };
   },
   PanelComponent: ({ updateData }) => (
     <ToolIcon
@@ -66,8 +70,8 @@ export const actionLoadScene: Action = {
       title="Load"
       aria-label="Load"
       onClick={() => {
-        loadFromJSON().then(({ elements }) => {
-          updateData(elements);
+        loadFromJSON().then(({ elements, appState }) => {
+          updateData({ elements: elements, appState: appState });
         });
       }}
     />
diff --git a/src/scene/data.ts b/src/scene/data.ts
index f739ea7d..a9a49859 100644
--- a/src/scene/data.ts
+++ b/src/scene/data.ts
@@ -3,6 +3,7 @@ import rough from "roughjs/bin/rough";
 import { ExcalidrawElement } from "../element/types";
 
 import { getElementAbsoluteCoords } from "../element";
+import { getDefaultAppState } from "../appState";
 
 import { renderScene } from "../renderer";
 import { AppState } from "../types";
@@ -25,21 +26,22 @@ function saveFile(name: string, data: string) {
 
 interface DataState {
   elements: readonly ExcalidrawElement[];
-  appState: any;
+  appState: AppState;
 }
 
 export function saveAsJSON(
   elements: readonly ExcalidrawElement[],
-  name: string
+  appState: AppState
 ) {
   const serialized = JSON.stringify({
     version: 1,
     source: window.location.origin,
-    elements: elements.map(({ shape, ...el }) => el)
+    elements: elements.map(({ shape, ...el }) => el),
+    appState: appState
   });
 
   saveFile(
-    `${name}.json`,
+    `${appState.name}.json`,
     "data:text/plain;charset=utf-8," + encodeURIComponent(serialized)
   );
 }
@@ -64,14 +66,17 @@ export function loadFromJSON() {
   return new Promise<DataState>(resolve => {
     reader.onloadend = () => {
       if (reader.readyState === FileReader.DONE) {
+        const defaultAppState = getDefaultAppState();
         let elements = [];
+        let appState = defaultAppState;
         try {
           const data = JSON.parse(reader.result as string);
           elements = data.elements || [];
+          appState = { ...defaultAppState, ...data.appState };
         } catch (e) {
           // Do nothing because elements array is already empty
         }
-        resolve(restore(elements, null));
+        resolve(restore(elements, appState));
       }
     };
   });
@@ -215,7 +220,7 @@ export function exportCanvas(
 
 function restore(
   savedElements: readonly ExcalidrawElement[],
-  savedState: any
+  savedState: AppState
 ): DataState {
   return {
     elements: savedElements.map(element => ({