@fto-consult/expo-ui 1.0.32 → 1.0.34

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "1.0.32",
+  "version": "1.0.34",
   "description": "Bibliothèque de composants UI Expo,react-native",
   "main": "index.js",
   "scripts": {
@@ -60,7 +60,7 @@
     "@emotion/native": "^11.10.0",
     "@expo/metro-config": "^0.4.0",
     "@expo/webpack-config": "^0.17.2",
-    "@fto-consult/common": "^1.1.8",
+    "@fto-consult/common": "^1.1.9",
     "@gorhom/portal": "^1.0.14",
     "@react-native-async-storage/async-storage": "~1.17.3",
     "@react-native-community/netinfo": "9.3.0",

package/src/auth/Login.js

@@ -1,6 +1,6 @@
 import React from "$react";
 import {isNonNullString,defaultNumber,defaultStr,uniqid,extendObj,isFunction} from "$utils";
-import {navigate} from "$enavigation/utils";
+import {navigate} from "$cnavigation";
 import FormData from "$ecomponents/Form/FormData/FormData";
 import {getForm} from "$ecomponents/Form/utils";
 import Button from "$ecomponents/Button";

package/src/components/AppBar/index.js

@@ -5,10 +5,9 @@ import APP from "$capp/instance"
 import {isSplitedActions,renderSplitedActions,splitActions,TITLE_FONT_SIZE} from "./utils";
 import theme,{Colors,flattenStyle} from "$theme";
 import {StyleSheet} from "react-native";
-import {goBack as navGoBack} from "$enavigation/utils";
+import {goBack as navGoBack,useNavigation,useRoute,useScreenOptions } from "$cnavigation";
 import PropTypes from "prop-types";
 import { Dimensions,TouchableWithoutFeedback} from "react-native";
-import { useNavigation,useRoute,useScreenOptions } from "$enavigation/utils";
 import Content from "./Content";
 import Icon from "$ecomponents/Icon";
 import {Elevations} from "$ecomponents/Surface";

package/src/components/Drawer/DrawerItems/DrawerItem.js

@@ -1,10 +1,8 @@
 import {isNonNullString,defaultStr,uniqid} from "$utils";
 import PropTypes from "prop-types"
 import _DrawerItem from "./_DrawerItem";
-import {navigate} from "$enavigation/utils";
+import {navigate,setActiveRoute} from "$cnavigation";
 import { useDrawer } from "../Provider";
-
-import {setActiveRoute} from "$enavigation/utils";
 import { setActiveItem,getOnPressAction,closeDrawer as nCloseDrawer,previousActiveItemRef,activeItemRef} from "./utils";
 import React from "$react";
 

package/src/components/Drawer/DrawerItems/utils.js

@@ -1,4 +1,4 @@
-import {navigate} from "$enavigation/utils";
+import {navigate} from "$cnavigation";
 import {defaultObj,isPromise,isObj,isNonNullString,isFunction} from "$utils";
 import {open as openPreloader,close as closePreloader} from "$epreloader";
 import React from "$react";

package/src/components/ErrorBoundary/ErrorMessage.js

@@ -1,12 +1,11 @@
 import * as React from 'react'
 import Types from 'prop-types';
-import {StyleSheet,View,TouchableOpacity,useWindowDimensions} from "react-native";
+import {StyleSheet,View,useWindowDimensions} from "react-native";
 import ScrollView  from "$ecomponents/ScrollView";
 import {Paragraph,Button,List } from "react-native-paper";
 import Portal from "$ecomponents/Portal";
 import theme from "$theme";
-import {navigationRef,sanitizeName} from "$enavigation/utils";
-import {isMobileNative} from "$cplatform";
+import {navigationRef,sanitizeName} from "$cnavigation";
 import Expandable from "$ecomponents/Expandable";
 import Label from "$ecomponents/Label";
 

package/src/components/Form/List/List.js

@@ -12,7 +12,7 @@ import {StyleSheet} from "react-native";
 import {List} from "react-native-paper";
 import FlashList from "$ecomponents/List";
 import Surface from "$ecomponents/Surface";
-import {navigate} from "$enavigation/utils";
+import {navigate} from "$cnavigation";
 import { handleBeforeSaveCallback } from "$ecomponents/Form/FormData/utils";
 import theme from "$theme";
 

package/src/components/Link/index.js

@@ -1,5 +1,5 @@
 import { Pressable } from "react-native";
-import { navigate } from "$enavigation/utils";
+import { navigate } from "$cnavigation";
 import PropTypes from "prop-types";
 import {defaultStr} from "$utils";
 import React from "$react";

package/src/index.js

@@ -7,7 +7,7 @@ import {navigationRef} from "$cnavigation"
 import NetInfo from '$utils/NetInfo';
 import Auth from "$cauth";
 import {isNativeMobile} from "$cplatform";
-import Navigation from "$enavigation";
+import Navigation from "./navigation";
 import {set as setSession,get as getSession} from "$session";
 import { showConfirm } from "$ecomponents/Dialog";
 import {close as closePreloader, isVisible as isPreloaderVisible} from "$epreloader";

package/src/layouts/Screen/FormData/FormData.js

@@ -3,10 +3,10 @@ import FormDataActions from "$ecomponents/Form/FormData/FormDataActions";
 import React from "$react";
 import {defaultObj,isObj,defaultStr} from "$utils";
 import ScreenContainer from "../Screen";
-import {useRoute} from "$enavigation/utils";
+import {useRoute} from "$cnavigation";
 import {Form as FormLoader} from "$ecomponents/ContentLoader";
 import HeavyScreen from "$ecomponents/HeavyScreen";
-import {goBack,getScreenProps} from "$enavigation/utils";
+import {goBack,getScreenProps} from "$cnavigation";
 
 
 export default class FormDataLayout extends FormDataActions {