refactor: remove "back" usage where not necessary

Telegram-Mini-Apps · Oct 12, 2024 · beac8b1 · beac8b1
1 parent bd4116d
commit beac8b1
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 8 deletions.
diff --git a/src/components/Page/Page.tsx b/src/components/Page/Page.tsx
@@ -1,6 +1,7 @@
 import {
   type Component,
   createEffect,
+  createMemo,
   type JSX,
   type ParentProps,
 } from 'solid-js';
@@ -15,15 +16,17 @@ export interface PageProps extends ParentProps {
   disclaimer?: JSX.Element;
   /**
    * True if it is allowed to go back from this page.
+   * @default true
    */
   back?: boolean;
 }
 
 export const Page: Component<PageProps> = (props) => {
   const navigate = useNavigate();
+  const back = createMemo(() => typeof props.back === 'boolean' ? props.back : true);
 
   createEffect(() => {
-    if (props.back) {
+    if (back()) {
       backButton.show();
       return backButton.onClick(() => {
         navigate(-1);
@@ -35,8 +38,7 @@ export const Page: Component<PageProps> = (props) => {
   return (
     <div class="page">
       <h1>{props.title}</h1>
-      {props.disclaimer &&
-        <div class="page__disclaimer">{props.disclaimer}</div>}
+      {props.disclaimer && <div class="page__disclaimer">{props.disclaimer}</div>}
       {props.children}
     </div>
   );

diff --git a/src/pages/IndexPage/IndexPage.tsx b/src/pages/IndexPage/IndexPage.tsx
@@ -9,7 +9,7 @@ import './IndexPage.css';
 
 export const IndexPage: Component = () => {
   return (
-    <Page title="Home Page">
+    <Page title="Home Page" back={false}>
       <p>
         This page is a home page in this boilerplate. You can use the links below to visit other
         pages with their own functionality.

diff --git a/src/pages/InitDataPage/InitDataPage.tsx b/src/pages/InitDataPage/InitDataPage.tsx
@@ -83,7 +83,6 @@ export const InitDataPage: Component = () => {
 
   return (
     <Page
-      back
       title="Init Data"
       disclaimer={(
         <>

diff --git a/src/pages/LaunchParamsPage.tsx b/src/pages/LaunchParamsPage.tsx
@@ -10,7 +10,6 @@ export const LaunchParamsPage: Component = () => {
 
   return (
     <Page
-      back
       title="Launch Params"
       disclaimer={(
         <>

diff --git a/src/pages/ThemeParamsPage.tsx b/src/pages/ThemeParamsPage.tsx
@@ -10,7 +10,6 @@ export const ThemeParamsPage: Component = () => {
 
   return (
     <Page
-      back
       title="Theme Params"
       disclaimer={(
         <>

diff --git a/src/pages/TonConnectPage/TonConnectPage.tsx b/src/pages/TonConnectPage/TonConnectPage.tsx
@@ -12,7 +12,7 @@ export const TonConnectPage: Component = () => {
   const wallet = useTonWallet();
 
   return (
-    <Page title="TON Connect" back>
+    <Page title="TON Connect">
       <Show
         when={wallet()}
         fallback={