sliftutils 0.20.0 → 0.22.0

package/index.d.ts

@@ -594,7 +594,7 @@ declare module "sliftutils/storage/FileFolderAPI" {
         hasKey(key: string): Promise<boolean>;
         getStorage(key: string): Promise<FileStorage>;
         removeStorage(key: string): Promise<void>;
-        getKeys(): Promise<string[]>;
+        getKeys(includeFolders?: boolean): Promise<string[]>;
     };
     export type FileStorage = IStorageRaw & {
         folder: NestedFileStorage;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "sliftutils",
-    "version": "0.20.0",
+    "version": "0.22.0",
     "main": "index.js",
     "license": "MIT",
     "files": [

package/render-utils/InputLabel.tsx

@@ -200,7 +200,7 @@ export class InputLabel extends preact.Component<InputLabelProps> {
         }
         return (
             <label onClick={onClick} className={
-                css.hbox(0).relative
+                css.hbox(5).relative
                 + " trigger-hover "
                 + props.outerClass
                 + (props.flavor === "large" && css.fontSize(18, "soft"))

package/storage/FileFolderAPI.d.ts

@@ -64,7 +64,7 @@ export type NestedFileStorage = {
     hasKey(key: string): Promise<boolean>;
     getStorage(key: string): Promise<FileStorage>;
     removeStorage(key: string): Promise<void>;
-    getKeys(): Promise<string[]>;
+    getKeys(includeFolders?: boolean): Promise<string[]>;
 };
 export type FileStorage = IStorageRaw & {
     folder: NestedFileStorage;

package/storage/FileFolderAPI.tsx

@@ -213,7 +213,7 @@ export const getDirectoryHandle = lazy(async function getDirectoryHandle(): Prom
 
         let handle: DirectoryWrapper | undefined;
 
-        let storedId = localStorage.getItem(getFileAPIKey());
+        const storedId = localStorage.getItem(getFileAPIKey());
         if (storedId) {
             let doneLoad = false;
             setTimeout(() => {
@@ -223,7 +223,45 @@ export const getDirectoryHandle = lazy(async function getDirectoryHandle(): Prom
             }, 500);
             try {
                 handle = await tryToLoadPointer(storedId);
-            } catch { }
+            } catch (e) {
+                console.error(e);
+                // Check if the error is due to user activation being required
+                const errorMessage = e instanceof Error ? e.message : String(e);
+                if (errorMessage.includes("user activation") || errorMessage.includes("User activation")) {
+                    doneLoad = true;
+                    // Show UI to get user to click and retry
+                    let retryCallback: (success: boolean) => void;
+                    let retryPromise = new Promise<boolean>(resolve => {
+                        retryCallback = resolve;
+                    });
+                    displayData.ui = (
+                        <button
+                            className={css.fontSize(40).pad2(80, 40)}
+                            onClick={async () => {
+                                displayData.ui = "Loading...";
+                                try {
+                                    const retryHandle = await tryToLoadPointer(storedId);
+                                    if (retryHandle) {
+                                        handle = retryHandle;
+                                        retryCallback(true);
+                                    } else {
+                                        retryCallback(false);
+                                    }
+                                } catch (retryError) {
+                                    console.error("Retry failed:", retryError);
+                                    retryCallback(false);
+                                }
+                            }}
+                        >
+                            Click to restore file system access
+                        </button>
+                    );
+                    const success = await retryPromise;
+                    if (handle) {
+                        return handle;
+                    }
+                }
+            }
             doneLoad = true;
             if (handle) {
                 return handle;
@@ -280,7 +318,7 @@ export type NestedFileStorage = {
     hasKey(key: string): Promise<boolean>;
     getStorage(key: string): Promise<FileStorage>;
     removeStorage(key: string): Promise<void>;
-    getKeys(): Promise<string[]>;
+    getKeys(includeFolders?: boolean): Promise<string[]>;
 };
 
 export type FileStorage = IStorageRaw & {
@@ -368,10 +406,10 @@ function wrapHandleFiles(handle: DirectoryWrapper): IStorageRaw {
             await handle.removeEntry(key);
         },
 
-        async getKeys(): Promise<string[]> {
+        async getKeys(includeFolders: boolean = false): Promise<string[]> {
             const keys: string[] = [];
             for await (const [name, entry] of handle) {
-                if (entry.kind === "file") {
+                if (entry.kind === "file" || includeFolders) {
                     keys.push(entry.name);
                 }
             }