58 top of bar charts have deformation

Sources/SwiftUICharts/BarChart/Extras/BarLayout.swift

@@ -0,0 +1,31 @@
+//
+//  BarLayout.swift
+//  
+//
+//  Created by Will Dale on 20/05/2022.
+//
+
+import CoreGraphics.CGGeometry
+
+internal struct BarLayout {
+    internal static func barWidth(_ totalWidth: CGFloat, _ widthFactor: CGFloat) -> CGFloat {
+        return totalWidth * widthFactor
+    }
+
+    internal static func barHeight(_ totalHeight: CGFloat, _ value: Double, _ maxValue: Double) -> CGFloat {
+        return totalHeight * divideByZeroProtection(CGFloat.self, value, maxValue)
+    }
+
+    internal static func barOffset(_ section: CGSize, _ widthFactor: CGFloat, _ value: Double, _ maxValue: Double) -> CGSize {
+        return CGSize(width: barXOffset(section.width, widthFactor),
+                      height: barYOffset(section.height, value, maxValue))
+    }
+
+    internal static func barXOffset(_ total: CGFloat, _ factor: CGFloat) -> CGFloat {
+        return (-(total * factor) / 2) + (total / 2)
+    }
+
+    internal static func barYOffset(_ total: CGFloat, _ value: Double, _ maxValue: Double) -> CGFloat {
+        return total - (total * divideByZeroProtection(CGFloat.self, value, maxValue))
+    }
+}

Sources/SwiftUICharts/BarChart/Views/GroupedBarChart.swift

@@ -150,5 +150,4 @@ internal struct GroupedBarCell<ChartData>: View where ChartData: GroupedBarChart
             }
         }
     }
-
 }

Sources/SwiftUICharts/BarChart/Views/StackedBarChart.swift

@@ -60,12 +60,16 @@ public struct StackedBarChart<ChartData>: View where ChartData: StackedBarChartD
         if chartData.isGreaterThanTwo() {
             HStack(alignment: .bottom, spacing: 0) {
                 ForEach(chartData.dataSets.dataSets) { dataSet in
+                    GeometryReader { geo in
                     StackElementSubView(dataSet: dataSet,
                                         specifier: chartData.infoView.touchSpecifier,
                                         formatter: chartData.infoView.touchFormatter)
                         .clipShape(RoundedRectangleBarShape(chartData.barStyle.cornerRadius))
-                        .scaleEffect(y: animationValue(dataSet.maxValue(), chartData.maxValue), anchor: .bottom)
-                        .scaleEffect(x: chartData.barStyle.barWidth, anchor: .center)
+
+                        .frame(width: BarLayout.barWidth(geo.size.width, chartData.barStyle.barWidth))
+                        .frame(height: frameAnimationValue(dataSet.maxValue(), height: geo.size.height))
+                        .offset(offsetAnimationValue(dataSet.maxValue(), size: geo.size))
+
                         .animation(.default, value: chartData.dataSets)
                         .background(Color(.gray).opacity(0.000000001))
                         .animateOnAppear(disabled: chartData.disableAnimation, using: chartData.chartStyle.globalAnimation) {
@@ -75,6 +79,7 @@ public struct StackedBarChart<ChartData>: View where ChartData: StackedBarChartD
                             self.startAnimation = false
                         }
                         .accessibilityLabel(LocalizedStringKey(chartData.metadata.title))
+                    }
                 }
             }
             .layoutNotifier(timer)
@@ -89,4 +94,23 @@ public struct StackedBarChart<ChartData>: View where ChartData: StackedBarChartD
             return startAnimation ? value : 0
         }
     }
+
+    func frameAnimationValue(_ value: Double, height: CGFloat) -> CGFloat {
+        let value = BarLayout.barHeight(height, value, chartData.maxValue)
+        if chartData.disableAnimation {
+            return value
+        } else {
+            return startAnimation ? value : 0
+        }
+    }
+
+    func offsetAnimationValue(_ value: Double, size: CGSize) -> CGSize {
+        let value = BarLayout.barOffset(size, chartData.barStyle.barWidth, value, chartData.maxValue)
+        let zero = BarLayout.barOffset(size, chartData.barStyle.barWidth, 0, 0)
+        if chartData.disableAnimation {
+            return value
+        } else {
+            return startAnimation ? value : zero
+        }
+    }
 }