Skip to content

Commit 5ecf05c

Browse files
dmytrokirpadmytrokirpa
authored
Merge branch 'master' into feat/docsite-ai-docs-agent-skills
2 parents f2bdf6b + 30d6910 commit 5ecf05c

358 files changed

Lines changed: 4554 additions & 806 deletions

File tree

Some content is hidden

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

‎.github/CODEOWNERS‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -195,16 +195,16 @@ common/_common.scss @microsoft/cxe-red @phkuo
195195
## vNext packages
196196
packages/react-components/eslint-plugin-react-components @microsoft/fluentui-react-build @microsoft/cxe-prg
197197
packages/react-components/keyboard-keys @microsoft/teams-prg
198-
packages/react-components/react-accordion/library @microsoft/cxe-prg @marcosmoura
199-
packages/react-components/react-accordion/stories @microsoft/cxe-prg @marcosmoura
198+
packages/react-components/react-accordion/library @microsoft/cxe-prg @ValentinaKozlova
199+
packages/react-components/react-accordion/stories @microsoft/cxe-prg @ValentinaKozlova
200200
packages/react-components/react-avatar/library @microsoft/cxe-prg @ValentinaKozlova
201201
packages/react-components/react-avatar/stories @microsoft/cxe-prg @ValentinaKozlova
202202
packages/react-components/react-badge/library @microsoft/cxe-prg @dmytrokirpa
203203
packages/react-components/react-badge/stories @microsoft/cxe-prg @dmytrokirpa
204-
packages/react-components/react-button/library @microsoft/cxe-prg @marcosmoura
205-
packages/react-components/react-button/stories @microsoft/cxe-prg @marcosmoura
206-
packages/react-components/react-card/library @microsoft/cxe-prg @marcosmoura
207-
packages/react-components/react-card/stories @microsoft/cxe-prg @marcosmoura
204+
packages/react-components/react-button/library @microsoft/cxe-prg @mainframev
205+
packages/react-components/react-button/stories @microsoft/cxe-prg @mainframev
206+
packages/react-components/react-card/library @microsoft/cxe-prg @ValentinaKozlova
207+
packages/react-components/react-card/stories @microsoft/cxe-prg @ValentinaKozlova
208208
packages/react-components/react-checkbox/library @microsoft/cxe-prg @mainframev
209209
packages/react-components/react-checkbox/stories @microsoft/cxe-prg @mainframev
210210
packages/react-components/react-combobox/library @microsoft/cxe-prg @microsoft/teams-prg @dmytrokirpa
@@ -233,28 +233,28 @@ packages/react-components/react-portal/library @microsoft/teams-prg
233233
packages/react-components/react-portal/stories @microsoft/teams-prg
234234
packages/react-components/react-provider/library @microsoft/teams-prg
235235
packages/react-components/react-provider/stories @microsoft/teams-prg
236-
packages/react-components/react-radio/library @microsoft/cxe-red @behowell @spmonahan
237-
packages/react-components/react-radio/stories @microsoft/cxe-red @behowell @spmonahan
236+
packages/react-components/react-radio/library @microsoft/cxe-red @spmonahan
237+
packages/react-components/react-radio/stories @microsoft/cxe-red @spmonahan
238238
packages/react-components/react-select/library @microsoft/cxe-prg @mainframev
239239
packages/react-components/react-select/stories @microsoft/cxe-prg @mainframev
240240
packages/react-components/react-slider/library @microsoft/cxe-prg @dmytrokirpa
241241
packages/react-components/react-slider/stories @microsoft/cxe-prg @dmytrokirpa
242-
packages/react-components/react-spinbutton/library @microsoft/cxe-prg @marcosmoura
243-
packages/react-components/react-spinbutton/stories @microsoft/cxe-prg @marcosmoura
244-
packages/react-components/react-spinner/library @microsoft/cxe-prg @marcosmoura
245-
packages/react-components/react-spinner/stories @microsoft/cxe-prg @marcosmoura
246-
packages/react-components/react-switch/library @microsoft/cxe-prg @marcosmoura
247-
packages/react-components/react-switch/stories @microsoft/cxe-prg @marcosmoura
242+
packages/react-components/react-spinbutton/library @microsoft/cxe-prg @ValentinaKozlova
243+
packages/react-components/react-spinbutton/stories @microsoft/cxe-prg @ValentinaKozlova
244+
packages/react-components/react-spinner/library @microsoft/cxe-prg @mainframev
245+
packages/react-components/react-spinner/stories @microsoft/cxe-prg @mainframev
246+
packages/react-components/react-switch/library @microsoft/cxe-prg @ValentinaKozlova
247+
packages/react-components/react-switch/stories @microsoft/cxe-prg @ValentinaKozlova
248248
packages/react-components/react-tabs/library @microsoft/cxe-prg @dmytrokirpa
249249
packages/react-components/react-tabs/stories @microsoft/cxe-prg @dmytrokirpa
250-
packages/react-components/react-text/library @microsoft/cxe-prg @marcosmoura
251-
packages/react-components/react-text/stories @microsoft/cxe-prg @marcosmoura
250+
packages/react-components/react-text/library @microsoft/cxe-prg @maifnramev
251+
packages/react-components/react-text/stories @microsoft/cxe-prg @mainframev
252252
packages/react-components/react-textarea/library @microsoft/cxe-prg @mainframev
253253
packages/react-components/react-textarea/stories @microsoft/cxe-prg @mainframev
254254
packages/react-components/react-tooltip/library @microsoft/cxe-prg @mainframev
255255
packages/react-components/react-tooltip/stories @microsoft/cxe-prg @mainframev
256-
packages/react-components/react-toolbar/library @microsoft/teams-prg @chpalac @ling1726
257-
packages/react-components/react-toolbar/stories @microsoft/teams-prg @chpalac @ling1726
256+
packages/react-components/react-toolbar/library @microsoft/teams-prg @chpalac
257+
packages/react-components/react-toolbar/stories @microsoft/teams-prg @chpalac
258258
packages/react-components/react-portal-compat @microsoft/teams-prg
259259
packages/react-components/react-portal-compat-context @microsoft/teams-prg
260260
packages/react-components/react-theme-sass @microsoft/teams-prg
@@ -271,8 +271,8 @@ packages/react-components/react-tree/library @microsoft/teams-prg
271271
packages/react-components/react-tree/stories @microsoft/teams-prg
272272
packages/react-components/react-virtualizer/library @microsoft/xc-uxe @Mitch-At-Work
273273
packages/react-components/react-virtualizer/stories @microsoft/xc-uxe @Mitch-At-Work
274-
packages/react-components/react-skeleton/library @microsoft/cxe-prg @marcosmoura
275-
packages/react-components/react-skeleton/stories @microsoft/cxe-prg @marcosmoura
274+
packages/react-components/react-skeleton/library @microsoft/cxe-prg @ValentinaKozlova
275+
packages/react-components/react-skeleton/stories @microsoft/cxe-prg @ValentinaKozlova
276276
packages/tokens @microsoft/teams-prg
277277
packages/react-components/react-tags/library @microsoft/cxe-prg @microsoft/teams-prg @ValentinaKozlova
278278
packages/react-components/react-tags/stories @microsoft/cxe-prg @microsoft/teams-prg @ValentinaKozlova
@@ -284,8 +284,8 @@ packages/react-components/react-migration-v8-v9/library @microsoft/cxe-prg @dmyt
284284
packages/react-components/react-migration-v8-v9/stories @microsoft/cxe-prg @dmytrokirpa
285285
packages/react-components/react-breadcrumb/library @microsoft/cxe-prg
286286
packages/react-components/react-breadcrumb/stories @microsoft/cxe-prg
287-
packages/react-components/react-drawer/library @microsoft/cxe-prg @marcosmoura
288-
packages/react-components/react-drawer/stories @microsoft/cxe-prg @marcosmoura
287+
packages/react-components/react-drawer/library @microsoft/cxe-prg @mainframev
288+
packages/react-components/react-drawer/stories @microsoft/cxe-prg @mainframev
289289
packages/react-components/react-storybook-addon-export-to-sandbox @microsoft/fluentui-react-build
290290
packages/react-components/babel-preset-storybook-full-source @microsoft/fluentui-react-build
291291
packages/react-components/react-jsx-runtime @microsoft/teams-prg
@@ -294,12 +294,12 @@ packages/react-components/react-toast/stories @microsoft/teams-prg
294294
packages/react-components/react-search/library @microsoft/cxe-prg @ValentinaKozlova
295295
packages/react-components/react-search/stories @microsoft/cxe-prg @ValentinaKozlova
296296
packages/react-components/react-colorpicker-compat @microsoft/cxe-red @sopranopillow
297-
packages/react-components/react-nav/library @microsoft/cxe-prg @marcosmoura
298-
packages/react-components/react-nav/stories @microsoft/cxe-prg @marcosmoura
297+
packages/react-components/react-nav/library @microsoft/cxe-prg @mainframev
298+
packages/react-components/react-nav/stories @microsoft/cxe-prg @mainframev
299299
packages/react-components/react-message-bar/library @microsoft/teams-prg
300300
packages/react-components/react-message-bar/stories @microsoft/teams-prg
301-
packages/react-components/react-rating/library @microsoft/cxe-prg @marcosmoura
302-
packages/react-components/react-rating/stories @microsoft/cxe-prg @marcosmoura
301+
packages/react-components/react-rating/library @microsoft/cxe-prg @ValentinaKozlova
302+
packages/react-components/react-rating/stories @microsoft/cxe-prg @ValentinaKozlova
303303
packages/react-components/react-swatch-picker/library @microsoft/cxe-prg
304304
packages/react-components/react-swatch-picker/stories @microsoft/cxe-prg
305305
packages/react-components/react-calendar-compat/library @microsoft/cxe-prg @ValentinaKozlova
@@ -373,7 +373,7 @@ packages/react/src/components/Overlay @microsoft/cxe-red @khmakoto
373373
packages/react/src/components/Panel @microsoft/cxe-red @khmakoto
374374
packages/react/src/components/Persona @microsoft/cxe-red
375375
packages/react/src/components/PersonaCoin @microsoft/cxe-red
376-
packages/react/src/components/Pivot @microsoft/cxe-red @behowell
376+
packages/react/src/components/Pivot @microsoft/cxe-red
377377
packages/react/src/components/SearchBox @microsoft/cxe-red
378378
packages/react/src/components/Shimmer @microsoft/cxe-red
379379
packages/react/src/components/SpinButton @microsoft/cxe-red
@@ -382,7 +382,7 @@ packages/react/src/components/SwatchColorPicker @microsoft/cxe-red
382382
packages/react/src/components/Text @microsoft/cxe-red @khmakoto
383383
packages/react/src/components/TextField @microsoft/cxe-red
384384
packages/react/src/components/Toggle @microsoft/cxe-red @khmakoto
385-
packages/react/src/components/Tooltip @microsoft/cxe-red @behowell
385+
packages/react/src/components/Tooltip @microsoft/cxe-red
386386
packages/react/src/components/WeeklyDayPicker @microsoft/cxe-red
387387

388388
## Theming and styling

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

Lines changed: 148 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@ import {
88
DialogTitle,
99
DialogTrigger,
1010
} from '@fluentui/react-dialog';
11+
import { OverlayDrawer, DrawerBody, DrawerHeader, DrawerHeaderTitle } from '@fluentui/react-drawer';
1112
import { Button } from '@fluentui/react-button';
1213
import { Combobox, Option } from '@fluentui/react-combobox';
13-
import { Rocket24Regular } from '@fluentui/react-icons';
14+
import { Rocket24Regular, Dismiss24Regular } from '@fluentui/react-icons';
1415
import type { Meta } from '@storybook/react-webpack5';
1516
import { getStoryVariant, DARK_MODE, HIGH_CONTRAST, RTL } from '../../utilities';
1617

@@ -528,3 +529,149 @@ export const IntegrationComboboxInline = () => {
528529
</Dialog>
529530
);
530531
};
532+
533+
export const DialogInsideDrawerDefault = () => (
534+
<OverlayDrawer open position="start">
535+
<DrawerHeader>
536+
<DrawerHeaderTitle action={<Button appearance="subtle" aria-label="Close" icon={<Dismiss24Regular />} />}>
537+
Drawer with Dialog
538+
</DrawerHeaderTitle>
539+
</DrawerHeader>
540+
<DrawerBody>
541+
<Dialog open>
542+
<DialogTrigger>
543+
<Button>Open dialog</Button>
544+
</DialogTrigger>
545+
<DialogSurface>
546+
<DialogBody>
547+
<DialogTitle>Dialog inside Drawer</DialogTitle>
548+
<DialogContent>This dialog has the default transparent backdrop when nested inside a Drawer.</DialogContent>
549+
<DialogActions>
550+
<DialogTrigger>
551+
<Button appearance="secondary">Close</Button>
552+
</DialogTrigger>
553+
<Button appearance="primary">Do Something</Button>
554+
</DialogActions>
555+
</DialogBody>
556+
</DialogSurface>
557+
</Dialog>
558+
</DrawerBody>
559+
</OverlayDrawer>
560+
);
561+
562+
DialogInsideDrawerDefault.storyName = 'dialog inside drawer default';
563+
564+
export const DialogInsideDrawerDefaultDarkMode = getStoryVariant(DialogInsideDrawerDefault, DARK_MODE);
565+
export const DialogInsideDrawerDefaultHighContrast = getStoryVariant(DialogInsideDrawerDefault, HIGH_CONTRAST);
566+
export const DialogInsideDrawerDefaultRTL = getStoryVariant(DialogInsideDrawerDefault, RTL);
567+
568+
export const DialogInsideDrawerDimmed = () => (
569+
<OverlayDrawer open position="start">
570+
<DrawerHeader>
571+
<DrawerHeaderTitle action={<Button appearance="subtle" aria-label="Close" icon={<Dismiss24Regular />} />}>
572+
Drawer with Dialog
573+
</DrawerHeaderTitle>
574+
</DrawerHeader>
575+
<DrawerBody>
576+
<Dialog open>
577+
<DialogTrigger>
578+
<Button>Open dialog</Button>
579+
</DialogTrigger>
580+
<DialogSurface backdrop={{ appearance: 'dimmed' }}>
581+
<DialogBody>
582+
<DialogTitle>Dialog inside Drawer</DialogTitle>
583+
<DialogContent>This dialog has a dimmed backdrop even though it is nested inside a Drawer.</DialogContent>
584+
<DialogActions>
585+
<DialogTrigger>
586+
<Button appearance="secondary">Close</Button>
587+
</DialogTrigger>
588+
<Button appearance="primary">Do Something</Button>
589+
</DialogActions>
590+
</DialogBody>
591+
</DialogSurface>
592+
</Dialog>
593+
</DrawerBody>
594+
</OverlayDrawer>
595+
);
596+
597+
DialogInsideDrawerDimmed.storyName = 'dialog inside drawer dimmed';
598+
599+
export const DialogInsideDrawerDimmedDarkMode = getStoryVariant(DialogInsideDrawerDimmed, DARK_MODE);
600+
export const DialogInsideDrawerDimmedHighContrast = getStoryVariant(DialogInsideDrawerDimmed, HIGH_CONTRAST);
601+
export const DialogInsideDrawerDimmedRTL = getStoryVariant(DialogInsideDrawerDimmed, RTL);
602+
603+
export const DialogInsideDrawerTransparent = () => (
604+
<OverlayDrawer open position="start">
605+
<DrawerHeader>
606+
<DrawerHeaderTitle action={<Button appearance="subtle" aria-label="Close" icon={<Dismiss24Regular />} />}>
607+
Drawer with Dialog
608+
</DrawerHeaderTitle>
609+
</DrawerHeader>
610+
<DrawerBody>
611+
<Dialog open>
612+
<DialogTrigger>
613+
<Button>Open dialog</Button>
614+
</DialogTrigger>
615+
<DialogSurface backdrop={{ appearance: 'transparent' }}>
616+
<DialogBody>
617+
<DialogTitle>Dialog inside Drawer</DialogTitle>
618+
<DialogContent>This dialog explicitly sets transparent backdrop appearance.</DialogContent>
619+
<DialogActions>
620+
<DialogTrigger>
621+
<Button appearance="secondary">Close</Button>
622+
</DialogTrigger>
623+
<Button appearance="primary">Do Something</Button>
624+
</DialogActions>
625+
</DialogBody>
626+
</DialogSurface>
627+
</Dialog>
628+
</DrawerBody>
629+
</OverlayDrawer>
630+
);
631+
632+
DialogInsideDrawerTransparent.storyName = 'dialog inside drawer transparent';
633+
634+
export const DialogInsideDrawerTransparentDarkMode = getStoryVariant(DialogInsideDrawerTransparent, DARK_MODE);
635+
export const DialogInsideDrawerTransparentHighContrast = getStoryVariant(DialogInsideDrawerTransparent, HIGH_CONTRAST);
636+
export const DialogInsideDrawerTransparentRTL = getStoryVariant(DialogInsideDrawerTransparent, RTL);
637+
638+
export const NestedDialogDimmed = () => (
639+
<Dialog open>
640+
<DialogTrigger>
641+
<Button>Open nested dialog</Button>
642+
</DialogTrigger>
643+
<DialogSurface as="div">
644+
<DialogBody>
645+
<DialogTitle>Outer Dialog</DialogTitle>
646+
<DialogContent>This is the outer dialog.</DialogContent>
647+
<DialogActions>
648+
<Dialog open>
649+
<DialogTrigger>
650+
<Button appearance="primary">Open inner dialog</Button>
651+
</DialogTrigger>
652+
<DialogSurface as="div" backdrop={{ appearance: 'dimmed' }}>
653+
<DialogBody>
654+
<DialogTitle>Inner Dialog with dimmed backdrop</DialogTitle>
655+
<DialogContent>
656+
This inner dialog explicitly sets dimmed backdrop to override the default transparent behavior for
657+
nested dialogs.
658+
</DialogContent>
659+
<DialogActions>
660+
<DialogTrigger>
661+
<Button appearance="primary">Close</Button>
662+
</DialogTrigger>
663+
</DialogActions>
664+
</DialogBody>
665+
</DialogSurface>
666+
</Dialog>
667+
</DialogActions>
668+
</DialogBody>
669+
</DialogSurface>
670+
</Dialog>
671+
);
672+
673+
NestedDialogDimmed.storyName = 'nested dialog dimmed';
674+
675+
export const NestedDialogDimmedDarkMode = getStoryVariant(NestedDialogDimmed, DARK_MODE);
676+
export const NestedDialogDimmedHighContrast = getStoryVariant(NestedDialogDimmed, HIGH_CONTRAST);
677+
export const NestedDialogDimmedRTL = getStoryVariant(NestedDialogDimmed, RTL);

‎change/@fluentui-eslint-plugin-react-components-a42b3f04-d734-4f80-a860-34b0ccbebba0.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "patch",
3+
"comment": "fix: add missing \"use client\" directive to client components and styles",
4+
"packageName": "@fluentui/eslint-plugin-react-components",
5+
"email": "dmytrokirpa@microsoft.com",
6+
"dependentChangeType": "patch"
7+
}

‎change/@fluentui-global-context-265c61ea-e1cf-47bc-9769-5db14b86d5f9.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "prerelease",
3+
"comment": "fix: add missing \"use client\" directive to client components and styles",
4+
"packageName": "@fluentui/global-context",
5+
"email": "dmytrokirpa@microsoft.com",
6+
"dependentChangeType": "patch"
7+
}

‎change/@fluentui-priority-overflow-9ca4f61b-1794-4d68-8b93-deca372b9b36.json‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎change/@fluentui-react-accordion-0b381d08-262e-4d88-8033-641d7997388d.json‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎change/@fluentui-react-avatar-7185a162-9726-469e-9d62-b6debdb55f19.json‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎change/@fluentui-react-button-e83c949c-d849-4636-b94e-c16be2c6079b.json‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎change/@fluentui-react-carousel-a96cffaf-5ba5-4437-9832-432901335262.json‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎change/@fluentui-react-charts-3bff1def-f8cd-4d1d-9fe7-1f2e2af1be73.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "patch",
3+
"comment": "fix: add missing \"use client\" directive to client components and styles",
4+
"packageName": "@fluentui/react-charts",
5+
"email": "dmytrokirpa@microsoft.com",
6+
"dependentChangeType": "patch"
7+
}

0 commit comments

Comments
 (0)