5htp-core 0.4.0-3 → 0.4.0-4

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "5htp-core",
 	"description": "Convenient TypeScript framework designed for Performance and Productivity.",
-	"version": "0.4.0-3",
+	"version": "0.4.0-4",
 	"author": "Gaetan Le Gac (https://github.com/gaetanlegac)",
 	"repository": "git://github.com/gaetanlegac/5htp-core.git",
 	"license": "MIT",

package/src/client/services/router/components/Page.tsx

@@ -21,10 +21,12 @@ export default ({ page }: { page: Page }) => {
     ----------------------------------*/
     const context = useContext();
 
-    const [apiData, setApiData] = React.useState<{[k: string]: any} | null>( 
-        page.data || {}
-    );
+    // Temporary fix: context.page may not be updated at this stage
+    //  Seems to be the case when we change page, but still same page component with different data
+    context.page = page;
 
+    // Bind data
+    const [apiData, setApiData] = React.useState<{[k: string]: any} | null>( page.data || {});
     page.setAllData = setApiData;
     context.data = apiData;
 

package/src/client/services/router/components/router.tsx

@@ -105,9 +105,8 @@ export default ({ service: clientRouter }: { service?: ClientRouter }) => {
         }
 
         // Fetch API data to hydrate the page
-        let newData;
         try {
-            newData = await newpage.fetchData();
+            await newpage.preRender();
         } catch (error) {
             console.error(LogPrefix, "Unable to fetch data:", error);
             clientRouter.setLoading(false);