Merge pull request #5200 from tring-bhagya/release/5.0.0_updated

Added Safe index subscript logic for ChartData

Author: danielgindi

Source/Charts/Data/Implementations/Standard/ChartData.swift

@@ -452,6 +452,10 @@ extension ChartData: MutableCollection
         get { return dataSets[position] }
         set { self._dataSets[position] = newValue }
     }
+    
+    public subscript(safe index: Index) -> Element? {
+        return indices.contains(index) ? self[index] : nil
+    }
 }
 
 // MARK: RandomAccessCollection

Source/Charts/Data/Implementations/Standard/RadarChartData.swift

@@ -46,6 +46,6 @@ open class RadarChartData: ChartData
 
     @objc open override func entry(for highlight: Highlight) -> ChartDataEntry?
     {
-        return self[highlight.dataSetIndex].entryForIndex(Int(highlight.x))
+        return self[safe: highlight.dataSetIndex]?.entryForIndex(Int(highlight.x))
     }
 }

Source/Charts/Renderers/BarChartRenderer.swift

@@ -701,7 +701,7 @@ open class BarChartRenderer: BarLineScatterCandleBubbleRenderer
         for high in indices
         {
             guard
-                let set = barData[high.dataSetIndex] as? BarChartDataSetProtocol,
+                let set = barData[safe: high.dataSetIndex] as? BarChartDataSetProtocol,
                 set.isHighlightEnabled
                 else { continue }
 

Source/Charts/Renderers/BubbleChartRenderer.swift

@@ -252,7 +252,7 @@ open class BubbleChartRenderer: BarLineScatterCandleBubbleRenderer
         for high in indices
         {
             guard
-                let dataSet = bubbleData[high.dataSetIndex] as? BubbleChartDataSetProtocol,
+                let dataSet = bubbleData[safe: high.dataSetIndex] as? BubbleChartDataSetProtocol,
                 dataSet.isHighlightEnabled,
                 let entry = dataSet.entryForXValue(high.x, closestToY: high.y) as? BubbleChartDataEntry,
                 isInBoundsX(entry: entry, dataSet: dataSet)

Source/Charts/Renderers/CandleStickChartRenderer.swift

@@ -362,7 +362,7 @@ open class CandleStickChartRenderer: LineScatterCandleRadarRenderer
         for high in indices
         {
             guard
-                let set = candleData[high.dataSetIndex] as? CandleChartDataSetProtocol,
+                let set = candleData[safe: high.dataSetIndex] as? CandleChartDataSetProtocol,
                 set.isHighlightEnabled
                 else { continue }
 

Source/Charts/Renderers/LineChartRenderer.swift

@@ -760,13 +760,7 @@ open class LineChartRenderer: LineRadarRenderer
 
         for high in indices
         {
-            // When updating the data set for the chart and then animating it, sometimes highlights are generated for the
-            // removed sets. This guard prevents OOB in the case where the new set has less data than the old set
-            if high.dataSetIndex >= lineData._dataSets.count - 1 {
-                continue
-            }
-            
-            guard let set = lineData[high.dataSetIndex] as? LineChartDataSetProtocol,
+            guard let set = lineData[safe: high.dataSetIndex] as? LineChartDataSetProtocol,
                   set.isHighlightEnabled
             else { continue }
 

Source/Charts/Renderers/PieChartRenderer.swift

@@ -714,7 +714,7 @@ open class PieChartRenderer: NSObject, DataRenderer
             // get the index to highlight
             let index = Int(hightlight.x)
             guard index < drawAngles.count,
-                  let set = data[hightlight.dataSetIndex] as? PieChartDataSetProtocol,
+                  let set = data[safe: hightlight.dataSetIndex] as? PieChartDataSetProtocol,
                   set.isHighlightEnabled
             else
             {

Source/Charts/Renderers/RadarChartRenderer.swift

@@ -354,7 +354,7 @@ open class RadarChartRenderer: LineRadarRenderer
         for high in indices
         {
             guard
-                let set = chart.data?[high.dataSetIndex] as? RadarChartDataSetProtocol,
+                let set = chart.data?[safe: high.dataSetIndex] as? RadarChartDataSetProtocol,
                 set.isHighlightEnabled
                 else { continue }
 

Source/Charts/Renderers/ScatterChartRenderer.swift

@@ -203,7 +203,7 @@ open class ScatterChartRenderer: LineScatterCandleRadarRenderer
         for high in indices
         {
             guard
-                let set = scatterData[high.dataSetIndex] as? ScatterChartDataSetProtocol,
+                let set = scatterData[safe: high.dataSetIndex] as? ScatterChartDataSetProtocol,
                 set.isHighlightEnabled
                 else { continue }