@dhiraj0720/report1chart 2.9.3 → 2.9.5

package/package.json

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

package/src/components/FrozenTableReport1A.jsx

@@ -1,13 +1,11 @@
 import React from 'react';
 import { View, Text, ScrollView, StyleSheet } from 'react-native';
 
-// Format numbers with commas: 1234567 → 1,234,567
 const formatNumber = (value) => {
   if (value === null || value === undefined || value === '') return '-';
   return Number(value).toLocaleString('en-US');
 };
 
-// Percentage cell with arrow and color
 const PercentCell = ({ value }) => {
   if (value === null || value === undefined) return <Text>-</Text>;
   const positive = value >= 0;
@@ -21,53 +19,59 @@ const PercentCell = ({ value }) => {
   );
 };
 
-// Reusable Cell
-const Cell = ({ children, bold = false, highlight = false, isFrozen = false }) => (
+const Cell = ({ children, bold = false, isFrozen = false }) => (
   <View style={[
     styles.cell,
     isFrozen && styles.frozenCell,
-    bold && styles.bold,
-    highlight && styles.highlightCell
+    bold && styles.boldCell
   ]}>
-    <Text style={[styles.cellText, bold && styles.boldText]}>
+    <Text 
+      style={[styles.cellText, bold && styles.boldText]}
+      numberOfLines={1}
+      ellipsizeMode="tail"
+    >
       {children}
     </Text>
   </View>
 );
 
-const FrozenTableReport1A = ({ rows = [], isFullscreen = false }) => {
+const FrozenTableReport1A = ({ rows = [] }) => {
   if (!rows.length) {
     return <Text style={{ textAlign: 'center', padding: 20, color: '#666' }}>No data available</Text>;
   }
 
-  // Wider frozen column in fullscreen
-  const frozenColumnWidth = isFullscreen ? 180 : 150;
+  const frozenColumnWidth = 150;
+  const rowHeight = 48; // Fixed height for perfect alignment
 
   return (
     <View style={styles.container}>
-      {/* Frozen Left Column - FAALİYET */}
+      {/* Frozen Column - Fixed Height Rows */}
       <View style={[styles.frozenColumn, { width: frozenColumnWidth }]}>
         <Cell bold isFrozen>FAALİYET</Cell>
         {rows.map((row, i) => (
-          <Cell key={i} bold isFrozen>
-            {row.name}
-          </Cell>
+          <View key={i} style={{ height: rowHeight }}>
+            <Cell bold isFrozen>
+              {row.name}
+            </Cell>
+          </View>
         ))}
       </View>
 
-      {/* Scrollable Columns */}
+      {/* Scrollable Columns - Same Fixed Height Rows */}
       <ScrollView horizontal showsHorizontalScrollIndicator={false}>
         <View>
-          {/* Header Row */}
+          {/* Header */}
           <View style={styles.headerRow}>
             {['2024', '2025', 'Artış %', '2025 Bütçe', 'Sapma %'].map((header) => (
-              <Cell key={header} bold>{header}</Cell>
+              <View key={header} style={{ height: rowHeight }}>
+                <Cell bold>{header}</Cell>
+              </View>
             ))}
           </View>
 
           {/* Data Rows */}
           {rows.map((row, i) => (
-            <View key={i} style={styles.dataRow}>
+            <View key={i} style={[styles.dataRow, { height: rowHeight }]}>
               <Cell>{formatNumber(row.actual2024)}</Cell>
               <Cell>{formatNumber(row.actual2025)}</Cell>
               <Cell><PercentCell value={row.actualChangePercent} /></Cell>
@@ -94,44 +98,42 @@ const styles = StyleSheet.create({
     backgroundColor: '#fff',
   },
   frozenColumn: {
-    backgroundColor: '#f4f6f8',
+    backgroundColor: '#f5f7fa',
     borderRightWidth: 1,
     borderColor: '#ddd',
   },
   headerRow: {
     flexDirection: 'row',
-    backgroundColor: '#f4f6f8',
+    backgroundColor: '#f0f0f0',
   },
   dataRow: {
     flexDirection: 'row',
   },
   cell: {
-    minWidth: 110,
-    paddingHorizontal: 14,           // +7 left/right for spacious feel
-    paddingVertical: 12,
+    flex: 1,
+     minWidth: 105,   
+    paddingHorizontal: 12,
     justifyContent: 'center',
     alignItems: 'center',
     borderBottomWidth: 1,
-    borderColor: '#e0e0e0',
+    borderColor: '#eee',
   },
   frozenCell: {
     justifyContent: 'flex-start',
-    paddingLeft: 18,
+    paddingLeft: 16,
+    paddingRight: 8,
+  },
+  boldCell: {
+    backgroundColor: '#e9f0f8',
   },
   cellText: {
     fontSize: 12.5,
     textAlign: 'center',
     color: '#333',
   },
-  bold: {
-    backgroundColor: '#e9f0f8',
-  },
   boldText: {
     fontWeight: '700',
   },
-  highlightCell: {
-    backgroundColor: '#e9f0f8',
-  },
   percentText: {
     fontWeight: '700',
     fontSize: 12.5,

package/src/screens/Report1AScreen.jsx

@@ -29,7 +29,7 @@ const Report1AScreen = ({ endpoint, token, onBack }) => {
       {/* FULL-WIDTH BLUE HEADER */}
       <View style={styles.header}>
         <TouchableOpacity onPress={onBack} style={styles.backButton}>
-          <Text style={styles.backIcon}>←</Text>
+          <Text style={styles.backIcon}>‹</Text>
         </TouchableOpacity>
         <Text style={styles.headerTitle}>PERFORMANS RAPORU (USD)</Text>
       </View>
@@ -97,9 +97,11 @@ const styles = StyleSheet.create({
   header: {
     flexDirection: 'row',
     alignItems: 'center',
-    paddingVertical: 18,
     paddingHorizontal: 16,
-    backgroundColor: '#1565c0',  // Deep blue
+    paddingVertical: 18,
+    backgroundColor: '#4E79A7',
+    borderBottomWidth: 1,
+    borderColor: '#4E79A7',
   },
   backButton: {
     padding: 8,

package/src/screens/Report3AScreen.jsx

@@ -205,7 +205,7 @@ const styles = StyleSheet.create({
     borderBottomWidth: 1,
     borderColor: '#4E79A7',
   },
-  backIcon: { fontSize: 28, color: '#fff', fontWeight: '800' },
+  backIcon: { fontSize: 32, color: '#fff', fontWeight: '800' },
   headerTitle: { fontSize: 19, fontWeight: '700', color: '#fff', flex: 1, textAlign: 'center' },
 
   filterBar: {