@mui/x-charts 7.11.1 → 7.12.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (287) hide show
  1. package/BarChart/BarChart.js +0 -2
  2. package/BarChart/BarElement.d.ts +20 -20
  3. package/BarChart/BarElement.js +3 -3
  4. package/BarChart/BarLabel/BarLabel.d.ts +20 -20
  5. package/BarChart/BarLabel/BarLabelItem.js +2 -2
  6. package/BarChart/BarPlot.js +2 -2
  7. package/BarChart/extremums.d.ts +1 -1
  8. package/BarChart/formatter.d.ts +2 -2
  9. package/BarChart/formatter.js +1 -1
  10. package/BarChart/getColor.d.ts +3 -3
  11. package/BarChart/getColor.js +4 -3
  12. package/BarChart/legend.d.ts +1 -1
  13. package/BarChart/plugin.d.ts +2 -2
  14. package/CHANGELOG.md +178 -4
  15. package/ChartContainer/ChartContainer.d.ts +4 -15
  16. package/ChartContainer/ChartContainer.js +7 -9
  17. package/ChartContainer/useChartContainerProps.d.ts +56 -57
  18. package/ChartContainer/useChartContainerProps.js +16 -19
  19. package/ChartContainer/useDefaultizeAxis.d.ts +25 -26
  20. package/ChartsLegend/ChartsLegend.js +6 -6
  21. package/ChartsLegend/DefaultChartsLegend.d.ts +1 -1
  22. package/ChartsLegend/LegendPerItem.js +2 -2
  23. package/ChartsLegend/utils.d.ts +1 -1
  24. package/ChartsTooltip/ChartsAxisTooltipContent.js +4 -4
  25. package/ChartsTooltip/ChartsItemTooltipContent.js +4 -4
  26. package/ChartsTooltip/ChartsTooltip.d.ts +1 -1
  27. package/ChartsTooltip/ChartsTooltip.js +10 -10
  28. package/ChartsVoronoiHandler/ChartsVoronoiHandler.js +1 -1
  29. package/ChartsXAxis/ChartsXAxis.js +5 -5
  30. package/ChartsYAxis/ChartsYAxis.js +6 -6
  31. package/Gauge/GaugeReferenceArc.js +1 -1
  32. package/Gauge/GaugeValueArc.js +1 -1
  33. package/LineChart/AnimatedArea.d.ts +20 -20
  34. package/LineChart/AnimatedArea.js +1 -1
  35. package/LineChart/AnimatedLine.d.ts +20 -20
  36. package/LineChart/AnimatedLine.js +1 -1
  37. package/LineChart/AreaElement.js +2 -2
  38. package/LineChart/AreaPlot.js +1 -1
  39. package/LineChart/LineChart.js +0 -2
  40. package/LineChart/LineElement.js +2 -2
  41. package/LineChart/LinePlot.js +1 -1
  42. package/LineChart/MarkElement.js +1 -1
  43. package/LineChart/extremums.d.ts +1 -1
  44. package/LineChart/formatter.d.ts +2 -2
  45. package/LineChart/formatter.js +1 -1
  46. package/LineChart/getColor.d.ts +3 -3
  47. package/LineChart/getColor.js +4 -3
  48. package/LineChart/legend.d.ts +1 -1
  49. package/LineChart/plugin.d.ts +2 -2
  50. package/PieChart/PieArc.js +1 -1
  51. package/PieChart/PieArcLabel.js +1 -1
  52. package/PieChart/PieChart.js +0 -2
  53. package/PieChart/formatter.d.ts +2 -2
  54. package/PieChart/formatter.js +1 -1
  55. package/PieChart/getColor.d.ts +3 -2
  56. package/PieChart/getColor.js +4 -3
  57. package/PieChart/legend.d.ts +1 -1
  58. package/PieChart/plugin.d.ts +2 -2
  59. package/ResponsiveChartContainer/ResponsiveChartContainer.js +0 -2
  60. package/ResponsiveChartContainer/useResponsiveChartContainerProps.d.ts +2 -3
  61. package/ScatterChart/ScatterChart.js +0 -2
  62. package/ScatterChart/extremums.d.ts +1 -1
  63. package/ScatterChart/formatter.d.ts +2 -2
  64. package/ScatterChart/getColor.d.ts +3 -4
  65. package/ScatterChart/getColor.js +4 -3
  66. package/ScatterChart/legend.d.ts +1 -1
  67. package/ScatterChart/plugin.d.ts +2 -2
  68. package/SparkLineChart/SparkLineChart.js +0 -2
  69. package/context/CartesianProvider/CartesianProvider.d.ts +0 -9
  70. package/context/CartesianProvider/CartesianProvider.js +4 -2
  71. package/context/CartesianProvider/computeValue.d.ts +3 -2
  72. package/context/CartesianProvider/computeValue.js +1 -1
  73. package/context/CartesianProvider/defaultizeAxis.d.ts +25 -26
  74. package/context/CartesianProvider/getAxisExtremum.d.ts +3 -3
  75. package/context/PluginProvider/ColorProcessor.types.d.ts +8 -0
  76. package/context/PluginProvider/ExtremumGetter.types.d.ts +14 -0
  77. package/context/PluginProvider/ExtremumGetter.types.js +5 -0
  78. package/context/PluginProvider/Plugin.types.d.ts +25 -0
  79. package/context/PluginProvider/Plugin.types.js +5 -0
  80. package/context/PluginProvider/PluginContext.d.ts +4 -0
  81. package/context/PluginProvider/PluginContext.js +21 -0
  82. package/context/PluginProvider/PluginProvider.d.ts +4 -0
  83. package/context/{ColorProvider.js → PluginProvider/PluginProvider.js} +12 -11
  84. package/context/PluginProvider/SeriesFormatter.types.d.ts +21 -0
  85. package/context/PluginProvider/SeriesFormatter.types.js +5 -0
  86. package/context/PluginProvider/index.d.ts +10 -0
  87. package/context/PluginProvider/index.js +115 -0
  88. package/context/PluginProvider/mergePlugins.d.ts +36 -0
  89. package/context/PluginProvider/mergePlugins.js +37 -0
  90. package/context/PluginProvider/useColorProcessor.d.ts +4 -0
  91. package/context/PluginProvider/useColorProcessor.js +23 -0
  92. package/context/PluginProvider/useSeriesFormatter.d.ts +4 -0
  93. package/context/PluginProvider/useSeriesFormatter.js +23 -0
  94. package/context/PluginProvider/useXExtremumGetter.d.ts +4 -0
  95. package/context/PluginProvider/useXExtremumGetter.js +23 -0
  96. package/context/PluginProvider/useYExtremumGetter.d.ts +4 -0
  97. package/context/PluginProvider/useYExtremumGetter.js +23 -0
  98. package/context/SeriesProvider/Series.types.d.ts +26 -0
  99. package/context/SeriesProvider/Series.types.js +5 -0
  100. package/context/SeriesProvider/SeriesContext.d.ts +4 -0
  101. package/{hooks/useColor.js → context/SeriesProvider/SeriesContext.js} +7 -8
  102. package/context/SeriesProvider/SeriesProvider.d.ts +5 -0
  103. package/context/SeriesProvider/SeriesProvider.js +38 -0
  104. package/context/SeriesProvider/index.d.ts +12 -0
  105. package/context/SeriesProvider/index.js +49 -0
  106. package/context/SeriesProvider/processSeries.d.ts +18 -0
  107. package/context/SeriesProvider/processSeries.js +55 -0
  108. package/esm/BarChart/BarChart.js +0 -2
  109. package/esm/BarChart/BarElement.js +2 -2
  110. package/esm/BarChart/BarLabel/BarLabelItem.js +1 -1
  111. package/esm/BarChart/BarPlot.js +1 -2
  112. package/esm/BarChart/formatter.js +1 -1
  113. package/esm/BarChart/getColor.js +3 -2
  114. package/esm/ChartContainer/ChartContainer.js +7 -9
  115. package/esm/ChartContainer/useChartContainerProps.js +14 -19
  116. package/esm/ChartsLegend/ChartsLegend.js +2 -2
  117. package/esm/ChartsLegend/LegendPerItem.js +1 -1
  118. package/esm/ChartsTooltip/ChartsAxisTooltipContent.js +2 -2
  119. package/esm/ChartsTooltip/ChartsItemTooltipContent.js +2 -2
  120. package/esm/ChartsTooltip/ChartsTooltip.js +3 -3
  121. package/esm/ChartsVoronoiHandler/ChartsVoronoiHandler.js +1 -1
  122. package/esm/ChartsXAxis/ChartsXAxis.js +2 -2
  123. package/esm/ChartsYAxis/ChartsYAxis.js +2 -2
  124. package/esm/Gauge/GaugeReferenceArc.js +1 -1
  125. package/esm/Gauge/GaugeValueArc.js +1 -1
  126. package/esm/LineChart/AnimatedArea.js +1 -1
  127. package/esm/LineChart/AnimatedLine.js +1 -1
  128. package/esm/LineChart/AreaElement.js +1 -1
  129. package/esm/LineChart/AreaPlot.js +1 -1
  130. package/esm/LineChart/LineChart.js +0 -2
  131. package/esm/LineChart/LineElement.js +1 -1
  132. package/esm/LineChart/LinePlot.js +1 -1
  133. package/esm/LineChart/MarkElement.js +1 -1
  134. package/esm/LineChart/formatter.js +1 -1
  135. package/esm/LineChart/getColor.js +3 -2
  136. package/esm/PieChart/PieArc.js +1 -1
  137. package/esm/PieChart/PieArcLabel.js +1 -1
  138. package/esm/PieChart/PieChart.js +0 -2
  139. package/esm/PieChart/formatter.js +1 -1
  140. package/esm/PieChart/getColor.js +3 -2
  141. package/esm/ResponsiveChartContainer/ResponsiveChartContainer.js +0 -2
  142. package/esm/ScatterChart/ScatterChart.js +0 -2
  143. package/esm/ScatterChart/getColor.js +3 -2
  144. package/esm/SparkLineChart/SparkLineChart.js +0 -2
  145. package/esm/context/CartesianProvider/CartesianProvider.js +4 -2
  146. package/esm/context/CartesianProvider/computeValue.js +1 -1
  147. package/esm/context/PluginProvider/Plugin.types.js +1 -0
  148. package/esm/context/PluginProvider/PluginContext.js +13 -0
  149. package/esm/context/PluginProvider/PluginProvider.js +19 -0
  150. package/esm/context/PluginProvider/SeriesFormatter.types.js +1 -0
  151. package/esm/context/PluginProvider/index.js +10 -0
  152. package/esm/context/PluginProvider/mergePlugins.js +30 -0
  153. package/esm/context/PluginProvider/useColorProcessor.js +15 -0
  154. package/esm/context/PluginProvider/useSeriesFormatter.js +15 -0
  155. package/esm/context/PluginProvider/useXExtremumGetter.js +15 -0
  156. package/esm/context/PluginProvider/useYExtremumGetter.js +15 -0
  157. package/esm/context/SeriesProvider/Series.types.js +1 -0
  158. package/esm/context/SeriesProvider/SeriesContext.js +8 -0
  159. package/esm/context/SeriesProvider/SeriesProvider.js +31 -0
  160. package/esm/context/SeriesProvider/index.js +8 -0
  161. package/{modern/context/SeriesContextProvider.js → esm/context/SeriesProvider/processSeries.js} +9 -34
  162. package/esm/hooks/useReducedMotion.js +2 -2
  163. package/esm/hooks/useSeries.js +1 -1
  164. package/esm/internals/colorScale.js +1 -1
  165. package/esm/internals/components/ChartsAxesGradients/ChartsContinuousGradient.js +1 -1
  166. package/esm/internals/getCurve.js +1 -1
  167. package/esm/internals/getScale.js +1 -1
  168. package/esm/internals/index.js +2 -2
  169. package/esm/internals/stackSeries.js +1 -1
  170. package/esm/internals/useAnimatedPath.js +1 -1
  171. package/esm/models/index.js +0 -1
  172. package/hooks/useReducedMotion.js +2 -2
  173. package/hooks/useSeries.d.ts +1 -1
  174. package/hooks/useSeries.js +2 -2
  175. package/hooks/useTicks.d.ts +1 -1
  176. package/index.js +1 -1
  177. package/internals/colorScale.d.ts +3 -3
  178. package/internals/colorScale.js +1 -1
  179. package/internals/components/ChartsAxesGradients/ChartsContinuousGradient.js +1 -1
  180. package/internals/defaultizeColor.d.ts +1 -1
  181. package/internals/getCurve.d.ts +1 -1
  182. package/internals/getCurve.js +1 -1
  183. package/internals/getScale.js +1 -1
  184. package/internals/index.d.ts +2 -2
  185. package/internals/index.js +16 -16
  186. package/internals/isBandScale.d.ts +1 -1
  187. package/internals/stackSeries.d.ts +1 -1
  188. package/internals/stackSeries.js +1 -1
  189. package/internals/useAnimatedPath.js +1 -1
  190. package/models/axis.d.ts +2 -2
  191. package/models/index.d.ts +0 -1
  192. package/models/index.js +0 -11
  193. package/models/seriesType/config.d.ts +0 -26
  194. package/models/seriesType/pie.d.ts +1 -1
  195. package/models/z-axis.d.ts +1 -1
  196. package/modern/BarChart/BarChart.js +0 -2
  197. package/modern/BarChart/BarElement.js +2 -2
  198. package/modern/BarChart/BarLabel/BarLabelItem.js +1 -1
  199. package/modern/BarChart/BarPlot.js +1 -2
  200. package/modern/BarChart/formatter.js +1 -1
  201. package/modern/BarChart/getColor.js +3 -2
  202. package/modern/ChartContainer/ChartContainer.js +7 -9
  203. package/modern/ChartContainer/useChartContainerProps.js +14 -19
  204. package/modern/ChartsLegend/ChartsLegend.js +2 -2
  205. package/modern/ChartsLegend/LegendPerItem.js +1 -1
  206. package/modern/ChartsTooltip/ChartsAxisTooltipContent.js +2 -2
  207. package/modern/ChartsTooltip/ChartsItemTooltipContent.js +2 -2
  208. package/modern/ChartsTooltip/ChartsTooltip.js +3 -3
  209. package/modern/ChartsVoronoiHandler/ChartsVoronoiHandler.js +1 -1
  210. package/modern/ChartsXAxis/ChartsXAxis.js +2 -2
  211. package/modern/ChartsYAxis/ChartsYAxis.js +2 -2
  212. package/modern/Gauge/GaugeReferenceArc.js +1 -1
  213. package/modern/Gauge/GaugeValueArc.js +1 -1
  214. package/modern/LineChart/AnimatedArea.js +1 -1
  215. package/modern/LineChart/AnimatedLine.js +1 -1
  216. package/modern/LineChart/AreaElement.js +1 -1
  217. package/modern/LineChart/AreaPlot.js +1 -1
  218. package/modern/LineChart/LineChart.js +0 -2
  219. package/modern/LineChart/LineElement.js +1 -1
  220. package/modern/LineChart/LinePlot.js +1 -1
  221. package/modern/LineChart/MarkElement.js +1 -1
  222. package/modern/LineChart/formatter.js +1 -1
  223. package/modern/LineChart/getColor.js +3 -2
  224. package/modern/PieChart/PieArc.js +1 -1
  225. package/modern/PieChart/PieArcLabel.js +1 -1
  226. package/modern/PieChart/PieChart.js +0 -2
  227. package/modern/PieChart/formatter.js +1 -1
  228. package/modern/PieChart/getColor.js +3 -2
  229. package/modern/ResponsiveChartContainer/ResponsiveChartContainer.js +0 -2
  230. package/modern/ScatterChart/ScatterChart.js +0 -2
  231. package/modern/ScatterChart/getColor.js +3 -2
  232. package/modern/SparkLineChart/SparkLineChart.js +0 -2
  233. package/modern/context/CartesianProvider/CartesianProvider.js +4 -2
  234. package/modern/context/CartesianProvider/computeValue.js +1 -1
  235. package/modern/context/PluginProvider/ColorProcessor.types.js +1 -0
  236. package/modern/context/PluginProvider/ExtremumGetter.types.js +1 -0
  237. package/modern/context/PluginProvider/Plugin.types.js +1 -0
  238. package/modern/context/PluginProvider/PluginContext.js +13 -0
  239. package/modern/context/PluginProvider/PluginProvider.js +19 -0
  240. package/modern/context/PluginProvider/SeriesFormatter.types.js +1 -0
  241. package/modern/context/PluginProvider/index.js +10 -0
  242. package/modern/context/PluginProvider/mergePlugins.js +30 -0
  243. package/modern/context/PluginProvider/useColorProcessor.js +15 -0
  244. package/modern/context/PluginProvider/useSeriesFormatter.js +15 -0
  245. package/modern/context/PluginProvider/useXExtremumGetter.js +15 -0
  246. package/modern/context/PluginProvider/useYExtremumGetter.js +15 -0
  247. package/modern/context/SeriesProvider/Series.types.js +1 -0
  248. package/modern/context/SeriesProvider/SeriesContext.js +8 -0
  249. package/modern/context/SeriesProvider/SeriesProvider.js +31 -0
  250. package/modern/context/SeriesProvider/index.js +8 -0
  251. package/{esm/context/SeriesContextProvider.js → modern/context/SeriesProvider/processSeries.js} +9 -34
  252. package/modern/hooks/useReducedMotion.js +2 -2
  253. package/modern/hooks/useSeries.js +1 -1
  254. package/modern/index.js +1 -1
  255. package/modern/internals/colorScale.js +1 -1
  256. package/modern/internals/components/ChartsAxesGradients/ChartsContinuousGradient.js +1 -1
  257. package/modern/internals/getCurve.js +1 -1
  258. package/modern/internals/getScale.js +1 -1
  259. package/modern/internals/index.js +2 -2
  260. package/modern/internals/stackSeries.js +1 -1
  261. package/modern/internals/useAnimatedPath.js +1 -1
  262. package/modern/models/index.js +0 -1
  263. package/package.json +6 -23
  264. package/ChartContainer/defaultPlugins.d.ts +0 -2
  265. package/ChartContainer/defaultPlugins.js +0 -11
  266. package/ChartContainer/useChartContainerHooks.d.ts +0 -11
  267. package/ChartContainer/useChartContainerHooks.js +0 -34
  268. package/ChartContainer/usePluginsMerge.d.ts +0 -9
  269. package/ChartContainer/usePluginsMerge.js +0 -39
  270. package/context/ColorProvider.d.ts +0 -12
  271. package/context/SeriesContextProvider.d.ts +0 -36
  272. package/context/SeriesContextProvider.js +0 -81
  273. package/esm/ChartContainer/defaultPlugins.js +0 -5
  274. package/esm/ChartContainer/useChartContainerHooks.js +0 -24
  275. package/esm/ChartContainer/usePluginsMerge.js +0 -31
  276. package/esm/context/ColorProvider.js +0 -16
  277. package/esm/hooks/useColor.js +0 -9
  278. package/hooks/useColor.d.ts +0 -4
  279. package/models/plugin.d.ts +0 -19
  280. package/modern/ChartContainer/defaultPlugins.js +0 -5
  281. package/modern/ChartContainer/useChartContainerHooks.js +0 -24
  282. package/modern/ChartContainer/usePluginsMerge.js +0 -31
  283. package/modern/context/ColorProvider.js +0 -16
  284. package/modern/hooks/useColor.js +0 -9
  285. /package/{models/plugin.js → context/PluginProvider/ColorProcessor.types.js} +0 -0
  286. /package/esm/{models/plugin.js → context/PluginProvider/ColorProcessor.types.js} +0 -0
  287. /package/{modern/models/plugin.js → esm/context/PluginProvider/ExtremumGetter.types.js} +0 -0
@@ -1,5 +1,5 @@
1
1
  import _extends from "@babel/runtime/helpers/esm/extends";
2
- import { stack as d3Stack } from 'd3-shape';
2
+ import { stack as d3Stack } from '@mui/x-charts-vendor/d3-shape';
3
3
  import { getStackingGroups } from '../internals/stackSeries';
4
4
  import { defaultizeValueFormatter } from '../internals/defaultizeValueFormatter';
5
5
  let warnedOnce = false;
@@ -1,4 +1,4 @@
1
- export default function getColor(series, xAxis, yAxis) {
1
+ const getColor = (series, xAxis, yAxis) => {
2
2
  const yColorScale = yAxis?.colorScale;
3
3
  const xColorScale = xAxis?.colorScale;
4
4
  if (yColorScale) {
@@ -22,4 +22,5 @@ export default function getColor(series, xAxis, yAxis) {
22
22
  };
23
23
  }
24
24
  return () => series.color;
25
- }
25
+ };
26
+ export default getColor;
@@ -3,7 +3,7 @@ import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWith
3
3
  const _excluded = ["classes", "color", "cornerRadius", "dataIndex", "endAngle", "id", "innerRadius", "isFaded", "isHighlighted", "onClick", "outerRadius", "paddingAngle", "startAngle", "highlightScope"];
4
4
  import * as React from 'react';
5
5
  import PropTypes from 'prop-types';
6
- import { arc as d3Arc } from 'd3-shape';
6
+ import { arc as d3Arc } from '@mui/x-charts-vendor/d3-shape';
7
7
  import { animated, to } from '@react-spring/web';
8
8
  import composeClasses from '@mui/utils/composeClasses';
9
9
  import generateUtilityClass from '@mui/utils/generateUtilityClass';
@@ -4,7 +4,7 @@ const _excluded = ["id", "classes", "color", "startAngle", "endAngle", "paddingA
4
4
  import * as React from 'react';
5
5
  import PropTypes from 'prop-types';
6
6
  import { animated, to } from '@react-spring/web';
7
- import { arc as d3Arc } from 'd3-shape';
7
+ import { arc as d3Arc } from '@mui/x-charts-vendor/d3-shape';
8
8
  import composeClasses from '@mui/utils/composeClasses';
9
9
  import generateUtilityClass from '@mui/utils/generateUtilityClass';
10
10
  import { styled } from '@mui/material/styles';
@@ -284,7 +284,6 @@ process.env.NODE_ENV !== "production" ? PieChart.propTypes = {
284
284
  * An array of [[AxisConfig]] objects.
285
285
  */
286
286
  xAxis: PropTypes.arrayOf(PropTypes.shape({
287
- axisId: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
288
287
  classes: PropTypes.object,
289
288
  colorMap: PropTypes.oneOfType([PropTypes.shape({
290
289
  colors: PropTypes.arrayOf(PropTypes.string).isRequired,
@@ -337,7 +336,6 @@ process.env.NODE_ENV !== "production" ? PieChart.propTypes = {
337
336
  * An array of [[AxisConfig]] objects.
338
337
  */
339
338
  yAxis: PropTypes.arrayOf(PropTypes.shape({
340
- axisId: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
341
339
  classes: PropTypes.object,
342
340
  colorMap: PropTypes.oneOfType([PropTypes.shape({
343
341
  colors: PropTypes.arrayOf(PropTypes.string).isRequired,
@@ -1,5 +1,5 @@
1
1
  import _extends from "@babel/runtime/helpers/esm/extends";
2
- import { pie as d3Pie } from 'd3-shape';
2
+ import { pie as d3Pie } from '@mui/x-charts-vendor/d3-shape';
3
3
  import { getLabel } from '../internals/getLabel';
4
4
  const getSortingComparator = (comparator = 'none') => {
5
5
  if (typeof comparator === 'function') {
@@ -1,5 +1,6 @@
1
- export default function getColor(series) {
1
+ const getColor = series => {
2
2
  return dataIndex => {
3
3
  return series.data[dataIndex].color;
4
4
  };
5
- }
5
+ };
6
+ export default getColor;
@@ -96,7 +96,6 @@ process.env.NODE_ENV !== "production" ? ResponsiveChartContainer.propTypes = {
96
96
  * An array of [[AxisConfig]] objects.
97
97
  */
98
98
  xAxis: PropTypes.arrayOf(PropTypes.shape({
99
- axisId: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
100
99
  classes: PropTypes.object,
101
100
  colorMap: PropTypes.oneOfType([PropTypes.shape({
102
101
  colors: PropTypes.arrayOf(PropTypes.string).isRequired,
@@ -149,7 +148,6 @@ process.env.NODE_ENV !== "production" ? ResponsiveChartContainer.propTypes = {
149
148
  * An array of [[AxisConfig]] objects.
150
149
  */
151
150
  yAxis: PropTypes.arrayOf(PropTypes.shape({
152
- axisId: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
153
151
  classes: PropTypes.object,
154
152
  colorMap: PropTypes.oneOfType([PropTypes.shape({
155
153
  colors: PropTypes.arrayOf(PropTypes.string).isRequired,
@@ -221,7 +221,6 @@ process.env.NODE_ENV !== "production" ? ScatterChart.propTypes = {
221
221
  * An array of [[AxisConfig]] objects.
222
222
  */
223
223
  xAxis: PropTypes.arrayOf(PropTypes.shape({
224
- axisId: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
225
224
  classes: PropTypes.object,
226
225
  colorMap: PropTypes.oneOfType([PropTypes.shape({
227
226
  colors: PropTypes.arrayOf(PropTypes.string).isRequired,
@@ -274,7 +273,6 @@ process.env.NODE_ENV !== "production" ? ScatterChart.propTypes = {
274
273
  * An array of [[AxisConfig]] objects.
275
274
  */
276
275
  yAxis: PropTypes.arrayOf(PropTypes.shape({
277
- axisId: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
278
276
  classes: PropTypes.object,
279
277
  colorMap: PropTypes.oneOfType([PropTypes.shape({
280
278
  colors: PropTypes.arrayOf(PropTypes.string).isRequired,
@@ -1,4 +1,4 @@
1
- export default function getColor(series, xAxis, yAxis, zAxis) {
1
+ const getColor = (series, xAxis, yAxis, zAxis) => {
2
2
  const zColorScale = zAxis?.colorScale;
3
3
  const yColorScale = yAxis?.colorScale;
4
4
  const xColorScale = xAxis?.colorScale;
@@ -39,4 +39,5 @@ export default function getColor(series, xAxis, yAxis, zAxis) {
39
39
  };
40
40
  }
41
41
  return () => series.color;
42
- }
42
+ };
43
+ export default getColor;
@@ -245,7 +245,6 @@ process.env.NODE_ENV !== "production" ? SparkLineChart.propTypes = {
245
245
  * Notice it is a single [[AxisConfig]] object, not an array of configuration.
246
246
  */
247
247
  xAxis: PropTypes.shape({
248
- axisId: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
249
248
  classes: PropTypes.object,
250
249
  colorMap: PropTypes.oneOfType([PropTypes.shape({
251
250
  colors: PropTypes.arrayOf(PropTypes.string).isRequired,
@@ -297,7 +296,6 @@ process.env.NODE_ENV !== "production" ? SparkLineChart.propTypes = {
297
296
  * Notice it is a single [[AxisConfig]] object, not an array of configuration.
298
297
  */
299
298
  yAxis: PropTypes.shape({
300
- axisId: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
301
299
  classes: PropTypes.object,
302
300
  colorMap: PropTypes.oneOfType([PropTypes.shape({
303
301
  colors: PropTypes.arrayOf(PropTypes.string).isRequired,
@@ -3,18 +3,20 @@ import { useDrawingArea } from '../../hooks/useDrawingArea';
3
3
  import { useSeries } from '../../hooks/useSeries';
4
4
  import { CartesianContext } from './CartesianContext';
5
5
  import { computeValue } from './computeValue';
6
+ import { useXExtremumGetter } from '../PluginProvider/useXExtremumGetter';
7
+ import { useYExtremumGetter } from '../PluginProvider';
6
8
  import { jsx as _jsx } from "react/jsx-runtime";
7
9
  function CartesianContextProvider(props) {
8
10
  const {
9
11
  xAxis,
10
12
  yAxis,
11
13
  dataset,
12
- xExtremumGetters,
13
- yExtremumGetters,
14
14
  children
15
15
  } = props;
16
16
  const formattedSeries = useSeries();
17
17
  const drawingArea = useDrawingArea();
18
+ const xExtremumGetters = useXExtremumGetter();
19
+ const yExtremumGetters = useYExtremumGetter();
18
20
  const xValues = React.useMemo(() => computeValue({
19
21
  drawingArea,
20
22
  formattedSeries,
@@ -1,5 +1,5 @@
1
1
  import _extends from "@babel/runtime/helpers/esm/extends";
2
- import { scaleBand, scalePoint, scaleTime } from 'd3-scale';
2
+ import { scaleBand, scalePoint, scaleTime } from '@mui/x-charts-vendor/d3-scale';
3
3
  import { isBandScaleConfig, isPointScaleConfig } from '../../models/axis';
4
4
  import { getColorScale, getOrdinalColorScale } from '../../internals/colorScale';
5
5
  import { getTickNumber } from '../../hooks/useTicks';
@@ -0,0 +1 @@
1
+ export {};
@@ -0,0 +1,13 @@
1
+ import * as React from 'react';
2
+ export const PluginContext = /*#__PURE__*/React.createContext({
3
+ isInitialized: false,
4
+ data: {
5
+ colorProcessors: {},
6
+ seriesFormatters: {},
7
+ xExtremumGetters: {},
8
+ yExtremumGetters: {}
9
+ }
10
+ });
11
+ if (process.env.NODE_ENV !== 'production') {
12
+ PluginContext.displayName = 'PluginContext';
13
+ }
@@ -0,0 +1,19 @@
1
+ import * as React from 'react';
2
+ import { PluginContext } from './PluginContext';
3
+ import { mergePlugins } from './mergePlugins';
4
+ import { jsx as _jsx } from "react/jsx-runtime";
5
+ function PluginProvider(props) {
6
+ const {
7
+ children,
8
+ plugins
9
+ } = props;
10
+ const formattedSeries = React.useMemo(() => ({
11
+ isInitialized: true,
12
+ data: mergePlugins(plugins)
13
+ }), [plugins]);
14
+ return /*#__PURE__*/_jsx(PluginContext.Provider, {
15
+ value: formattedSeries,
16
+ children: children
17
+ });
18
+ }
19
+ export { PluginProvider };
@@ -0,0 +1,10 @@
1
+ export * from './PluginProvider';
2
+ export * from './Plugin.types';
3
+ export * from './PluginContext';
4
+ export * from './ColorProcessor.types';
5
+ export * from './SeriesFormatter.types';
6
+ export * from './ExtremumGetter.types';
7
+ export * from './useColorProcessor';
8
+ export * from './useSeriesFormatter';
9
+ export * from './useXExtremumGetter';
10
+ export * from './useYExtremumGetter';
@@ -0,0 +1,30 @@
1
+ import { plugin as barPlugin } from '../../BarChart/plugin';
2
+ import { plugin as scatterPlugin } from '../../ScatterChart/plugin';
3
+ import { plugin as linePlugin } from '../../LineChart/plugin';
4
+ import { plugin as piePlugin } from '../../PieChart/plugin';
5
+ export const defaultPlugins = [barPlugin, scatterPlugin, linePlugin, piePlugin];
6
+ export function mergePlugins(plugins) {
7
+ const defaultizedPlugins = plugins ?? defaultPlugins;
8
+ const seriesFormatters = {};
9
+ const colorProcessors = {};
10
+ const xExtremumGetters = {};
11
+ const yExtremumGetters = {};
12
+ for (let i = 0; i < defaultizedPlugins.length; i += 1) {
13
+ const plugin = defaultizedPlugins[i];
14
+ const seriesType = plugin.seriesType;
15
+ seriesFormatters[seriesType] = plugin.seriesFormatter;
16
+ colorProcessors[seriesType] = plugin.colorProcessor;
17
+ if (plugin.xExtremumGetter) {
18
+ xExtremumGetters[seriesType] = plugin.xExtremumGetter;
19
+ }
20
+ if (plugin.yExtremumGetter) {
21
+ yExtremumGetters[seriesType] = plugin.yExtremumGetter;
22
+ }
23
+ }
24
+ return {
25
+ seriesFormatters,
26
+ colorProcessors,
27
+ xExtremumGetters,
28
+ yExtremumGetters
29
+ };
30
+ }
@@ -0,0 +1,15 @@
1
+ import * as React from 'react';
2
+ import { PluginContext } from './PluginContext';
3
+ export function useColorProcessor(seriesType) {
4
+ const {
5
+ isInitialized,
6
+ data
7
+ } = React.useContext(PluginContext);
8
+ if (!isInitialized) {
9
+ throw new Error(['MUI X: Could not find the plugin context.', 'It looks like you rendered your component outside of a ChartsContainer parent component.'].join('\n'));
10
+ }
11
+ if (!seriesType) {
12
+ return data.colorProcessors;
13
+ }
14
+ return data.colorProcessors[seriesType];
15
+ }
@@ -0,0 +1,15 @@
1
+ import * as React from 'react';
2
+ import { PluginContext } from './PluginContext';
3
+ export function useSeriesFormatter(seriesType) {
4
+ const {
5
+ isInitialized,
6
+ data
7
+ } = React.useContext(PluginContext);
8
+ if (!isInitialized) {
9
+ throw new Error(['MUI X: Could not find the plugin context.', 'It looks like you rendered your component outside of a ChartsContainer parent component.'].join('\n'));
10
+ }
11
+ if (!seriesType) {
12
+ return data.seriesFormatters;
13
+ }
14
+ return data.seriesFormatters[seriesType];
15
+ }
@@ -0,0 +1,15 @@
1
+ import * as React from 'react';
2
+ import { PluginContext } from './PluginContext';
3
+ export function useXExtremumGetter(seriesType) {
4
+ const {
5
+ isInitialized,
6
+ data
7
+ } = React.useContext(PluginContext);
8
+ if (!isInitialized) {
9
+ throw new Error(['MUI X: Could not find the plugin context.', 'It looks like you rendered your component outside of a ChartsContainer parent component.'].join('\n'));
10
+ }
11
+ if (!seriesType) {
12
+ return data.xExtremumGetters;
13
+ }
14
+ return data.xExtremumGetters[seriesType];
15
+ }
@@ -0,0 +1,15 @@
1
+ import * as React from 'react';
2
+ import { PluginContext } from './PluginContext';
3
+ export function useYExtremumGetter(seriesType) {
4
+ const {
5
+ isInitialized,
6
+ data
7
+ } = React.useContext(PluginContext);
8
+ if (!isInitialized) {
9
+ throw new Error(['MUI X: Could not find the plugin context.', 'It looks like you rendered your component outside of a ChartsContainer parent component.'].join('\n'));
10
+ }
11
+ if (!seriesType) {
12
+ return data.yExtremumGetters;
13
+ }
14
+ return data.yExtremumGetters[seriesType];
15
+ }
@@ -0,0 +1 @@
1
+ export {};
@@ -0,0 +1,8 @@
1
+ import * as React from 'react';
2
+ export const SeriesContext = /*#__PURE__*/React.createContext({
3
+ isInitialized: false,
4
+ data: {}
5
+ });
6
+ if (process.env.NODE_ENV !== 'production') {
7
+ SeriesContext.displayName = 'SeriesContext';
8
+ }
@@ -0,0 +1,31 @@
1
+ import * as React from 'react';
2
+ import { useTheme } from '@mui/material/styles';
3
+ import { blueberryTwilightPalette } from '../../colorPalettes';
4
+ import { SeriesContext } from './SeriesContext';
5
+ import { preprocessSeries } from './processSeries';
6
+ import { useSeriesFormatter } from '../PluginProvider';
7
+ import { jsx as _jsx } from "react/jsx-runtime";
8
+ function SeriesProvider(props) {
9
+ const {
10
+ series,
11
+ dataset,
12
+ colors = blueberryTwilightPalette,
13
+ children
14
+ } = props;
15
+ const seriesFormatters = useSeriesFormatter();
16
+ const theme = useTheme();
17
+ const formattedSeries = React.useMemo(() => ({
18
+ isInitialized: true,
19
+ data: preprocessSeries({
20
+ series,
21
+ colors: typeof colors === 'function' ? colors(theme.palette.mode) : colors,
22
+ seriesFormatters,
23
+ dataset: dataset
24
+ })
25
+ }), [series, colors, theme.palette.mode, seriesFormatters, dataset]);
26
+ return /*#__PURE__*/_jsx(SeriesContext.Provider, {
27
+ value: formattedSeries,
28
+ children: children
29
+ });
30
+ }
31
+ export { SeriesProvider };
@@ -0,0 +1,8 @@
1
+ import { preprocessSeries } from './processSeries';
2
+ export * from './SeriesProvider';
3
+ export * from './SeriesContext';
4
+ export * from './Series.types';
5
+ const seriesProviderUtils = {
6
+ preprocessSeries
7
+ };
8
+ export { seriesProviderUtils };
@@ -1,25 +1,19 @@
1
1
  import _extends from "@babel/runtime/helpers/esm/extends";
2
- import * as React from 'react';
3
- import { useTheme } from '@mui/material/styles';
4
- import { defaultizeColor } from '../internals/defaultizeColor';
5
- import { blueberryTwilightPalette } from '../colorPalettes';
6
- import { jsx as _jsx } from "react/jsx-runtime";
7
- export const SeriesContext = /*#__PURE__*/React.createContext({
8
- isInitialized: false,
9
- data: {}
10
- });
11
- if (process.env.NODE_ENV !== 'production') {
12
- SeriesContext.displayName = 'SeriesContext';
13
- }
2
+ import { defaultizeColor } from '../../internals/defaultizeColor';
14
3
  /**
15
4
  * This methods is the interface between what the developer is providing and what components receives
16
5
  * To simplify the components behaviors, it groups series by type, such that LinePlots props are not updated if some line data are modified
17
6
  * It also add defaultized values such as the ids, colors
18
- * @param series The array of series provided by devs
7
+ * @param series The array of series provided by the developer
19
8
  * @param colors The color palette used to defaultize series colors
20
9
  * @returns An object structuring all the series by type.
21
10
  */
22
- const preprocessSeries = (series, colors, seriesFormatters, dataset) => {
11
+ export const preprocessSeries = ({
12
+ series,
13
+ colors,
14
+ seriesFormatters,
15
+ dataset
16
+ }) => {
23
17
  // Group series by type
24
18
  const seriesGroups = {};
25
19
  series.forEach((seriesData, seriesIndex) => {
@@ -50,23 +44,4 @@ const preprocessSeries = (series, colors, seriesFormatters, dataset) => {
50
44
  }
51
45
  });
52
46
  return formattedSeries;
53
- };
54
- function SeriesContextProvider(props) {
55
- const {
56
- series,
57
- dataset,
58
- colors = blueberryTwilightPalette,
59
- seriesFormatters,
60
- children
61
- } = props;
62
- const theme = useTheme();
63
- const formattedSeries = React.useMemo(() => ({
64
- isInitialized: true,
65
- data: preprocessSeries(series, typeof colors === 'function' ? colors(theme.palette.mode) : colors, seriesFormatters, dataset)
66
- }), [series, colors, theme.palette.mode, seriesFormatters, dataset]);
67
- return /*#__PURE__*/_jsx(SeriesContext.Provider, {
68
- value: formattedSeries,
69
- children: children
70
- });
71
- }
72
- export { SeriesContextProvider };
47
+ };
@@ -19,10 +19,10 @@ export const useReducedMotion = () => {
19
19
  return () => {};
20
20
  }
21
21
  const mql = window.matchMedia('(prefers-reduced-motion)');
22
- const handleMediaChange = e => {
22
+ const handleMediaChange = event => {
23
23
  Globals.assign({
24
24
  // Modification such the react-spring implementation such that this hook can remove animation but never activate animation.
25
- skipAnimation: e.matches || undefined
25
+ skipAnimation: event.matches || undefined
26
26
  });
27
27
  };
28
28
  handleMediaChange(mql);
@@ -1,5 +1,5 @@
1
1
  import * as React from 'react';
2
- import { SeriesContext } from '../context/SeriesContextProvider';
2
+ import { SeriesContext } from '../context/SeriesProvider';
3
3
 
4
4
  /**
5
5
  * Get access to the internal state of series.
package/modern/index.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * @mui/x-charts v7.11.1
2
+ * @mui/x-charts v7.12.1
3
3
  *
4
4
  * @license MIT
5
5
  * This source code is licensed under the MIT license found in the
@@ -1,4 +1,4 @@
1
- import { scaleOrdinal, scaleThreshold, scaleSequential } from 'd3-scale';
1
+ import { scaleOrdinal, scaleThreshold, scaleSequential } from '@mui/x-charts-vendor/d3-scale';
2
2
  export function getSequentialColorScale(config) {
3
3
  if (config.type === 'piecewise') {
4
4
  return scaleThreshold(config.thresholds, config.colors);
@@ -1,5 +1,5 @@
1
1
  import * as React from 'react';
2
- import { interpolateDate, interpolateNumber } from 'd3-interpolate';
2
+ import { interpolateDate, interpolateNumber } from '@mui/x-charts-vendor/d3-interpolate';
3
3
  import { jsx as _jsx } from "react/jsx-runtime";
4
4
  const PX_PRECISION = 10;
5
5
  export default function ChartsContinuousGradient(props) {
@@ -1,4 +1,4 @@
1
- import { curveCatmullRom, curveLinear, curveMonotoneX, curveMonotoneY, curveNatural, curveStep, curveStepAfter, curveStepBefore } from 'd3-shape';
1
+ import { curveCatmullRom, curveLinear, curveMonotoneX, curveMonotoneY, curveNatural, curveStep, curveStepAfter, curveStepBefore } from '@mui/x-charts-vendor/d3-shape';
2
2
  export default function getCurveFactory(curveType) {
3
3
  switch (curveType) {
4
4
  case 'catmullRom':
@@ -1,4 +1,4 @@
1
- import { scaleLog, scalePow, scaleSqrt, scaleTime, scaleUtc, scaleLinear } from 'd3-scale';
1
+ import { scaleLog, scalePow, scaleSqrt, scaleTime, scaleUtc, scaleLinear } from '@mui/x-charts-vendor/d3-scale';
2
2
  export function getScale(scaleType, domain, range) {
3
3
  switch (scaleType) {
4
4
  case 'log':
@@ -25,10 +25,10 @@ export * from './isDefined';
25
25
 
26
26
  export * from '../context/CartesianProvider';
27
27
  export * from '../context/DrawingProvider';
28
- export * from '../context/ColorProvider';
29
28
  export * from '../context/InteractionProvider';
30
- export * from '../context/SeriesContextProvider';
29
+ export * from '../context/SeriesProvider';
31
30
  export * from '../context/ZAxisContextProvider';
31
+ export * from '../context/PluginProvider';
32
32
  // series configuration
33
33
  export * from '../models/seriesType/config';
34
34
  export * from '../models/seriesType/common';
@@ -1,4 +1,4 @@
1
- import { stackOrderAppearance as d3StackOrderAppearance, stackOrderAscending as d3StackOrderAscending, stackOrderDescending as d3StackOrderDescending, stackOrderInsideOut as d3StackOrderInsideOut, stackOrderNone as d3StackOrderNone, stackOrderReverse as d3StackOrderReverse, stackOffsetExpand as d3StackOffsetExpand, stackOffsetDiverging as d3StackOffsetDiverging, stackOffsetNone as d3StackOffsetNone, stackOffsetSilhouette as d3StackOffsetSilhouette, stackOffsetWiggle as d3StackOffsetWiggle } from 'd3-shape';
1
+ import { stackOrderAppearance as d3StackOrderAppearance, stackOrderAscending as d3StackOrderAscending, stackOrderDescending as d3StackOrderDescending, stackOrderInsideOut as d3StackOrderInsideOut, stackOrderNone as d3StackOrderNone, stackOrderReverse as d3StackOrderReverse, stackOffsetExpand as d3StackOffsetExpand, stackOffsetDiverging as d3StackOffsetDiverging, stackOffsetNone as d3StackOffsetNone, stackOffsetSilhouette as d3StackOffsetSilhouette, stackOffsetWiggle as d3StackOffsetWiggle } from '@mui/x-charts-vendor/d3-shape';
2
2
  export const StackOrder = {
3
3
  /**
4
4
  * Series order such that the earliest series (according to the maximum value) is at the bottom.
@@ -1,5 +1,5 @@
1
1
  import * as React from 'react';
2
- import { interpolateString } from 'd3-interpolate';
2
+ import { interpolateString } from '@mui/x-charts-vendor/d3-interpolate';
3
3
  import { useSpring, to } from '@react-spring/web';
4
4
  function usePrevious(value) {
5
5
  const ref = React.useRef(null);
@@ -1,5 +1,4 @@
1
1
  export * from './seriesType';
2
2
  export * from './layout';
3
3
  export * from './stacking';
4
- export * from './plugin';
5
4
  export {};
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@mui/x-charts",
3
- "version": "7.11.1",
3
+ "version": "7.12.1",
4
4
  "description": "The community edition of the Charts components (MUI X).",
5
5
  "author": "MUI Team",
6
6
  "main": "./index.js",
@@ -29,19 +29,14 @@
29
29
  "directory": "packages/x-charts"
30
30
  },
31
31
  "dependencies": {
32
- "@babel/runtime": "^7.24.8",
33
- "@mui/base": "^5.0.0-beta.40",
32
+ "@babel/runtime": "^7.25.0",
34
33
  "@mui/system": "^5.16.5",
35
34
  "@mui/utils": "^5.16.5",
36
- "@react-spring/rafz": "^9.7.3",
37
- "@react-spring/web": "^9.7.3",
35
+ "@react-spring/rafz": "^9.7.4",
36
+ "@react-spring/web": "^9.7.4",
38
37
  "clsx": "^2.1.1",
39
- "d3-color": "^3.1.0",
40
- "d3-delaunay": "^6.0.4",
41
- "d3-interpolate": "^3.0.1",
42
- "d3-scale": "^4.0.2",
43
- "d3-shape": "^3.2.0",
44
- "prop-types": "^15.8.1"
38
+ "prop-types": "^15.8.1",
39
+ "@mui/x-charts-vendor": "7.12.1"
45
40
  },
46
41
  "peerDependencies": {
47
42
  "@emotion/react": "^11.9.0",
@@ -58,18 +53,6 @@
58
53
  "optional": true
59
54
  }
60
55
  },
61
- "exports": {
62
- ".": {
63
- "types": "./index.d.ts",
64
- "import": "./esm/index.js",
65
- "default": "./esm/index.js"
66
- },
67
- "./*": {
68
- "types": "./*/index.d.ts",
69
- "import": "./esm/*/index.js",
70
- "default": "./esm/*/index.js"
71
- }
72
- },
73
56
  "engines": {
74
57
  "node": ">=14.0.0"
75
58
  },
@@ -1,2 +0,0 @@
1
- import { ChartsPluginType } from '../models';
2
- export declare const defaultPlugins: ChartsPluginType<'bar' | 'scatter' | 'line' | 'pie'>[];
@@ -1,11 +0,0 @@
1
- "use strict";
2
-
3
- Object.defineProperty(exports, "__esModule", {
4
- value: true
5
- });
6
- exports.defaultPlugins = void 0;
7
- var _plugin = require("../BarChart/plugin");
8
- var _plugin2 = require("../ScatterChart/plugin");
9
- var _plugin3 = require("../LineChart/plugin");
10
- var _plugin4 = require("../PieChart/plugin");
11
- const defaultPlugins = exports.defaultPlugins = [_plugin.plugin, _plugin2.plugin, _plugin3.plugin, _plugin4.plugin];
@@ -1,11 +0,0 @@
1
- import * as React from 'react';
2
- import { ChartsPluginType } from '../models';
3
- import { ChartSeriesType } from '../models/seriesType/config';
4
- export declare const useChartContainerHooks: (ref: React.ForwardedRef<unknown> | null, plugins?: ChartsPluginType<ChartSeriesType>[]) => {
5
- svgRef: React.RefObject<SVGSVGElement>;
6
- chartSurfaceRef: ((instance: unknown) => void | React.DO_NOT_USE_OR_YOU_WILL_BE_FIRED_CALLBACK_REF_RETURN_VALUES[keyof React.DO_NOT_USE_OR_YOU_WILL_BE_FIRED_CALLBACK_REF_RETURN_VALUES]) | null;
7
- xExtremumGetters: import("../models").ExtremumGettersConfig<keyof import("../models/seriesType/config").ChartsSeriesConfig>;
8
- yExtremumGetters: import("../models").ExtremumGettersConfig<keyof import("../models/seriesType/config").ChartsSeriesConfig>;
9
- seriesFormatters: import("../internals").SeriesFormatterConfig<keyof import("../models/seriesType/config").ChartsSeriesConfig>;
10
- colorProcessors: import("../models").ColorProcessorsConfig<keyof import("../models/seriesType/config").ChartsSeriesConfig>;
11
- };