Fix inferred type error related to ITheme (cherry-pick from 7.0)

[xugao]

Pull request checklist

• Addresses an existing issue: Fixes #0000
• Include a change request file using $ yarn change

Description of changes

Cherry-pick #15560.

Also noticed change from #14963 is missing. Most likely lost by code move. So adding it back.

Focus areas to test

(optional)

[codesandbox-ci]

This pull request is automatically built and testable in CodeSandbox.

To see build info of the built libraries, click here or the icon next to each commit SHA.

Latest deployment of this branch, based on commit 10cc860:

Sandbox	Source
Fluent UI Button	Configuration
codesandbox-react-template	Configuration
codesandbox-react-northstar-template	Configuration

[msft-github-bot]

Perf Analysis

No significant results to display.

All results

Scenario	Render type	Master Ticks	PR Ticks	Iterations	Status
Avatar	mount	833	823	5000
BaseButtonCompat	mount	901	902	5000
Breadcrumb	mount	160087	161821	5000
Checkbox	mount	1507	1524	5000
CheckboxBase	mount	1259	1282	5000
ChoiceGroup	mount	4827	4736	5000
ComboBox	mount	950	983	1000
CommandBar	mount	21930	22000	1000
ContextualMenu	mount	6165	6146	1000
DefaultButtonCompat	mount	1160	1123	5000
DetailsRow	mount	3594	3613	5000
DetailsRowFast	mount	3624	3662	5000
DetailsRowNoStyles	mount	3487	3534	5000
Dialog	mount	1492	1482	1000
DocumentCardTitle	mount	1830	1847	1000
Dropdown	mount	3791	3737	5000
FocusTrapZone	mount	1792	1767	5000
FocusZone	mount	1837	1834	5000
IconButtonCompat	mount	1751	1747	5000
Label	mount	342	341	5000
Layer	mount	1820	1802	5000
Link	mount	478	483	5000
MenuButtonCompat	mount	1454	1474	5000
MessageBar	mount	2047	2037	5000
Nav	mount	3541	3306	1000
OverflowSet	mount	1047	1047	5000
Panel	mount	1466	1456	1000
Persona	mount	861	869	1000
Pivot	mount	1422	1405	1000
PrimaryButtonCompat	mount	1297	1281	5000
Rating	mount	7489	7472	5000
SearchBox	mount	1313	1302	5000
Shimmer	mount	2529	2544	5000
Slider	mount	1911	1941	5000
SpinButton	mount	5331	5318	5000
Spinner	mount	417	426	5000
SplitButtonCompat	mount	3208	3150	5000
Stack	mount	518	510	5000
StackWithIntrinsicChildren	mount	1930	1903	5000
StackWithTextChildren	mount	4952	4990	5000
SwatchColorPicker	mount	10386	10311	5000
TagPicker	mount	2730	2703	5000
TeachingBubble	mount	11629	11601	5000
Text	mount	424	431	5000
TextField	mount	1382	1414	5000
ThemeProvider	mount	2009	2070	5000
ThemeProvider	virtual-rerender	649	651	5000
Toggle	mount	791	832	5000
button	mount	541	564	5000
buttonNative	mount	117	117	5000

Perf Analysis (Fluent)

Perf comparison

Status	Scenario	Fluent TPI	Fabric TPI	Ratio	Iterations	Ticks
🎯	Avatar.Fluent	0.45	0.5	0.9:1	2000	893
🦄	Button.Fluent	0.12	0.2	0.6:1	5000	606
🔧	Checkbox.Fluent	0.65	0.35	1.86:1	1000	649
🎯	Dialog.Fluent	0.16	0.22	0.73:1	5000	822
🔧	Dropdown.Fluent	2.99	0.44	6.8:1	1000	2985
🔧	Icon.Fluent	0.14	0.06	2.33:1	5000	690
🦄	Image.Fluent	0.08	0.13	0.62:1	5000	407
🔧	Slider.Fluent	1.58	0.45	3.51:1	1000	1581
🔧	Text.Fluent	0.08	0.03	2.67:1	5000	382
🦄	Tooltip.Fluent	0.12	0.9	0.13:1	5000	578

🔧 Needs work     🎯 On target     🦄 Amazing

Perf tests with no regressions

Scenario	Current PR Ticks	Baseline Ticks	Ratio
DividerMinimalPerf.default	421	378	1.11:1
RefMinimalPerf.default	257	240	1.07:1
AvatarMinimalPerf.default	511	482	1.06:1
CarouselMinimalPerf.default	476	450	1.06:1
LabelMinimalPerf.default	447	420	1.06:1
TableMinimalPerf.default	458	433	1.06:1
AttachmentSlotsPerf.default	1183	1132	1.05:1
FormMinimalPerf.default	462	438	1.05:1
SkeletonMinimalPerf.default	455	435	1.05:1
FlexMinimalPerf.default	317	305	1.04:1
MenuButtonMinimalPerf.default	1646	1590	1.04:1
TreeWith60ListItems.default	209	201	1.04:1
Image.Fluent	407	390	1.04:1
AccordionMinimalPerf.default	157	153	1.03:1
ButtonMinimalPerf.default	190	184	1.03:1
ChatDuplicateMessagesPerf.default	435	422	1.03:1
ChatWithPopoverPerf.default	476	461	1.03:1
GridMinimalPerf.default	370	358	1.03:1
ListNestedPerf.default	600	581	1.03:1
VideoMinimalPerf.default	658	638	1.03:1
Button.Fluent	606	589	1.03:1
ButtonOverridesMissPerf.default	1778	1736	1.02:1
HeaderMinimalPerf.default	397	391	1.02:1
ImageMinimalPerf.default	398	392	1.02:1
LayoutMinimalPerf.default	431	423	1.02:1
LoaderMinimalPerf.default	751	734	1.02:1
SplitButtonMinimalPerf.default	3830	3749	1.02:1
StatusMinimalPerf.default	749	731	1.02:1
AlertMinimalPerf.default	302	300	1.01:1
AttachmentMinimalPerf.default	179	177	1.01:1
ButtonUseCssPerf.default	879	871	1.01:1
CardMinimalPerf.default	574	570	1.01:1
CheckboxMinimalPerf.default	2885	2861	1.01:1
ListCommonPerf.default	659	653	1.01:1
MenuMinimalPerf.default	914	901	1.01:1
ProviderMinimalPerf.default	1053	1044	1.01:1
SliderMinimalPerf.default	1626	1606	1.01:1
TableManyItemsPerf.default	2207	2191	1.01:1
TextMinimalPerf.default	373	371	1.01:1
ToolbarMinimalPerf.default	991	983	1.01:1
Checkbox.Fluent	649	643	1.01:1
Dialog.Fluent	822	814	1.01:1
Dropdown.Fluent	2985	2959	1.01:1
BoxMinimalPerf.default	380	379	1:1
ChatMinimalPerf.default	632	632	1:1
ItemLayoutMinimalPerf.default	1299	1296	1:1
SegmentMinimalPerf.default	375	376	1:1
IconMinimalPerf.default	721	719	1:1
CustomToolbarPrototype.default	4003	3987	1:1
TooltipMinimalPerf.default	830	826	1:1
TreeMinimalPerf.default	910	910	1:1
AnimationMinimalPerf.default	423	427	0.99:1
ButtonUseCssNestingPerf.default	1137	1144	0.99:1
DialogMinimalPerf.default	814	821	0.99:1
DropdownMinimalPerf.default	2995	3015	0.99:1
EmbedMinimalPerf.default	1934	1951	0.99:1
InputMinimalPerf.default	1330	1341	0.99:1
ListWith60ListItems.default	952	966	0.99:1
ProviderMergeThemesPerf.default	2113	2124	0.99:1
RadioGroupMinimalPerf.default	463	470	0.99:1
ReactionMinimalPerf.default	422	426	0.99:1
Avatar.Fluent	893	905	0.99:1
ButtonSlotsPerf.default	600	612	0.98:1
DropdownManyItemsPerf.default	760	772	0.98:1
HeaderSlotsPerf.default	792	811	0.98:1
PopupMinimalPerf.default	712	724	0.98:1
TextAreaMinimalPerf.default	492	501	0.98:1
Slider.Fluent	1581	1608	0.98:1
Tooltip.Fluent	578	588	0.98:1
PortalMinimalPerf.default	173	179	0.97:1
ListMinimalPerf.default	500	522	0.96:1
Icon.Fluent	690	722	0.96:1
Text.Fluent	382	404	0.95:1

[size-auditor]

Asset size changes

Project	Bundle	Baseline Size	New Size	Difference
office-ui-fabric-react	fluentui-react-ContextualMenu	142.682 kB	142.733 kB	51 bytes

 Over Tolerance (1024 B)  Over Baseline  Below Baseline  New   Removed 1 kB = 1000 B

Baseline commit: 74992881d9e046805213421093810417bd944759 (build)

[msft-github-bot]

🎉@fluentui/[email protected] has been released which incorporates this pull request.:tada:

Handy links:

• Release Notes
• Official NPM Release