Skip to content

Commit

Permalink
Merge branch 'master' into include-prefix-in-portal-compat-class-name
Browse files Browse the repository at this point in the history
  • Loading branch information
alina-zaieva authored Jul 18, 2023
2 parents 9433fd7 + beef721 commit 1562100
Show file tree
Hide file tree
Showing 124 changed files with 1,784 additions and 588 deletions.
2 changes: 1 addition & 1 deletion apps/perf-test-react-components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"@fluentui/react-avatar": "*",
"@fluentui/react-button": "*",
"@fluentui/react-field": "*",
"@fluentui/react-infobutton": "9.0.0-beta.41",
"@fluentui/react-infobutton": "9.0.0-beta.42",
"@fluentui/react-persona": "*",
"@fluentui/react-provider": "*",
"@fluentui/react-spinbutton": "*",
Expand Down
1 change: 1 addition & 0 deletions apps/public-docsite-v9/.storybook/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ module.exports = /** @type {Omit<import('../../../.storybook/main'), 'typescript
'../../../packages/react-components/react-migration-v0-v9/stories/**/@(index.stories.@(ts|tsx)|*.stories.mdx)',
'../../../packages/react-components/react-migration-v8-v9/stories/**/@(index.stories.@(ts|tsx)|*.stories.mdx)',
'../../../packages/react-components/react-datepicker-compat/stories/**/@(index.stories.@(ts|tsx)|*.stories.mdx)',
'../../../packages/react-components/react-breadcrumb-preview/stories/**/@(index.stories.@(ts|tsx)|*.stories.mdx)',
'../../../packages/react-components/react-search-preview/stories/**/@(index.stories.@(ts|tsx)|*.stories.mdx)',
],
staticDirs: ['../public'],
Expand Down
1 change: 1 addition & 0 deletions apps/public-docsite-v9/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
"@fluentui/scripts-tasks": "*"
},
"dependencies": {
"@fluentui/react-breadcrumb-preview": "*",
"@fluentui/react-datepicker-compat": "*",
"@fluentui/react-migration-v8-v9": "*",
"@fluentui/react-migration-v0-v9": "*",
Expand Down
2 changes: 1 addition & 1 deletion apps/vr-tests-react-components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"@fluentui/react-field": "*",
"@fluentui/react-icons": "^2.0.203",
"@fluentui/react-image": "*",
"@fluentui/react-infobutton": "9.0.0-beta.41",
"@fluentui/react-infobutton": "9.0.0-beta.42",
"@fluentui/react-input": "*",
"@fluentui/react-label": "*",
"@fluentui/react-link": "*",
Expand Down
114 changes: 57 additions & 57 deletions apps/vr-tests-react-components/src/stories/Spinner.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,81 +13,69 @@ const InvertedWrapper: React.FC = ({ children }) => {

storiesOf('Spinner converged', module)
.addDecorator(TestWrapperDecoratorNoAnimation)
.addStory('Primary', () => <Spinner className="test-class" />, {
.addStory('Primary', () => <Spinner />, {
includeHighContrast: true,
includeDarkMode: true,
})
.addStory('Primary with Label', () => <Spinner className="test-class" label="Loading" />, {
.addStory('Primary with Label', () => <Spinner label="Loading" />, {
includeHighContrast: true,
includeDarkMode: true,
})
.addStory(
'Primary with Label Before',
() => <Spinner className="test-class" labelPosition="before" label="Loading" />,
{
includeHighContrast: true,
includeDarkMode: true,
includeRtl: true,
},
)
.addStory(
'Primary with Label After',
() => <Spinner className="test-class" labelPosition="after" label="Loading" />,
{
includeHighContrast: true,
includeDarkMode: true,
includeRtl: true,
},
)
.addStory(
'Primary with Label Above',
() => <Spinner className="test-class" labelPosition="above" label="Loading" />,
{
includeHighContrast: true,
includeDarkMode: true,
},
)
.addStory(
'Primary with Label Below',
() => <Spinner className="test-class" labelPosition="below" label="Loading" />,
{
includeHighContrast: true,
includeDarkMode: true,
},
)
.addStory('Primary with Size Tiny', () => <Spinner className="test-class" size="tiny" />, {
.addStory('Primary with Label Before', () => <Spinner labelPosition="before" label="Loading" />, {
includeHighContrast: true,
includeDarkMode: true,
includeRtl: true,
})
.addStory('Primary with Size Extra Small', () => <Spinner className="test-class" size="extra-small" />, {
.addStory('Primary with Label After', () => <Spinner labelPosition="after" label="Loading" />, {
includeHighContrast: true,
includeDarkMode: true,
includeRtl: true,
})
.addStory('Primary with Size Small', () => <Spinner className="test-class" size="small" />, {
.addStory('Primary with Label Above', () => <Spinner labelPosition="above" label="Loading" />, {
includeHighContrast: true,
includeDarkMode: true,
})
.addStory('Primary with Size Medium', () => <Spinner className="test-class" size="medium" />, {
.addStory('Primary with Label Below', () => <Spinner labelPosition="below" label="Loading" />, {
includeHighContrast: true,
includeDarkMode: true,
})
.addStory('Primary with Size Large', () => <Spinner className="test-class" size="large" />, {
.addStory('Primary with Size Extra Tiny', () => <Spinner size="extra-tiny" />, {
includeHighContrast: true,
includeDarkMode: true,
})
.addStory('Primary with Size Extra Large', () => <Spinner className="test-class" size="extra-large" />, {
.addStory('Primary with Size Tiny', () => <Spinner size="tiny" />, {
includeHighContrast: true,
includeDarkMode: true,
})
.addStory('Primary with Huge', () => <Spinner className="test-class" size="huge" />, {
.addStory('Primary with Size Extra Small', () => <Spinner size="extra-small" />, {
includeHighContrast: true,
includeDarkMode: true,
})
.addStory('Primary with Size Small', () => <Spinner size="small" />, {
includeHighContrast: true,
includeDarkMode: true,
})
.addStory('Primary with Size Medium', () => <Spinner size="medium" />, {
includeHighContrast: true,
includeDarkMode: true,
})
.addStory('Primary with Size Large', () => <Spinner size="large" />, {
includeHighContrast: true,
includeDarkMode: true,
})
.addStory('Primary with Size Extra Large', () => <Spinner size="extra-large" />, {
includeHighContrast: true,
includeDarkMode: true,
})
.addStory('Primary with Huge', () => <Spinner size="huge" />, {
includeHighContrast: true,
includeDarkMode: true,
})
.addStory(
'Inverted',
() => (
<InvertedWrapper>
<Spinner className="test-class" appearance="inverted" />
<Spinner appearance="inverted" />
</InvertedWrapper>
),
{
Expand All @@ -99,7 +87,7 @@ storiesOf('Spinner converged', module)
'Inverted with Label',
() => (
<InvertedWrapper>
<Spinner className="test-class" appearance="inverted" label="Loading" />
<Spinner appearance="inverted" label="Loading" />
</InvertedWrapper>
),
{
Expand All @@ -111,7 +99,7 @@ storiesOf('Spinner converged', module)
'Inverted with Label Before',
() => (
<InvertedWrapper>
<Spinner className="test-class" appearance="inverted" labelPosition="before" label="Loading" />
<Spinner appearance="inverted" labelPosition="before" label="Loading" />
</InvertedWrapper>
),
{
Expand All @@ -123,7 +111,7 @@ storiesOf('Spinner converged', module)
'Inverted with Label After',
() => (
<InvertedWrapper>
<Spinner className="test-class" appearance="inverted" labelPosition="after" label="Loading" />
<Spinner appearance="inverted" labelPosition="after" label="Loading" />
</InvertedWrapper>
),
{
Expand All @@ -135,7 +123,7 @@ storiesOf('Spinner converged', module)
'Inverted with Label Above',
() => (
<InvertedWrapper>
<Spinner className="test-class" appearance="inverted" labelPosition="above" label="Loading" />
<Spinner appearance="inverted" labelPosition="above" label="Loading" />
</InvertedWrapper>
),
{
Expand All @@ -147,7 +135,19 @@ storiesOf('Spinner converged', module)
'Inverted with Label Below',
() => (
<InvertedWrapper>
<Spinner className="test-class" appearance="inverted" labelPosition="below" label="Loading" />
<Spinner appearance="inverted" labelPosition="below" label="Loading" />
</InvertedWrapper>
),
{
includeHighContrast: true,
includeDarkMode: true,
},
)
.addStory(
'Inverted with Size Extra Tiny',
() => (
<InvertedWrapper>
<Spinner appearance="inverted" size="extra-tiny" />
</InvertedWrapper>
),
{
Expand All @@ -156,10 +156,10 @@ storiesOf('Spinner converged', module)
},
)
.addStory(
'Primary with Size Tiny',
'Inverted with Size Tiny',
() => (
<InvertedWrapper>
<Spinner className="test-class" appearance="inverted" size="tiny" />
<Spinner appearance="inverted" size="tiny" />
</InvertedWrapper>
),
{
Expand All @@ -171,7 +171,7 @@ storiesOf('Spinner converged', module)
'Inverted with Size Extra Small',
() => (
<InvertedWrapper>
<Spinner className="test-class" appearance="inverted" size="extra-small" />
<Spinner appearance="inverted" size="extra-small" />
</InvertedWrapper>
),
{
Expand All @@ -183,7 +183,7 @@ storiesOf('Spinner converged', module)
'Inverted with Size Small',
() => (
<InvertedWrapper>
<Spinner className="test-class" appearance="inverted" size="small" />
<Spinner appearance="inverted" size="small" />
</InvertedWrapper>
),
{
Expand All @@ -195,7 +195,7 @@ storiesOf('Spinner converged', module)
'Inverted with Size Medium',
() => (
<InvertedWrapper>
<Spinner className="test-class" appearance="inverted" size="medium" />
<Spinner appearance="inverted" size="medium" />
</InvertedWrapper>
),
{
Expand All @@ -207,7 +207,7 @@ storiesOf('Spinner converged', module)
'Inverted with Size Large',
() => (
<InvertedWrapper>
<Spinner className="test-class" appearance="inverted" size="large" />
<Spinner appearance="inverted" size="large" />
</InvertedWrapper>
),
{
Expand All @@ -219,7 +219,7 @@ storiesOf('Spinner converged', module)
'Inverted with Size Extra Large',
() => (
<InvertedWrapper>
<Spinner className="test-class" appearance="inverted" size="extra-large" />
<Spinner appearance="inverted" size="extra-large" />
</InvertedWrapper>
),
{
Expand All @@ -231,7 +231,7 @@ storiesOf('Spinner converged', module)
'Inverted with Huge',
() => (
<InvertedWrapper>
<Spinner className="test-class" appearance="inverted" size="huge" />
<Spinner appearance="inverted" size="huge" />
</InvertedWrapper>
),
{
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@
"@nrwl/node": "15.9.4",
"@nrwl/workspace": "15.9.4",
"@octokit/rest": "18.12.0",
"@phenomnomnominal/tsquery": "6.1.2",
"@storybook/addon-a11y": "6.5.15",
"@storybook/addon-actions": "6.5.15",
"@storybook/addon-docs": "6.5.15",
Expand Down
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": "Tue, 18 Jul 2023 07:35:18 GMT",
"tag": "@fluentui/azure-themes_v8.6.24",
"version": "8.6.24",
"comments": {
"patch": [
{
"author": "beachball",
"package": "@fluentui/azure-themes",
"comment": "Bump @fluentui/react to v8.110.10",
"commit": "bbba7284a99cf7a63cbd7676a5a85e8770163357"
}
]
}
},
{
"date": "Mon, 17 Jul 2023 07:39:32 GMT",
"tag": "@fluentui/azure-themes_v8.6.23",
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, 17 Jul 2023 07:39:32 GMT and should not be manually modified.
This log was last generated on Tue, 18 Jul 2023 07:35:18 GMT and should not be manually modified.

<!-- Start content -->

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

Tue, 18 Jul 2023 07:35:18 GMT
[Compare changes](https://github.com/microsoft/fluentui/compare/@fluentui/azure-themes_v8.6.23..@fluentui/azure-themes_v8.6.24)

### Patches

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

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

Mon, 17 Jul 2023 07:39:32 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.23",
"version": "8.6.24",
"description": "Azure themes for Fluent UI React",
"main": "lib-commonjs/index.js",
"module": "lib/index.js",
Expand Down Expand Up @@ -28,7 +28,7 @@
"@fluentui/scripts-webpack": "*"
},
"dependencies": {
"@fluentui/react": "^8.110.9",
"@fluentui/react": "^8.110.10",
"@fluentui/set-version": "^8.2.11",
"tslib": "^2.1.0"
}
Expand Down
2 changes: 1 addition & 1 deletion packages/cra-template/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@fluentui/cra-template",
"version": "8.4.103",
"version": "8.4.104",
"description": "Create React App template for Fluent UI React (@fluentui/react)",
"repository": {
"type": "git",
Expand Down
Loading

0 comments on commit 1562100

Please sign in to comment.