|
|
@@ -27,16 +27,13 @@ class Storage {
|
|
27
|
27
|
|
|
28
|
28
|
this.loadPage(data, data.currentPageId)
|
|
29
|
29
|
|
|
30
|
|
- this.saveToLocalStorage(data, data.document.id)
|
|
|
30
|
+ // this.saveToLocalStorage(data, data.document.id)
|
|
31
|
31
|
|
|
32
|
32
|
localStorage.setItem(`${CURRENT_VERSION}_lastOpened`, data.document.id)
|
|
33
|
33
|
}
|
|
34
|
34
|
|
|
35
|
35
|
load(data: Data, restoredData: any) {
|
|
36
|
36
|
// Before loading the state, save the pages / page states
|
|
37
|
|
- for (let key in restoredData.document.pages) {
|
|
38
|
|
- this.savePage(restoredData, restoredData.document.id, key)
|
|
39
|
|
- }
|
|
40
|
37
|
|
|
41
|
38
|
// Empty current state.
|
|
42
|
39
|
data.document = {} as TLDocument
|
|
|
@@ -71,11 +68,6 @@ class Storage {
|
|
71
|
68
|
|
|
72
|
69
|
const restoredData: any = JSON.parse(lzw_decode(savedData))
|
|
73
|
70
|
|
|
74
|
|
- for (let pageId in restoredData.document.pages) {
|
|
75
|
|
- const selectedIds = restoredData.pageStates[pageId].selectedIds
|
|
76
|
|
- restoredData.pageStates[pageId].selectedIds = new Set(selectedIds)
|
|
77
|
|
- }
|
|
78
|
|
-
|
|
79
|
71
|
this.load(data, restoredData)
|
|
80
|
72
|
}
|
|
81
|
73
|
|
|
|
@@ -92,7 +84,7 @@ class Storage {
|
|
92
|
84
|
dataToSave.document.pages[pageId] = restored
|
|
93
|
85
|
}
|
|
94
|
86
|
|
|
95
|
|
- const pageState = dataToSave.pageStates[pageId]
|
|
|
87
|
+ const pageState = { ...dataToSave.pageStates[pageId] }
|
|
96
|
88
|
pageState.selectedIds = setToArray(pageState.selectedIds)
|
|
97
|
89
|
}
|
|
98
|
90
|
|
|
|
@@ -114,6 +106,11 @@ class Storage {
|
|
114
|
106
|
|
|
115
|
107
|
loadDocumentFromJson(data: Data, restoredData: any) {
|
|
116
|
108
|
this.load(data, restoredData)
|
|
|
109
|
+
|
|
|
110
|
+ for (let key in restoredData.document.pages) {
|
|
|
111
|
+ this.savePage(restoredData, restoredData.document.id, key)
|
|
|
112
|
+ }
|
|
|
113
|
+
|
|
117
|
114
|
this.loadPage(data, data.currentPageId)
|
|
118
|
115
|
this.saveToLocalStorage(data, data.document.id)
|
|
119
|
116
|
localStorage.setItem(`${CURRENT_VERSION}_lastOpened`, data.document.id)
|
|
|
@@ -166,10 +163,10 @@ class Storage {
|
|
166
|
163
|
const fileId = data.document.id
|
|
167
|
164
|
|
|
168
|
165
|
// Page
|
|
169
|
|
-
|
|
170
|
166
|
const savedPage = localStorage.getItem(storageId(fileId, 'page', pageId))
|
|
171
|
167
|
|
|
172
|
168
|
if (savedPage !== null) {
|
|
|
169
|
+ console.log(lzw_decode(savedPage))
|
|
173
|
170
|
data.document.pages[pageId] = JSON.parse(lzw_decode(savedPage))
|
|
174
|
171
|
} else {
|
|
175
|
172
|
data.document.pages[pageId] = {
|
|
|
@@ -182,7 +179,6 @@ class Storage {
|
|
182
|
179
|
}
|
|
183
|
180
|
|
|
184
|
181
|
// Page state
|
|
185
|
|
-
|
|
186
|
182
|
const savedPageState = localStorage.getItem(
|
|
187
|
183
|
storageId(fileId, 'pageState', pageId)
|
|
188
|
184
|
)
|
|
|
@@ -200,10 +196,6 @@ class Storage {
|
|
200
|
196
|
}
|
|
201
|
197
|
}
|
|
202
|
198
|
|
|
203
|
|
- data.pageStates[pageId].selectedIds = new Set(
|
|
204
|
|
- data.pageStates[pageId].selectedIds
|
|
205
|
|
- )
|
|
206
|
|
-
|
|
207
|
199
|
// Empty shapes in state for other pages
|
|
208
|
200
|
|
|
209
|
201
|
for (let key in data.document.pages) {
|
|
|
@@ -211,6 +203,11 @@ class Storage {
|
|
211
|
203
|
data.document.pages[key].shapes = {}
|
|
212
|
204
|
}
|
|
213
|
205
|
|
|
|
206
|
+ // Force selected Ids into sets
|
|
|
207
|
+ for (let key in data.pageStates) {
|
|
|
208
|
+ data.pageStates[key].selectedIds = new Set([])
|
|
|
209
|
+ }
|
|
|
210
|
+
|
|
214
|
211
|
// Update camera for the new page state
|
|
215
|
212
|
document.documentElement.style.setProperty(
|
|
216
|
213
|
'--camera-zoom',
|