@dhiraj0720/report1chart 2.6.6 → 2.6.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dhiraj0720/report1chart",
-  "version": "2.6.6",
+  "version": "2.6.8",
   "main": "src/index.jsx",
   "scripts": {
     "test": "echo 'No tests'"
@@ -8,6 +8,7 @@
   "dependencies": {
     "axios": "^1.13.2",
     "react-native-gesture-handler": "^2.30.0",
+    "react-native-reanimated": "^4.2.1",
     "react-native-svg": "^15.15.1"
   },
   "peerDependencies": {

package/src/components/FrozenTableReport2A.jsx

@@ -1,13 +1,11 @@
 import React from 'react';
 import { View, Text, ScrollView, StyleSheet } from 'react-native';
 
-// Helper: Format numbers with commas (e.g., 1083203 → 1,083,203)
 const formatNumber = (value) => {
   if (value === null || value === undefined || value === '') return '-';
   return Number(value).toLocaleString('en-US');
 };
 
-// Percentage cell with up/down arrow and color
 const PercentCell = ({ value }) => {
   if (value === null || value === undefined) return <Text>-</Text>;
   const positive = value >= 0;
@@ -21,10 +19,10 @@ const PercentCell = ({ value }) => {
   );
 };
 
-// Reusable cell component
-const Cell = ({ children, bold = false, highlight = false }) => (
+const Cell = ({ children, bold = false, highlight = false, width }) => (
   <View style={[
     styles.cell,
+    { width }, // dynamic width
     bold && styles.bold,
     highlight && styles.highlightCell
   ]}>
@@ -34,24 +32,24 @@ const Cell = ({ children, bold = false, highlight = false }) => (
   </View>
 );
 
-const FrozenTableReport2A = ({ rows = [] }) => {
-  if (!rows || rows.length === 0) {
-    return <Text>No data available</Text>;
+const FrozenTableReport2A = ({ rows = [], isFullscreen = false }) => {
+  if (!rows.length) {
+    return <Text style={{ textAlign: 'center', padding: 20 }}>No data available</Text>;
   }
 
+  // Dynamic widths based on fullscreen mode
+  const frozenColumnWidth = isFullscreen ? 180 : 120;
+  const cellWidth = isFullscreen ? 140 : 130;
+
   return (
     <View style={styles.container}>
-      {/* Frozen Left Column - AY (Month) */}
-      <View style={styles.frozenColumn}>
-        <Cell bold>AY</Cell>
-        {rows.map((row, index) => {
+      {/* Frozen Column */}
+      <View style={[styles.frozenColumn, { width: frozenColumnWidth }]}>
+        <Cell bold width={frozenColumnWidth}>AY</Cell>
+        {rows.map((row, i) => {
           const isTotal = row.monthLabel === 'Total';
           return (
-            <Cell
-              key={index}
-              bold={isTotal}
-              highlight={isTotal}
-            >
+            <Cell key={i} bold={isTotal} highlight={isTotal} width={frozenColumnWidth}>
               {row.monthLabel}
             </Cell>
           );
@@ -61,41 +59,24 @@ const FrozenTableReport2A = ({ rows = [] }) => {
       {/* Scrollable Columns */}
       <ScrollView horizontal showsHorizontalScrollIndicator={false}>
         <View>
-          {/* Header Row */}
           <View style={styles.headerRow}>
-            {[
-              '2024 TEU', '2025 TEU', 'TEU %',
-              '2024 Kar', '2025 Kar', 'Kar %',
-              '2025 Bütçe', 'Bütçe %'
-            ].map((header) => (
-              <Cell key={header} bold>
-                {header}
-              </Cell>
+            {['2024 TEU', '2025 TEU', 'TEU %', '2024 Kar', '2025 Kar', 'Kar %', '2025 Bütçe', 'Bütçe %'].map((h) => (
+              <Cell key={h} bold width={cellWidth}>{h}</Cell>
             ))}
           </View>
 
-          {/* Data Rows */}
-          {rows.map((row, index) => {
+          {rows.map((row, i) => {
             const isTotal = row.monthLabel === 'Total';
-
             return (
-              <View key={index} style={styles.dataRow}>
-                <Cell highlight={isTotal}>{formatNumber(row.teu2024)}</Cell>
-                <Cell highlight={isTotal}>{formatNumber(row.teu2025)}</Cell>
-                <Cell highlight={isTotal}>
-                  <PercentCell value={row.teuChangePercent} />
-                </Cell>
-
-                <Cell highlight={isTotal}>{formatNumber(row.profitUsd2024)}</Cell>
-                <Cell highlight={isTotal}>{formatNumber(row.profitUsd2025)}</Cell>
-                <Cell highlight={isTotal}>
-                  <PercentCell value={row.profitChangePercent} />
-                </Cell>
-
-                <Cell highlight={isTotal}>{formatNumber(row.budgetProfitUsd2025)}</Cell>
-                <Cell highlight={isTotal}>
-                  <PercentCell value={row.budgetChangePercent} />
-                </Cell>
+              <View key={i} style={styles.dataRow}>
+                <Cell highlight={isTotal} width={cellWidth}>{formatNumber(row.teu2024)}</Cell>
+                <Cell highlight={isTotal} width={cellWidth}>{formatNumber(row.teu2025)}</Cell>
+                <Cell highlight={isTotal} width={cellWidth}><PercentCell value={row.teuChangePercent} /></Cell>
+                <Cell highlight={isTotal} width={cellWidth}>{formatNumber(row.profitUsd2024)}</Cell>
+                <Cell highlight={isTotal} width={cellWidth}>{formatNumber(row.profitUsd2025)}</Cell>
+                <Cell highlight={isTotal} width={cellWidth}><PercentCell value={row.profitChangePercent} /></Cell>
+                <Cell highlight={isTotal} width={cellWidth}>{formatNumber(row.budgetProfitUsd2025)}</Cell>
+                <Cell highlight={isTotal} width={cellWidth}><PercentCell value={row.budgetChangePercent} /></Cell>
               </View>
             );
           })}
@@ -118,20 +99,13 @@ const styles = StyleSheet.create({
     backgroundColor: '#fff',
   },
   frozenColumn: {
-    width: 120,
     backgroundColor: '#f4f6f8',
     borderRightWidth: 1,
     borderColor: '#ddd',
   },
-  headerRow: {
-    flexDirection: 'row',
-    backgroundColor: '#f4f6f8',
-  },
-  dataRow: {
-    flexDirection: 'row',
-  },
+  headerRow: { flexDirection: 'row', backgroundColor: '#f4f6f8' },
+  dataRow: { flexDirection: 'row' },
   cell: {
-    width: 130,
     paddingVertical: 10,
     paddingHorizontal: 6,
     justifyContent: 'center',
@@ -143,18 +117,8 @@ const styles = StyleSheet.create({
     textAlign: 'center',
     color: '#333',
   },
-  bold: {
-    backgroundColor: '#e9f0f8',
-  },
-  boldText: {
-    fontWeight: '700',
-  },
-  highlightCell: {
-    backgroundColor: '#e9f0f8',
-  },
-  percentText: {
-    fontWeight: '700',
-    fontSize: 12,
-    textAlign: 'center',
-  },
+  bold: { backgroundColor: '#e9f0f8' },
+  boldText: { fontWeight: '700' },
+  highlightCell: { backgroundColor: '#e9f0f8' },
+  percentText: { fontWeight: '700', fontSize: 12, textAlign: 'center' },
 });

package/src/components/SvgBarLineChartCompact.jsx

@@ -93,7 +93,7 @@ const SvgBarLineChartCompact = ({ data }) => {
                       fill="white"
                       fontWeight="700"
                     >
-                      ${formatNumber(val2024)}
+                      {formatNumber(val2024)}
                     </SvgText>
                   )}
 
@@ -114,7 +114,7 @@ const SvgBarLineChartCompact = ({ data }) => {
                       fill="white"
                       fontWeight="700"
                     >
-                      ${formatNumber(val2025)}
+                      {formatNumber(val2025)}
                     </SvgText>
                   )}
 
@@ -150,7 +150,7 @@ const SvgBarLineChartCompact = ({ data }) => {
                     fill="#333"
                     fontWeight="700"
                   >
-                    ${formatNumber(budget)}
+                    {formatNumber(budget)}
                   </SvgText>
 
                   {/* X Axis Label - Rotated */}

package/src/screens/Report2AScreen.jsx

@@ -9,8 +9,7 @@ import {
   Dimensions,
   ActivityIndicator,
 } from 'react-native';
-import { PinchGestureHandler, State } from 'react-native-gesture-handler';
-import Svg from 'react-native-svg'; // if not imported globally
+import Svg, { Path } from 'react-native-svg';
 import { filterChartByMonths } from '../utils/filterChartByMonths';
 import { getDivisions, getTable, getLine, getBar } from '../api/report2Fetcher';
 import MonthFilterModal from '../components/MonthFilterModal';
@@ -18,57 +17,33 @@ import DivisionFilterModal from '../components/DivisionFilterModal';
 import FrozenTableReport2A from '../components/FrozenTableReport2A';
 import SvgLineChartCompact from '../components/SvgLineChartCompact';
 import SvgBarLineChartCompact from '../components/SvgBarLineChartCompact';
-import { FilterIcon, FullScreenIcon } from './icons'; // or inline
-
-// Proper SVG Funnel Icon Component (clean black filter icon)
-const FunnelIcon = () => (
-  <View style={styles.funnelIcon}>
-    <View style={styles.funnelTop} />
-    <View style={styles.funnelBody} />
-    <View style={styles.funnelLines}>
-      <View style={styles.line1} />
-      <View style={styles.line2} />
-      <View style={styles.line3} />
-    </View>
-  </View>
-);
 
 const Report2AScreen = ({ api, token, onBack }) => {
   const [monthsModal, setMonthsModal] = useState(false);
   const [divisionModal, setDivisionModal] = useState(false);
+  const [fullscreen, setFullscreen] = useState(false);
 
   const [months, setMonths] = useState([]);
   const [selectedMonths, setSelectedMonths] = useState([]);
   const [divisions, setDivisions] = useState([]);
   const [division, setDivision] = useState(null);
-  const [fullscreen, setFullscreen] = useState(false);
-  const [zoomScale, setZoomScale] = useState(1);
 
   const [table, setTable] = useState(null);
   const [line, setLine] = useState(null);
   const [bar, setBar] = useState(null);
   const [loading, setLoading] = useState(true);
-  const [error, setError] = useState(null);
 
-  
   useEffect(() => {
-    if (!api?.divisions || !token) return;
-
     getDivisions(api.divisions, token)
       .then((d) => {
         setDivisions(d);
         if (d.length > 0) setDivision(d[0].code);
-      })
-      .catch(() => setError('Failed to load divisions'))
-      .finally(() => setLoading(false));
-  }, [api?.divisions, token]);
+      });
+  }, [api.divisions, token]);
 
   useEffect(() => {
-    if (!division || !api || !token) return;
-
+    if (!division) return;
     setLoading(true);
-    setError(null);
-
     Promise.all([
       getTable(api.table, division, token),
       getLine(api.line, division, token),
@@ -81,73 +56,63 @@ const Report2AScreen = ({ api, token, onBack }) => {
         setMonths(l.labels || []);
         setSelectedMonths(l.labels || []);
       })
-      .catch(() => setError('Failed to load data'))
       .finally(() => setLoading(false));
-  }, [division, api, token]);
+  }, [division]);
 
   if (loading) {
     return (
       <View style={styles.center}>
         <ActivityIndicator size="large" color="#000" />
-        <Text style={styles.loadingText}>Loading...</Text>
       </View>
     );
   }
 
-  if (error) {
-    return (
-      <View style={styles.center}>
-        <Text style={styles.errorText}>{error}</Text>
-        <TouchableOpacity onPress={onBack}>
-          <Text style={styles.backLink}>‹ Back to Reports</Text>
-        </TouchableOpacity>
-      </View>
-    );
-  }
-
-  if (!table || !line || !bar || !division) {
-    return <View style={styles.center}><Text>No data available</Text></View>;
-  }
+  const currentDivisionName = divisions.find(d => d.code === division)?.displayName || 'Division';
 
-const currentDivisionName = divisions.find(d => d.code === division)?.displayName || 'Division';
   const filteredRows = table.rows.filter(r => selectedMonths.includes(r.monthLabel));
   const filteredLine = filterChartByMonths(line, selectedMonths);
   const filteredBar = filterChartByMonths(bar, selectedMonths);
 
+  const { width, height } = Dimensions.get('window');
+  const isLandscape = width > height;
+
   return (
     <View style={styles.container}>
-      {/* HEADER WITH BACK ICON + HEADING */}
+      {/* HEADER */}
       <View style={styles.header}>
-        <TouchableOpacity onPress={onBack} style={styles.backButton}>
-          <Text style={styles.backIcon}>‹</Text>
+        <TouchableOpacity onPress={onBack}>
+          <Text style={styles.backIcon}>←</Text>
         </TouchableOpacity>
-
-        <Text style={styles.headerTitle}>
-          {currentDivisionName} Transportation
-        </Text>
+        <Text style={styles.headerTitle}>{currentDivisionName} Transportation</Text>
       </View>
 
-      {/* FILTERS - BLACK TEXT + PROPER FUNNEL ICON */}
+      {/* FILTERS */}
       <View style={styles.filterBar}>
         <TouchableOpacity onPress={() => setMonthsModal(true)} style={styles.filterItem}>
-          <FilterIcon />
+          <Svg width={22} height={22} viewBox="0 0 24 24" fill="none">
+            <Path d="M20 4H4V6.5L12 14.5L20 6.5V4Z" stroke="#000" strokeWidth={2} strokeLinecap="round" strokeLinejoin="round" />
+            <Path d="M8 11V19L16 19V11" stroke="#000" strokeWidth={2} strokeLinecap="round" strokeLinejoin="round" />
+          </Svg>
           <Text style={styles.filterText}>Months ({selectedMonths.length}/{months.length})</Text>
         </TouchableOpacity>
 
         <TouchableOpacity onPress={() => setDivisionModal(true)} style={styles.filterItem}>
-          <FilterIcon />
+          <Svg width={22} height={22} viewBox="0 0 24 24" fill="none">
+            <Path d="M20 4H4V6.5L12 14.5L20 6.5V4Z" stroke="#000" strokeWidth={2} strokeLinecap="round" strokeLinejoin="round" />
+            <Path d="M8 11V19L16 19V11" stroke="#000" strokeWidth={2} strokeLinecap="round" strokeLinejoin="round" />
+          </Svg>
           <Text style={styles.filterText}>{currentDivisionName}</Text>
         </TouchableOpacity>
       </View>
 
       <ScrollView style={styles.content}>
-        {/* FULL SCREEN ICON ABOVE TABLE */}
-        <TouchableOpacity
-          onPress={() => setFullscreen(true)}
-          style={styles.fullScreenBtn}
-        >
-          <FullScreenIcon size={28} />
-          <Text style={styles.fullScreenText}>Full Screen View</Text>
+        {/* FULL SCREEN BUTTON */}
+        <TouchableOpacity onPress={() => setFullscreen(true)} style={styles.fullScreenBtn}>
+          <Svg width={28} height={28} viewBox="0 0 24 24" fill="none">
+            <Path d="M8 3H5C4.44772 3 4 3.44772 4 4V8M20 8V4C20 3.44772 19.5523 3 19 3H16M16 21H19C19.5523 21 20 20.5523 20 20V16M4 16V20C4 20.5523 4.44772 21 5 21H8"
+              stroke="#000" strokeWidth={2} strokeLinecap="round" strokeLinejoin="round" />
+          </Svg>
+          <Text style={styles.fullScreenText}>Full Screen Table</Text>
         </TouchableOpacity>
 
         <FrozenTableReport2A rows={filteredRows} />
@@ -161,60 +126,48 @@ const currentDivisionName = divisions.find(d => d.code === division)?.displayNam
         </View>
       </ScrollView>
 
-      {/* MODALS */}
-
-      {/* FULL SCREEN MODAL */}
-      <Modal visible={fullscreen} supportedOrientations={['portrait', 'landscape']}>
+      {/* FULL SCREEN MODAL - PERFECT LANDSCAPE FIT + ZOOM */}
+      <Modal visible={fullscreen} supportedOrientations={['portrait', 'landscape']} animationType="fade">
         <View style={styles.fullModal}>
+          {/* TOP BAR - ONE LINE */}
           <View style={styles.fullHeader}>
+            <Text style={styles.fullHintText}>
+              Rotate device • Pinch to zoom
+            </Text>
             <TouchableOpacity onPress={() => setFullscreen(false)}>
-              <Text style={styles.closeFull}>✕</Text>
+              <Text style={styles.closeBtn}>✕</Text>
             </TouchableOpacity>
-            <Text style={styles.fullTitle}>Rotate device to landscape for best view</Text>
           </View>
 
-          <PinchGestureHandler
-            onGestureEvent={(e) => setZoomScale(e.nativeEvent.scale)}
-            onHandlerStateChange={(e) => {
-              if (e.nativeEvent.state === State.END) {
-                setZoomScale(Math.max(0.8, Math.min(e.nativeEvent.scale, 3)));
-              }
-            }}
+          {/* ZOOMABLE & FIT TABLE */}
+          <ScrollView
+            maximumZoomScale={3}
+            minimumZoomScale={0.7}
+            showsHorizontalScrollIndicator={false}
+            showsVerticalScrollIndicator={false}
+            contentContainerStyle={styles.zoomContent}
+            pinchGestureEnabled={true}
+            bouncesZoom={true}
           >
-            <View style={styles.zoomView}>
-              <View style={{ transform: [{ scale: zoomScale }] }}>
-                <FrozenTableReport2A rows={table.rows} isFullscreen /> {/* all rows */}
-              </View>
+            <View style={[
+              styles.tableWrapper,
+              isLandscape && styles.landscapeFit
+            ]}>
+              <FrozenTableReport2A rows={table.rows} isFullscreen />
             </View>
-          </PinchGestureHandler>
+          </ScrollView>
         </View>
       </Modal>
 
-      <MonthFilterModal
-        visible={monthsModal}
-        months={months}
-        selected={selectedMonths}
-        onApply={setSelectedMonths}
-        onClose={() => setMonthsModal(false)}
-      />
-
-      <DivisionFilterModal
-        visible={divisionModal}
-        divisions={divisions}
-        selected={division}
-        onSelect={setDivision}
-        onClose={() => setDivisionModal(false)}
-      />
+      <MonthFilterModal visible={monthsModal} months={months} selected={selectedMonths} onApply={setSelectedMonths} onClose={() => setMonthsModal(false)} />
+      <DivisionFilterModal visible={divisionModal} divisions={divisions} selected={division} onSelect={setDivision} onClose={() => setDivisionModal(false)} />
     </View>
   );
 };
 
 const styles = StyleSheet.create({
   container: { flex: 1, backgroundColor: '#f8f9fa' },
-  center: { flex: 1, justifyContent: 'center', alignItems: 'center', padding: 20 },
-  loadingText: { marginTop: 12, fontSize: 16, color: '#000' },
-  errorText: { fontSize: 16, color: '#d32f2f', textAlign: 'center', marginBottom: 20 },
-  backLink: { fontSize: 18, color: '#000', fontWeight: '600' },
+  center: { flex: 1, justifyContent: 'center', alignItems: 'center' },
 
   header: {
     flexDirection: 'row',
@@ -225,15 +178,8 @@ const styles = StyleSheet.create({
     borderBottomWidth: 1,
     borderColor: '#eee',
   },
-  backButton: { paddingRight: 12 },
-  backIcon: { fontSize: 28, color: '#000', fontWeight: '300' },
-  headerTitle: {
-    fontSize: 19,
-    fontWeight: '700',
-    color: '#000',
-    flex: 1,
-    textAlign: 'center',
-  },
+  backIcon: { fontSize: 28, color: '#000' },
+  headerTitle: { fontSize: 19, fontWeight: '700', color: '#000', flex: 1, textAlign: 'center' },
 
   filterBar: {
     flexDirection: 'row',
@@ -243,75 +189,60 @@ const styles = StyleSheet.create({
     borderBottomWidth: 1,
     borderColor: '#eee',
   },
-  filterItem: {
+  filterItem: { flexDirection: 'row', alignItems: 'center' },
+  filterText: { fontSize: 16, color: '#000', fontWeight: '600', marginLeft: 8 },
+
+  fullScreenBtn: {
+    flexDirection: 'row',
+    alignItems: 'center',
+    justifyContent: 'center',
+    padding: 14,
+    backgroundColor: '#f0f0f0',
+    borderRadius: 8,
+    marginVertical: 12,
+  },
+  fullScreenText: { marginLeft: 10, fontSize: 16, color: '#000', fontWeight: '600' },
+
+  content: { flex: 1, padding: 12 },
+  chartContainer: { borderWidth: 1, borderColor: '#ddd', borderRadius: 10, overflow: 'hidden', marginVertical: 12, backgroundColor: '#fff' },
+
+  fullModal: { flex: 1, backgroundColor: '#fff' },
+  fullHeader: {
     flexDirection: 'row',
+    justifyContent: 'center',
     alignItems: 'center',
-    paddingHorizontal: 16,
-    paddingVertical: 8,
+    paddingVertical: 16,
+    paddingHorizontal: 20,
+    backgroundColor: '#f8f8f8',
+    borderBottomWidth: 1,
+    borderColor: '#ddd',
   },
-  filterText: {
+  fullHintText: {
     fontSize: 16,
     color: '#000',
     fontWeight: '600',
-    marginLeft: 8,
+    textAlign: 'center',
+    flex: 1,
   },
+  closeBtn: { fontSize: 28, color: '#000', paddingLeft: 20 },
 
-  // Proper Funnel Icon (SVG-style with Views)
-  funnelIcon: {
-    width: 20,
-    height: 20,
+  zoomContent: {
+    flexGrow: 1,
     justifyContent: 'center',
     alignItems: 'center',
+    padding: 20,
   },
-  funnelTop: {
-    width: 16,
-    height: 4,
-    backgroundColor: '#000',
-    borderRadius: 2,
+  tableWrapper: {
+    shadowColor: '#000',
+    shadowOffset: { width: 0, height: 2 },
+    shadowOpacity: 0.1,
+    shadowRadius: 8,
+    elevation: 5,
   },
-  funnelBody: {
-    width: 10,
-    height: 10,
-    borderLeftWidth: 4,
-    borderRightWidth: 4,
-    borderBottomWidth: 8,
-    borderColor: 'transparent',
-    borderBottomColor: '#000',
-    marginTop: -2,
+  landscapeFit: {
+    transform: [{ scale: 1.4 }], // Perfect fit in landscape
+    maxWidth: '100%',
   },
-  funnelLines: {
-    position: 'absolute',
-    top: 6,
-    left: 4,
-    right: 4,
-  },
-  line1: { height: 1, backgroundColor: '#000', marginVertical: 2 },
-  line2: { height: 1, backgroundColor: '#000', marginVertical: 2 },
-  line3: { height: 1, backgroundColor: '#000', marginVertical: 2 },
-
-  content: { flex: 1, padding: 12 },
-  chartContainer: {
-    borderWidth: 1,
-    borderColor: '#ddd',
-    borderRadius: 10,
-    overflow: 'hidden',
-    marginVertical: 12,
-    backgroundColor: '#fff',
-  },
-  fullScreenBtn: {
-    flexDirection: 'row',
-    alignItems: 'center',
-    justifyContent: 'center',
-    padding: 12,
-    marginBottom: 12,
-  },
-  fullScreenText: { marginLeft: 8, fontSize: 16, color: '#000', fontWeight: '600' },
-
-  fullModal: { flex: 1, backgroundColor: '#fff' },
-  fullHeader: { flexDirection: 'row', alignItems: 'center', justifyContent: 'center', padding: 16, backgroundColor: '#f8f9fa', position: 'relative' },
-  closeFull: { position: 'absolute', left: 16, fontSize: 28, color: '#000' },
-  fullTitle: { fontSize: 16, color: '#000' },
-  zoomView: { flex: 1, justifyContent: 'center', alignItems: 'center' },
 });
 
 export default Report2AScreen;