fix(storage): null typing in destr object

Novout · Sep 5, 2022 · eb8cc97 · eb8cc97
1 parent 7650a0d
commit eb8cc97
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/packages/better-write-app/src/use/raw.ts b/packages/better-write-app/src/use/raw.ts
@@ -440,7 +440,7 @@ export const useRaw = () => {
         }
       }
 
-      const menu = async (e: MouseEvent, index: number) => {
+      const menu = async (e: MouseEvent | TouchEvent, index: number) => {
         ABSOLUTE.entity.menu = false
 
         EDITOR.actives.entity.index = index
@@ -450,7 +450,7 @@ export const useRaw = () => {
           return
         }
 
-        e?.preventDefault()
+        if (e) e?.preventDefault()
 
         await nextTick
 

diff --git a/packages/better-write-app/src/use/storage/local.ts b/packages/better-write-app/src/use/storage/local.ts
@@ -1,5 +1,5 @@
 import destr from 'destr'
-import { ProjectObject } from 'better-write-types'
+import { Maybe, ProjectObject } from 'better-write-types'
 import { useToast } from 'vue-toastification'
 import { useEnv } from '../env'
 import i18n from '@/lang'
@@ -22,8 +22,10 @@ export const useLocalStorage = () => {
     localStorage.setItem(name, JSON.stringify(obj))
   }
 
-  const get = (name: string) => {
-    return destr((localStorage as any).getItem(name))
+  const get = (name: string): Maybe<ProjectObject> => {
+    const item = localStorage.getItem(name)
+
+    return item ? destr(item) : undefined
   }
 
   const setProject = (obj: ProjectObject) => {
@@ -32,8 +34,10 @@ export const useLocalStorage = () => {
     } catch (e) {}
   }
 
-  const getProject = (): ProjectObject => {
-    return storage.support(get(env.projectLocalStorage()))
+  const getProject = (): Maybe<ProjectObject> => {
+    const project = get(env.projectLocalStorage())
+
+    return project ? storage.support(project) : undefined
   }
 
   const onSaveProject = async (event: boolean = true) => {