Skip to content

Commit c07b479

Browse files
Minimize binary compatibility breaking
1 parent e6800a6 commit c07b479

File tree

5 files changed

+25
-35
lines changed

5 files changed

+25
-35
lines changed

core/shared/src/main/scala/plotly/layout/Annotation.scala

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import plotly.element._
1616
text: Option[Element] = None,
1717
font: Option[Font] = None,
1818
showarrow: Option[Boolean] = None,
19+
@since("0.8.0")
1920
ax: Option[Double] = None,
2021
ay: Option[Double] = None
2122
)
@@ -31,9 +32,7 @@ object Annotation {
3132
yanchor: Anchor = null,
3233
text: Element = null,
3334
font: Font = null,
34-
showarrow: JBoolean = null,
35-
ax: JDouble = null,
36-
ay: JDouble = null
35+
showarrow: JBoolean = null
3736
): Annotation =
3837
Annotation(
3938
Option(xref),
@@ -44,8 +43,6 @@ object Annotation {
4443
Option(yanchor),
4544
Option(text),
4645
Option(font),
47-
Option(showarrow).map(v => v: Boolean),
48-
Option(ax).map(x => x: Double),
49-
Option(ay).map(x => x: Double)
46+
Option(showarrow).map(v => v: Boolean)
5047
)
5148
}

core/shared/src/main/scala/plotly/layout/Axis.scala

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@ import plotly.element._
4242
ticktext: Option[Sequence] = None,
4343
nticks: Option[Int] = None,
4444
automargin: Option[Boolean] = None,
45-
rangeslider: Option[RangeSlider],
45+
@since("0.8.0")
46+
rangeslider: Option[RangeSlider] = None
4647
)
4748

4849
object Axis {
@@ -82,8 +83,7 @@ object Axis {
8283
tickvals: Sequence = null,
8384
ticktext: Sequence = null,
8485
nticks: JInt = null,
85-
automargin: JBoolean = null,
86-
rangeslider: RangeSlider = null
86+
automargin: JBoolean = null
8787
): Axis =
8888
Axis(
8989
Option(title),
@@ -120,7 +120,6 @@ object Axis {
120120
Option(tickvals),
121121
Option(ticktext),
122122
Option(nticks) .map(x => x: Int),
123-
Option(automargin) .map(x => x: Boolean),
124-
Option(rangeslider)
123+
Option(automargin) .map(x => x: Boolean)
125124
)
126125
}

core/shared/src/main/scala/plotly/layout/Layout.scala

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,9 @@ import plotly.element._
3434
hovermode: Option[HoverMode] = None,
3535
boxmode: Option[BoxMode] = None,
3636
scene: Option[Scene] = None,
37-
dragmode: Option[String],
38-
shapes: Option[Seq[Shape]]
37+
@since("0.8.0")
38+
dragmode: Option[String] = None,
39+
shapes: Option[Seq[Shape]] = None
3940
)
4041

4142
object Layout {
@@ -67,9 +68,7 @@ object Layout {
6768
bargroupgap: JDouble = null,
6869
hovermode: HoverMode = null,
6970
boxmode: BoxMode = null,
70-
scene: Scene = null,
71-
dragmode: String = null,
72-
shapes: Seq[Shape] = null
71+
scene: Scene = null
7372
): Layout =
7473
new Layout(
7574
Option(title),
@@ -98,8 +97,6 @@ object Layout {
9897
Option(bargroupgap).map(x => x),
9998
Option(hovermode),
10099
Option(boxmode),
101-
Option(scene),
102-
Option(dragmode),
103-
Option(shapes)
100+
Option(scene)
104101
)
105102
}

core/shared/src/main/scala/plotly/layout/RangeSlider.scala

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@ package plotly.layout
33
import dataclass.data
44
import plotly.Sequence
55

6-
@data class RangeSlider(
7-
range: Option[Sequence]
6+
@data(optionSetters = true) class RangeSlider(
7+
range: Option[Sequence] = None
88
)
9-
object RangeSlider {
10-
def apply(range: Sequence = null): RangeSlider = RangeSlider(Option(range))
11-
}

core/shared/src/main/scala/plotly/layout/Shape.scala

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ package plotly.layout
33
import dataclass.data
44
import plotly.element.{Color, Line}
55

6-
@data class Shape (
7-
`type`: Option[String],
8-
xref: Option[String],
9-
yref: Option[String],
10-
x0: Option[String],
11-
y0: Option[Double],
12-
x1: Option[String],
13-
y1: Option[Double],
14-
fillcolor: Option[Color],
15-
opacity: Option[Double],
16-
line: Option[Line],
6+
@data(optionSetters = true) class Shape (
7+
`type`: Option[String] = None,
8+
xref: Option[String] = None,
9+
yref: Option[String] = None,
10+
x0: Option[String] = None,
11+
y0: Option[Double] = None,
12+
x1: Option[String] = None,
13+
y1: Option[Double] = None,
14+
fillcolor: Option[Color] = None,
15+
opacity: Option[Double] = None,
16+
line: Option[Line] = None
1717
)

0 commit comments

Comments
 (0)