Fix #52

DerGoogler · Oct 31, 2023 · e634bdc · e634bdc
1 parent 6877b5a
commit e634bdc
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/Website/src/activitys/TerminalActivity.tsx b/Website/src/activitys/TerminalActivity.tsx
@@ -103,10 +103,9 @@ const TerminalActivity = () => {
 
   return (
     <Page
-      onDeviceBackButton={(e: Event) => {
-        e.preventDefault();
+      onDeviceBackButton={(e) => {
         if (!active) {
-          context.popPage();
+          e.callParentHandler();
         }
       }}
       onShow={install}

diff --git a/Website/src/components/onsenui/Page.tsx b/Website/src/components/onsenui/Page.tsx
@@ -24,7 +24,7 @@ interface HTMLPage {
   onShow?: Function;
   onHide?: Function;
   onInfiniteScroll?: Function;
-  onDeviceBackButton?: Function;
+  onDeviceBackButton?: (event: DeviceBackButtonEvent) => void;
   children?: React.ReactNode;
   statusbarColor?: string;
   setStatusBarColor?: string;

diff --git a/Website/src/typings/global.d.ts b/Website/src/typings/global.d.ts
@@ -196,4 +196,16 @@ declare global {
     changeBoot?: boolean;
     mmtReborn?: boolean;
   }
+
+  // OnsenUI Types
+  /**
+   * @extends {Event}
+   */
+  export interface DeviceBackButtonEvent extends Event {
+    /**
+     * Runs the handler for the immediate parent that supports device back button.
+     * @returns {void}
+     */
+    callParentHandler: () => void;
+  }
 }