data verification to prevent crash

Author: dhewzulla

index.d.ts

@@ -65,7 +65,7 @@ declare module 'global-input-react' {
             DisplayMobileConnect:WhenFunction;
             setFieldValueById:SetFieldValueByIdFunction;
             setOnFieldChanged:(onFieldChanged:OnFieldChangedFunction)=>void;
-            initData:InitData;
+            initDataID:string;
     }
 
     type WhenFunction=(props:any)=>any;

src/globalinput.js

@@ -10,13 +10,15 @@ export const initialData={
         fields:[],
         values:[], 
         setters:[],
-        initData:null,
-    },               
-    onFieldChanged:()=>{},    
+        initData:null,        
+    },    
+    onFieldChanged:()=>{},
+
 };
-export const getValues         = mobile => mobile.current.data.values;
-export const getFields         = mobile => mobile.current.data.fields;
-export const getSetters        = mobile => mobile.current.data.setters;
+export const getValues         = mobile => mobile.current.data && mobile.current.data.values;
+export const getFields         = mobile => mobile.current.data && mobile.current.data.fields;
+export const getSetters        = mobile => mobile.current.data && mobile.current.data.setters;
+export const getInitDataID     = mobile => mobile.current.data && mobile.current.data.initData && mobile.current.data.initData.id;
 
 export const setOnFieldChanged=(mobile,onFieldChanged)=>{
     mobile.current.onFieldChanged=onFieldChanged;
@@ -26,12 +28,13 @@ export const closeConnection=(mobile)=>{
     if(mobile.current.connector){
         mobile.current.connector.disconnect();
         mobile.current.connector=null;
-        mobile.current.data=null;        
+        mobile.current.data=null;         
     }
 };
 
 
 
+
 export const onFieldChanged=(mobile,field,setFieldValueById,setInitData)=>{
     if(field && mobile.current.onFieldChanged){
         mobile.current.onFieldChanged({
@@ -99,10 +102,12 @@ export const startConnect =(mobile,dispatch,configData) => {
             }
         },
         onSenderConnected:(sender, senders) => {
-            dispatch({type:ACTION_TYPES.SENDER_CONNECTED, senders,sender});
+            dispatch({type:ACTION_TYPES.SENDER_CONNECTED, senders,sender});            
         },
-        onSenderDisconnected:(sender, senders) => {
-            dispatch({type:ACTION_TYPES.SENDER_DISCONNECTED, senders,sender});            
+        onSenderDisconnected:(sender, senders) => {            
+            closeConnection(mobile);
+            dispatch({type:ACTION_TYPES.SENDER_DISCONNECTED});
+            
         },
         onError:errorMessage => {                   
             dispatch({type:ACTION_TYPES.ON_CONNECTION_ERROR,errorMessage});
@@ -252,3 +257,17 @@ export const displayWhen = (children,mobileState,st)=>{
 
 
 
+const styles={
+    barcode:{
+        backgroundColor:"white",        
+        padding:20,
+        display:"flex",
+        flexDirection:"column",
+        justifyContent:"flex-start",
+        alignItems:"center"      
+    },
+    label:{
+        paddingTop:20,
+        color:"#A9C8E6", //#4880ED
+    }
+}

src/reducer.js

@@ -5,7 +5,7 @@ export const initialState={
     connectionCode:null,
     errorMessage:null,        
     senders:null,    
-    field:null    
+    field:null        
 };
 
 
@@ -37,11 +37,11 @@ export default (state, action)=>{
         case ACTION_TYPES.SENDER_CONNECTED:                    
                 return {...state,senders:action.senders, mobileState:MobileState.MOBILE_CONNECTED};
 
-        case ACTION_TYPES.SENDER_DISCONNECTED:
-                        {
-                            const mobileState=action.senders && action.senders.length >0 ? state.mobileState:MobileState.WAITING_FOR_MOBILE;
-                            return {...state,senders:action.senders,mobileState};
-                        }
+        case ACTION_TYPES.SENDER_DISCONNECTED:                                                    
+                            return {...state,
+                                senders:null,
+                                mobileState:MobileState.DISCONNECTED
+                            };                        
         case ACTION_TYPES.ON_CONNECTION_ERROR:
                     return {...state,
                           errorMessage:action.errorMessage,

src/useGlobalInputApp.js

@@ -64,7 +64,8 @@ export default (configData, dependencies)=>{
         WhenWaiting, 
         WhenConnected,
         WhenDisconnected,            
-        WhenError,  
+        WhenError,
+        initDataID:globalInput.getInitDataID(mobile)
     };
 };