Skip to content

Commit

Permalink
Merge branch 'master' into feat/add-eslint-rule-prefer-v9
Browse files Browse the repository at this point in the history
  • Loading branch information
dmytrokirpa authored Jan 6, 2025
2 parents 4a9659a + 029804f commit 7ed0058
Show file tree
Hide file tree
Showing 78 changed files with 29,181 additions and 92 deletions.
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -430,6 +430,7 @@ packages/react/src/components/WeeklyDayPicker @microsoft/cxe-red
packages/react/src/utilities/ThemeProvider @microsoft/cxe-red @dzearing
packages/fluent2-theme @microsoft/cxe-red @geoffcoxmsft
## Experiments
packages/react-experiments @microsoft/cxe-red
packages/react-experiments/src/components/Signals @ThomasMichon
packages/react-experiments/src/components/Tile @ThomasMichon
packages/react-experiments/src/components/TileList @ThomasMichon
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "fix: contrast border of thumb",
"packageName": "@fluentui/react-color-picker-preview",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "minor",
"comment": "fix: accName updates and semantic fixes",
"packageName": "@fluentui/react-teaching-popover",
"email": "[email protected]",
"dependentChangeType": "patch"
}
15 changes: 15 additions & 0 deletions packages/azure-themes/CHANGELOG.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,21 @@
{
"name": "@fluentui/azure-themes",
"entries": [
{
"date": "Fri, 03 Jan 2025 07:21:32 GMT",
"tag": "@fluentui/azure-themes_v8.6.117",
"version": "8.6.117",
"comments": {
"patch": [
{
"author": "beachball",
"package": "@fluentui/azure-themes",
"comment": "Bump @fluentui/react to v8.122.4",
"commit": "7bb97f178d73a470dc438a2b19d165d9d0bd4b51"
}
]
}
},
{
"date": "Mon, 30 Dec 2024 07:21:29 GMT",
"tag": "@fluentui/azure-themes_v8.6.116",
Expand Down
11 changes: 10 additions & 1 deletion packages/azure-themes/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,18 @@
# Change Log - @fluentui/azure-themes

This log was last generated on Mon, 30 Dec 2024 07:21:29 GMT and should not be manually modified.
This log was last generated on Fri, 03 Jan 2025 07:21:32 GMT and should not be manually modified.

<!-- Start content -->

## [8.6.117](https://github.com/microsoft/fluentui/tree/@fluentui/azure-themes_v8.6.117)

Fri, 03 Jan 2025 07:21:32 GMT
[Compare changes](https://github.com/microsoft/fluentui/compare/@fluentui/azure-themes_v8.6.116..@fluentui/azure-themes_v8.6.117)

### Patches

- Bump @fluentui/react to v8.122.4 ([PR #33529](https://github.com/microsoft/fluentui/pull/33529) by beachball)

## [8.6.116](https://github.com/microsoft/fluentui/tree/@fluentui/azure-themes_v8.6.116)

Mon, 30 Dec 2024 07:21:29 GMT
Expand Down
4 changes: 2 additions & 2 deletions packages/azure-themes/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@fluentui/azure-themes",
"version": "8.6.116",
"version": "8.6.117",
"description": "Azure themes for Fluent UI React",
"main": "lib-commonjs/index.js",
"module": "lib/index.js",
Expand All @@ -27,7 +27,7 @@
"@fluentui/scripts-webpack": "*"
},
"dependencies": {
"@fluentui/react": "^8.122.3",
"@fluentui/react": "^8.122.4",
"@fluentui/set-version": "^8.2.23",
"tslib": "^2.1.0"
}
Expand Down
1 change: 1 addition & 0 deletions packages/charts/react-charting/.npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,4 @@ visualtests
!dist
docs
test-data.ts
src/components/DeclatativeChart/tests/schema
50 changes: 50 additions & 0 deletions packages/charts/react-charting/CHANGELOG.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,56 @@
{
"name": "@fluentui/react-charting",
"entries": [
{
"date": "Mon, 06 Jan 2025 07:16:33 GMT",
"tag": "@fluentui/react-charting_v5.23.38",
"version": "5.23.38",
"comments": {
"patch": [
{
"author": "[email protected]",
"package": "@fluentui/react-charting",
"commit": "4a38a00cf1396e755104635cca027b62c59ae224",
"comment": "Enabling titles for x and y axes for Declarative charts"
}
],
"none": [
{
"author": "[email protected]",
"package": "@fluentui/react-charting",
"commit": "ab40feaff6ddc0c75161cc69c849f6b372c1d016",
"comment": "Added test cases to declartive chart examples"
}
]
}
},
{
"date": "Fri, 03 Jan 2025 07:21:32 GMT",
"tag": "@fluentui/react-charting_v5.23.37",
"version": "5.23.37",
"comments": {
"patch": [
{
"author": "[email protected]",
"package": "@fluentui/react-charting",
"commit": "0b5ff6e25513a28011ba742c0c479056fcecf68b",
"comment": "Gauge and Pie chart fixes"
},
{
"author": "beachball",
"package": "@fluentui/react-charting",
"comment": "Bump @fluentui/theme-samples to v8.7.193",
"commit": "7bb97f178d73a470dc438a2b19d165d9d0bd4b51"
},
{
"author": "beachball",
"package": "@fluentui/react-charting",
"comment": "Bump @fluentui/react to v8.122.4",
"commit": "7bb97f178d73a470dc438a2b19d165d9d0bd4b51"
}
]
}
},
{
"date": "Thu, 02 Jan 2025 07:22:03 GMT",
"tag": "@fluentui/react-charting_v5.23.36",
Expand Down
22 changes: 21 additions & 1 deletion packages/charts/react-charting/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,29 @@
# Change Log - @fluentui/react-charting

This log was last generated on Thu, 02 Jan 2025 07:22:03 GMT and should not be manually modified.
This log was last generated on Mon, 06 Jan 2025 07:16:33 GMT and should not be manually modified.

<!-- Start content -->

## [5.23.38](https://github.com/microsoft/fluentui/tree/@fluentui/react-charting_v5.23.38)

Mon, 06 Jan 2025 07:16:33 GMT
[Compare changes](https://github.com/microsoft/fluentui/compare/@fluentui/react-charting_v5.23.37..@fluentui/react-charting_v5.23.38)

### Patches

- Enabling titles for x and y axes for Declarative charts ([PR #33533](https://github.com/microsoft/fluentui/pull/33533) by [email protected])

## [5.23.37](https://github.com/microsoft/fluentui/tree/@fluentui/react-charting_v5.23.37)

Fri, 03 Jan 2025 07:21:32 GMT
[Compare changes](https://github.com/microsoft/fluentui/compare/@fluentui/react-charting_v5.23.36..@fluentui/react-charting_v5.23.37)

### Patches

- Gauge and Pie chart fixes ([PR #33541](https://github.com/microsoft/fluentui/pull/33541) by [email protected])
- Bump @fluentui/theme-samples to v8.7.193 ([PR #33529](https://github.com/microsoft/fluentui/pull/33529) by beachball)
- Bump @fluentui/react to v8.122.4 ([PR #33529](https://github.com/microsoft/fluentui/pull/33529) by beachball)

## [5.23.36](https://github.com/microsoft/fluentui/tree/@fluentui/react-charting_v5.23.36)

Thu, 02 Jan 2025 07:22:03 GMT
Expand Down
6 changes: 3 additions & 3 deletions packages/charts/react-charting/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@fluentui/react-charting",
"version": "5.23.36",
"version": "5.23.38",
"description": "React web charting controls for Microsoft fluentui system.",
"main": "lib-commonjs/index.js",
"module": "lib/index.js",
Expand Down Expand Up @@ -40,7 +40,7 @@
},
"dependencies": {
"@fluentui/react-focus": "^8.9.20",
"@fluentui/theme-samples": "^8.7.192",
"@fluentui/theme-samples": "^8.7.193",
"@microsoft/load-themed-styles": "^1.10.26",
"@types/d3-array": "^3.0.0",
"@types/d3-axis": "^3.0.0",
Expand All @@ -66,7 +66,7 @@
"tslib": "^2.1.0"
},
"peerDependencies": {
"@fluentui/react": "^8.122.3",
"@fluentui/react": "^8.122.4",
"@types/react": ">=16.8.0 <19.0.0",
"@types/react-dom": ">=16.8.0 <19.0.0",
"react": ">=16.8.0 <19.0.0",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
import { render } from '@testing-library/react';
import { DeclarativeChart } from './index';
import * as React from 'react';
import { resetIds } from '../../Utilities';

describe('DeclarativeChart', () => {
const mockGetComputedTextLength = jest.fn().mockReturnValue(100);
// Replace the original method with the mock implementation
Object.defineProperty(
Object.getPrototypeOf(document.createElementNS('http://www.w3.org/2000/svg', 'tspan')),
'getComputedTextLength',
{
value: mockGetComputedTextLength,
},
);
beforeEach(() => {
resetIds();
});
test('Should render areachart in DeclarativeChart', () => {
// Arrange
const plotlySchema = require('./tests/schema/fluent_area_test.json');
const { container } = render(<DeclarativeChart key={'areachart'} chartSchema={{ plotlySchema }} />);
expect(container).toMatchSnapshot();
});

test('Should render donutchart in DeclarativeChart', () => {
// Arrange
const plotlySchema = require('./tests/schema/fluent_donut_test.json');
const { container } = render(<DeclarativeChart key={'donutchart'} chartSchema={{ plotlySchema }} />);
expect(container).toMatchSnapshot();
});

test('Should render gaugechart in DeclarativeChart', () => {
// Arrange
const plotlySchema = require('./tests/schema/fluent_gauge_test.json');
const { container } = render(<DeclarativeChart key={'gaugechart'} chartSchema={{ plotlySchema }} />);
expect(container).toMatchSnapshot();
});

test('Should render heatmapchart in DeclarativeChart', () => {
// Arrange
const plotlySchema = require('./tests/schema/fluent_heatmap_test.json');
const { container } = render(<DeclarativeChart key={'heatmapchart'} chartSchema={{ plotlySchema }} />);
expect(container).toMatchSnapshot();
});

test('Should render linechart in DeclarativeChart', () => {
// Arrange
const plotlySchema = require('./tests/schema/fluent_line_test.json');
const { container } = render(<DeclarativeChart key={'linechart'} chartSchema={{ plotlySchema }} />);
expect(container).toMatchSnapshot();
});

test('Should render piechart in DeclarativeChart', () => {
// Arrange
const plotlySchema = require('./tests/schema/fluent_pie_test.json');
const { container } = render(<DeclarativeChart key={'piechart'} chartSchema={{ plotlySchema }} />);
expect(container).toMatchSnapshot();
});

test('Should render sankeychart in DeclarativeChart', () => {
// Arrange
const plotlySchema = require('./tests/schema/fluent_sankey_test.json');
const { container } = render(<DeclarativeChart key={'sankeychart'} chartSchema={{ plotlySchema }} />);
expect(container).toMatchSnapshot();
});

test('Should render verticalbarchart in DeclarativeChart', () => {
// Arrange
const plotlySchema = require('./tests/schema/fluent_verticalbar_test.json');
const { container } = render(<DeclarativeChart key={'verticalbarchart'} chartSchema={{ plotlySchema }} />);
expect(container).toMatchSnapshot();
});
});
Loading

0 comments on commit 7ed0058

Please sign in to comment.