Skip to content

Commit b31250d

Browse files
authored
Merge branch 'master' into chore/remove-export-star-2
2 parents b208264 + 001b1b3 commit b31250d

File tree

560 files changed

+16648
-2926
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

560 files changed

+16648
-2926
lines changed

apps/public-docsite-v9/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
"react-hook-form": "^5.7.2",
4545
"@fluentui/react-nav-preview": "*",
4646
"@fluentui/react-motion-components-preview": "*",
47-
"@fluentui/react-icons-compat": "*"
47+
"@fluentui/react-icons-compat": "*",
48+
"@fluentui/react-color-picker-preview": "*"
4849
}
4950
}

apps/public-docsite-v9/src/Concepts/Slots/Slots.stories.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ If you need to replace the slot's entire content, including the containing eleme
174174
pass a render function as the children.
175175

176176
This is an escape hatch in the slots API, so prefer the other techniques whenever possible.
177-
If you replace the entire slot, very accessibility, layout, and styling still work properly.
177+
If you replace the entire slot, verify accessibility, layout, and styling still work properly.
178178

179179
By passing `renderBigLetterIcon` as the `children`, the `span` that normally contains the icon is replaced with an `b` (bold).
180180

change/@fluentui-react-charting-1fd94ef3-bdd1-4473-b5cf-5a5f67f3a547.json

Lines changed: 0 additions & 7 deletions
This file was deleted.
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "patch",
3+
"comment": "enable negativeData prop in declarative charts",
4+
"packageName": "@fluentui/react-charting",
5+
"email": "[email protected]",
6+
"dependentChangeType": "patch"
7+
}

change/@fluentui-react-charts-preview-803c5a15-3686-44e2-827f-e70720369036.json

Lines changed: 0 additions & 7 deletions
This file was deleted.
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "minor",
3+
"comment": "feat(Collapse): add margin to whitespace animation",
4+
"packageName": "@fluentui/react-motion-components-preview",
5+
"email": "[email protected]",
6+
"dependentChangeType": "patch"
7+
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "patch",
3+
"comment": "feat(motion): Refactor scale, migrate to new variant structure",
4+
"packageName": "@fluentui/react-motion-components-preview",
5+
"email": "[email protected]",
6+
"dependentChangeType": "patch"
7+
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "patch",
3+
"comment": "refactor(Toast): replace custom component with CollapseDelayed",
4+
"packageName": "@fluentui/react-toast",
5+
"email": "[email protected]",
6+
"dependentChangeType": "patch"
7+
}

packages/charts/react-charting/CHANGELOG.json

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,57 @@
11
{
22
"name": "@fluentui/react-charting",
33
"entries": [
4+
{
5+
"date": "Fri, 06 Dec 2024 07:21:16 GMT",
6+
"tag": "@fluentui/react-charting_v5.23.21",
7+
"version": "5.23.21",
8+
"comments": {
9+
"patch": [
10+
{
11+
"author": "[email protected]",
12+
"package": "@fluentui/react-charting",
13+
"commit": "f42240c92b9d09297a5cb21b195604ed7526d192",
14+
"comment": "support negative y values in Vertical Bar chart"
15+
}
16+
]
17+
}
18+
},
19+
{
20+
"date": "Thu, 05 Dec 2024 07:23:45 GMT",
21+
"tag": "@fluentui/react-charting_v5.23.20",
22+
"version": "5.23.20",
23+
"comments": {
24+
"patch": [
25+
{
26+
"author": "[email protected]",
27+
"package": "@fluentui/react-charting",
28+
"commit": "fe4dad5c896b6a08aa571cfcd5eabebc8cbc0c8a",
29+
"comment": "feat: add plotly adapter for histogram"
30+
}
31+
]
32+
}
33+
},
34+
{
35+
"date": "Tue, 03 Dec 2024 07:20:27 GMT",
36+
"tag": "@fluentui/react-charting_v5.23.19",
37+
"version": "5.23.19",
38+
"comments": {
39+
"patch": [
40+
{
41+
"author": "[email protected]",
42+
"package": "@fluentui/react-charting",
43+
"commit": "99e5e6a9d394d6be64a58ac4ffb38b11023bcb72",
44+
"comment": "Create declarative chart component"
45+
},
46+
{
47+
"author": "[email protected]",
48+
"package": "@fluentui/react-charting",
49+
"commit": "f97d1c3965fcd9dc372123b7a9c47f2c8220fd1d",
50+
"comment": "Add grouped vertical bar chart plotly adapter"
51+
}
52+
]
53+
}
54+
},
455
{
556
"date": "Mon, 02 Dec 2024 07:20:01 GMT",
657
"tag": "@fluentui/react-charting_v5.23.18",

packages/charts/react-charting/CHANGELOG.md

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,37 @@
11
# Change Log - @fluentui/react-charting
22

3-
This log was last generated on Mon, 02 Dec 2024 07:20:01 GMT and should not be manually modified.
3+
This log was last generated on Fri, 06 Dec 2024 07:21:16 GMT and should not be manually modified.
44

55
<!-- Start content -->
66

7+
## [5.23.21](https://github.com/microsoft/fluentui/tree/@fluentui/react-charting_v5.23.21)
8+
9+
Fri, 06 Dec 2024 07:21:16 GMT
10+
[Compare changes](https://github.com/microsoft/fluentui/compare/@fluentui/react-charting_v5.23.20..@fluentui/react-charting_v5.23.21)
11+
12+
### Patches
13+
14+
- support negative y values in Vertical Bar chart ([PR #33377](https://github.com/microsoft/fluentui/pull/33377) by [email protected])
15+
16+
## [5.23.20](https://github.com/microsoft/fluentui/tree/@fluentui/react-charting_v5.23.20)
17+
18+
Thu, 05 Dec 2024 07:23:45 GMT
19+
[Compare changes](https://github.com/microsoft/fluentui/compare/@fluentui/react-charting_v5.23.19..@fluentui/react-charting_v5.23.20)
20+
21+
### Patches
22+
23+
- feat: add plotly adapter for histogram ([PR #33399](https://github.com/microsoft/fluentui/pull/33399) by [email protected])
24+
25+
## [5.23.19](https://github.com/microsoft/fluentui/tree/@fluentui/react-charting_v5.23.19)
26+
27+
Tue, 03 Dec 2024 07:20:27 GMT
28+
[Compare changes](https://github.com/microsoft/fluentui/compare/@fluentui/react-charting_v5.23.18..@fluentui/react-charting_v5.23.19)
29+
30+
### Patches
31+
32+
- Create declarative chart component ([PR #33348](https://github.com/microsoft/fluentui/pull/33348) by [email protected])
33+
- Add grouped vertical bar chart plotly adapter ([PR #33383](https://github.com/microsoft/fluentui/pull/33383) by [email protected])
34+
735
## [5.23.18](https://github.com/microsoft/fluentui/tree/@fluentui/react-charting_v5.23.18)
836

937
Mon, 02 Dec 2024 07:20:01 GMT

packages/charts/react-charting/etc/react-charting.api.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,6 +293,7 @@ export interface ICartesianChartProps {
293293
showXAxisLablesTooltip?: boolean;
294294
strokeWidth?: number;
295295
styles?: IStyleFunctionOrObject<ICartesianChartStyleProps, ICartesianChartStyles>;
296+
supportNegativeData?: boolean;
296297
svgProps?: React_2.SVGProps<SVGSVGElement>;
297298
theme?: ITheme;
298299
tickFormat?: string;
@@ -1043,7 +1044,7 @@ export interface IModifiedCartesianChartProps extends ICartesianChartProps {
10431044
createStringYAxis: (yAxisParams: IYAxisParams, dataPoints: string[], isRtl: boolean, barWidth: number | undefined) => ScaleBand<string>;
10441045
// Warning: (ae-forgotten-export) The symbol "IYAxisParams" needs to be exported by the entry point index.d.ts
10451046
// Warning: (ae-forgotten-export) The symbol "IAxisData" needs to be exported by the entry point index.d.ts
1046-
createYAxis: (yAxisParams: IYAxisParams, isRtl: boolean, axisData: IAxisData, isIntegralDataset: boolean, useSecondaryYScale?: boolean) => ScaleLinear<number, number, never>;
1047+
createYAxis: (yAxisParams: IYAxisParams, isRtl: boolean, axisData: IAxisData, isIntegralDataset: boolean, useSecondaryYScale?: boolean, supportNegativeData?: boolean) => ScaleLinear<number, number, never>;
10471048
culture?: string;
10481049
customizedCallout?: any;
10491050
datasetForXAxisDomain?: string[];

packages/charts/react-charting/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@fluentui/react-charting",
3-
"version": "5.23.18",
3+
"version": "5.23.21",
44
"description": "React web charting controls for Microsoft fluentui system.",
55
"main": "lib-commonjs/index.js",
66
"module": "lib/index.js",

packages/charts/react-charting/src/components/AreaChart/AreaChartRTL.test.tsx

Lines changed: 162 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -268,6 +268,158 @@ const chartPointsWithDate = [
268268
},
269269
];
270270

271+
const negativeChart1Points = [
272+
{
273+
x: 20,
274+
y: -9,
275+
},
276+
{
277+
x: 25,
278+
y: -14,
279+
},
280+
{
281+
x: 30,
282+
y: -14,
283+
},
284+
{
285+
x: 35,
286+
y: -23,
287+
},
288+
{
289+
x: 40,
290+
y: -20,
291+
},
292+
{
293+
x: 45,
294+
y: -31,
295+
},
296+
{
297+
x: 50,
298+
y: -29,
299+
},
300+
{
301+
x: 55,
302+
y: -27,
303+
},
304+
{
305+
x: 60,
306+
y: -37,
307+
},
308+
{
309+
x: 65,
310+
y: -51,
311+
},
312+
];
313+
314+
const negativeChart2Points = [
315+
{
316+
x: 20,
317+
y: -21,
318+
},
319+
{
320+
x: 25,
321+
y: -25,
322+
},
323+
{
324+
x: 30,
325+
y: -10,
326+
},
327+
{
328+
x: 35,
329+
y: -10,
330+
},
331+
{
332+
x: 40,
333+
y: -14,
334+
},
335+
{
336+
x: 45,
337+
y: -18,
338+
},
339+
{
340+
x: 50,
341+
y: -9,
342+
},
343+
{
344+
x: 55,
345+
y: -23,
346+
},
347+
{
348+
x: 60,
349+
y: -7,
350+
},
351+
{
352+
x: 65,
353+
y: -55,
354+
},
355+
];
356+
357+
const negativeChart3Points = [
358+
{
359+
x: 20,
360+
y: -30,
361+
},
362+
{
363+
x: 25,
364+
y: -35,
365+
},
366+
{
367+
x: 30,
368+
y: -33,
369+
},
370+
{
371+
x: 35,
372+
y: -40,
373+
},
374+
{
375+
x: 40,
376+
y: -10,
377+
},
378+
{
379+
x: 45,
380+
y: -40,
381+
},
382+
{
383+
x: 50,
384+
y: -34,
385+
},
386+
{
387+
x: 55,
388+
y: -40,
389+
},
390+
{
391+
x: 60,
392+
y: -60,
393+
},
394+
{
395+
x: 65,
396+
y: -40,
397+
},
398+
];
399+
400+
const negativeChartPoints = [
401+
{
402+
legend: 'legend1',
403+
data: negativeChart1Points,
404+
color: 'green',
405+
},
406+
{
407+
legend: 'legend2',
408+
data: negativeChart2Points,
409+
color: 'yellow',
410+
},
411+
{
412+
legend: 'legend3',
413+
data: negativeChart3Points,
414+
color: 'blue',
415+
},
416+
];
417+
418+
const negativeChartData = {
419+
chartTitle: 'Area chart multiple negative y value example',
420+
lineChartData: negativeChartPoints,
421+
};
422+
271423
const tickValues = [
272424
new Date('2020-01-06T00:00:00.000Z'),
273425
new Date('2020-01-08T00:00:00.000Z'),
@@ -350,6 +502,16 @@ describe('Area chart rendering', () => {
350502
expect(container).toMatchSnapshot();
351503
},
352504
);
505+
506+
testWithoutWait(
507+
'Should render the Area Chart with negative y values',
508+
AreaChart,
509+
{ data: negativeChartData, supportNegativeData: true },
510+
container => {
511+
//Asset
512+
expect(container).toMatchSnapshot();
513+
},
514+
);
353515
});
354516

355517
describe('Area chart - Subcomponent Area', () => {

0 commit comments

Comments
 (0)