fix RouterContext and Router > routeParameterName was not being changed

wpdas · Apr 9, 2024 · 4505eef · 4505eef
1 parent a39957d
commit 4505eef
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 19 deletions.
diff --git a/lib/alem-vm/importable/RouteLink.tsx b/lib/alem-vm/importable/RouteLink.tsx
@@ -1,3 +1,7 @@
+// NOTA: Arquivo original antes da descoberta e uso do `Link`
+// `Link` não está sendo usado pois falha quando se tentar voltar ou ir pra frente
+// usando os botoes do navegador
+
 import { LinkProps, navigate, useContext } from "../alem-vm";
 
 /**

diff --git a/lib/alem-vm/importable/Router.tsx b/lib/alem-vm/importable/Router.tsx
@@ -44,14 +44,6 @@ const Router = (props: RouterProps) => {
     });
   }, [routes]);
 
-  // Update the parameter name if needed
-  useEffect(() => {
-    if (parameterName && parameterName !== alem.routeParameterName) {
-      // Comes from RouterProvider
-      alemRoutes.updateRouteParameterName(parameterName);
-    }
-  }, []);
-
   const { routeParameterName, routeType, activeRoute } = alemRoutes;
   const routeParamName = parameterName || routeParameterName;
 
@@ -128,6 +120,7 @@ const Router = (props: RouterProps) => {
           routeParams: _activeRouteParams,
           history: _history,
           routeBlocked: true,
+          routeParameterName: routeParamName,
         });
       }
     }

diff --git a/lib/alem-vm/importable/RouterContext.ts b/lib/alem-vm/importable/RouterContext.ts
@@ -41,16 +41,6 @@ const RouterContext = () => {
 
     // ==================================== Routes - Methods ====================================
 
-    /**
-     * Update Route Parameter Name
-     * @param parameterName
-     */
-    updateRouteParameterName: (parameterName: string) => {
-      updateAlemRoutesState({
-        routeParameterName: parameterName,
-      });
-    },
-
     /**
      * Update route parameters
      */
@@ -61,6 +51,7 @@ const RouterContext = () => {
       routeBlocked?: boolean;
       routeParams?: Record<string, any>;
       history?: History[]; // Previous history if config.keepRoute is true
+      routeParameterName?: string;
     }) => {
       // Update History
       const currentHistory = alemRoutesState().history;
@@ -93,6 +84,8 @@ const RouterContext = () => {
         activeRoute: routeProps.activeRoute || alemRoutesState().activeRoute,
         routeBlocked: routeProps.routeBlocked || alemRoutesState().routeBlocked,
         routeParams: routeProps.routeParams || alemRoutesState().routeParams,
+        routeParameterName:
+          routeProps.routeParameterName || alemRoutesState().routeParameterName,
         history: updatedHistory,
         routesInitialized: true,
       });

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "alem",
   "description": "Create web3 applications for NEAR BOS with a focus on performance and friendly development.",
-  "version": "1.0.0-beta.14",
+  "version": "1.0.0-beta.15",
   "main": "main.js",
   "types": "index.d.ts",
   "author": "Wenderson Pires - wendersonpires.near",