5htp-core 0.4.0-3 → 0.4.0-5

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-5",
 	"author": "Gaetan Le Gac (https://github.com/gaetanlegac)",
 	"repository": "git://github.com/gaetanlegac/5htp-core.git",
 	"license": "MIT",

package/src/client/assets/css/components/button.less

@@ -259,7 +259,7 @@ ul.row {
     }
 
     .btn.icon > .label,
-    > li > .btn + ul {
+    > li > .btn + .menu {
         position: absolute;
     }
 
@@ -269,8 +269,8 @@ ul.row {
         position: relative;
 
         // Submenu
-        &:not(:hover) > .btn + ul,
-        > .btn[disabled] + ul {
+        &:not(:hover) > .btn + .menu,
+        > .btn[disabled] + .menu {
             display: none;
         }
     }
@@ -321,7 +321,7 @@ ul.col {
     }
 
     .btn.icon > .label,
-    > li > .btn + ul {
+    > li > .btn + .menu {
         left: 100%;
         margin-left: @spacing;
     }
@@ -354,7 +354,7 @@ ul.col {
     &.bubble-left {
 
         .btn.icon > .label,
-        > li > .btn + ul {
+        > li > .btn + .menu {
             left: auto;
             margin-left: 0;
             right: 100%;
@@ -363,10 +363,17 @@ ul.col {
     }
 }
 
+// Submenu
 ul.row {
     .btn.icon > .label,
-    > li > .btn + ul {
+    > li > .btn + .menu {
         bottom: 100%;
         margin-bottom: @spacing / 2;
     }
+
+    > li > .btn + .menu.pos-bottom {
+        bottom: auto;
+        top: 100%;
+        margin-bottom: @spacing / 2;
+    }
 }

package/src/client/assets/css/text/text.less

@@ -14,15 +14,17 @@ a {
 
     &.super {
         text-decoration: none;
-        &::after {
+
+        &::before {
             content: ' ';
             position: absolute;
             top: 0; left: 0; right: 0; bottom: 0;
             z-index: 5;
+        }
     
-            ~ a, ~ * a, ~ button, ~ * button {
-                z-index: 6;
-            }
+        > * {
+            z-index: 6;
+            position: relative;
         }
     }
 }

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);

package/src/server/services/router/index.ts

@@ -531,7 +531,7 @@ declare type Routes = {
             for (let iKey = 0; iKey < route.keys.length; iKey++) {
                 const nomParam = route.keys[iKey];
                 if (typeof nomParam === 'string') // number = sans nom
-                    request.data[nomParam] = match[iKey + 1]
+                    request.data[nomParam] = decodeURIComponent(match[iKey + 1]);
             }
 
             // Run on resolution hooks. Ex: authentication check