Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix implicit merge conflict in ComboBox #15096

Merged
merged 2 commits into from
Sep 17, 2020
Merged

Fix implicit merge conflict in ComboBox #15096

merged 2 commits into from
Sep 17, 2020

Conversation

ecraig12345
Copy link
Member

Fix conflict between #14719 and #15079

@msft-github-bot
Copy link
Contributor

Hello @ecraig12345!

Because this pull request has the AutoMerge label, I will be glad to assist with helping to merge this pull request once all check-in policies pass.

Do note that I've been instructed to only help merge pull requests of this repository that have been opened for at least 8 hours, a condition that will be fulfilled in about 7 hours 51 minutes. No worries though, I will be back when the time is right! 😉

p.s. you can customize the way I help with merging this pull request, such as holding this pull request until a specific person approves. Simply @mention me (@msft-github-bot) and give me an instruction to get started! Learn more here.

@ecraig12345
Copy link
Member Author

@msft-github-bot merge this in 1 minute

@msft-github-bot
Copy link
Contributor

Hello @ecraig12345!

Because you've given me some instructions on how to help merge this pull request, I'll be modifying my merge approach. Here's how I understand your requirements for merging this pull request:

  • I won't merge this pull request until after the UTC date Thu, 17 Sep 2020 17:48:38 GMT, which is in 1 minute

If this doesn't seem right to you, you can tell me to cancel these instructions and use the auto-merge policy that has been configured for this repository. Try telling me "forget everything I just told you".

@ecraig12345 ecraig12345 merged commit 3d11ce7 into microsoft:master Sep 17, 2020
@ecraig12345 ecraig12345 deleted the combobox-merge branch September 17, 2020 17:54
@codesandbox-ci
Copy link

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 ba434cf:

Sandbox Source
Fluent UI Button Configuration
microsoft/fluentui: codesandbox-react-template Configuration
microsoft/fluentui: codesandbox-react-next-template Configuration
microsoft/fluentui: codesandbox-react-northstar-template Configuration

@msft-github-bot
Copy link
Contributor

Perf Analysis

No significant results to display.

All results

Scenario Render type Master Ticks PR Ticks Iterations Status
BaseButton mount 926 910 5000
Breadcrumb mount 39141 39195 5000
BreadcrumbNext mount 149897 149581 5000
ButtonNext mount 569 590 5000
Checkbox mount 1599 1616 5000
CheckboxBase mount 1312 1335 5000
CheckboxNext mount 1501 1589 5000
ChoiceGroup mount 4977 5041 5000
ChoiceGroupNext mount 5010 5052 5000
ComboBox mount 923 930 1000
CommandBar mount 7356 7368 1000
ContextualMenu mount 12282 12279 1000
DefaultButton mount 1103 1106 5000
DetailsRow mount 3518 3565 5000
DetailsRowFast mount 3545 3652 5000
DetailsRowNoStyles mount 3308 3381 5000
Dialog mount 1505 1489 1000
DocumentCardTitle mount 1780 1762 1000
Dropdown mount 2581 2603 5000
FocusZone mount 1747 1731 5000
IconButton mount 1797 1801 5000
Label mount 328 339 5000
Link mount 452 437 5000
LinkNext mount 470 458 5000
MenuButton mount 1490 1487 5000
MessageBar mount 2008 1992 5000
MessageBarNext mount 1953 1977 5000
Nav mount 3195 3236 1000
OverflowSet mount 1420 1427 5000
OverflowSetNext mount 1025 1044 5000
Panel mount 1468 1383 1000
Persona mount 828 815 1000
Pivot mount 1423 1443 1000
PivotNext mount 1375 1365 1000
PrimaryButton mount 1249 1278 5000
Rating mount 7725 7763 5000
RatingNext mount 7690 7622 5000
SearchBox mount 1318 1325 5000
SearchBoxNext mount 1358 1357 5000
Shimmer mount 2687 2684 5000
ShimmerNext mount 2620 2640 5000
Slider mount 1495 1462 5000
SliderNext mount 1905 1941 5000
SpinButton mount 5017 4981 5000
SpinButtonNext mount 5089 5021 5000
Spinner mount 395 411 5000
SplitButton mount 3169 3164 5000
Stack mount 544 530 5000
StackWithIntrinsicChildren mount 1892 1850 5000
StackWithTextChildren mount 5023 5067 5000
SwatchColorPicker mount 10229 10120 5000
SwatchColorPickerNext mount 10151 10039 5000
TagPicker mount 2742 2746 5000
TeachingBubble mount 47607 47818 5000
TeachingBubbleNext mount 47713 47654 5000
Text mount 433 427 5000
TextField mount 1361 1385 5000
ThemeProvider mount 4773 4804 5000
ThemeProvider virtual-rerender 585 605 5000
Toggle mount 819 860 5000
ToggleNext mount 808 815 5000
button mount 111 117 5000

Perf Analysis (Fluent)

⚠️ 5 potential perf regressions detected

Potential regressions comparing to master

Scenario Current PR Ticks Baseline Ticks Ratio Regression Analysis
ButtonOverridesMissPerf.default 1709 43 39.74:1 analysis
ButtonUseCssNestingPerf.default 1112 43 25.86:1 analysis
ButtonUseCssPerf.default 839 44 19.07:1 analysis
ChatWithPopoverPerf.default 487 470 1.04:1 analysis
ListCommonPerf.default 708 951 0.74:1 analysis
Perf comparison
Status Scenario Fluent TPI Fabric TPI Ratio Iterations Ticks
🎯 Avatar.Fluent 0.46 0.48 0.96:1 2000 927
🦄 Button.Fluent 0.12 0.2 0.6:1 5000 621
🔧 Checkbox.Fluent 0.64 0.36 1.78:1 1000 637
🎯 Dialog.Fluent 0.16 0.22 0.73:1 5000 823
🔧 Dropdown.Fluent 2.85 0.48 5.94:1 1000 2847
🔧 Icon.Fluent 0.15 0.06 2.5:1 5000 768
🎯 Image.Fluent 0.09 0.12 0.75:1 5000 437
🔧 Slider.Fluent 1.54 0.37 4.16:1 1000 1536
🔧 Text.Fluent 0.08 0.03 2.67:1 5000 400
🦄 Tooltip.Fluent 0.11 14.72 0.01:1 5000 552

🔧 Needs work     🎯 On target     🦄 Amazing

Perf tests with no regressions
Scenario Current PR Ticks Baseline Ticks Ratio
PortalMinimalPerf.default 161 113 1.42:1
HeaderMinimalPerf.default 428 348 1.23:1
ImageMinimalPerf.default 437 360 1.21:1
TextAreaMinimalPerf.default 581 479 1.21:1
RefMinimalPerf.default 241 201 1.2:1
StatusMinimalPerf.default 808 684 1.18:1
Image.Fluent 437 371 1.18:1
LayoutMinimalPerf.default 438 376 1.16:1
ReactionMinimalPerf.default 453 392 1.16:1
SkeletonMinimalPerf.default 482 414 1.16:1
Text.Fluent 400 346 1.16:1
BoxMinimalPerf.default 389 337 1.15:1
FlexMinimalPerf.default 321 280 1.15:1
LabelMinimalPerf.default 450 391 1.15:1
RadioGroupMinimalPerf.default 479 417 1.15:1
AnimationMinimalPerf.default 422 369 1.14:1
FormMinimalPerf.default 479 421 1.14:1
TextMinimalPerf.default 386 338 1.14:1
ButtonMinimalPerf.default 188 167 1.13:1
DividerMinimalPerf.default 407 361 1.13:1
AttachmentMinimalPerf.default 172 154 1.12:1
Button.Fluent 621 553 1.12:1
Tooltip.Fluent 552 493 1.12:1
AlertMinimalPerf.default 332 299 1.11:1
GridMinimalPerf.default 383 344 1.11:1
ListMinimalPerf.default 522 470 1.11:1
SegmentMinimalPerf.default 393 353 1.11:1
IconMinimalPerf.default 712 641 1.11:1
TooltipMinimalPerf.default 829 744 1.11:1
Icon.Fluent 768 693 1.11:1
AccordionMinimalPerf.default 162 147 1.1:1
CardMinimalPerf.default 617 561 1.1:1
ChatMinimalPerf.default 651 594 1.1:1
Dialog.Fluent 823 754 1.09:1
HeaderSlotsPerf.default 853 787 1.08:1
ProviderMinimalPerf.default 922 851 1.08:1
TableMinimalPerf.default 436 403 1.08:1
ToolbarMinimalPerf.default 997 923 1.08:1
Avatar.Fluent 927 861 1.08:1
DialogMinimalPerf.default 804 753 1.07:1
MenuButtonMinimalPerf.default 1642 1534 1.07:1
VideoMinimalPerf.default 685 641 1.07:1
AvatarMinimalPerf.default 500 473 1.06:1
CarouselMinimalPerf.default 482 455 1.06:1
MenuMinimalPerf.default 897 843 1.06:1
PopupMinimalPerf.default 686 653 1.05:1
ProviderMergeThemesPerf.default 1861 1765 1.05:1
CustomToolbarPrototype.default 3724 3552 1.05:1
TreeMinimalPerf.default 915 873 1.05:1
AttachmentSlotsPerf.default 1174 1130 1.04:1
EmbedMinimalPerf.default 1984 1915 1.04:1
ButtonSlotsPerf.default 611 593 1.03:1
ChatDuplicateMessagesPerf.default 418 404 1.03:1
DropdownManyItemsPerf.default 780 756 1.03:1
InputMinimalPerf.default 1296 1261 1.03:1
SplitButtonMinimalPerf.default 3901 3779 1.03:1
CheckboxMinimalPerf.default 2854 2798 1.02:1
Dropdown.Fluent 2847 2797 1.02:1
DropdownMinimalPerf.default 2852 2813 1.01:1
ItemLayoutMinimalPerf.default 1320 1309 1.01:1
Checkbox.Fluent 637 628 1.01:1
LoaderMinimalPerf.default 729 729 1:1
SliderMinimalPerf.default 1555 1553 1:1
TableManyItemsPerf.default 2251 2246 1:1
Slider.Fluent 1536 1543 1:1
TreeWith60ListItems.default 196 199 0.98:1
ListWith60ListItems.default 946 1060 0.89:1
ListNestedPerf.default 609 886 0.69:1

@size-auditor
Copy link

size-auditor bot commented Sep 17, 2020

Asset size changes

⚠️ Insufficient baseline data to detect size changes

Unable to find bundle size details for Baseline commit: 49b7362

Possible causes

  • The baseline build 49b7362 is broken
  • The Size Auditor run for the baseline build 49b7362 was not triggered

Recommendations

  • Please merge your branch for this Pull request with the latest master build and commit your changes once again

@msft-github-bot
Copy link
Contributor

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

Handy links:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dzearing dzearing dzearing approved these changes

@MLoughry MLoughry MLoughry approved these changes

Assignees
No one assigned
Labels
AutoMerge Component: Combobox
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@ecraig12345 @msft-github-bot @dzearing @MLoughry