feat: soft pop

BlastLauncher · Aug 20, 2023 · 7c4c8d0 · 7c4c8d0
1 parent 571e8b7
commit 7c4c8d0
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/apps/electron-client/package.json b/apps/electron-client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "blast",
-  "version": "0.0.12",
+  "version": "0.0.13",
   "description": "Blast Launcher Electron Client",
   "keywords": [],
   "license": "MIT",

diff --git a/apps/electron-client/src/renderer/components/List/index.tsx b/apps/electron-client/src/renderer/components/List/index.tsx
@@ -168,7 +168,7 @@ export function getListIndexFromValue(value: string) {
 export const List = ({ children, props }: { children: BlastComponent[]; props: ListProps }): JSX.Element => {
   const listItems = children.filter((child) => child.elementType === "ListItem");
   const emptyView = children.find((child) => child.elementType === "EmptyView");
-  const { pop } = useNavigationContext();
+  const { softPop, pop } = useNavigationContext();
 
   const emptyViewActionPanel = emptyView
     ? emptyView.children.find((child) => child.elementType === "ActionPanel")
@@ -196,7 +196,7 @@ export const List = ({ children, props }: { children: BlastComponent[]; props: L
             }
           } else if (e.key === "Backspace" && !inputRef.current.value) {
             e.preventDefault();
-            pop();
+            softPop();
           }
         }}
       >

diff --git a/apps/electron-client/src/renderer/components/Navigation/context.ts b/apps/electron-client/src/renderer/components/Navigation/context.ts
@@ -2,11 +2,15 @@ import { createContext, useContext } from "react";
 
 export const NavigationContext = createContext<{
   pop: () => void;
+  softPop: () => void;
   canPop: boolean;
 }>({
   pop: () => {
     /* noop */
   },
+  softPop: () => {
+    /* noop */
+  },
   canPop: false,
 });
 

diff --git a/apps/electron-client/src/renderer/components/index.tsx b/apps/electron-client/src/renderer/components/index.tsx
@@ -40,11 +40,18 @@ export const TreeComponent = ({ blastProps }: { blastProps: BlastComponent }) =>
     }
   }, [canPop, ws]);
 
+  const softPop = useCallback(() => {
+    if (canPop) {
+      ws.call("blast-global:pop");
+    }
+  }, [canPop, ws]);
+
   return (
     <NavigationContext.Provider
       value={{
         pop,
         canPop,
+        softPop
       }}
     >
       {elementType === "List" ? <List children={firstChild.children} props={props as ListProps} /> : null}