Even safer local storage... (#2686)

GitbookIO · Jan 7, 2025 · b0bd871 · b0bd871
1 parent c30bc24
commit b0bd871
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/.changeset/strange-hornets-trade.md b/.changeset/strange-hornets-trade.md
@@ -0,0 +1,5 @@
+---
+'gitbook': patch
+---
+
+Even safer localStorage
diff --git a/packages/gitbook/src/lib/local-storage.ts b/packages/gitbook/src/lib/local-storage.ts
@@ -3,11 +3,11 @@
  */
 export function getItem<T>(key: string, defaultValue: T): T {
     try {
-        if (typeof localStorage === 'undefined') {
-            return defaultValue;
+        if (typeof localStorage !== 'undefined' && localStorage && 'getItem' in localStorage) {
+            const stored = localStorage.getItem(key);
+            return stored ? (JSON.parse(stored) as T) : defaultValue;
         }
-        const stored = localStorage.getItem(key);
-        return stored ? (JSON.parse(stored) as T) : defaultValue;
+        return defaultValue;
     } catch (error) {
         if (error instanceof Error && error.name === 'SecurityError') {
             return defaultValue;
@@ -21,10 +21,9 @@ export function getItem<T>(key: string, defaultValue: T): T {
  */
 export function setItem(key: string, value: unknown) {
     try {
-        if (typeof localStorage === 'undefined') {
-            return;
+        if (typeof localStorage !== 'undefined' && localStorage && 'setItem' in localStorage) {
+            localStorage.setItem(key, JSON.stringify(value));
         }
-        localStorage.setItem(key, JSON.stringify(value));
     } catch (error) {
         if (error instanceof Error && error.name === 'SecurityError') {
             return;