Skip to content

Commit 8c3385f

Browse files
marcosmouramarcosmoura
committed
Merge branch 'feat/drawer-header' into feat/split-drawer
* feat/drawer-header: fix: add changefiles feat(react-drawer): create DrawerBody component (microsoft#27581) feat(react-tree): TreeItem itemType restructure (microsoft#27799) feat: Implement state management for toasts (microsoft#27800) bugfix: fix VisibleFlatTreeItemGenerator omitting visible items (microsoft#27802) fix: overflowManager should always dispatch initial state (microsoft#27756) fix(react-badge): Remove white border around presence badge when on a dark background (microsoft#27780) react-tags: rename dismissable to dismissible (microsoft#27798) chore: update ownership of react-tags (microsoft#27795) applying package updates feat(react-tags): Replace `avatar` prop with `media`; polish styles for spacing (microsoft#27725) RFC appearance migration (microsoft#24181) chore(react-skeleton): Release react-skeleton to stable (microsoft#27767) fix(Coachmark): Remove positioning regression and update bounds on resize (microsoft#27782) applying package updates fix(v8): explicitly publish dist folder after node 16 upgrade (microsoft#27769)
2 parents 986b6bb + a8683e8 commit 8c3385f

File tree

311 files changed

+5349
-1827
lines changed

Some content is hidden

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

311 files changed

+5349
-1827
lines changed

‎.github/CODEOWNERS

+1-1
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ packages/react-components/react-tree @microsoft/teams-prg
225225
packages/react-components/react-virtualizer @microsoft/xc-uxe @Mitch-At-Work
226226
packages/react-components/react-skeleton @microsoft/cxe-red
227227
packages/tokens @microsoft/teams-prg
228-
packages/react-components/react-tags @microsoft/cxe-coastal @YuanboXue-Amber
228+
packages/react-components/react-tags @microsoft/cxe-coastal @microsoft/teams-prg
229229
packages/react-components/react-data-grid-react-window @microsoft/teams-prg
230230
packages/react-components/react-migration-v0-v9 @microsoft/teams-prg
231231
packages/react-components/react-datepicker-compat @microsoft/cxe-red @sopranopillow @khmakoto

‎apps/perf-test/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
},
2020
"dependencies": {
2121
"@fluentui/scripts-perf-test-flamegrill": "*",
22-
"@fluentui/example-data": "^8.4.8",
23-
"@fluentui/react": "^8.109.1",
22+
"@fluentui/example-data": "^8.4.9",
23+
"@fluentui/react": "^8.109.3",
2424
"@microsoft/load-themed-styles": "^1.10.26",
2525
"react": "17.0.2",
2626
"react-dom": "17.0.2",

‎apps/public-docsite-resources/package.json

+7-7
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,15 @@
3434
"@fluentui/scripts-webpack": "*"
3535
},
3636
"dependencies": {
37-
"@fluentui/react": "^8.109.1",
37+
"@fluentui/react": "^8.109.3",
3838
"@fluentui/react-examples": "^8.34.4",
3939
"@microsoft/load-themed-styles": "^1.10.26",
40-
"@fluentui/azure-themes": "^8.6.2",
41-
"@fluentui/react-docsite-components": "^8.12.6",
42-
"@fluentui/font-icons-mdl2": "^8.5.16",
43-
"@fluentui/set-version": "^8.2.8",
44-
"@fluentui/theme-samples": "^8.7.82",
45-
"@fluentui/react-monaco-editor": "^1.7.83",
40+
"@fluentui/azure-themes": "^8.6.4",
41+
"@fluentui/react-docsite-components": "^8.12.8",
42+
"@fluentui/font-icons-mdl2": "^8.5.17",
43+
"@fluentui/set-version": "^8.2.9",
44+
"@fluentui/theme-samples": "^8.7.84",
45+
"@fluentui/react-monaco-editor": "^1.7.85",
4646
"office-ui-fabric-core": "^11.0.0",
4747
"react": "17.0.2",
4848
"react-dom": "17.0.2",

‎apps/public-docsite-v9/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"@fluentui/react-datepicker-compat": "^0.0.1",
2727
"@fluentui/react-migration-v8-v9": "^9.2.10",
2828
"@fluentui/react-migration-v0-v9": "9.0.0-alpha.0",
29-
"@fluentui/react": "^8.109.1",
29+
"@fluentui/react": "^8.109.3",
3030
"@fluentui/react-northstar": "^0.66.4",
3131
"@fluentui/react-icons-northstar": "^0.66.4",
3232
"@fluentui/react-components": "^9.19.1",

‎apps/public-docsite/package.json

+14-14
Original file line numberDiff line numberDiff line change
@@ -23,29 +23,29 @@
2323
},
2424
"license": "MIT",
2525
"devDependencies": {
26-
"@fluentui/common-styles": "^1.2.25",
26+
"@fluentui/common-styles": "^1.2.26",
2727
"@fluentui/eslint-plugin": "*",
28-
"@fluentui/react-monaco-editor": "^1.7.83",
28+
"@fluentui/react-monaco-editor": "^1.7.85",
2929
"write-file-webpack-plugin": "^4.1.0",
3030
"@fluentui/scripts-tasks": "*",
3131
"@fluentui/scripts-webpack": "*"
3232
},
3333
"dependencies": {
34-
"@fluentui/font-icons-mdl2": "^8.5.16",
34+
"@fluentui/font-icons-mdl2": "^8.5.17",
3535
"@fluentui/public-docsite-resources": "^8.1.41",
3636
"@fluentui/public-docsite-setup": "^0.3.19",
37-
"@fluentui/react": "^8.109.1",
38-
"@fluentui/react-docsite-components": "^8.12.6",
37+
"@fluentui/react": "^8.109.3",
38+
"@fluentui/react-docsite-components": "^8.12.8",
3939
"@fluentui/react-examples": "^8.34.4",
40-
"@fluentui/react-experiments": "^8.14.77",
41-
"@fluentui/fluent2-theme": "^8.107.6",
42-
"@fluentui/react-file-type-icons": "^8.8.16",
43-
"@fluentui/react-icons-mdl2": "^1.3.40",
44-
"@fluentui/react-icons-mdl2-branded": "^1.2.41",
45-
"@fluentui/set-version": "^8.2.8",
46-
"@fluentui/theme": "^2.6.28",
47-
"@fluentui/theme-samples": "^8.7.82",
48-
"@fluentui/utilities": "^8.13.12",
40+
"@fluentui/react-experiments": "^8.14.79",
41+
"@fluentui/fluent2-theme": "^8.107.8",
42+
"@fluentui/react-file-type-icons": "^8.8.17",
43+
"@fluentui/react-icons-mdl2": "^1.3.41",
44+
"@fluentui/react-icons-mdl2-branded": "^1.2.42",
45+
"@fluentui/set-version": "^8.2.9",
46+
"@fluentui/theme": "^2.6.29",
47+
"@fluentui/theme-samples": "^8.7.84",
48+
"@fluentui/utilities": "^8.13.13",
4949
"@microsoft/load-themed-styles": "^1.10.26",
5050
"office-ui-fabric-core": "^11.0.0",
5151
"react": "17.0.2",

‎apps/react-18-tests-v8/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
"@fluentui/scripts-webpack": "*"
2222
},
2323
"dependencies": {
24-
"@fluentui/react": "^8.109.1",
25-
"@fluentui/react-hooks": "^8.6.23",
24+
"@fluentui/react": "^8.109.3",
25+
"@fluentui/react-hooks": "^8.6.24",
2626
"@types/react": "18.0.14",
2727
"@types/react-dom": "18.0.6",
2828
"react": "18.2.0",

‎apps/ssr-tests/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
},
1414
"license": "MIT",
1515
"devDependencies": {
16-
"@fluentui/react": "^8.109.1",
16+
"@fluentui/react": "^8.109.3",
1717
"@microsoft/load-themed-styles": "^1.10.26",
1818
"@types/mocha": "7.0.2",
1919
"@fluentui/public-docsite-resources": "^8.1.41",

‎apps/stress-test/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"type-check": "tsc -b tsconfig.type.json"
1111
},
1212
"dependencies": {
13-
"@fluentui/react": "^8.109.1",
13+
"@fluentui/react": "^8.109.3",
1414
"@fluentui/react-components": "^9.19.1",
1515
"@fluentui/react-icons": "^2.0.196",
1616
"@fluentui/web-components": "^2.5.14",

‎apps/theming-designer/package.json

+7-7
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@
1919
"@fluentui/scripts-webpack": "*"
2020
},
2121
"dependencies": {
22-
"@fluentui/react": "^8.109.1",
23-
"@fluentui/merge-styles": "^8.5.9",
24-
"@fluentui/react-docsite-components": "^8.12.6",
25-
"@fluentui/foundation-legacy": "^8.2.36",
26-
"@fluentui/scheme-utilities": "^8.3.29",
27-
"@fluentui/set-version": "^8.2.8",
28-
"@fluentui/font-icons-mdl2": "^8.5.16",
22+
"@fluentui/react": "^8.109.3",
23+
"@fluentui/merge-styles": "^8.5.10",
24+
"@fluentui/react-docsite-components": "^8.12.8",
25+
"@fluentui/foundation-legacy": "^8.2.37",
26+
"@fluentui/scheme-utilities": "^8.3.30",
27+
"@fluentui/set-version": "^8.2.9",
28+
"@fluentui/font-icons-mdl2": "^8.5.17",
2929
"@microsoft/load-themed-styles": "^1.10.26",
3030
"react": "17.0.2",
3131
"react-dom": "17.0.2",

‎apps/ts-minbar-test-react/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"description": "Testing Fluent UI React compatibility with Typescript 3.9",
66
"license": "MIT",
77
"dependencies": {
8-
"@fluentui/react": "^8.109.1"
8+
"@fluentui/react": "^8.109.3"
99
},
1010
"scripts": {
1111
"type-check": "tsc -p .",

‎apps/vr-tests-react-components/src/stories/PresenceBadge.stories.tsx

+42-15
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,12 @@
11
import { storiesOf } from '@storybook/react';
22
import * as React from 'react';
3-
import { PresenceBadge, PresenceBadgeProps } from '@fluentui/react-badge';
3+
import { PresenceBadge } from '@fluentui/react-badge';
4+
import { tokens } from '@fluentui/react-theme';
5+
import { Steps, StoryWright } from 'storywright';
6+
import { TestWrapperDecorator } from '../utilities/TestWrapperDecorator';
47

5-
const statuses: PresenceBadgeProps['status'][] = [
6-
'available',
7-
'away',
8-
'busy',
9-
'do-not-disturb',
10-
'offline',
11-
'out-of-office',
12-
'unknown',
13-
];
8+
const statuses = ['available', 'away', 'busy', 'do-not-disturb', 'offline', 'out-of-office', 'unknown'] as const;
9+
const sizes = ['tiny', 'extra-small', 'small', 'medium', 'large', 'extra-large'] as const;
1410

1511
storiesOf('PresenceBadge Converged - status', module).addStory(
1612
'default',
@@ -40,12 +36,43 @@ storiesOf('PresenceBadge Converged - sizes', module).addStory(
4036
'default',
4137
() => (
4238
<div style={{ display: 'flex', gap: 10 }}>
43-
{(['tiny', 'extra-small', 'small', 'medium', 'large', 'extra-large'] as PresenceBadgeProps['size'][]).map(
44-
size => (
45-
<PresenceBadge status="available" key={size} size={size} />
46-
),
47-
)}
39+
{sizes.map(size => (
40+
<PresenceBadge status="available" key={size} size={size} />
41+
))}
4842
</div>
4943
),
5044
{ includeRtl: true },
5145
);
46+
47+
storiesOf('PresenceBadge Converged - inverted background', module)
48+
.addDecorator(TestWrapperDecorator)
49+
.addDecorator(story => (
50+
<StoryWright steps={new Steps().snapshot('default', { cropTo: '.testWrapper' }).end()}>{story()}</StoryWright>
51+
))
52+
.addStory(
53+
'default',
54+
() => (
55+
<div
56+
style={{
57+
display: 'inline-grid',
58+
gridTemplateColumns: `repeat(${2 * statuses.length}, auto)`,
59+
placeItems: 'start',
60+
gap: '10px',
61+
padding: '16px',
62+
backgroundColor: tokens.colorNeutralBackgroundInverted,
63+
}}
64+
>
65+
{sizes.map(size => (
66+
<>
67+
{statuses.map(status => (
68+
<PresenceBadge key={size + status} size={size} status={status} />
69+
))}
70+
{statuses.map(status => (
71+
<PresenceBadge key={size + status + 'OOO'} size={size} status={status} outOfOffice />
72+
))}
73+
</>
74+
))}
75+
</div>
76+
),
77+
{ includeHighContrast: true, includeDarkMode: true },
78+
);

‎apps/vr-tests/package.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@
2020
"@fluentui/scripts-tasks": "*"
2121
},
2222
"dependencies": {
23-
"@fluentui/example-data": "^8.4.8",
24-
"@fluentui/font-icons-mdl2": "^8.5.16",
25-
"@fluentui/react": "^8.109.1",
26-
"@fluentui/react-experiments": "^8.14.77",
27-
"@fluentui/react-hooks": "^8.6.23",
28-
"@fluentui/react-icons-mdl2": "^1.3.40",
23+
"@fluentui/example-data": "^8.4.9",
24+
"@fluentui/font-icons-mdl2": "^8.5.17",
25+
"@fluentui/react": "^8.109.3",
26+
"@fluentui/react-experiments": "^8.14.79",
27+
"@fluentui/react-hooks": "^8.6.24",
28+
"@fluentui/react-icons-mdl2": "^1.3.41",
2929
"@fluentui/storybook": "^1.0.0",
3030
"react": "17.0.2",
3131
"react-dom": "17.0.2",

‎change/@fluentui-priority-overflow-a6802865-2d8b-43e0-8ac7-09dcca1570c8.json

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "patch",
3+
"comment": "fix: overflowManager should always dispatch initial state",
4+
"packageName": "@fluentui/priority-overflow",
5+
"email": "lingfangao@hotmail.com",
6+
"dependentChangeType": "patch"
7+
}

‎change/@fluentui-react-badge-4df99d1f-b2d8-4ebd-a8c8-defa2b7568f2.json

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "patch",
3+
"comment": "fix: Remove white border around presence badge when on a dark background",
4+
"packageName": "@fluentui/react-badge",
5+
"email": "behowell@microsoft.com",
6+
"dependentChangeType": "patch"
7+
}

‎change/@fluentui-react-components-a75e4422-c023-4ded-b591-b8e9a071ac3e.json

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "minor",
3+
"comment": "chore: Releasing react-skeleton to stable.",
4+
"packageName": "@fluentui/react-components",
5+
"email": "ololubek@microsoft.com",
6+
"dependentChangeType": "patch"
7+
}

‎change/@fluentui-react-overflow-3a8651a5-c348-403c-a0a7-eaab0b660b52.json

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "patch",
3+
"comment": "refactor: Consolidate all overflow state into one object",
4+
"packageName": "@fluentui/react-overflow",
5+
"email": "lingfangao@hotmail.com",
6+
"dependentChangeType": "patch"
7+
}

‎change/@fluentui-react-provider-8d16b583-90bc-4602-8f12-908adfa27fa2.json

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "minor",
3+
"comment": "feat: add style overrides for drawer components",
4+
"packageName": "@fluentui/react-provider",
5+
"email": "marcosvmmoura@gmail.com",
6+
"dependentChangeType": "patch"
7+
}

‎change/@fluentui-react-shared-contexts-9885d20c-9563-4217-9582-4dea3020602a.json

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "minor",
3+
"comment": "feat: add style overrides for drawer components",
4+
"packageName": "@fluentui/react-shared-contexts",
5+
"email": "marcosvmmoura@gmail.com",
6+
"dependentChangeType": "patch"
7+
}

‎change/@fluentui-react-skeleton-50e30320-4803-4403-a4e3-ad463e7134bf.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"type": "prerelease",
2+
"type": "none",
33
"comment": "chore: move makeStyles() calls to .styles.ts files",
44
"packageName": "@fluentui/react-skeleton",
55
"email": "olfedias@microsoft.com",

‎change/@fluentui-react-skeleton-725eba8c-20d0-45a2-b5f9-e2901c493699.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"type": "prerelease",
2+
"type": "none",
33
"comment": "chore: exclude .swcrc from being published",
44
"packageName": "@fluentui/react-skeleton",
55
"email": "olfedias@microsoft.com",

‎change/@fluentui-react-skeleton-9cfea4a1-5247-4590-801d-5581a95e02e7.json

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "minor",
3+
"comment": "chore: Releasing react-skeleton to stable.",
4+
"packageName": "@fluentui/react-skeleton",
5+
"email": "ololubek@microsoft.com",
6+
"dependentChangeType": "patch"
7+
}

‎change/@fluentui-react-skeleton-9e800ca2-9155-4112-9add-68393df30fe7.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"type": "prerelease",
2+
"type": "none",
33
"comment": "fix: Scale pulse animation with percentages and flip wave animation's direction.",
44
"packageName": "@fluentui/react-skeleton",
55
"email": "ololubek@microsoft.com",

‎change/@fluentui-react-tree-2069fb39-182d-4a48-a7b0-2ddd973a40ee.json

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "prerelease",
3+
"comment": "feat: TreeItem itemType restructure",
4+
"packageName": "@fluentui/react-tree",
5+
"email": "bernardo.sunderhus@gmail.com",
6+
"dependentChangeType": "patch"
7+
}

‎change/@fluentui-react-tree-e91902ae-b031-47c0-99be-2f7450c3f3f7.json

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "prerelease",
3+
"comment": "bugfix: fix VisibleFlatTreeItemGenerator omitting visible items",
4+
"packageName": "@fluentui/react-tree",
5+
"email": "bernardo.sunderhus@gmail.com",
6+
"dependentChangeType": "patch"
7+
}

‎package.json

+1
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,7 @@
174174
"@types/react-dom": "17.0.15",
175175
"@types/react-is": "17.0.3",
176176
"@types/react-test-renderer": "17.0.2",
177+
"@types/react-transition-group": "4.4.6",
177178
"@types/request-promise-native": "1.0.18",
178179
"@types/scheduler": "0.16.2",
179180
"@types/semver": "^6.2.0",

‎packages/azure-themes/.npmignore

+1
Original file line numberDiff line numberDiff line change
@@ -35,3 +35,4 @@ visualtests
3535
!lib
3636
!lib-commonjs
3737
!lib-amd
38+
!dist

0 commit comments

Comments
 (0)