Skip to content

Commit

Permalink
6.2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
ihnatmoisieiev committed Nov 21, 2018
1 parent 2cd6924 commit ff1e3b6
Show file tree
Hide file tree
Showing 2,290 changed files with 327,911 additions and 52,102 deletions.
27 changes: 27 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,3 +1,30 @@
# Version 6.2.0

## iOS:

1. All style options are of type HICSSObject.

## Framework:

1. Added support for multiple data labels on each single point.
2. Added draggable points plugin as module.
3. Added support for pointPlacement in X range charts, affecting the category Y axis. Closed #7419.

## Framework bug fixes:

1. Fixed #2366, improved polar chart yAxis plotLines resize and animation.
2. Fixed #4281, added information about point in tooltip's headerFormat.
3. Fixed #6169. cropShoulder was inherited by column series, which set it to 0. Fixed by overriding to 1.
4. Fixed #6370, category axis with breaks was rendered incorrectly.
5. Fixed #9049, issue with lines to culled points in boost.
6. Fixed #9052, conflict between settings boost.enabled and seriesThreshold.
7. Fixed #9058, error when running chart tests in jsdom.
8. Fixed #9088, updating a point in a pie chart threw errors when another slice was hovered.
9. Fixed #9091, showCheckbox didn't work with layout proximate.
10. Fixed #9097, chart.update error when removing axes and series.
11. Fixed #9119, dataLabels sometimes overlapped stackLabels.
12. Fixed animation of grid lines when changing axis extremes. Follow tick marks.

# Version 6.1.4

## Framework:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@
TargetAttributes = {
45DAC08D1F56A5680004F0B1 = {
CreatedOnToolsVersion = 8.3.3;
DevelopmentTeam = BK36LKB8JF;
DevelopmentTeam = FYYW4F45T7;
LastSwiftMigration = 0900;
ProvisioningStyle = Automatic;
};
Expand Down Expand Up @@ -362,7 +362,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = BK36LKB8JF;
DEVELOPMENT_TEAM = FYYW4F45T7;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)",
Expand All @@ -384,7 +384,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = BK36LKB8JF;
DEVELOPMENT_TEAM = FYYW4F45T7;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)",
Expand Down
33 changes: 21 additions & 12 deletions Example/HighFit/HighFit Swift/HighFit/OptionsProvider.swift
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ class OptionsProvider {
let title = HITitle()
title.text = options["title"] as! String
title.align = "left"
title.style = HIStyle()
title.style = HICSSObject()
title.style.fontFamily = "Arial"
title.style.fontSize = "14px"
title.style.color = "rgba(255, 255, 255, 0.6)"
Expand All @@ -79,7 +79,10 @@ class OptionsProvider {
subtitle.text = subtitle.text + " total"
}
subtitle.align = "left"
subtitle.style = ["fontFamily": "Arial", "fontSize": "10px", "color": "rgba(255, 255, 255, 0.6)"]
subtitle.style = HICSSObject()
subtitle.style.fontFamily = "Arial"
subtitle.style.fontSize = "10px"
subtitle.style.color = "rgba(255, 255, 255, 0.6)"
subtitle.y = 28
hioptions.subtitle = subtitle

Expand All @@ -91,7 +94,7 @@ class OptionsProvider {
xaxis.tickColor = HIColor(rgba: 255, green: 255, blue: 255, alpha: 0.0)
xaxis.lineColor = HIColor(rgba: 255, green: 255, blue: 255, alpha: 0.3)
xaxis.labels = HILabels()
xaxis.labels.style = HIStyle()
xaxis.labels.style = HICSSObject()
xaxis.labels.style.color = "rgb(255, 255, 255)"
xaxis.labels.style.textOutline = "10px Arial"
xaxis.labels.step = step
Expand All @@ -103,7 +106,7 @@ class OptionsProvider {
yaxis.lineWidth = 1
yaxis.gridLineWidth = 0
yaxis.labels = HILabels()
yaxis.labels.style = HIStyle()
yaxis.labels.style = HICSSObject()
yaxis.labels.style.color = "rgb(255, 255, 255)"
yaxis.labels.style.textOutline = "10px Arial"
yaxis.labels.x = -5
Expand Down Expand Up @@ -159,7 +162,7 @@ class OptionsProvider {
let title = HITitle()
title.text = options["title"] as! String
title.align = "left"
title.style = HIStyle()
title.style = HICSSObject()
title.style.fontFamily = "Arial"
title.style.fontSize = "14px"
title.style.color = "rgba(255, 255, 255, 0.6)"
Expand All @@ -172,7 +175,10 @@ class OptionsProvider {
subtitle.text = subtitle.text + " total"
}
subtitle.align = "left"
subtitle.style = ["fontFamily": "Arial", "fontSize": "10px", "color": "rgba(255, 255, 255, 0.6)"]
subtitle.style = HICSSObject()
subtitle.style.fontFamily = "Arial"
subtitle.style.fontSize = "10px"
subtitle.style.color = "rgba(255, 255, 255, 0.6)"
subtitle.y = 28
hioptions.subtitle = subtitle

Expand All @@ -184,7 +190,7 @@ class OptionsProvider {
xaxis.tickColor = HIColor(rgba: 255, green: 255, blue: 255, alpha: 0.0)
xaxis.lineColor = HIColor(rgba: 255, green: 255, blue: 255, alpha: 0.3)
xaxis.labels = HILabels()
xaxis.labels.style = HIStyle()
xaxis.labels.style = HICSSObject()
xaxis.labels.style.color = "rgb(255, 255, 255)"
xaxis.labels.style.textOutline = "10px Arial"
xaxis.labels.step = step
Expand All @@ -196,7 +202,7 @@ class OptionsProvider {
yaxis.gridLineWidth = 0
yaxis.lineColor = HIColor(rgba: 255, green: 255, blue: 255, alpha: 0.3)
yaxis.labels = HILabels()
yaxis.labels.style = HIStyle()
yaxis.labels.style = HICSSObject()
yaxis.labels.style.color = "rgb(255, 255, 255)"
yaxis.labels.style.textOutline = "10px Arial"
yaxis.labels.x = -5
Expand Down Expand Up @@ -248,7 +254,7 @@ class OptionsProvider {
let title = HITitle()
title.text = options["title"] as! String
title.align = "left"
title.style = HIStyle()
title.style = HICSSObject()
title.style.fontFamily = "Arial"
title.style.fontSize = "14px"
title.style.color = "rgba(255, 255, 255, 0.6)"
Expand All @@ -261,7 +267,10 @@ class OptionsProvider {
subtitle.text = subtitle.text + " total"
}
subtitle.align = "left"
subtitle.style = ["fontFamily": "Arial", "fontSize": "10px", "color": "rgba(255, 255, 255, 0.6)"]
subtitle.style = HICSSObject()
subtitle.style.fontFamily = "Arial"
subtitle.style.fontSize = "10px"
subtitle.style.color = "rgba(255, 255, 255, 0.6)"
subtitle.y = 28
hioptions.subtitle = subtitle

Expand All @@ -273,7 +282,7 @@ class OptionsProvider {
xaxis.tickColor = HIColor(rgba: 255, green: 255, blue: 255, alpha: 0.0)
xaxis.lineColor = HIColor(rgba: 255, green: 255, blue: 255, alpha: 0.3)
xaxis.labels = HILabels()
xaxis.labels.style = HIStyle()
xaxis.labels.style = HICSSObject()
xaxis.labels.style.color = "rgb(255, 255, 255)"
xaxis.labels.style.textOutline = "10px Arial"
xaxis.labels.step = step
Expand All @@ -286,7 +295,7 @@ class OptionsProvider {
yaxis.lineColor = HIColor(rgba: 255, green: 255, blue: 255, alpha: 0.3)
yaxis.labels = HILabels()
yaxis.labels = HILabels()
yaxis.labels.style = HIStyle()
yaxis.labels.style = HICSSObject()
yaxis.labels.style.color = "rgb(255, 255, 255)"
yaxis.labels.style.textOutline = "10px Arial"
yaxis.labels.x = -5
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@

/**
Animation setting for hovering the graph in line-type series.
**Defaults to** `{ "duration": 50 }`.
*/
@interface HIAnimation: HIChartsJSONSerializable

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
/**
* (c) 2009-2018 Highsoft AS
*
* License: www.highcharts.com/license
* For commercial usage, a valid license is required. To purchase a license for Highcharts iOS, please see our website: https://shop.highsoft.com/
* In case of questions, please contact [email protected]
*/

#import "HIChartsJSONSerializable.h"
#import "HIFunction.h"


/**
An animation configuration. Animation configurations can also be defined as booleans, where `false` turns off animation and `true` defaults to a duration of 500ms.
*/
@interface HIAnimationOptionsObject: HIChartsJSONSerializable

/**
The animation duration in milliseconds.
*/
@property(nonatomic, readwrite) NSNumber *duration;
/**
The name of an easing function as defined on the `Math` object.
*/
@property(nonatomic, readwrite) NSString *easing;
/**
A callback function to exectute when the animation finishes.
*/
@property(nonatomic, readwrite) HIFunction *complete;
/**
A callback function to execute on each step of each attribute or CSS property that's being animated. The first argument contains information about the animation and progress.
*/
@property(nonatomic, readwrite) HIFunction *step;

-(NSDictionary *)getParams;

@end
38 changes: 19 additions & 19 deletions Example/HighFit/HighFit Swift/Highcharts.framework/Headers/HIArea.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,17 @@


/**
A `area` series. If the `type` option is not specified, it is inherited from `chart.type`.
Configuration options for the series are given in three levels:
A `area` series. If the `type` option is not specified, it is inherited from `chart.type`.
1. Options for all series in a chart are defined in the `plotOptions.series` object.
2. Options for all `area` series are defined in `plotOptions.area`.
3. Options for one single series are given in `the series instance array`.
Configuration options for the series are given in three levels:
1. Options for all series in a chart are defined in the `plotOptions.series` object.
2. Options for all `area` series are defined in `plotOptions.area`.
3. Options for one single series are given in `the series instance array`.
<pre>
<pre>
Highcharts.chart('container', {
plotOptions: {
series: {
Expand All @@ -36,8 +36,8 @@ Configuration options for the series are given in three levels:
type: 'area'
}]
});
<pre>
*/
<pre>
*/
@interface HIArea: HISeries

/**
Expand All @@ -49,13 +49,15 @@ A separate color for the negative part of the area. In styled mode, a negative c
*/
@property(nonatomic, readwrite) HIColor *negativeFillColor;
/**
A separate color for the graph line. By default the line takes the `color` of the series, but the lineColor setting allows setting a separate color for the line without altering the `fillColor`. In styled mode, the line stroke can be set with the `.highcharts-graph` class name.
Whether the whole area or just the line should respond to mouseover tooltips and other mouse or touch events.
**Defaults to** `false`.
**Try it**
* [Dark gray line](https://jsfiddle.net/gh/get/library/pure/highcharts/highcharts/tree/master/samples/highcharts/plotoptions/area-linecolor/)
* [Display the tooltip when the area is hovered](https://jsfiddle.net/gh/get/library/pure/highcharts/highcharts/tree/master/samples/highcharts/plotoptions/area-trackbyarea/)
*/
@property(nonatomic, readwrite) HIColor *lineColor;
@property(nonatomic, readwrite) NSNumber /* Bool */ *trackByArea;
/**
Fill color or gradient for the area. When `null`, the series' `color` is used with the series' `fillOpacity`. In styled mode, the fill color can be set with the `.highcharts-area` class name.
Expand All @@ -66,15 +68,13 @@ Fill color or gradient for the area. When `null`, the series' `color` is used wi
*/
@property(nonatomic, readwrite) HIColor *fillColor;
/**
Whether the whole area or just the line should respond to mouseover tooltips and other mouse or touch events.
**Defaults to** `false`.
A separate color for the graph line. By default the line takes the `color` of the series, but the lineColor setting allows setting a separate color for the line without altering the `fillColor`. In styled mode, the line stroke can be set with the `.highcharts-graph` class name.
**Try it**
* [Display the tooltip when the area is hovered](https://jsfiddle.net/gh/get/library/pure/highcharts/highcharts/tree/master/samples/highcharts/plotoptions/area-trackbyarea/)
* [Dark gray line](https://jsfiddle.net/gh/get/library/pure/highcharts/highcharts/tree/master/samples/highcharts/plotoptions/area-linecolor/)
*/
@property(nonatomic, readwrite) NSNumber /* Bool */ *trackByArea;
@property(nonatomic, readwrite) HIColor *lineColor;
/**
Fill opacity for the area. When you set an explicit `fillColor`, the `fillOpacity` is not applied. Instead, you should define the opacity in the `fillColor` with an rgba color definition. The `fillOpacity` setting, also the default setting, overrides the alpha component of the `color` setting. In styled mode, the fill opacity can be set with the `.highcharts-area` class name.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,22 +59,22 @@ A separate color for the negative part of the area. In styled mode, a negative c
*/
@property(nonatomic, readwrite) HIColor *negativeFillColor;
/**
A separate color for the graph line. By default the line takes the `color` of the series, but the lineColor setting allows setting a separate color for the line without altering the `fillColor`. In styled mode, the line stroke can be set with the `.highcharts-graph` class name.
Fill color or gradient for the area. When `null`, the series' `color` is used with the series' `fillOpacity`. In styled mode, the fill color can be set with the `.highcharts-area` class name.
**Try it**
* [Dark gray line](https://jsfiddle.net/gh/get/library/pure/highcharts/highcharts/tree/master/samples/highcharts/plotoptions/area-linecolor/)
* [Null by default](https://jsfiddle.net/gh/get/library/pure/highcharts/highcharts/tree/master/samples/highcharts/plotoptions/area-fillcolor-default/)
* [Gradient](https://jsfiddle.net/gh/get/library/pure/highcharts/highcharts/tree/master/samples/highcharts/plotoptions/area-fillcolor-gradient/)
*/
@property(nonatomic, readwrite) HIColor *lineColor;
@property(nonatomic, readwrite) HIColor *fillColor;
/**
Fill color or gradient for the area. When `null`, the series' `color` is used with the series' `fillOpacity`. In styled mode, the fill color can be set with the `.highcharts-area` class name.
A separate color for the graph line. By default the line takes the `color` of the series, but the lineColor setting allows setting a separate color for the line without altering the `fillColor`. In styled mode, the line stroke can be set with the `.highcharts-graph` class name.
**Try it**
* [Null by default](https://jsfiddle.net/gh/get/library/pure/highcharts/highcharts/tree/master/samples/highcharts/plotoptions/area-fillcolor-default/)
* [Gradient](https://jsfiddle.net/gh/get/library/pure/highcharts/highcharts/tree/master/samples/highcharts/plotoptions/area-fillcolor-gradient/)
* [Dark gray line](https://jsfiddle.net/gh/get/library/pure/highcharts/highcharts/tree/master/samples/highcharts/plotoptions/area-linecolor/)
*/
@property(nonatomic, readwrite) HIColor *fillColor;
@property(nonatomic, readwrite) HIColor *lineColor;
/**
Fill opacity for the area. When you set an explicit `fillColor`, the `fillOpacity` is not applied. Instead, you should define the opacity in the `fillColor` with an rgba color definition. The `fillOpacity` setting, also the default setting, overrides the alpha component of the `color` setting. In styled mode, the fill opacity can be set with the `.highcharts-area` class name.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
type: 'areaspline'
}]
});
<pre>
<pre>
*/
@interface HIAreaspline: HISeries

Expand All @@ -49,13 +49,15 @@ A separate color for the negative part of the area. In styled mode, a negative c
*/
@property(nonatomic, readwrite) HIColor *negativeFillColor;
/**
A separate color for the graph line. By default the line takes the `color` of the series, but the lineColor setting allows setting a separate color for the line without altering the `fillColor`. In styled mode, the line stroke can be set with the `.highcharts-graph` class name.
Whether the whole area or just the line should respond to mouseover tooltips and other mouse or touch events.
**Defaults to** `false`.
**Try it**
* [Dark gray line](https://jsfiddle.net/gh/get/library/pure/highcharts/highcharts/tree/master/samples/highcharts/plotoptions/area-linecolor/)
* [Display the tooltip when the area is hovered](https://jsfiddle.net/gh/get/library/pure/highcharts/highcharts/tree/master/samples/highcharts/plotoptions/area-trackbyarea/)
*/
@property(nonatomic, readwrite) HIColor *lineColor;
@property(nonatomic, readwrite) NSNumber /* Bool */ *trackByArea;
/**
Fill color or gradient for the area. When `null`, the series' `color` is used with the series' `fillOpacity`. In styled mode, the fill color can be set with the `.highcharts-area` class name.
Expand All @@ -66,15 +68,13 @@ Fill color or gradient for the area. When `null`, the series' `color` is used wi
*/
@property(nonatomic, readwrite) HIColor *fillColor;
/**
Whether the whole area or just the line should respond to mouseover tooltips and other mouse or touch events.
**Defaults to** `false`.
A separate color for the graph line. By default the line takes the `color` of the series, but the lineColor setting allows setting a separate color for the line without altering the `fillColor`. In styled mode, the line stroke can be set with the `.highcharts-graph` class name.
**Try it**
* [Display the tooltip when the area is hovered](https://jsfiddle.net/gh/get/library/pure/highcharts/highcharts/tree/master/samples/highcharts/plotoptions/area-trackbyarea/)
* [Dark gray line](https://jsfiddle.net/gh/get/library/pure/highcharts/highcharts/tree/master/samples/highcharts/plotoptions/area-linecolor/)
*/
@property(nonatomic, readwrite) NSNumber /* Bool */ *trackByArea;
@property(nonatomic, readwrite) HIColor *lineColor;
/**
Fill opacity for the area. When you set an explicit `fillColor`, the `fillOpacity` is not applied. Instead, you should define the opacity in the `fillColor` with an rgba color definition. The `fillOpacity` setting, also the default setting, overrides the alpha component of the `color` setting. In styled mode, the fill opacity can be set with the `.highcharts-area` class name.
Expand Down
Loading

0 comments on commit ff1e3b6

Please sign in to comment.