@fto-consult/expo-ui 5.6.12 → 5.7.0

package/babel.config.alias.js

@@ -12,16 +12,8 @@ module.exports = (opts)=>{
     opts.withPouchDB = opts.withPouchDB !== false && opts.withPouchdb !== false ? true : false;
     delete opts.withPouchdb;
     const expoUI = require("./expo-ui-path")();
-    let cpath = "@fto-consult/common/babel.config.alias";
-    try {
-        const envPath = path.resolve(base,".env");
-        const envObj = fs.existsSync(envPath)? require("./parse-env")(fs.readFileSync(envPath,'utf8')) : {};
-        const commonPathm = typeof envObj.COMMON_ROOT_PATH =="string" && envObj.COMMON_ROOT_PATH && path.resolve(envObj.COMMON_ROOT_PATH)||'';
-        const cm = commonPathm && fs.existsSync(commonPathm)? commonPathm : null;
-        if(cm &&  fs.existsSync(path.resolve(cm,"src")) && fs.existsSync(path.resolve(cm,"babel.config.alias.js"))){
-            cpath = path.resolve(cm,"babel.config.alias.js");
-        }
-    } catch{}
+    const euCommon = path.resolve(expoUI,"node_modules","@fto-consult","common");
+    const cpath = fs.existsSync(euCommon)? path.resolve(euCommon,"babel.config.alias") : "@fto-consult/common/babel.config.alias";
     const r = require(`${cpath}`)(opts);
     const expo = path.resolve(expoUI,"src");
     r["$eauth"] = path.resolve(expo,"auth");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "5.6.12",
+  "version": "5.7.0",
   "description": "Bibliothèque de composants UI Expo,react-native",
   "main": "index.js",
   "scripts": {
@@ -61,7 +61,7 @@
     "@emotion/native": "^11.10.0",
     "@expo/html-elements": "^0.2.0",
     "@expo/vector-icons": "^13.0.0",
-    "@fto-consult/common": "^3.9.18",
+    "@fto-consult/common": "^3.10.0",
     "@gorhom/portal": "^1.0.14",
     "@react-native-async-storage/async-storage": "^1.17.11",
     "@react-native-community/datetimepicker": "^6.7.3",

package/src/App.js

@@ -1,7 +1,7 @@
 import '$session';
 import React from 'react';
 import {SWRConfig} from "$swr";
-import {defaultObj} from "$utils";
+import {defaultObj} from "$cutils";
 import  {updateTheme,defaultTheme} from "$theme";
 import {Provider as PaperProvider } from 'react-native-paper';
 import Index from './index';
@@ -30,11 +30,11 @@ import appConfig from "$capp/config";
 import {showPrompt} from "$components/Dialog/confirm";
 import { AppState } from 'react-native'
 import {canFetchOffline} from "$capi/utils";
-import {defaultNumber} from "$utils";
+import {defaultNumber} from "$cutils";
 import { timeout as SWR_REFRESH_TIMEOUT} from '$ecomponents/Datagrid/SWRDatagrid';
 import { Dimensions,Keyboard } from 'react-native';
 import {isTouchDevice} from "$platform";
-import * as Utils from "$utils";
+import * as Utils from "$cutils";
 Object.map(Utils,(v,i)=>{
   if(typeof v =='function' && typeof window !='undefined' && window && !window[i]){
      window[i] = v;

package/src/auth/Login.js

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

package/src/auth/ProviderSelector.js

@@ -5,7 +5,7 @@ import Button from "$components/Button";
 import Menu from "$components/Menu";
 import theme from "$theme";
 import React from "$react";
-import {isObj,defaultStr,defaultObj} from "$utils";
+import {isObj,defaultStr,defaultObj} from "$cutils";
 import PropTypes from "prop-types";
 import View from "$components/View";
 

package/src/auth/ThemeSelector/index.js

@@ -11,7 +11,7 @@ import defaultTheme,{getColors} from "$theme/defaultTheme";
 import theme,{defaultDarkTheme,Colors,defaultLightTheme} from "$theme";
 import Provider from "$ecomponents/Form/FormData/DialogProvider";
 import Dropdown from "$ecomponents/Dropdown";
-import {defaultObj} from "$utils";
+import {defaultObj} from "$cutils";
 import Icon from "$ecomponents/Icon";
 import {open,close} from "$preloader";
 import {fields,getThemeData} from "$theme/utils";

package/src/components/Animations/Animation/utils.js

@@ -1,4 +1,4 @@
-import {defaultStr,isObj} from "$utils";
+import {defaultStr,isObj} from "$cutils";
 import PropTypes from "prop-types";
 import {FadeIn,FadeInRight,FadeInLeft,FadeInUp,FadeInDown,SlideInRight,SlideInLeft,SlideInUp,SlideInDown} from "react-native-reanimated"; 
 import {FadeOut,FadeOutRight,FadeOutLeft,FadeOutUp,FadeOutDown,SlideOutRight,SlideOutLeft,SlideOutUp,SlideOutDown} from "react-native-reanimated";

package/src/components/AppBar/Content.js

@@ -3,7 +3,7 @@ import {Platform,StyleSheet,TouchableWithoutFeedback,View} from 'react-native';
 import Label from "$ecomponents/Label";
 import theme,{Colors,StyleProp} from "$theme";
 import PropTypes from "prop-types";
-import {defaultObj,defaultStr} from "$utils";
+import {defaultObj,defaultStr} from "$cutils";
 import {isIos,isAndroid,isWeb} from "$cplatform";
 
 const AppbarContent = React.forwardRef(({

package/src/components/AppBar/index.js

@@ -1,6 +1,6 @@
 import React from "$react"
 import { Appbar} from 'react-native-paper';
-import {defaultObj,defaultVal,defaultStr} from "$utils";
+import {defaultObj,defaultVal,defaultStr} from "$cutils";
 import APP from "$capp/instance"
 import {isSplitedActions,renderSplitedActions,splitActions,TITLE_FONT_SIZE} from "./utils";
 import theme,{Colors,flattenStyle} from "$theme";

package/src/components/AppBar/utils.js

@@ -1,4 +1,4 @@
-import {isPlainObj,defaultFunc,defaultStr,isObjOrArray,isObj,defaultObj} from "$utils";
+import {isPlainObj,defaultFunc,defaultStr,isObjOrArray,isObj,defaultObj} from "$cutils";
 import {getWindowSizes,isMobileOrTabletMedia,isMobileMedia} from "$cdimensions";
 import { StyleSheet } from "react-native";
 import Button from "$ecomponents/Button";

package/src/components/AutoLink/index.js

@@ -4,7 +4,7 @@
 
 import * as Linking from 'expo-linking';
 import { Pressable } from 'react-native';
-import {isValidUrl,isValidEmail,defaultStr,isSms} from "$utils";
+import {isValidUrl,isValidEmail,defaultStr,isSms} from "$cutils";
 import PropTypes from "prop-types";
 import Browser from "$ecomponents/Browser";
 

package/src/components/AutoSizer/AutoResizer.js

@@ -7,7 +7,7 @@ import { Platform, StyleSheet, View} from "react-native";
 import { findDOMNode } from "react-dom";
 import PropTypes from "prop-types";
 import stableHash from "stable-hash";
-import {defaultNumber,isNumber} from "$utils";
+import {defaultNumber,isNumber} from "$cutils";
 
 const styles = StyleSheet.create({container: { flex: 1 }});
 

package/src/components/AutoSizer/Vertical.js

@@ -3,7 +3,7 @@ import { Dimensions} from 'react-native';
 import PropTypes from "prop-types";
 import View from "$ecomponents/View";
 import theme from "$theme";
-import {defaultStr,defaultObj,defaultNumber} from "$utils";
+import {defaultStr,defaultObj,defaultNumber} from "$cutils";
 import APP from "$capp/instance";
 import ActivityIndicator from "$ecomponents/ActivityIndicator";
 import {isWeb} from "$cplatform";

package/src/components/Avatar/AutoHeightImage/index.js

@@ -6,7 +6,7 @@ import PropTypes from 'prop-types';
 import { ActivityIndicator } from 'react-native-paper';
 import theme from "$theme";
 import View from "$ecomponents/View";
-import {defaultStr} from "$utils";
+import {defaultStr} from "$cutils";
 
 import { getImageSizeFitWidth, getImageSizeFitWidthFromCache } from './cache';
 import { NOOP, DEFAULT_HEIGHT } from './helpers';

package/src/components/Avatar/Image.js

@@ -2,7 +2,7 @@ import React from '$react';
 import {Image,StyleSheet,TouchableOpacity} from 'react-native';
 import PropTypes from "prop-types";
 import { StyleProp } from '$theme';
-import {defaultStr,isNumber,defaultNumber} from "$utils";
+import {defaultStr,isNumber,defaultNumber} from "$cutils";
 import AutoHeightImage from "./AutoHeightImage";
 
 export const SIZE = 64;

package/src/components/Avatar/Text.js

@@ -3,7 +3,7 @@ import {Text,StyleSheet,Pressable} from 'react-native';
 import View from "$ecomponents/View";
 import PropTypes from 'prop-types';
 import {Colors,StylePropTypes} from "$theme";
-import {defaultStr,defaultNumber} from "$utils";
+import {defaultStr,defaultNumber} from "$cutils";
 
 const defaultSize = 64;
 

package/src/components/Avatar/index.js

@@ -1,6 +1,6 @@
 import { Avatar } from "react-native-paper";
 import {Colors} from "$theme"; 
-import {defaultDecimal,isNumber,defaultVal,isValid,defaultStr,defaultObj} from "$utils";
+import {defaultDecimal,isNumber,defaultVal,isValid,defaultStr,defaultObj} from "$cutils";
 import {StyleSheet} from "react-native";
 import React from "react";
 import Text from "./Text";

package/src/components/BackToTop/index.js

@@ -1,5 +1,5 @@
 import Fab from "$ecomponents/Fab";
-import {isObj,defaultStr,defaultVal,defaultObj} from "$utils";
+import {isObj,defaultStr,defaultVal,defaultObj} from "$cutils";
 import React from "$react";
 import PropTypes from "prop-types";
 import theme from "$theme";

package/src/components/Badge/index.js

@@ -6,7 +6,7 @@ import {
 import View from "$ecomponents/View";
 import theme,{ StyleProps,Colors} from '$theme';
 import PropTypes from "prop-types";
-import {defaultVal,defaultNumber,defaultObj} from "$utils";
+import {defaultVal,defaultNumber,defaultObj} from "$cutils";
 import Label from "$ecomponents/Label";
 
 const defaultSize = 18;

package/src/components/BottomSheet/Menu.js

@@ -2,7 +2,7 @@ import BottomSheet from "./Sheet";
 import {isMobileMedia} from "$cplatform/dimensions";
 import Menu,{renderItems} from "$ecomponents/Menu";
 import React from "$react";
-import {defaultObj,defaultDecimal,defaultStr,isDecimal,defaultBool} from "$utils";
+import {defaultObj,defaultDecimal,defaultStr,isDecimal,defaultBool} from "$cutils";
 import View from "$ecomponents/View";
 import PropTypes from "prop-types";
 import {getContentHeight} from "./utils";

package/src/components/BottomSheet/Provider.js

@@ -1,6 +1,6 @@
 import {Menu} from "$ecomponents/BottomSheet";
 import React from "$react";
-import {defaultObj} from "$utils";
+import {defaultObj} from "$cutils";
 
 let bottomSheetRef = null;
 

package/src/components/BottomSheet/Sheet.js

@@ -4,7 +4,7 @@ import PropTypes from "prop-types";
 import theme,{Colors} from "$theme";
 import Label from "$ecomponents/Label";
 import { renderActions } from "$ecomponents/Dialog";
-import {isObjOrArray,defaultVal,defaultObj} from "$utils";
+import {isObjOrArray,defaultVal,defaultObj} from "$cutils";
 import {renderSplitedActions} from "$ecomponents/AppBar/utils";
 import {isWeb,isNativeMobile} from "$cplatform";
 import Divider from "$ecomponents/Divider";
@@ -12,7 +12,7 @@ import {isMobileOrTabletMedia} from "$cplatform/dimensions";
 import APP from "$capp/instance";
 import KeyboardAvoidingView from "$ecomponents/KeyboardAvoidingView";
 import {Elevations} from "$ecomponents/Surface";
-import {defaultStr} from "$utils";
+import {defaultStr} from "$cutils";
 import View from "$ecomponents/View";
 import {Easing} from "react-native";
 import Portal from "$ecomponents/Portal";

package/src/components/BottomSheet/utils.js

@@ -1,5 +1,5 @@
 import { Dimensions } from "react-native";
-import {isDecimal} from "$utils";
+import {isDecimal} from "$cutils";
 
 export const getContentHeight = (innerRef,cb,screenIndent)=>{
     return new Promise ((resolve)=>{

package/src/components/Button/index.js

@@ -11,7 +11,7 @@ import {TouchableRipple} from "react-native-paper";
 import ActivityIndicator from "$ecomponents/ActivityIndicator";
 import Surface from "$ecomponents/Surface";
 import Label from "$ecomponents/Label";
-import {defaultObj,defaultVal,defaultDecimal,defaultStr} from "$utils";
+import {defaultObj,defaultVal,defaultDecimal,defaultStr} from "$cutils";
 
 import PropTypes from "prop-types";
 const white = "white";

package/src/components/CardView/index.android.js

@@ -1,6 +1,6 @@
 import { PropTypes } from 'prop-types';
 import React from '$react';
-import {defaultObj} from "$utils";
+import {defaultObj} from "$cutils";
 import View from "$ecomponents/View";
 
 import {

package/src/components/Chart/appexChart/index.native.js

@@ -1,7 +1,7 @@
 const htmlTemplate = require("./index.html");
 import React from "$react";
 import WebView from "$ecomponents/WebView";
-import {defaultStr,defaultObj,uniqid} from "$utils";
+import {defaultStr,defaultObj,uniqid} from "$cutils";
 import View from "$ecomponents/View";
 import { methodsNames } from "./utils";
 

package/src/components/Chart/appexChart/utils.js

@@ -1,7 +1,7 @@
 // Copyright 2022 @fto-consult/Boris Fouomene. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
-import {defaultNumber} from "$utils";
+import {defaultNumber} from "$cutils";
 export const methodsNames = ["updateOptions","updateSeries","destroy","render","exec","appendSeries","toggleSeries","showSeries","hideSeries","zoomX","resetSeries","appendData","toggleDataPointSelection","addXaxisAnnotation","addYaxisAnnotation","addPointAnnotation","removeAnnotation","clearAnnotations","dataURI","clearAnnotations",""];
 
 export const destroyChart = (chartContext,timeout)=>{

package/src/components/Chart/index.js

@@ -1,6 +1,6 @@
 import React from '$react'
 import PropTypes from 'prop-types'
-import {defaultStr,defaultVal,defaultObj,uniqid} from "$utils";
+import {defaultStr,defaultVal,defaultObj,uniqid} from "$cutils";
 import Chart from "./appexChart";
 import theme from "$theme";
 import { destroyChart } from './appexChart/utils';

package/src/components/Chart/utils.js

@@ -1,7 +1,7 @@
 // Copyright 2022 @fto-consult/Boris Fouomene. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
-import {isObj,defaultNumber} from "$utils";
+import {isObj,defaultNumber} from "$cutils";
 import appConfig from "$app/config";
 
 /*** retourne le nombre maximal de courbes pouvant s'afficher sur un même graphe

package/src/components/Checkbox/index.js

@@ -1,7 +1,7 @@
 import { Checkbox } from 'react-native-paper';
 import View from "$ecomponents/View";
 import React from "$react";
-import {isUndefined,defaultObj,defaultVal,defaultStr} from "$utils";
+import {isUndefined,defaultObj,defaultVal,defaultStr} from "$cutils";
 import {isIos,isAndroid} from "$cplatform";
 import theme,{Colors,DISABLED_OPACITY,ALPHA_OPACITY} from "$theme";
 import { StyleSheet } from 'react-native';

package/src/components/Chip/index.js

@@ -11,7 +11,7 @@ import {Text,TouchableRipple } from 'react-native-paper';
 import theme,{ black,Colors, white,StyleProps} from '$theme';
 import PropTypes from "prop-types";
 import {flatMode } from '$ecomponents/TextField/utils';
-import {defaultStr} from "$utils";
+import {defaultStr} from "$cutils";
 import Surface from "$ecomponents/Surface";
 
 const ChipComponent = React.forwardRef(({

package/src/components/Color/ColorPicker.js

@@ -1,6 +1,6 @@
 import React, { Component } from "$react";
 import {normalize,RGB_MAX,HUE_MAX,SV_MAX,hexToRgb} from "$theme/colors";
-import {extendObj} from "$utils";
+import {extendObj} from "$cutils";
 import View from "$ecomponents/View";
 import {
 	Animated,

package/src/components/Color/index.js

@@ -7,7 +7,7 @@ import PropTypes from "prop-types";
 import React from "$react";
 import Dialog from "$ecomponents/Dialog";
 import {isMobileOrTabletMedia} from "$cplatform/dimensions";
-import {defaultStr,defaultObj} from "$utils";
+import {defaultStr,defaultObj} from "$cutils";
 
 const ColorPickerComponent = React.forwardRef ((props,ref)=>{
     let {defaultValue,label,rippleColor,onChange,text,containerProp,editable,disabled,readOnly,...rest} = props;

package/src/components/ContentLoader/index copy.js

@@ -1,5 +1,5 @@
 /**** see : https://github.com/danilowoz/react-content-loader */
-import {defaultObj} from "$utils";
+import {defaultObj} from "$cutils";
 import View from "$ecomponents/View";
 import {StyleSheet,Dimensions,useWindowDimensions} from "react-native";
 import React from "react";

package/src/components/ContentLoader/index.js

@@ -1,5 +1,5 @@
 /**** see : https://github.com/danilowoz/react-content-loader */
-import {defaultObj} from "$utils";
+import {defaultObj} from "$cutils";
 import View from "$ecomponents/View";
 import {StyleSheet,Dimensions} from "react-native";
 import React from "react";

package/src/components/CountUp/index.js

@@ -1,7 +1,7 @@
 import React from "$react";
 import PropTypes from "prop-types";
 import Label from "$ecomponents/Label";
-import {defaultNumber,defaultStr} from "$utils";
+import {defaultNumber,defaultStr} from "$cutils";
 
 export const getDefaultStep = (count)=>{
     count = Math.abs(parseInt(count)||0);

package/src/components/Countries/Flag.js

@@ -1,7 +1,7 @@
 import React from "$react";
 import Image from "$components/Image";
 import { getCountry,styles} from "./utils";
-import {isNonNullString,defaultStr,isNumber} from "$utils";
+import {isNonNullString,defaultStr,isNumber} from "$cutils";
 import View from "$ecomponents/View"
 import theme from "$theme";
 import Label from "$components/Label";

package/src/components/Countries/SelectCountry.js

@@ -3,9 +3,9 @@ import SimpleSelect from "$ecomponents/SimpleSelect";
 import { countries,styles} from "./utils";
 import View from "$ecomponents/View";
 import {StyleSheet,Image} from "react-native";
-import {defaultObj} from "$utils";
+import {defaultObj} from "$cutils";
 import PropTypes from "prop-types";
-import {isNonNullString,isNumber,defaultStr} from "$utils";
+import {isNonNullString,isNumber,defaultStr} from "$cutils";
 import Label from "$ecomponents/Label";
 import appConfig from "$capp/config";
 

package/src/components/Datagrid/Accordion/Filters.js

@@ -1,7 +1,7 @@
 import {Content} from "$ecomponents/BottomSheet";
 import Icon from "$ecomponents/Icon";
 import React from "$react";
-import {defaultStr,defaultBool,defaultObj} from "$utils";
+import {defaultStr,defaultBool,defaultObj} from "$cutils";
 import Filter, {canHandleFilter,getFilterStateValues} from "$ecomponents/Filter";
 import PropTypes from "prop-types";
 import { StyleSheet,View } from "react-native";

package/src/components/Datagrid/Accordion/Row.js

@@ -1,6 +1,6 @@
 import Avatar from "$ecomponents/Avatar";
 import { StyleSheet,Pressable,Animated,View} from "react-native";
-import {defaultObj,isObj,defaultStr,isFunction,defaultBool} from "$utils";
+import {defaultObj,isObj,defaultStr,isFunction,defaultBool} from "$cutils";
 import {getContentHeight} from "$ecomponents/BottomSheet";
 import Label from "$ecomponents/Label";
 import PropTypes from "prop-types";

package/src/components/Datagrid/Accordion/index.js

@@ -25,7 +25,7 @@ import List from "$ecomponents/Table/List";
 import theme,{Colors} from "$theme";
 import {getRowStyle,styles as rStyles} from "../utils";
 import Avatar from "$ecomponents/Avatar";
-import {defaultObj,isOb,isNonNullString} from "$utils";
+import {defaultObj,isOb,isNonNullString} from "$cutils";
 import PropTypes from "prop-types";
 
 const DatagridFactory = (Factory)=>{

package/src/components/Datagrid/Accordion/utils.js

@@ -1,5 +1,5 @@
 import { Dimensions } from "react-native";
-import {defaultObj,defaultNumber} from "$utils";
+import {defaultObj,defaultNumber} from "$cutils";
 
 export const MIN_ITEM_HEIGHT = 50;
 

package/src/components/Datagrid/Actions/Header.js

@@ -1,6 +1,6 @@
 import React from "$react";
 import {StyleSheet} from "react-native";
-import {defaultStr} from "$utils";
+import {defaultStr} from "$cutils";
 import Label from "$ecomponents/Label";
 import View from "$ecomponents/View";
 import theme from "$theme";

package/src/components/Datagrid/Actions/index.js

@@ -1,7 +1,7 @@
 
 import Header from "./Header";
 import PropTypes from "prop-types";
-import {isFunction,defaultObj} from "$utils";
+import {isFunction,defaultObj} from "$cutils";
 import React from "$react";
 import {splitActions,renderSplitedActions} from "$ecomponents/AppBar/utils";
 import {MORE_ICON} from "$ecomponents/Icon/utils";

package/src/components/Datagrid/Checkbox.js

@@ -1,6 +1,6 @@
 import {Checkbox} from "$ecomponents/Icon";
 import React from "$react";
-import {defaultObj,isObj} from "$utils";
+import {defaultObj,isObj} from "$cutils";
 import PropTypes from "prop-types";
 import theme from "$theme";
 

package/src/components/Datagrid/Common/Common.js

@@ -11,7 +11,7 @@ import {showConfirm} from "$ecomponents/Dialog";
 import Label from "$ecomponents/Label";
 import Icon,{COPY_ICON,CHECKED_ICON,UNCHECKED_ICON} from "$ecomponents/Icon";
 import filterUtils from "$cfilters";
-import {sortBy,isDecimal,defaultVal,sanitizeSheetName,extendObj,isObjOrArray,isObj,defaultNumber,defaultStr,isFunction,defaultBool,defaultArray,defaultObj,isNonNullString,defaultDecimal} from "$utils";
+import {sortBy,isDecimal,defaultVal,sanitizeSheetName,extendObj,isObjOrArray,isObj,defaultNumber,defaultStr,isFunction,defaultBool,defaultArray,defaultObj,isNonNullString,defaultDecimal} from "$cutils";
 import {Datagrid as DatagridContentLoader} from "$ecomponents/ContentLoader";
 import React from "$react";
 import DateLib from "$lib/date";

package/src/components/Datagrid/Common/TableData.js

@@ -1,5 +1,5 @@
 import CommonDatagrid from "./Common";
-import {defaultObj,extendObj,defaultStr,isNonNullString,isFunction,isPromise} from "$utils";
+import {defaultObj,extendObj,defaultStr,isNonNullString,isFunction,isPromise} from "$cutils";
 import PropTypes from "prop-types";
 import actions from "$actions";
 /**** 

package/src/components/Datagrid/Common/session.js

@@ -1,5 +1,5 @@
 import $session from "$session";
-import {isNonNullString} from "$utils";
+import {isNonNullString} from "$cutils";
 
 export const getKey = x => "datagrid-merged-sess-"+defaultStr(Auth.getLoggedUserCode());
 export const get = (key)=>{

package/src/components/Datagrid/Common/setQueryLimit.js

@@ -1,5 +1,5 @@
 import {showPrompt,notify} from "$ecomponents/Dialog";
-import {defaultFunc,isNonNullString,defaultDecimal} from "$utils";
+import {defaultFunc,isNonNullString,defaultDecimal} from "$cutils";
 import APP from "$capp/instance";
 
 const setDatagridQueryLimit = (limit,successCB,errorCB)=>{

package/src/components/Datagrid/Common/utils.js

@@ -1,7 +1,7 @@
 // Copyright 2023 @fto-consult/Boris Fouomene. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
-import {isNonNullString,isArray,isObjOrArray,defaultStr,defaultArray,defaultObj,isObj} from "$utils";
+import {isNonNullString,isArray,isObjOrArray,defaultStr,defaultArray,defaultObj,isObj} from "$cutils";
 import Hashtag from "$ecomponents/Hashtag";
 import DateLib from "$date";
 import Image from "$ecomponents/Image";

package/src/components/Datagrid/Dashboard/index.js

@@ -1,5 +1,5 @@
 import {TableData} from "../Common";
-import {defaultObj,defaultArray,defaultStr,defaultDecimal,isNonNullString} from "$utils";
+import {defaultObj,defaultArray,defaultStr,defaultDecimal,isNonNullString} from "$cutils";
 import View from "$ecomponents/View";
 import { StyleSheet,Dimensions,Pressable } from "react-native";
 import Icon,{MENU_ICON} from "$ecomponents/Icon";

package/src/components/Datagrid/Footer/Footer.js

@@ -2,7 +2,7 @@ import Menu from "$ecomponents/BottomSheet/Menu";
 import View from "$ecomponents/View";
 import {Pressable,StyleSheet} from "react-native";
 import Label from "$ecomponents/Label";
-import {defaultVal,defaultObj,isNonNullString,isObj} from "$utils";
+import {defaultVal,defaultObj,isNonNullString,isObj} from "$cutils";
 import React from "$react";
 import theme from "$theme"
 import appConfig from "$capp/config";

package/src/components/Datagrid/Footer/index.js

@@ -3,7 +3,7 @@ import View from "$ecomponents/View";
 import React from "$react";
 import memoize from "$react/memoize";
 export {default as FooterItem} from "./Footer";
-import {parseDecimal,defaultObj,defaultStr,isNonNullString} from "$utils";
+import {parseDecimal,defaultObj,defaultStr,isNonNullString} from "$cutils";
 import { aggregatorFunctions as mAggregatorFunctions } from "./Footer";
 export * from "./Footer";
 

package/src/components/Datagrid/IndexComponent.js

@@ -6,7 +6,7 @@ import Accordion,{ TableData as TableDataAccordion} from "./Accordion";
 import Dashboard  from "./Dashboard";
 import Table,{TableData as DatagridTableData} from "./Table";
 import {isDesktopMedia,isMobileMedia} from "$cplatform/dimensions";
-import {isFunction,defaultVal} from "$utils";
+import {isFunction,defaultVal} from "$cutils";
 import React from "$react";
 import {getRenderType} from "./utils";
 

package/src/components/Datagrid/RenderType.js

@@ -2,7 +2,7 @@ import {get,set} from "./Common/session";
 import Icon from "$ecomponents/Icon";
 import {notify} from "$ecomponents/Dialog";
 import {isDesktopMedia} from "$cplatform/dimensions";
-import {defaultStr} from "$utils";
+import {defaultStr} from "$cutils";
 import {Menu} from "$ecomponents/BottomSheet";
 import {accordionIcon,tableIcon,typeKey} from "./RenderTypes/utils";
 import rendersTypes from "./RenderTypes";;

package/src/components/Datagrid/SWRDatagrid.js

@@ -6,14 +6,14 @@
  *  @see : 
  */
 import Datagrid from "./IndexComponent";
-import {defaultStr,defaultObj,defaultVal,isNonNullString,defaultNumber,isObjOrArray,isObj,extendObj} from "$utils";
+import {defaultStr,defaultObj,defaultVal,isNonNullString,defaultNumber,isObjOrArray,isObj,extendObj} from "$cutils";
 import {Pressable} from "react-native";
 import React from "$react";
 import Auth from "$cauth";
 import DateLib from "$lib/date";
 import {getFetchOptions} from "$cutils/filters";
 import {setQueryParams} from "$cutils/uri";
-import {uniqid} from "$utils";
+import {uniqid} from "$cutils";
 import { getFetcherOptions } from "$capi/fetch";
 import Icon from "$ecomponents/Icon";
 import Label from "$ecomponents/Label";

package/src/components/Datagrid/Table/index.js

@@ -1,5 +1,5 @@
 import CommonDatagrid,{TableData as CommonDatagridTableData} from "../Common";
-import {defaultObj,defaultArray,defaultStr,defaultDecimal,isNonNullString} from "$utils";
+import {defaultObj,defaultArray,defaultStr,defaultDecimal,isNonNullString} from "$cutils";
 import View from "$ecomponents/View";
 import { StyleSheet,Dimensions,Pressable ,ScrollView} from "react-native";
 import {isMobileOrTabletMedia} from "$cplatform/dimensions";

package/src/components/Datagrid/factory.js

@@ -1,6 +1,6 @@
 import CommonDatagrid from "./Common/Common";
 import TableDatagrid from "./Common/TableData"
-import {defaultStr} from "$utils";
+import {defaultStr} from "$cutils";
 
 
 export default function Factory(type) {