@admin-layout/gluestack-ui-mobile 7.3.8-alpha.8 → 8.5.3-alpha.0

package/lib/utils/getReplacedRouteConfig.mjs

@@ -0,0 +1,265 @@
+const getReplacedRouteConfig = ({ layoutType, layoutConfigData, routeConfig = [], initialRouteName = null, }) => {
+    let modulesRouteConfig = [];
+    const modulesRouteConfigObj = Object.assign({}, ...(routeConfig?.flat(1) || []));
+    const layoutOrgLength = Object.keys(modulesRouteConfigObj)?.filter((r) => r?.startsWith('/:orgName/l/'))?.length;
+    const hostOrgLength = Object.keys(modulesRouteConfigObj)?.filter((r) => r?.startsWith('/:orgName/h/'))?.length;
+    const isLayoutOrgExists = layoutOrgLength > 0 ? true : false;
+    const isHostOrgExists = hostOrgLength > 0 ? true : false;
+    const layoutRouteConfig = layoutConfigData[layoutType];
+    const hostRouteConfig = layoutConfigData['host-bottom'];
+    const layoutRouteKey = Object.keys(layoutRouteConfig)[1];
+    const hostRouteKey = Object.keys(hostRouteConfig)[1];
+    const appLayout = layoutRouteConfig[layoutRouteKey];
+    const hostLayout = hostRouteConfig[hostRouteKey];
+    const keyToReplace = appLayout.key || 'bottom_tab';
+    const hostFilteredRouteConfig = routeConfig?.map((rcArry) => rcArry.filter(((obj) => !Object.keys(obj)?.[0]?.startsWith('/l/') && !Object.keys(obj)?.[0].startsWith('/:orgName/l/'))));
+    let filteredRouteConfig = routeConfig;
+    if (keyToReplace == 'host_tab') {
+        filteredRouteConfig = hostFilteredRouteConfig;
+    }
+    const hostModuleRouteConfigLength = Object.entries(modulesRouteConfigObj)?.filter(([key, value]) => key?.startsWith('/:orgName/h/') || key?.startsWith('/h/'))?.flat(1)?.filter((rc) => rc.length)?.length ?? 0;
+    if (hostModuleRouteConfigLength && hostModuleRouteConfigLength > 0) {
+        modulesRouteConfig = [[layoutRouteConfig || []], [hostRouteConfig || []], ...filteredRouteConfig];
+    }
+    else {
+        modulesRouteConfig = [[layoutRouteConfig || []], ...filteredRouteConfig];
+    }
+    // const layoutRouteConfigObj = Object.assign(
+    //     {},
+    //     ...(modulesRouteConfig?.flat(1) || [])
+    //   );
+    //const mainStackConfig:any = Object.entries(layoutRouteConfigObj)?.filter(([key,val])=> key == '/')?.reduce((acc,val)=>{ return val[1]},{});
+    // const mainStackPath = mainStackConfig?.name?.toLowerCase()??'';
+    // const mainStackName = mainStackConfig?.name??'MainStack';
+    const lConfig = Object.keys(layoutRouteConfig).map((k) => layoutRouteConfig[k]);
+    const mainStackConfig = lConfig[0] || {};
+    const layoutConfig = lConfig[1] || {};
+    const mainStackPath = mainStackConfig?.name?.toLowerCase() ?? '';
+    const mainStackName = mainStackConfig?.name ?? 'MainStack';
+    const layoutName = layoutConfig?.name ?? 'Layout';
+    const layoutRootName = mainStackName + '.' + layoutName;
+    const hConfig = Object.keys(hostRouteConfig).map((k) => hostRouteConfig[k]);
+    const hostConfig = hConfig[1] || {};
+    const hostName = hostConfig?.name ?? 'Layout';
+    const hostRootName = mainStackName + '.' + hostName;
+    const replacedNavigationRouteConfig = modulesRouteConfig?.map((innerArray) => innerArray?.map((obj) => Object.fromEntries(Object.entries(obj).map(([key, val]) => {
+        let originalVal = Object.assign({}, val);
+        let objKey = key;
+        let path = originalVal.path || key;
+        let pathObj = { path: path };
+        let objVal = Object.assign({}, val, pathObj);
+        let name = objVal.name;
+        if (key === '/' && initialRouteName)
+            objVal.props.initialRouteName = initialRouteName;
+        if (key == '/' + keyToReplace && initialRouteName)
+            objVal.props.initialRouteName = initialRouteName;
+        let initialParams = objVal?.props?.initialParams ?? {};
+        if (objVal?.props?.options) {
+            initialParams.auth = objVal?.auth ?? false;
+            initialParams.menu_position = objVal?.menu_position ?? 'bottom';
+            initialParams.priority = objVal?.props?.options?.priority ?? 0;
+            // initialParams.options = objVal.props.options ? JSON.stringify(objVal?.props?.options) : null;
+            objVal.props.initialParams = initialParams;
+        }
+        if (isLayoutOrgExists && objKey == `/${keyToReplace}`) {
+            objKey = objKey.replace(objKey, `/:orgName${objKey}`);
+            path = path.replace(path, `/:orgName${path}`);
+        }
+        if (isHostOrgExists && key == `/${hostLayout.key}`) {
+            objKey = key.replace(objKey, `/:orgName${objKey}`);
+            path = path.replace(path, `/:orgName${path}`);
+        }
+        if (keyToReplace == 'host_tab') {
+            name = path.startsWith('/:orgName/l/')
+                ? name.replace(name, `${layoutRootName}.${name}`)
+                : path.startsWith('/l/')
+                    ? name.replace(name, `${layoutRootName}.${name}`)
+                    : path.startsWith('/:orgName/h/')
+                        ? name.replace(name, `${hostRootName}.${name}`)
+                        : path.startsWith('/h/')
+                            ? name.replace(name, `${hostRootName}.${name}`)
+                            : path.startsWith('//')
+                                ? name.startsWith(`${mainStackName}`)
+                                    ? name
+                                    : name.replace(name, `${mainStackName}.${name}`)
+                                : path.startsWith(`/${mainStackPath}`)
+                                    ? name
+                                    : path === '/'
+                                        ? name
+                                        : name.startsWith(`${mainStackName}`)
+                                            ? name
+                                            : name.replace(name, `${mainStackName}.${name}`);
+            objKey = objKey.startsWith('/:orgName/h/')
+                ? objKey.replace('/:orgName/h/', '//:orgName/' + keyToReplace + '/')
+                : objKey.startsWith('/h/')
+                    ? objKey.replace('/h/', '//' + keyToReplace + '/')
+                    : objKey.startsWith('/:orgName/l/')
+                        ? null
+                        : objKey.startsWith('/l/')
+                            ? null
+                            : objKey === '/'
+                                ? objKey
+                                : objKey.startsWith('//')
+                                    ? objKey
+                                    : objKey.replace('/', '//');
+            path = path.startsWith('/:orgName/h/')
+                ? path.replace('/:orgName/h/', '/:orgName/' + keyToReplace + '/')
+                : path.startsWith('/h/')
+                    ? path.replace('/h/', '/' + keyToReplace + '/')
+                    : path.startsWith('/:orgName/l/')
+                        ? null
+                        : path.startsWith('/l/')
+                            ? null
+                            : path.startsWith('//')
+                                ? path.replace('//', '/')
+                                : path.startsWith(`/${mainStackPath}`)
+                                    ? path
+                                    : path === '/'
+                                        ? path
+                                        : path.replace('/', `/${mainStackPath}/`);
+        }
+        else {
+            name = path.startsWith('/:orgName/l/')
+                ? name.replace(name, `${layoutRootName}.${name}`)
+                : path.startsWith('/l/')
+                    ? name.replace(name, `${layoutRootName}.${name}`)
+                    : path.startsWith('/:orgName/h/')
+                        ? name.replace(name, `${hostRootName}.${name}`)
+                        : path.startsWith('/h/')
+                            ? name.replace(name, `${hostRootName}.${name}`)
+                            : path.startsWith('//')
+                                ? name.startsWith(`${mainStackName}`)
+                                    ? name
+                                    : name.replace(name, `${mainStackName}.${name}`)
+                                : path.startsWith(`/${mainStackPath}`)
+                                    ? name
+                                    : path === '/'
+                                        ? name
+                                        : name.startsWith(`${mainStackName}`)
+                                            ? name
+                                            : name.replace(name, `${mainStackName}.${name}`);
+            objKey = objKey.startsWith('/:orgName/l/')
+                ? objKey.replace('/:orgName/l/', '//:orgName/' + keyToReplace + '/')
+                : objKey.startsWith('/l/')
+                    ? objKey.replace('/l/', '//' + keyToReplace + '/')
+                    : objKey.startsWith('/:orgName/h/')
+                        ? objKey.replace('/:orgName/h/', '//:orgName/host_tab/')
+                        : objKey.startsWith('/h/')
+                            ? objKey.replace('/h/', '//host_tab/')
+                            : objKey === '/'
+                                ? objKey
+                                : objKey.startsWith('//')
+                                    ? objKey
+                                    : objKey.replace('/', '//');
+            path = path.startsWith('/:orgName/l/')
+                ? path.replace('/:orgName/l/', '/:orgName/' + keyToReplace + '/')
+                : path.startsWith('/l/')
+                    ? path.replace('/l/', '/' + keyToReplace + '/')
+                    : path.startsWith('/:orgName/h/')
+                        ? path.replace('/:orgName/h/', '/:orgName/host_tab/')
+                        : path.startsWith('/h/')
+                            ? path.replace('/h/', '/host_tab/')
+                            : path.startsWith('//')
+                                ? path.replace('//', '/')
+                                : path.startsWith(`/${mainStackPath}`)
+                                    ? path
+                                    : path;
+            // : path === '/' ? path : path.replace('/',`/${mainStackPath}/`);
+            //name = name.startsWith(`${mainStackName}`) ? name : name.replace(name,`${mainStackName}.${name}`);
+        }
+        objVal.path = path;
+        objVal.name = name;
+        return [objKey, objVal];
+    }))));
+    const replacedConfiguredRouteConfig = modulesRouteConfig.map((innerArray) => innerArray.map((obj) => Object.fromEntries(Object.entries(obj).map(([key, val]) => {
+        let originalVal = Object.assign({}, val);
+        let objKey = key;
+        let path = originalVal.path || key;
+        let pathObj = { path: path };
+        let objVal = Object.assign({}, val, pathObj);
+        let name = objVal.name;
+        if (key === '/' && initialRouteName)
+            objVal.props.initialRouteName = initialRouteName;
+        if (key == '/' + keyToReplace && initialRouteName)
+            objVal.props.initialRouteName = initialRouteName;
+        let initialParams = objVal?.props?.initialParams ?? {};
+        if (objVal?.props?.options) {
+            initialParams.menu_position = objVal?.menu_position ?? 'bottom';
+            initialParams.priority = objVal?.props?.options?.priority ?? 0;
+            // initialParams.options = objVal.props.options ? JSON.stringify(objVal?.props?.options) : null;
+            objVal.props.initialParams = initialParams;
+        }
+        if (isLayoutOrgExists && objKey == `/${keyToReplace}`) {
+            objKey = objKey.replace(objKey, `/:orgName${objKey}`);
+            path = path.replace(path, `/:orgName${path}`);
+        }
+        if (isHostOrgExists && key == `/${hostLayout.key}`) {
+            objKey = key.replace(objKey, `/:orgName${objKey}`);
+            path = path.replace(path, `/:orgName${path}`);
+        }
+        if (keyToReplace == 'host_tab') {
+            objKey = objKey.startsWith('/:orgName/h/')
+                ? objKey.replace('/:orgName/h/', '//:orgName/' + keyToReplace + '/')
+                : objKey.startsWith('/h/')
+                    ? objKey.replace('/h/', '//' + keyToReplace + '/')
+                    : objKey.startsWith('/:orgName/l/')
+                        ? null
+                        : objKey.startsWith('/l/')
+                            ? null
+                            : objKey === '/'
+                                ? objKey
+                                : objKey.startsWith('//')
+                                    ? objKey
+                                    : objKey.replace('/', '//');
+            path = path.startsWith('/:orgName/h/')
+                ? path.replace('/:orgName/h/', '/:orgName/' + keyToReplace + '/')
+                : path.startsWith('/h/')
+                    ? path.replace('/h/', '/' + keyToReplace + '/')
+                    : path.startsWith('/:orgName/l/')
+                        ? null
+                        : path.startsWith('/l/')
+                            ? null
+                            : path.startsWith('//')
+                                ? path.replace('//', '/')
+                                : path.startsWith(`/${mainStackPath}`)
+                                    ? path
+                                    : path === '/'
+                                        ? path
+                                        : path.replace('/', `/${mainStackPath}/`);
+        }
+        else {
+            objKey = objKey.startsWith('/:orgName/l/')
+                ? objKey.replace('/:orgName/l/', '//:orgName/' + keyToReplace + '/')
+                : objKey.startsWith('/l/')
+                    ? objKey.replace('/l/', '//' + keyToReplace + '/')
+                    : objKey.startsWith('/:orgName/h/')
+                        ? objKey.replace('/:orgName/h/', '//:orgName/host_tab/')
+                        : objKey.startsWith('/h/')
+                            ? objKey.replace('/h/', '//host_tab/')
+                            : objKey === '/'
+                                ? objKey
+                                : objKey.startsWith('//')
+                                    ? objKey
+                                    : objKey.replace('/', '//');
+            path = path.startsWith('/:orgName/l/')
+                ? path.replace('/:orgName/l/', '/:orgName/' + keyToReplace + '/')
+                : path.startsWith('/l/')
+                    ? path.replace('/l/', '/' + keyToReplace + '/')
+                    : path.startsWith('/:orgName/h/')
+                        ? path.replace('/:orgName/h/', '/:orgName/host_tab/')
+                        : path.startsWith('/h/')
+                            ? path.replace('/h/', '/host_tab/')
+                            : path.startsWith('//')
+                                ? path.replace('//', '/')
+                                : path.startsWith(`/${mainStackPath}`)
+                                    ? path
+                                    : path;
+        }
+        objVal.path = path;
+        objVal.name = name;
+        return [objKey, objVal];
+    }))));
+    return { replacedNavigationRouteConfig, replacedConfiguredRouteConfig };
+};
+
+export { getReplacedRouteConfig };

package/lib/utils/routeConfigKeyReplace.js

@@ -1,25 +1,23 @@
 import { Feature } from '@common-stack/client-react';
 const routeConfigKeyReplace = (keyReplacedWith, features, appLayout = null, intialRouteName = 'MainStack.Layout') => {
-    var _a, _b, _c, _d, _e;
-    let appLayoutFeatures = Object.assign({}, features);
-    appLayoutFeatures.routeConfig = (_a = appLayoutFeatures === null || appLayoutFeatures === void 0 ? void 0 : appLayoutFeatures.routeConfig) === null || _a === void 0 ? void 0 : _a.map((obj) => {
-        let rObj = Object.assign({}, obj);
+    let appLayoutFeatures = { ...features };
+    appLayoutFeatures.routeConfig = appLayoutFeatures?.routeConfig?.map((obj) => {
+        let rObj = { ...obj };
         if (rObj.hasOwnProperty('/'))
             rObj['/'].props.initialRouteName = intialRouteName;
         let objectEntries = Object.entries(rObj).map(([key, val]) => {
-            var _a, _b, _c, _d, _e, _f, _g, _h;
             let objVal = Object.assign({}, val);
-            let initialParams = (_b = (_a = objVal === null || objVal === void 0 ? void 0 : objVal.props) === null || _a === void 0 ? void 0 : _a.initialParams) !== null && _b !== void 0 ? _b : {};
-            if ((_c = objVal === null || objVal === void 0 ? void 0 : objVal.props) === null || _c === void 0 ? void 0 : _c.options) {
-                initialParams.menu_position = (_d = objVal === null || objVal === void 0 ? void 0 : objVal.menu_position) !== null && _d !== void 0 ? _d : 'bottom';
-                initialParams.priority = (_g = (_f = (_e = objVal === null || objVal === void 0 ? void 0 : objVal.props) === null || _e === void 0 ? void 0 : _e.options) === null || _f === void 0 ? void 0 : _f.priority) !== null && _g !== void 0 ? _g : 0;
-                initialParams.options = objVal.props.options ? JSON.stringify((_h = objVal === null || objVal === void 0 ? void 0 : objVal.props) === null || _h === void 0 ? void 0 : _h.options) : null;
+            let initialParams = objVal?.props?.initialParams ?? {};
+            if (objVal?.props?.options) {
+                initialParams.menu_position = objVal?.menu_position ?? 'bottom';
+                initialParams.priority = objVal?.props?.options?.priority ?? 0;
+                initialParams.options = objVal.props.options ? JSON.stringify(objVal?.props?.options) : null;
                 objVal.props.initialParams = initialParams;
             }
             let objKey;
             if (keyReplacedWith == '//host_tab/') {
                 objKey = key.startsWith('//:orgName/h/')
-                    ? key.replace('//:orgName/h/', '//:orgName' + (keyReplacedWith === null || keyReplacedWith === void 0 ? void 0 : keyReplacedWith.replace('//', '/')))
+                    ? key.replace('//:orgName/h/', '//:orgName' + keyReplacedWith?.replace('//', '/'))
                     : key.startsWith('//h/')
                         ? key.replace('//h/', keyReplacedWith)
                         : key.startsWith('//:orgName/l/') ? null
@@ -27,7 +25,7 @@ const routeConfigKeyReplace = (keyReplacedWith, features, appLayout = null, inti
                                 : key;
             }
             else {
-                objKey = key.startsWith('//:orgName/l/') ? key.replace('//:orgName/l/', '//:orgName' + (keyReplacedWith === null || keyReplacedWith === void 0 ? void 0 : keyReplacedWith.replace('//', '/')))
+                objKey = key.startsWith('//:orgName/l/') ? key.replace('//:orgName/l/', '//:orgName' + keyReplacedWith?.replace('//', '/'))
                     : key.startsWith('//l/') ? key.replace('//l/', keyReplacedWith)
                         : key.startsWith('//:orgName/h/') ? null
                             : key.startsWith('//h/') ? null
@@ -39,9 +37,9 @@ const routeConfigKeyReplace = (keyReplacedWith, features, appLayout = null, inti
     });
     let appLayoutConfig = null;
     if (appLayout) {
-        let layoutFeatures = [...features === null || features === void 0 ? void 0 : features.routeConfig];
+        let layoutFeatures = [...features?.routeConfig];
         //const intialRoutename = layoutFeatures?.map((obj:any)=>obj.hasOwnProperty('/') && obj['/'].props.initialRouteName)?.filter((obj:any)=>obj)[0]??'MainStack.MainDrawer';
-        const isOrgName = (_d = (_c = (_b = layoutFeatures === null || layoutFeatures === void 0 ? void 0 : layoutFeatures.map((obj) => {
+        const isOrgName = layoutFeatures?.map((obj) => {
             return Object.entries(obj).map(([key, val]) => {
                 if (keyReplacedWith == '//host_tab/') {
                     if (key.startsWith('//:orgName/h/'))
@@ -56,15 +54,15 @@ const routeConfigKeyReplace = (keyReplacedWith, features, appLayout = null, inti
                         null;
                 }
             });
-        })) === null || _b === void 0 ? void 0 : _b.flat(1)) === null || _c === void 0 ? void 0 : _c.filter((obj) => obj)) !== null && _d !== void 0 ? _d : [];
-        appLayoutConfig = Object.assign({}, appLayout);
-        appLayoutConfig.routeConfig = (_e = appLayoutConfig === null || appLayoutConfig === void 0 ? void 0 : appLayoutConfig.routeConfig) === null || _e === void 0 ? void 0 : _e.map((obj) => {
-            let rObj = Object.assign({}, obj);
+        })?.flat(1)?.filter((obj) => obj) ?? [];
+        appLayoutConfig = { ...appLayout };
+        appLayoutConfig.routeConfig = appLayoutConfig?.routeConfig?.map((obj) => {
+            let rObj = { ...obj };
             //if (rObj.hasOwnProperty('/')) rObj['/'].props.initialRouteName = intialRoutename;
             let objectEntries = Object.entries(rObj).map(([key, val]) => {
                 let objVal = Object.assign({}, val);
                 let objKey;
-                objKey = (isOrgName === null || isOrgName === void 0 ? void 0 : isOrgName.length) > 0 ? key.startsWith('//') ? key.replace('//', '//:orgName/') : key : key;
+                objKey = isOrgName?.length > 0 ? key.startsWith('//') ? key.replace('//', '//:orgName/') : key : key;
                 return [objKey, objVal];
             });
             return Object.fromEntries(objectEntries);

package/lib/utils/routeConfigKeyReplace.js.map

@@ -1 +1 @@
-{"version":3,"file":"routeConfigKeyReplace.js","sourceRoot":"","sources":["../../src/utils/routeConfigKeyReplace.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"routeConfigKeyReplace.js","sourceRoot":"","sources":["../../src/utils/routeConfigKeyReplace.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,8 +1,9 @@
 {
     "name": "@admin-layout/gluestack-ui-mobile",
-    "version": "7.3.8-alpha.8",
+    "version": "8.5.3-alpha.0",
     "description": "Glustack-ui for mobile component layout",
     "main": "lib/index.js",
+    "type": "module",
     "scripts": {
         "jest": "./node_modules/.bin/jest",
         "test:debug": "npm test -- --runInBand",
@@ -11,7 +12,8 @@
         "watch": "npm run build:lib:watch",
         "build": "npm run build:clean && npm run build:lib",
         "build:clean": "rimraf lib",
-        "build:lib": "tsc",
+        "build:replacedRouteConfig": "npx rollup lib/utils/getReplacedRouteConfig.js --file lib/utils/getReplacedRouteConfig.mjs",
+        "build:lib": "tsc && yarn build:replacedRouteConfig",
         "build:lib:watch": "npm run build:lib -- --watch",
         "test": "yarn tests && yarn lint",
         "tests": "jest --updateSnapshot",
@@ -23,8 +25,8 @@
     "author": "CDMBase LLC",
     "license": "ISC",
     "dependencies": {
-        "@admin-layout/client": "7.3.8-alpha.8",
-        "@common-stack/remix-router-redux": "^5.0.2-alpha.1",
+        "@admin-layout/client": "8.5.3-alpha.0",
+        "@common-stack/remix-router-redux": "^5.0.4-alpha.5",
         "@gluestack-style/react": "^1.0.53",
         "@gluestack-ui/config": "^1.1.18",
         "@gluestack-ui/themed": "^1.1.22",
@@ -38,5 +40,5 @@
     "typescript": {
         "definition": "lib/index.d.ts"
     },
-    "gitHead": "b6a69125a955d5fe0c3fec14100ccf9edde3f0e2"
+    "gitHead": "299897d5ba3d293244a8786fc09e4134480e2cb4"
 }

package/src/components/ApplicationErrorHandler.tsx

@@ -1,30 +1,35 @@
-import { ApplicationErrorHandlerCommon, APPLICATION_ERROR_SLOT_FILL } from '@admin-layout/client'
-import { Slot } from '@common-stack/components-pro'
+import { ApplicationErrorHandlerCommon, APPLICATION_ERROR_SLOT_FILL } from '@admin-layout/client';
+import { Slot } from '@common-stack/components-pro';
 import Toast from 'react-native-toast-message';
 import * as React from 'react';
 
 const FallbackComponent = () => {
-  React.useLayoutEffect(() => {
-    Toast.show({
-      type: 'error',
-      text1: 'Something went wrong...'
-    });
-  }, [])
+    React.useLayoutEffect(() => {
+        Toast.show({
+            type: 'error',
+            text1: 'Something went wrong...',
+        });
+    }, []);
 
-  return null;
-}
+    return null;
+};
 
 const RendererComponent = (props) => {
-  const { applicationErrors, backendError } = props;
-  return (
-    <>
-      {!!backendError && <FallbackComponent />}
-      {!!applicationErrors?.length && <Slot name={APPLICATION_ERROR_SLOT_FILL} fillProps={{ active: true, applicationErrors: applicationErrors }} />}
-    </>
-  )
-}
+    const { applicationErrors, backendError } = props;
+    return (
+        <>
+            {!!backendError && <FallbackComponent />}
+            {!!applicationErrors?.length && (
+                <Slot
+                    name={APPLICATION_ERROR_SLOT_FILL}
+                    fillProps={{ active: true, applicationErrors: applicationErrors }}
+                />
+            )}
+        </>
+    );
+};
 
 export const ApplicationErrorHandler = (props) => {
-  const CommonHandler = ApplicationErrorHandlerCommon(FallbackComponent, Slot, RendererComponent);
-  return <CommonHandler {...props} />
-}
+    const CommonHandler = (ApplicationErrorHandlerCommon as any)(FallbackComponent, Slot, RendererComponent);
+    return <CommonHandler {...props} />;
+};

package/src/components/AuthWrapper.tsx

@@ -0,0 +1,29 @@
+import React from 'react';
+import { isUserAuthenticated } from '@adminide-stack/user-auth0-client';
+import { useNavigation } from '@react-navigation/native';
+import { useSelector } from 'react-redux';
+import DefaultAuthComponent from './UnAuthenticatedComponent';
+import {withLifeCycleManaged,withInteractionsManaged,withLifeCycleInteractionsManaged} from './with-interactions-lifecycle-managed';
+
+export const AuthWrapper = ({auth=false,component,unauthenticatedComponent=null,withLifeCycle=null,withInteraction=null,withLifeCycleInteraction=null}: any) => {
+   const user = useSelector((state: any) => state.user);
+    const { authenticated } = isUserAuthenticated();
+    const navigation = useNavigation<any>();
+
+    React.useEffect(()=>{
+      if(auth && !user?.profile) navigation.navigate('MainStack.Login')
+    },[auth,user])
+
+    const wrapperComponent = withLifeCycle 
+            ? withLifeCycleManaged(component)
+            : withInteraction
+            ? withInteractionsManaged(component,withInteraction?.duration??null) 
+            : withLifeCycleInteraction 
+            ? withLifeCycleInteractionsManaged(component,withLifeCycleInteraction?.duration??null) 
+            :component;
+
+
+    if (auth && !user?.profile)
+        return unauthenticatedComponent ? unauthenticatedComponent :<DefaultAuthComponent />;
+    else return wrapperComponent;
+};

package/src/components/Layout/components/BottomTabBar.tsx

@@ -136,3 +136,5 @@ export const BottomTabBar = ({ state, descriptors, navigation,...props }: any) =
         </SafeAreaView>
     );
 };
+
+export default BottomTabBar;

package/src/components/Layout/components/Drawer.tsx

@@ -27,6 +27,7 @@ export const Drawer = (props: any) => {
     const settings = useSelector<any>((state) => state.settings) as any;
     const platform = useSelector<any>((state) => state.platform) as any;
     const user = useSelector<any>((state) => state.user) as any;
+    const isShowDefaultRoutes = props?.showDefaultRoutes??false;
     const dispatch = useDispatch();
     const navigation = useNavigation<any>();
     const route = useRoute<any>();
@@ -35,7 +36,7 @@ export const Drawer = (props: any) => {
     let getRootState: any = null;
     let allRoutes: any = null;
     let tabRoutes: any = null;
-    if (settings && settings.layout == 'mixSide') {
+    if (settings && settings.layout == 'mixSide' && !isShowDefaultRoutes) {
         getRootState = navigationRef.isReady() ? navigationRef?.getRootState() : null;
         if (getRootState) {
             allRoutes = getRootState?.routes[0]?.state?.routes ?? null;
@@ -410,3 +411,5 @@ export const Drawer = (props: any) => {
         </Box>
     );
 };
+
+export default Drawer;

package/src/components/Layout/components/Header.tsx

@@ -17,8 +17,10 @@ export const Header = React.memo(({
     theme = 'light',
     right = null,
     rightComponent,
+    isMixedLayout=null,
+    ...rest
 }: any)=>{
-    const title = getHeaderTitle(options, route.name);
+    const title = rest?.title || getHeaderTitle(options, route.name);
 
     const matches: any = title.match(/\b(\w)/g);
     const acronym: any = matches.join('').substring(0, 2); // JSON
@@ -47,7 +49,7 @@ export const Header = React.memo(({
                 //     settings?.layout === 'bottom' || settings?.layout === 'host-bottom' ? 'center' : 'space-between'
                 // }
                 justifyContent={
-                    (settings?.layout === 'bottom' || settings?.layout === 'host-bottom') && !right
+                    (settings?.layout === 'bottom' || settings?.layout === 'host-bottom') &&!isMixedLayout && !right
                         ? 'center'
                         : 'space-between'
                 }
@@ -61,7 +63,7 @@ export const Header = React.memo(({
                     <Button size="xs" bg={'transparent'} onPress={() => navigation.goBack()}>
                         <Ionicons name={'arrow-back'} color={theme === 'light' ? 'black' : 'white'} size={20} />
                     </Button>
-                ) : showToggle && settings?.layout !== 'bottom' ? (
+                ) : (showToggle && settings?.layout !== 'bottom') || (showToggle && settings?.layout !== 'host-bottom') ? (
                     <Button size="xs" bg={'transparent'} onPress={() => navigation.toggleDrawer()}>
                         <Ionicons name={'menu'} color={theme === 'light' ? 'black' : 'white'} size={20} />
                     </Button>
@@ -101,6 +103,8 @@ export const Header = React.memo(({
     );
 });
 
+export default Header;
+
 // export const Header = ({
 //     navigation,
 //     route,

package/src/components/UnAuthenticatedComponent.tsx

@@ -0,0 +1,38 @@
+import React from 'react';
+import {
+    Box,
+    Button,
+    Heading,
+    Text,
+    HStack,
+    Pressable,
+    Divider,
+    ButtonText,
+    SafeAreaView,
+} from '@gluestack-ui/themed';
+import { useNavigation } from '@react-navigation/native';
+import { Ionicons } from '@expo/vector-icons';
+import { Linking } from 'react-native';
+
+ const UnAuthenticatedComponent = () => {
+    const navigation = useNavigation<any>();
+    return (
+        <SafeAreaView flex={1}>
+        <Box flex={1} borderTopWidth={'$1'} borderTopColor={'$trueGray200'}>
+            {/* <Box h={'$1'} bg={Colors.primaryBgColor} /> */}
+            <Box flex={1} p={'$6'} bg="$white" justifyContent={'center'}>
+                <Heading mt={'$2'}>Login</Heading>
+                <Text fontSize="$md" mt={'$2'}>
+                    Log in to continue.
+                </Text>
+                <Button bg={'$blue500'} size="lg" my={'$3'} onPress={() => navigation.navigate('MainStack.Login')}>
+                    <ButtonText color="$white">Login</ButtonText>
+                </Button>
+                <Divider my={'$3'} />
+            </Box>
+        </Box>
+    </SafeAreaView>
+    );
+};
+
+export default UnAuthenticatedComponent;

package/src/components/index.ts

@@ -7,3 +7,4 @@ export * from './ErrorBounday';
 export * from './NavigationComponent';
 export * from './ToastAlert';
 export * from './with-interactions-managed';
+export * from './AuthWrapper'