@fto-consult/expo-ui 2.25.4 → 2.26.0

package/package.json

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

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

@@ -7,7 +7,7 @@ import $session from "$session";
 import Auth from "$cauth";
 import Tooltip from "$ecomponents/Tooltip";
 import setQueryLimit from "./setQueryLimit";
-import {notify,showConfirm} from "$ecomponents/Dialog";
+import {showConfirm} from "$ecomponents/Dialog";
 import Label from "$ecomponents/Label";
 import Image from "$ecomponents/Image";
 import Icon,{COPY_ICON} from "$ecomponents/Icon";
@@ -39,6 +39,7 @@ import {Menu} from "$ecomponents/BottomSheet";
 import {styles as tableStyles} from "$ecomponents/Table";
 import {DialogProvider} from "$ecomponents/Form/FormData";
 import Chart,{getMaxSupportedSeriesSize} from "$ecomponents/Chart";
+import notify from "$cnotify";
 
 export const donutChart = {
     isChart : true,
@@ -710,6 +711,9 @@ export default class CommonDatagridComponent extends AppComponent {
         const r = isObj(selected)? selected : {};
         const ret = {
             ...dataSourceArgs,
+            showConfirm,
+            Preloader,
+            notify,
             selected : defaultBool(selected,false),
             ...r,
             isMobile : isMobileOrTabletMedia(),

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

@@ -2,6 +2,7 @@ import CommonDatagrid from "./Common";
 import {defaultObj,extendObj,defaultStr,isNonNullString,isFunction,isPromise} from "$utils";
 import PropTypes from "prop-types";
 import {convertToSQL} from "$ecomponents/Filter";
+import actions from "$actions";
 /**** 
  *      la fonction fetchOptionsMutator permet éventuellemnt de faire une mutations sur les options fetchOptions avant qu'elle ne soit appliquée pour la recherche. elle
  *      est appelée avant que la fonction convertToSQL ne soit appelée, bien évidemement si la props convertToSQL est active pour le datagrid
@@ -41,11 +42,20 @@ export default class CommonTableDatagrid extends CommonDatagrid{
         extendObj(this._events,{
             onUpsertData : this.onUpsertData.bind(this),
         });
+        if(isNonNullString(this.tableName)){
+            APP.on(actions.upsert(this.tableName),this._events.onUpsertData)
+            APP.on(actions.remove(this.tableName),this._events.onUpsertData)
+        }
         this.fetchData({force:true});
     }
 
     componentWillUnmount(){
         super.componentWillUnmount();
+        if(isNonNullString(this.tableName)){
+            unmountDatabaseTable(this.tableName);
+            APP.off(actions.upsert(this.tableName),this._events.onUpsertData);
+            APP.off(actions.remove(this.tableName),this._events.onUpsertData);
+        }
         this.clearEvents();
         this.setSelectedRows();
     }

package/src/components/Datagrid/SWRDatagrid.js

@@ -22,7 +22,7 @@ import theme from "$theme";
 import useSWR,{useInfinite} from "$swr";
 import appConfig from "$capp/config";
 import APP from "$capp/instance";
-import cAction from "$cactions";
+
 import PropTypes from "prop-types";
 import {isDesktopMedia} from "$dimensions";
 import ActivityIndicator from "$ecomponents/ActivityIndicator";
@@ -246,19 +246,6 @@ const SWRDatagridComponent = React.forwardRef((props,ref)=>{
         ///si le nombre total d'élements est inférieur au nombre limite alors le trie peut être fait localement
         return totalRef.current > limitRef.current && true || false;
     }
-    React.useEffect(()=>{
-        const upsert = cAction.upsert(tableName);
-        const remove = cAction.remove(tableName);
-        const onUpsert = ()=>{
-            doRefresh(false);
-        }
-        APP.on(remove,onUpsert);
-        APP.on(upsert,onUpsert);
-        return ()=>{
-            APP.off(upsert,onUpsert);
-            APP.off(remove,onUpsert);
-        }
-    },[]);
     const loading = (isLoading|| isValidating);
     const pointerEvents = loading ?"node" : "auto";
     return (