@admin-layout/gluestack-ui-mobile 12.2.4-alpha.3 → 12.2.4-alpha.31

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

@@ -1,11 +1,11 @@
 import React from 'react';
-import {Box,Pressable,Center,Text, SafeAreaView} from '@gluestack-ui/themed';
+import { Box, Pressable, Center, Text, SafeAreaView } from '@gluestack-ui/themed';
 import { useSelector } from 'react-redux';
 import { useRoute } from '@react-navigation/native';
 import { navigationRef } from '@common-stack/client-react';
 
-export const BottomTabBar = ({ state, descriptors, navigation,...props }: any) => {
-    const tabBarProps = props?.customTabBarProps??{};
+export const BottomTabBar = ({ state, descriptors, navigation, ...props }: any) => {
+    const tabBarProps = props?.customTabBarProps ?? {};
     const settings = useSelector<any>((state) => state.settings) as any;
     //const currentRoute: any = useRoute();
     const currentRoute: any = navigationRef.isReady() ? navigationRef?.getCurrentRoute() : null;
@@ -23,118 +23,117 @@ export const BottomTabBar = ({ state, descriptors, navigation,...props }: any) =
                 (b.options.priority ? b.options.priority : b.options.title),
         );
 
-        const onPress = React.useCallback((route, navigation, isFocused) => {
-            if (route?.route) {
-                const event = navigation.emit({
-                    type: 'tabPress',
-                    target: route.route.key,
-                    canPreventDefault: true,
-                });
-
-                if (!isFocused && !event.defaultPrevented) {
-                    // The `merge: true` option makes sure that the params inside the tab screen are preserved
-                    navigation.navigate({
-                        name: route.route.name,
-                        merge: true,
-                        orgName: currentRoute?.params?.orgName || platformState?.orgName,
-                    });
-                }
-            }
-        }, []);
+    const onPress = React.useCallback((route, navigation, isFocused) => {
+        if (route?.route) {
+            const event = navigation.emit({
+                type: 'tabPress',
+                target: route.route.key,
+                canPreventDefault: true,
+            });
 
-        const onLongPress = React.useCallback((route, navigation, isFocused) => {
-            if (route?.route) {
-                navigation.emit({
-                    type: 'tabLongPress',
-                    target: route.route.key,
+            if (!isFocused && !event.defaultPrevented) {
+                // The `merge: true` option makes sure that the params inside the tab screen are preserved
+                navigation.navigate({
+                    name: route.route.name,
+                    merge: true,
+                    orgName: currentRoute?.params?.orgName || platformState?.orgName,
                 });
             }
-        }, []);
+        }
+    }, []);
 
+    const onLongPress = React.useCallback((route, navigation, isFocused) => {
+        if (route?.route) {
+            navigation.emit({
+                type: 'tabLongPress',
+                target: route.route.key,
+            });
+        }
+    }, []);
 
     return (
         <SafeAreaView>
-        <Box
-            flexDirection="row"
-            width="100%"
-            alignSelf="center"
-            bg={'$white'}
-            borderTopWidth={"$1"}
-            borderTopColor={'#d3d3d3'}
-            py={"$4"}
-            {...tabBarProps}
-        >
-            {appRoutes.map((route: any, index: any) => {
-                const options = route.options;
-                const label =
-                    options.tabBarLabel !== undefined
-                        ? options.tabBarLabel
-                        : options.title !== undefined
+            <Box
+                flexDirection="row"
+                width="100%"
+                alignSelf="center"
+                bg={'$white'}
+                borderTopWidth={'$1'}
+                borderTopColor={'#d3d3d3'}
+                py={'$4'}
+                {...tabBarProps}
+            >
+                {appRoutes.map((route: any, index: any) => {
+                    const options = route.options;
+                    const label =
+                        options.tabBarLabel !== undefined
+                            ? options.tabBarLabel
+                            : options.title !== undefined
                             ? options.title
                             : route.route.name;
 
-                const isFocused = state.index === route.index;
+                    const isFocused = state.index === route.index;
 
-                // const onPress = () => {
-                //     const event = navigation.emit({
-                //         type: 'tabPress',
-                //         target: route.route.key,
-                //         canPreventDefault: true,
-                //     });
+                    // const onPress = () => {
+                    //     const event = navigation.emit({
+                    //         type: 'tabPress',
+                    //         target: route.route.key,
+                    //         canPreventDefault: true,
+                    //     });
 
-                //     if (!isFocused && !event.defaultPrevented) {
-                //         // The `merge: true` option makes sure that the params inside the tab screen are preserved
-                //         navigation.navigate({
-                //             name: route.route.name,
-                //             merge: true,
-                //             orgName: currentRoute?.params?.orgName || platformState?.orgName,
-                //         });
-                //     }
-                // };
+                    //     if (!isFocused && !event.defaultPrevented) {
+                    //         // The `merge: true` option makes sure that the params inside the tab screen are preserved
+                    //         navigation.navigate({
+                    //             name: route.route.name,
+                    //             merge: true,
+                    //             orgName: currentRoute?.params?.orgName || platformState?.orgName,
+                    //         });
+                    //     }
+                    // };
 
-                // const onLongPress = () => {
-                //     navigation.emit({
-                //         type: 'tabLongPress',
-                //         target: route.route.key,
-                //     });
-                // };
+                    // const onLongPress = () => {
+                    //     navigation.emit({
+                    //         type: 'tabLongPress',
+                    //         target: route.route.key,
+                    //     });
+                    // };
 
-                return (
-                    <Pressable
-                        key={index}
-                        opacity={isFocused ? "$100" : "$50"}
-                      //  pb="$8"
-                      //  pt={"$3"}
-                        flex={1}
-                        onPress={()=>onPress(route,navigation,isFocused)}
-                        onLongPress={()=>onLongPress(route,navigation,isFocused)}
-                        testID={options.tabBarTestID}
-                        accessibilityState={isFocused ? { selected: true } : {}}
-                        accessibilityLabel={options.tabBarAccessibilityLabel}
-                    >
-                        <Center>
-                            {options?.tabBarIcon
-                                ? options.tabBarIcon({
-                                    color: isFocused
-                                        ? options.tabBarActiveTintColor
-                                        : options.tabBarInactiveTintColor,
-                                    size: 24,
-                                })
-                                : null}
+                    return (
+                        <Pressable
+                            key={index}
+                            opacity={isFocused ? '$100' : '$50'}
+                            //  pb="$8"
+                            //  pt={"$3"}
+                            flex={1}
+                            onPress={() => onPress(route, navigation, isFocused)}
+                            onLongPress={() => onLongPress(route, navigation, isFocused)}
+                            testID={options.tabBarTestID}
+                            accessibilityState={isFocused ? { selected: true } : {}}
+                            accessibilityLabel={options.tabBarAccessibilityLabel}
+                        >
+                            <Center>
+                                {options?.tabBarIcon
+                                    ? options.tabBarIcon({
+                                          color: isFocused
+                                              ? options.tabBarActiveTintColor
+                                              : options.tabBarInactiveTintColor,
+                                          size: 24,
+                                      })
+                                    : null}
 
-                            <Text
-                                color={isFocused ? options.tabBarActiveTintColor : options.tabBarInactiveTintColor}
-                                style={{fontSize:12}}
-                            >
-                                {label}
-                            </Text>
-                        </Center>
-                    </Pressable>
-                );
-            })}
-        </Box>
+                                <Text
+                                    color={isFocused ? options.tabBarActiveTintColor : options.tabBarInactiveTintColor}
+                                    style={{ fontSize: 12 }}
+                                >
+                                    {label}
+                                </Text>
+                            </Center>
+                        </Pressable>
+                    );
+                })}
+            </Box>
         </SafeAreaView>
     );
 };
 
-export default BottomTabBar;
+export default BottomTabBar;

package/src/components/Layout/components/Sample.tsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import {  Box, Text } from '@gluestack-ui/themed';
+import { Box, Text } from '@gluestack-ui/themed';
 
 export const Sample = () => {
     return (

package/src/components/ToastAlert.tsx

@@ -1,14 +1,6 @@
 import React from 'react';
 
-import {
-    Toast,
-    VStack,
-    ToastTitle,
-    ToastDescription,
-    Pressable,
-    Icon,
-    CloseIcon,
-} from '@gluestack-ui/themed';
+import { Toast, VStack, ToastTitle, ToastDescription, Pressable, Icon, CloseIcon } from '@gluestack-ui/themed';
 
 interface IToast {
     id: string;
@@ -17,7 +9,7 @@ interface IToast {
     description?: string;
     isClosable?: boolean;
     toast?: any;
-    variant?:any
+    variant?: any;
 }
 
 // variants:
@@ -25,7 +17,15 @@ interface IToast {
 // solid,
 // outline
 
-export const ToastAlert = ({ id, status = 'info', title='', description = '',variant='solid', isClosable, toast=null }: IToast) => {
+export const ToastAlert = ({
+    id,
+    status = 'info',
+    title = '',
+    description = '',
+    variant = 'solid',
+    isClosable,
+    toast = null,
+}: IToast) => {
     const toastId = 'toast-' + id;
     const actionType = status || 'info';
     return (

package/src/components/UnAuthenticatedComponent.tsx

@@ -1,38 +1,28 @@
 import React from 'react';
-import {
-    Box,
-    Button,
-    Heading,
-    Text,
-    HStack,
-    Pressable,
-    Divider,
-    ButtonText,
-    SafeAreaView,
-} from '@gluestack-ui/themed';
+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 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 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>
-        </Box>
-    </SafeAreaView>
+        </SafeAreaView>
     );
 };
 
-export default UnAuthenticatedComponent;
+export default UnAuthenticatedComponent;

package/src/components/index.ts

@@ -1,3 +1,4 @@
+export * from './InputToolBar';
 export * from './Layout';
 export * from './PluginArea';
 export * from './ApplicationErrorHandler';

package/src/components/usePermissionAutoFetch.tsx

@@ -2,21 +2,21 @@ import { ResourceAuthority, ConfigFragmentName, IContext } from 'common';
 import { generateUserUri } from '@adminide-stack/core';
 import { useGetContextDataQuery } from 'common/lib/generated/generated.js';
 import { useSetting } from './useSetting';
+import type { URI } from '@vscode-alt/monaco-editor/esm/vs/base/common/uri.js';
 
 interface userPermissionAutoFetchProps {
     configKey?: string;
 }
 export const usePermissionAutoFetch = (options?: userPermissionAutoFetchProps) => {
     const { data, loading } = useGetContextDataQuery();
-    const { orgUri, userId } = (data?.getContextData as IContext) || {};
+    const { orgResource, userId } = (data?.getContextData as IContext) || {};
 
-    // Determine resource based on teamUri, orgUri, or fallback to userId
-    let resource = orgUri || (userId ? generateUserUri({ _id: userId }) : generateUserUri({ _id: 'guest' }));
+    let resource = orgResource || (userId ? generateUserUri({ _id: userId }) : generateUserUri({ _id: 'guest' }));
 
     const { loading: settingLoading, ...remaining } = useSetting({
         configKey: options?.configKey || '',
         overrides: {
-            resource: resource,
+            resource: resource as unknown as URI,
         },
         options: {
             forceExist: false,

package/src/containers/layout/ProLayout.tsx

@@ -11,7 +11,7 @@ const ProLayout: React.FC<any> = (props) => {
     const [appRoutes, setAppRoutes] = React.useState<any>([]);
     const { pathKey, appLayout } = useLayoutSetting(props);
     AppLayout = appLayout;
-    const {appFeatures} = routeConfigKeyReplace(pathKey, props?.features,appLayout);
+    const { appFeatures } = routeConfigKeyReplace(pathKey, props?.features, appLayout);
     AppFeatures = appFeatures;
 
     React.useEffect(() => {

package/src/index.ts

@@ -5,7 +5,7 @@ import { settingsReducer } from './redux/settings';
 import { useAfterInteractions } from './hooks/use-after-interactions';
 import useIsReady from './hooks/useIsReady';
 import routeConfigKeyReplace from './utils/routeConfigKeyReplace';
-import {getReplacedRouteConfig} from './utils/getReplacedRouteConfig'
+import { getReplacedRouteConfig } from './utils/getReplacedRouteConfig';
 import LayoutFeature, { ProLayout, AppFeatures, AppLayout } from './containers/layout/module';
 import { useLayoutSetting, LayoutSettingProps } from './hooks/useLayoutSetting';
 import i18next from './config/i18next';
@@ -21,7 +21,6 @@ export * from '@gluestack-ui/config';
 export * from '@gluestack-style/react';
 //............................gluestack-ui....///
 
-
 export {
     useLayoutSetting,
     LayoutSettingProps,