@dhiraj0720/report1chart 2.3.0 → 2.3.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dhiraj0720/report1chart",
-  "version": "2.3.0",
+  "version": "2.3.2",
   "main": "src/index.jsx",
   "scripts": {
     "test": "echo 'No tests'"

package/src/components/SafeScreen.jsx

@@ -0,0 +1,29 @@
+import React from 'react';
+import {
+  SafeAreaView,
+  View,
+  StyleSheet,
+  Platform,
+} from 'react-native';
+
+const SafeScreen = ({ children }) => {
+  return (
+    <SafeAreaView style={styles.safe}>
+      <View style={styles.container}>{children}</View>
+    </SafeAreaView>
+  );
+};
+
+export default SafeScreen;
+
+const styles = StyleSheet.create({
+  safe: {
+    flex: 1,
+    backgroundColor: '#fff',
+  },
+  container: {
+    flex: 1,
+    paddingBottom: Platform.OS === 'android' ? 24 : 0,
+    paddingTop: Platform.OS === 'android' ? 24 : 0,
+  },
+});

package/src/components/SvgBarLineChart.jsx

@@ -70,7 +70,7 @@ const SvgBarLineChart = ({ data }) => {
                   x={x}
                   y={yPos(data.series[0].data[i])}
                   width={barWidth}
-                  height={scaleY(dat.series[0].data[i])}
+                  height={scaleY(data.series[0].data[i])}
                   fill="#E07A3F"
                   onPress={() =>
                     setActivePoint({

package/src/index.jsx

@@ -1,6 +1,6 @@
 import React, { useState, useEffect } from 'react';
 import { View, ActivityIndicator } from 'react-native';
-
+import SafeScreen from './components/SafeScreen';
 import ReportListScreen from './screens/ReportListScreen';
 import Report1Screen from './screens/Report1Screen';
 import Report2Screen from './screens/Report2Screen';
@@ -36,39 +36,50 @@ const AnalyticsReports = ({ config }) => {
 
   // 👉 AFTER LOADER → SHOW REPORT LIST
   if (!active) {
-    return <ReportListScreen onSelect={setActive} />;
-  }
+  return (
+    <SafeScreen>
+      <ReportListScreen onSelect={setActive} />
+    </SafeScreen>
+  );
+}
+
 
   // 👉 REPORT 1
   if (active === 1) {
     return (
+      <SafeScreen>
       <Report1Screen
         endpoint={config.report1.url}
         token={config.token}
         onBack={() => setActive(null)}
       />
+      </SafeScreen>
     );
   }
 
   // 👉 REPORT 2
   if (active === 2) {
     return (
+      <SafeScreen>
       <Report2Screen
         api={config.report2}
         token={config.token}
         onBack={() => setActive(null)}
       />
+      </SafeScreen>
     );
   }
 
   // 👉 REPORT 3
   if (active === 3) {
     return (
+      <SafeScreen>
       <Report3Screen
         api={config.report3}
         token={config.token}
         onBack={() => setActive(null)}
       />
+      </SafeScreen>
     );
   }
 

package/src/screens/Report1Screen.jsx

@@ -13,6 +13,7 @@ const Report1Screen = ({ endpoint, token, onBack }) => {
   if (!rows) return <ActivityIndicator />;
 
   return (
+
     <ScrollView style={{ padding: 16 }}>
       <Text onPress={onBack} style={{ marginBottom: 12 }}>‹ Back</Text>
       <Text style={{ fontSize: 18, fontWeight: '700', marginBottom: 12 }}>

package/src/screens/Report2Screen.jsx

@@ -1,6 +1,6 @@
 import React, { useEffect, useState } from 'react';
 import { ScrollView, Text, ActivityIndicator } from 'react-native';
-
+import SafeScreen from '../components/SafeScreen';
 import { getDivisions, getTable, getLine, getBar } from '../api/report2Fetcher';
 import MonthSelector from '../components/MonthSelector';
 import DivisionSelector from '../components/DivisionSelector';
@@ -91,6 +91,7 @@ const filteredBar = filterChartByMonth(bar, month);
 
       
     </ScrollView>
+
   );
 };
 

package/src/screens/Report3Screen.jsx

@@ -53,6 +53,7 @@ const filteredBar = filterChartByMonth(bar, month);
 
 
   return (
+
     <ScrollView style={{ padding: 16 }}>
       <Text onPress={onBack}>‹ Back</Text>
 
@@ -71,6 +72,7 @@ const filteredBar = filterChartByMonth(bar, month);
       <SvgLineChart data={filteredLine} />
 <SvgBarLineChart data={filteredBar} />
     </ScrollView>
+
   );
 };