@fto-consult/expo-ui 6.16.6 → 6.17.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "6.16.6",
+  "version": "6.17.0",
   "description": "Bibliothèque de composants UI Expo,react-native",
   "main": "index.js",
   "scripts": {

package/src/components/Drawer/index.js

@@ -103,8 +103,19 @@ const DrawerComponent = React.forwardRef((props,ref)=>{
         callbackRef.current = callback;
         setState({minimized:false,permanent:true});
     }
+    const checkToggleBtn = (cb)=>{
+      if(!Dimensions.isDesktopMedia() && drawerRef?.current?.isPermanent()){
+          setState({permanent:false});
+          if(typeof cb ==='function'){
+            cb(getDrawerState());
+          }
+          return false;
+      }
+      return true;
+    }
     
     context.toggleMinimized = (minimized,s2)=>{
+        if(!checkToggleBtn()) return;
         if(!Dimensions.isDesktopMedia() || typeof minimized !== 'boolean' || !drawerRef.current || !drawerRef.current.isOpen()) return;
         if(!minimizable === false) return;
         let nS = {minimized};
@@ -119,6 +130,17 @@ const DrawerComponent = React.forwardRef((props,ref)=>{
     context.isLeftPosition = ()=> isLeftPosition;
     context.canToggle = x=> canHandleExtra() ? true : permanent? false : true;
     context.canMinimize = x => minimizable !== false && canBeMinimizedOrPermanent() ? true : false;
+    context.togglePermanent = (x,cb)=>{
+      if(typeof x !== "boolean") return;
+      if(!checkToggleBtn(cb)) return;
+      const isPerm = drawerRef?.current?.isPermanent();
+      if(x && ! isPerm || !x && isPerm){
+        setState({permanent:x});
+      } 
+      if(typeof cb =="function"){
+        cb(getDrawerState());
+      }
+    }
                     
     let {permanent:isPermanent,minimized:isMinimized} = session.get();
     if(_canBeMinimizedOrPermanent && isPermanent){
@@ -288,9 +310,10 @@ const DrawerComponent = React.forwardRef((props,ref)=>{
                         drawerRef.current.isOpen = context.isOpen = typeof drawerRef.current.isOpen =='function'? drawerRef.current.isOpen.bind(drawerRef.current) : x=> drawerRef && drawerRef.current ? drawerRef.current.drawerShown : false;
                         drawerRef.current.isClosed = context.isClosed = x => !drawerRef.current.isOpen();
                         context.toggle = drawerRef.current.toggleDrawer = drawerRef.current.toggle = cb =>{
+                          if(!checkToggleBtn(cb)) return;
                           if(isPermanent || isMinimized) {
                             if(typeof cb ==='function'){
-                                cb(getDrawerState(getDrawerState()));
+                                cb(getDrawerState());
                             }
                             return;
                           }

package/src/components/Form/Fields/SelectTableData/Component.js

@@ -21,6 +21,8 @@ import useApp from "$econtext/hooks";
  */
 const TableDataSelectField = React.forwardRef(({foreignKeyColumn,isStructData,getForeignKeyTable:cGetForeignKeyTable,prepareFilters:cPrepareFilters,bindUpsert2RemoveEvents,onAdd,showAdd:customShowAdd,canShowAdd,foreignKeyTable,fetchItemsPath,foreignKeyLabel,foreignKeyLabelIndex,dropdownActions,fields,fetchItems:customFetchItem,convertFiltersToSQL,mutateFetchedItems,onFetchItems,isFilter,isUpdate,isDocEditing,items,onAddProps,fetchOptions,...props},ref)=>{
     props.data = defaultObj(props.data);
+    const type = defaultStr(props.type)?.toLowerCase();
+    isStructData = isStructData || type?.replaceAll("-","").replaceAll("_","").trim().contains("structdata");
     const {getTableData:appGetForeignKeyTable,getStructData} = useApp();
     if(!foreignKeyColumn && isNonNullString(props.field)){
         foreignKeyColumn = props.field;
@@ -252,7 +254,7 @@ const TableDataSelectField = React.forwardRef(({foreignKeyColumn,isStructData,ge
         if(typeof canShowAdd ==='function'){
             return canShowAdd({...props,table:foreignKeyTable,foreignKeyColumn,foreignKeyLabel,sortDir,foreignKeyTableObj:fKeyTable,foreignKeyTable})
         }
-        if(Auth.isTableDataAllowed({table:foreignKeyTable,action:'create'})){
+        if(Auth[isStructData?"isStructDataAllowed":"isTableDataAllowed"]({table:foreignKeyTable,action:'create'})){
             return !!defaultVal(customShowAdd,true);
         }
         return false;