Fix #1531

Author: AAChartModel

AAChartKitDemo/Demo/AAOptionsWithJS/JSFunctionForAAChartEventsComposer2.h

@@ -14,7 +14,9 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface JSFunctionForAAChartEventsComposer2 : NSObject
 
++ (AAOptions *)addClickEventToXAxisLabelAndAccessData;
 + (AAOptions *)defaultSelectedAPointForLineChart;
++ (AAOptions *)configureBlinkMarkerChart;
 
 @end
 

AAChartKitDemo/Demo/AAOptionsWithJS/JSFunctionForAAChartEventsComposer2.m

@@ -12,6 +12,52 @@
 
 @implementation JSFunctionForAAChartEventsComposer2
 
+//How to add click event to X-axis label and access data ?
+//https://www.highcharts.com/forum/viewtopic.php?t=40590
+//https://codepen.io/anon/pen/LmObxY?editors=1010
+//https://github.com/AAChartModel/AAChartKit/issues/1531
++ (AAOptions *)addClickEventToXAxisLabelAndAccessData {
+    AAOptions *options = AAOptions.new
+    .chartSet(AAChart.new
+              .typeSet(AAChartTypeColumn)
+              .eventsSet(AAChartEvents.new
+                         .loadSet(@AAJSFunc(function() {
+                             var axis = this.xAxis[0];
+                             var ticks = axis.ticks;
+                             var points = this.series[0].points;
+                             var tooltip = this.tooltip;
+
+                             points.forEach(function(point, i) {
+                                 if (ticks[i]) {
+                                     var label = ticks[i].label.element;
+
+                                     label.onclick = function() {
+                                         tooltip.getPosition(null, null, point);
+                                         tooltip.refresh(point);
+                                     };
+                                 }
+                             });
+                         }))))
+    .xAxisSet(AAXAxis.new
+              .categoriesSet(@[@"Africa", @"America", @"Asia", @"Europe", @"Oceania"]))
+    .yAxisSet(AAYAxis.new
+              .minSet(@0))
+    .tooltipSet(AATooltip.new
+                .valueSuffixSet(@" millions"))
+    .plotOptionsSet(AAPlotOptions.new
+                    .seriesSet(AASeries.new
+                               .dataLabelsSet(AADataLabels.new
+                                              .enabledSet(YES))))
+    .seriesSet(@[
+        AASeriesElement.new
+        .nameSet(@"Year 1800")
+        .dataSet(@[@107, @31, @635, @203, @2])
+    ]);
+
+    return options;
+}
+
+
 /*
  Highcharts.chart('container', {
      xAxis: {
@@ -105,4 +151,36 @@ + (AAOptions *)defaultSelectedAPointForLineChart {
     return options;
 }
 
+//https://github.com/AAChartModel/AAChartKit/issues/1531
+//https://stackoverflow.com/questions/42062016/in-high-chart-how-to-add-event-for-label-click
++ (AAOptions *)configureBlinkMarkerChart {
+    AAOptions *options = AAOptions.new
+    .chartSet(AAChart.new
+              .typeSet(AAChartTypeAreaspline)
+              .eventsSet(AAChartEvents.new
+                         .loadSet(@AAJSFunc(function() {
+                             const childNodes = this.xAxis[0].labelGroup.element.childNodes;
+                             childNodes
+                             .forEach(function(label, index) {
+                                 label.style.cursor = "pointer";
+                                 label.onclick = function() {
+                                     alert('You clicked on ' + this.textContent + ', index: ' + index);
+                                 }
+                             });
+                         }))))
+    .xAxisSet(AAXAxis.new
+              .categoriesSet(@[@"一月", @"二月", @"三月", @"四月", @"五月", @"六月", @"七月", @"八月", @"九月", @"十月", @"十一月", @"十二月"]))
+    .seriesSet(@[
+        AASeriesElement.new
+        .dataSet(@[@7.0, @6.9, @2.5, @14.5, @18.2, @21.5, @5.2, @26.5, @23.3, @45.3, @13.9, @9.6])
+        .markerSet(AAMarker.new
+                   .lineColorSet(AAColor.redColor)
+                   .lineWidthSet(@3)
+                   .radiusSet(@10))
+    ]);
+
+    return options;
+}
+
+
 @end

AAChartKitDemo/Demo/AAOptionsWithJS/JSFunctionForAAChartEventsVC.m

@@ -62,7 +62,9 @@ - (id)chartConfigurationWithSelectedIndex:(NSUInteger)selectedIndex {
         case 9: return [self configureECGStyleChart]; //配置心电图样式的图表
         case 10: return [self configureTheSizeOfTheSliceOfDonutAndPieChart]; //配置环形图和饼图的扇区大小
 //        case 11: return [self configurePlotBackgroundClickEvent]; //配置绘图区的点击事件
-        case 11: return [JSFunctionForAAChartEventsComposer2 defaultSelectedAPointForLineChart];
+//        case 11: return [JSFunctionForAAChartEventsComposer2 defaultSelectedAPointForLineChart];
+        case 11: return [JSFunctionForAAChartEventsComposer2 configureBlinkMarkerChart];
+
 
 
     }

AAChartKitLib/AAChartCreator/AAChartView.m

@@ -438,34 +438,51 @@ - (void)configureTheOptionsJsonStringWithAAOptions:(AAOptions *)aaOptions {
 
 #pragma mark - WKUIDelegate
 - (void)webView:(WKWebView *)webView runJavaScriptAlertPanelWithMessage:(NSString *)message initiatedByFrame:(WKFrameInfo *)frame completionHandler:(void (^)(void))completionHandler {
-#if TARGET_OS_IPHONE
-    UIAlertController *alertController =
-    [UIAlertController alertControllerWithTitle:@"JS WARNING"
-                                        message:message
-                                 preferredStyle:UIAlertControllerStyleAlert];
+#if TARGET_OS_IOS
+    UIAlertController *alertController = [UIAlertController alertControllerWithTitle:@"JS WARNING" message:message preferredStyle:UIAlertControllerStyleAlert];
 
-    UIAlertAction *alertAction =
-    [UIAlertAction actionWithTitle:@"Okay"
-                             style:UIAlertActionStyleDefault
-                           handler:^(UIAlertAction * _Nonnull action) {
+    UIAlertAction *okayAction = [UIAlertAction actionWithTitle:@"Okay" style:UIAlertActionStyleDefault handler:^(UIAlertAction *action) {
         completionHandler();
     }];
-    [alertController addAction:alertAction];
+    [alertController addAction:okayAction];
 
-    UIViewController *alertHelperController = [[UIViewController alloc]init];
-    [self addSubview:alertHelperController.view];
+    UIViewController *presentingViewController = [self nextUIViewController];
+    if (!presentingViewController) {
+        AADetailLog(@"Unable to present UIAlertController from AAChartView. Completing JavaScript alert handler.");
+        completionHandler();
+        return;
+    }
+    
+    [presentingViewController presentViewController:alertController animated:YES completion:nil];
 
-    [alertHelperController presentViewController:alertController animated:YES completion:nil];
 #elif TARGET_OS_MAC
     NSAlert *alert = [[NSAlert alloc] init];
     alert.alertStyle = NSAlertStyleWarning;
     alert.messageText = @"JS WARNING";
     alert.informativeText = message;
     [alert addButtonWithTitle:@"Okay"];
-    [alert beginSheetModalForWindow:[self window] completionHandler:nil];
+    
+    [alert beginSheetModalForWindow:[NSApplication sharedApplication].mainWindow completionHandler:^(NSModalResponse response) {
+        if (response == NSModalResponseOK) {
+            completionHandler();
+        }
+    }];
 #endif
 }
 
+#if TARGET_OS_IOS
+- (UIViewController *)nextUIViewController {
+    UIResponder *responder = self;
+    while (responder != nil) {
+        if ([responder isKindOfClass:[UIViewController class]]) {
+            return (UIViewController *)responder;
+        }
+        responder = [responder nextResponder];
+    }
+    return nil;
+}
+#endif
+
 #pragma mark - AAChartView Event Handler
 - (void)didFinishLoadHandler:(AADidFinishLoadBlock)handler {
     self.didFinishLoadBlock = handler;