Skip to content

Commit 6ba0bde

Browse files
kMutagenekMutagene
authored
Merge pull request #502 from plotly/plotly2.28
finish plotlyjs 2.28 parity
2 parents 41f2f88 + 0ccd95c commit 6ba0bde

33 files changed

Lines changed: 2045 additions & 45 deletions

File tree

‎AGENTS.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Guidance for AI coding agents working in the Plotly.NET repo. This is a first dr
66

77
Plotly.NET is an interactive charting library for .NET, built on top of plotly.js. The core is written in F# and wraps the plotly.js JSON schema with multiple API layers (high-level type-safe `Chart` API down to low-level object manipulation). See [README.md](README.md) for user-facing docs and the [F1000Research paper](https://doi.org/10.12688/f1000research.123971.1) for design rationale.
88

9-
Currently targeted plotly.js version: **2.27.1** (bundled at [src/Plotly.NET/plotly-2.27.1.min.js](src/Plotly.NET/plotly-2.27.1.min.js)).
9+
Currently targeted plotly.js version: **2.28.0** (bundled at [src/Plotly.NET/plotly-2.28.0.min.js](src/Plotly.NET/plotly-2.28.0.min.js)).
1010

1111
## Packages (monorepo layout)
1212

‎Plotly.NET.sln‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio Version 17
4-
VisualStudioVersion = 17.0.31903.59
3+
# Visual Studio Version 18
4+
VisualStudioVersion = 18.5.11709.299 stable
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "project", "project", "{BF60BC93-E09B-4E5F-9D85-95A519479D54}"
77
ProjectSection(SolutionItems) = preProject
88
.editorconfig = .editorconfig
9+
AGENTS.md = AGENTS.md
910
CITATION.cff = CITATION.cff
1011
.config\dotnet-tools.json = .config\dotnet-tools.json
1112
LICENSE = LICENSE
@@ -135,9 +136,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "04_distribution-charts", "0
135136
docs\distribution-charts\histograms.fsx = docs\distribution-charts\histograms.fsx
136137
docs\distribution-charts\pareto-chart.fsx = docs\distribution-charts\pareto-chart.fsx
137138
docs\distribution-charts\point-density.fsx = docs\distribution-charts\point-density.fsx
139+
docs\distribution-charts\residual.fsx = docs\distribution-charts\residual.fsx
138140
docs\distribution-charts\splom.fsx = docs\distribution-charts\splom.fsx
139141
docs\distribution-charts\violin-plots.fsx = docs\distribution-charts\violin-plots.fsx
140-
docs\distribution-charts\residual.fsx = docs\distribution-charts\residual.fsx
141142
EndProjectSection
142143
EndProject
143144
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "01_chart-layout", "01_chart-layout", "{C7D0EF67-9A18-49DD-AC79-944E384BD8D0}"
@@ -169,6 +170,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "00_general", "00_general",
169170
docs\general\chart-config.fsx = docs\general\chart-config.fsx
170171
docs\general\defaults.fsx = docs\general\defaults.fsx
171172
docs\general\display-options.fsx = docs\general\display-options.fsx
173+
docs\general\encoded-arrays.fsx = docs\general\encoded-arrays.fsx
172174
docs\general\image-export.fsx = docs\general\image-export.fsx
173175
docs\general\multi-arguments.fsx = docs\general\multi-arguments.fsx
174176
docs\general\styling-markers.fsx = docs\general\styling-markers.fsx

‎docs/3D-charts/3d-isosurface-plots.fsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ index: 7
1010
(*** hide ***)
1111

1212
(*** condition: prepare ***)
13-
#r "nuget: Newtonsoft.JSON, 13.0.1"
14-
#r "nuget: DynamicObj, 2.0.0"
13+
#r "nuget: Newtonsoft.JSON, 13.0.3"
14+
#r "nuget: DynamicObj, 7.0.1"
1515
#r "nuget: Giraffe.ViewEngine, 1.4.0"
1616
#r "../../src/Plotly.NET/bin/Release/netstandard2.0/Plotly.NET.dll"
1717

‎docs/_head.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@
2020
<meta name="twitter:image" content="{{root}}img/logo_meta_tags.png">
2121

2222
<link rel="shortcut icon" type="image/x-icon" href="{{root}}/img/favicon.ico">
23-
<script src="https://cdn.plot.ly/plotly-2.27.1.min.js"></script>
23+
<script src="https://cdn.plot.ly/plotly-2.28.0.min.js"></script>
2424
<script>MathJax = { tex: { inlineMath: [['$', '$'], ['\\(', '\\)']] } };</script>
2525
<script src="https://cdn.jsdelivr.net/npm/mathjax@3.2.0/es5/tex-svg.js"></script>

‎docs/_template.ipynb‎

Whitespace-only changes.

‎docs/categorical-charts/sankey.fsx‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,3 +79,31 @@ sankey1
7979
(***hide***)
8080
sankey1 |> GenericChart.toChartHTML
8181
(***include-it-raw***)
82+
83+
(**
84+
## Node alignment
85+
86+
The `NodeAlign` parameter controls how nodes are aligned horizontally. The available options are
87+
`Left`, `Right`, `Center`, and `Justify` (the default).
88+
89+
Use the `NodeAlign` parameter on `Chart.Sankey` to apply alignment via the convenience overload,
90+
or pass `Align` to `SankeyNodes.init` directly when building nodes manually:
91+
*)
92+
93+
let sankeyAligned =
94+
Chart.Sankey(
95+
nodeLabels = [ "Source A"; "Source B"; "Sink" ],
96+
linkedNodeIds = [ 0, 2; 1, 2 ],
97+
linkValues = [ 8; 4 ],
98+
NodeAlign = StyleParam.SankeyNodeAlign.Left,
99+
UseDefaults = false
100+
)
101+
102+
(*** condition: ipynb ***)
103+
#if IPYNB
104+
sankeyAligned
105+
#endif // IPYNB
106+
107+
(***hide***)
108+
sankeyAligned |> GenericChart.toChartHTML
109+
(***include-it-raw***)

0 commit comments

Comments
 (0)