@lowdefy/client 4.0.0-alpha.14 → 4.0.0-alpha.17

package/dist/auth/createAuthMethods.js

@@ -14,12 +14,13 @@
   limitations under the License.
 */ import { type, urlQuery as urlQueryFn } from '@lowdefy/helpers';
 function getCallbackUrl({ lowdefy , callbackUrl ={}  }) {
-    const { home , pageId , urlQuery  } = callbackUrl;
+    const { home , pageId , urlQuery , url  } = callbackUrl;
     if ([
         !home,
-        !pageId
+        !pageId,
+        !url
     ].filter((v)=>!v).length > 1) {
-        throw Error(`Invalid Link: To avoid ambiguity, only one of 'home' or 'pageId' can be defined.`);
+        throw Error(`Invalid Link: To avoid ambiguity, only one of 'home', 'pageId' or 'url' can be defined.`);
     }
     const query = type.isNone(urlQuery) ? '' : `${urlQueryFn.stringify(urlQuery)}`;
     if (home === true) {
@@ -28,12 +29,15 @@ function getCallbackUrl({ lowdefy , callbackUrl ={}  }) {
     if (type.isString(pageId)) {
         return `/${pageId}${query ? `?${query}` : ''}`;
     }
+    if (type.isString(url)) {
+        return `${url}${query ? `?${query}` : ''}`;
+    }
     return undefined;
 }
 function createAuthMethods({ lowdefy , auth  }) {
     // login and logout are Lowdefy function that handle action params
     // signIn and signOut are the next-auth methods
-    function login({ providerId , callbackUrl , authUrl ={}  } = {}) {
+    function login({ authUrl , callbackUrl , providerId  } = {}) {
         if (type.isNone(providerId) && auth.authConfig.providers.length === 1) {
             providerId = auth.authConfig.providers[0].id;
         }
@@ -42,11 +46,16 @@ function createAuthMethods({ lowdefy , auth  }) {
                 lowdefy,
                 callbackUrl
             })
-        }, authUrl.urlQuery);
+        }, authUrl?.urlQuery);
     }
-    // TODO: fix callbackUrl
-    function logout() {
-        auth.signOut();
+    function logout({ callbackUrl , redirect  } = {}) {
+        auth.signOut({
+            callbackUrl: getCallbackUrl({
+                lowdefy,
+                callbackUrl
+            }),
+            redirect
+        });
     }
     return {
         login,

package/dist/block/CategorySwitch.js

@@ -31,6 +31,8 @@ const CategorySwitch = ({ block , Blocks , context , loading , lowdefy  })=>{
     if (loading && type.isObject(block.eval.skeleton)) {
         return /*#__PURE__*/ React.createElement(LoadingBlock, {
             blockLayout: block.eval.layout,
+            blockProperties: block.eval.properties,
+            blockStyle: block.eval.style,
             context: context,
             lowdefy: lowdefy,
             skeleton: block.eval.skeleton

package/dist/block/LoadingBlock.js

@@ -29,7 +29,7 @@ const blockMethods = {
     triggerEvent: ()=>{},
     unshiftItem: ()=>{}
 };
-const LoadingBlock = ({ blockLayout , blockId , context , lowdefy , skeleton  })=>{
+const LoadingBlock = ({ blockId , blockLayout , blockProperties , blockStyle , context , lowdefy , skeleton ,  })=>{
     let Component = lowdefy._internal.blockComponents[skeleton.type];
     useEffect(()=>{
         if (!lowdefy._internal.blockComponents[skeleton.type]) {
@@ -41,32 +41,32 @@ const LoadingBlock = ({ blockLayout , blockId , context , lowdefy , skeleton  })
         // default to box when a skeleton block is not found - should be a basic or loader block.
         Component = lowdefy._internal.blockComponents.Box;
     }
-    const layout = skeleton.layout || blockLayout || {};
     switch(Component.meta.category){
         case 'list':
             return /*#__PURE__*/ React.createElement(LoadingList, {
                 blockId: blockId,
                 Component: Component,
                 context: context,
-                layout: layout,
                 lowdefy: lowdefy,
                 skeleton: skeleton
             });
         case 'container':
             return /*#__PURE__*/ React.createElement(LoadingContainer, {
                 blockId: blockId,
+                blockLayout: blockLayout,
+                blockProperties: blockProperties,
+                blockStyle: blockStyle,
                 Component: Component,
                 context: context,
-                layout: layout,
                 lowdefy: lowdefy,
                 skeleton: skeleton
             });
         default:
             return /*#__PURE__*/ React.createElement(BlockLayout, {
-                blockStyle: skeleton.style,
+                blockStyle: skeleton.style ?? blockStyle,
                 highlightBorders: lowdefy.lowdefyGlobal.highlightBorders,
                 id: `s-bl-${blockId}-${skeleton.id}`,
-                layout: layout,
+                layout: skeleton.layout ?? blockLayout,
                 makeCssClass: makeCssClass
             }, /*#__PURE__*/ React.createElement(Component, {
                 basePath: lowdefy.basePath,
@@ -76,7 +76,7 @@ const LoadingBlock = ({ blockLayout , blockId , context , lowdefy , skeleton  })
                 menus: lowdefy.menus,
                 methods: blockMethods,
                 pageId: lowdefy.pageId,
-                properties: skeleton.properties
+                properties: skeleton.properties ?? blockProperties
             }));
     }
 };

package/dist/block/LoadingContainer.js

@@ -16,7 +16,7 @@
 import { Area, BlockLayout, layoutParamsToArea } from '@lowdefy/layout';
 import { makeCssClass } from '@lowdefy/block-utils';
 import LoadingBlock from './LoadingBlock.js';
-const LoadingContainer = ({ blockId , Component , context , layout , lowdefy , skeleton  })=>{
+const LoadingContainer = ({ blockId , blockLayout , blockProperties , blockStyle , Component , context , lowdefy , skeleton ,  })=>{
     const content = {};
     // eslint-disable-next-line prefer-destructuring
     Object.keys(skeleton.areas).forEach((areaKey, i)=>{
@@ -24,7 +24,7 @@ const LoadingContainer = ({ blockId , Component , context , layout , lowdefy , s
                 area: layoutParamsToArea({
                     area: skeleton.areas[areaKey] || {},
                     areaKey,
-                    layout
+                    layout: skeleton.layout ?? blockLayout
                 }),
                 areaStyle: [
                     areaStyle,
@@ -43,10 +43,10 @@ const LoadingContainer = ({ blockId , Component , context , layout , lowdefy , s
                 })));
     });
     return /*#__PURE__*/ React.createElement(BlockLayout, {
-        blockStyle: skeleton.style,
+        blockStyle: skeleton.style ?? blockStyle,
         highlightBorders: lowdefy.lowdefyGlobal.highlightBorders,
         id: `s-bl-${blockId}-${skeleton.id}`,
-        layout: layout,
+        layout: skeleton.layout ?? blockLayout,
         makeCssClass: makeCssClass
     }, /*#__PURE__*/ React.createElement(Component, {
         basePath: lowdefy.basePath,
@@ -59,7 +59,7 @@ const LoadingContainer = ({ blockId , Component , context , layout , lowdefy , s
             makeCssClass
         },
         pageId: lowdefy.pageId,
-        properties: skeleton.properties
+        properties: skeleton.properties ?? blockProperties
     }));
 };
 export default LoadingContainer;

package/dist/block/LoadingList.js

@@ -16,16 +16,16 @@
 import { Area, BlockLayout, layoutParamsToArea } from '@lowdefy/layout';
 import { makeCssClass } from '@lowdefy/block-utils';
 import LoadingBlock from './LoadingBlock.js';
-const LoadingList = ({ blockId , Component , context , layout , lowdefy , skeleton  })=>{
+const LoadingList = ({ blockId , blockLayout , blockProperties , blockStyle , Component , context , lowdefy , skeleton ,  })=>{
     const content = {};
     const contentList = [];
     new Array(3).forEach(()=>{
         Object.keys(skeleton.areas).forEach((areaKey, i)=>{
             content[areaKey] = (areaStyle)=>/*#__PURE__*/ React.createElement(Area, {
                     area: layoutParamsToArea({
-                        area: skeleton.areas[areaKey] || {},
+                        area: skeleton.areas[areaKey] ?? {},
                         areaKey,
-                        layout
+                        layout: skeleton.layout ?? blockLayout
                     }),
                     areaStyle: [
                         areaStyle,
@@ -48,10 +48,10 @@ const LoadingList = ({ blockId , Component , context , layout , lowdefy , skelet
         });
     });
     return /*#__PURE__*/ React.createElement(BlockLayout, {
-        blockStyle: skeleton.style,
+        blockStyle: skeleton.style ?? blockStyle,
         highlightBorders: lowdefy.lowdefyGlobal.highlightBorders,
         id: `s-bl-${blockId}-${skeleton.id}`,
-        layout: layout,
+        layout: skeleton.layout ?? blockLayout,
         makeCssClass: makeCssClass
     }, /*#__PURE__*/ React.createElement(Component, {
         basePath: lowdefy.basePath,
@@ -63,7 +63,7 @@ const LoadingList = ({ blockId , Component , context , layout , lowdefy , skelet
             makeCssClass
         },
         pageId: lowdefy.pageId,
-        properties: skeleton.properties
+        properties: skeleton.properties ?? blockProperties
     }));
 };
 export default LoadingList;

package/dist/createLinkComponent.js

@@ -2,6 +2,7 @@ import React from 'react';
 import { createLink } from '@lowdefy/engine';
 import { type } from '@lowdefy/helpers';
 const createLinkComponent = (lowdefy, Link)=>{
+    const { window  } = lowdefy._internal.globals;
     const backLink = ({ ariaLabel , children , className , id , rel  })=>/*#__PURE__*/ React.createElement("a", {
             id: id,
             onClick: ()=>lowdefy._internal.router.back(),

package/dist/initLowdefyContext.js

@@ -50,8 +50,11 @@ function initLowdefyContext({ auth , Components , config , router , stage , type
     lowdefy.pageId = config.pageConfig.pageId;
     lowdefy.urlQuery = urlQuery.parse(window.location.search.slice(1));
     lowdefy.user = auth?.session?.user ?? null;
-    lowdefy._internal.window = window;
-    lowdefy._internal.document = window.document;
+    lowdefy._internal.globals = {
+        document: window.document,
+        fetch: window.fetch,
+        window
+    };
     lowdefy._internal.router = router;
     lowdefy._internal.link = setupLink(lowdefy);
     lowdefy._internal.updateBlock = (blockId)=>lowdefy._internal.updaters[blockId] && lowdefy._internal.updaters[blockId]();

package/dist/setupLink.js

@@ -14,7 +14,8 @@
   limitations under the License.
 */ import { createLink } from '@lowdefy/engine';
 function setupLink(lowdefy) {
-    const { router , window  } = lowdefy._internal;
+    const { router  } = lowdefy._internal;
+    const { window  } = lowdefy._internal.globals;
     const backLink = ()=>router.back();
     const disabledLink = ()=>{};
     const newOriginLink = ({ url , query , newTab  })=>{

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lowdefy/client",
-  "version": "4.0.0-alpha.14",
+  "version": "4.0.0-alpha.17",
   "license": "Apache-2.0",
   "description": "Lowdefy Client",
   "homepage": "https://lowdefy.com",
@@ -43,17 +43,17 @@
   },
   "dependencies": {
     "@ant-design/icons": "4.7.0",
-    "@lowdefy/block-utils": "4.0.0-alpha.14",
-    "@lowdefy/engine": "4.0.0-alpha.14",
-    "@lowdefy/helpers": "4.0.0-alpha.14",
-    "@lowdefy/layout": "4.0.0-alpha.14",
+    "@lowdefy/block-utils": "4.0.0-alpha.17",
+    "@lowdefy/engine": "4.0.0-alpha.17",
+    "@lowdefy/helpers": "4.0.0-alpha.17",
+    "@lowdefy/layout": "4.0.0-alpha.17",
     "classnames": "2.3.1",
     "react": "18.1.0",
     "react-dom": "18.1.0"
   },
   "devDependencies": {
     "@emotion/jest": "11.9.1",
-    "@lowdefy/jest-yaml-transform": "4.0.0-alpha.14",
+    "@lowdefy/jest-yaml-transform": "4.0.0-alpha.17",
     "@swc/cli": "0.1.57",
     "@swc/core": "1.2.194",
     "@swc/jest": "0.2.21",
@@ -68,5 +68,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "9cc0b7280c82a16689c31aaf71be278f3a40edc6"
+  "gitHead": "9172974b2fe19c527d3f0ea66b8dbde827ac9c0e"
 }