Skip to content

Commit 38d8b01

Browse files
gavinbarrongavinbarron
committed
merge from 'origin/next/fluentui' into 'next/wc-registration'
2 parents 6628282 + 731bba4 commit 38d8b01

File tree

26 files changed

+285
-322
lines changed

26 files changed

+285
-322
lines changed

‎.storybook/manager-head.html‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
}
4545

4646
// This is a fix for an accessibility issue: https://github.com/microsoftgraph/microsoft-graph-toolkit/issues/1085
47-
sidebarHeader[0].innerHTML = '<h1 tabindex="0" class="css-1su1ft1">' + '<a href="https://aka.ms/mgt" target="_blank" class="css-ixbm00">' + "Microsoft Graph Toolkit Playground</a>" + "</h1>";
47+
sidebarHeader[0].innerHTML = '<h1 tabindex="-1" class="css-1su1ft1">' + '<a href="https://aka.ms/mgt" target="_blank" class="css-ixbm00">' + "Microsoft Graph Toolkit Playground</a>" + "</h1>";
4848

4949
const sidebarNode = sidebarHeader[0].parentNode;
5050

@@ -417,6 +417,7 @@
417417
color: #717171 !important;
418418
}
419419

420+
.sto-ulso1l,
420421
.css-1en6m26 {
421422
color: #616159 !important;
422423
}
@@ -425,4 +426,4 @@
425426
.css-8ktt77 {
426427
display: none;
427428
}
428-
</style>
429+
</style>

‎.storybook/preview-body.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,11 @@
7676
}
7777

7878
.css-19nbuh3,
79-
.css-1m7olli * .token.attr-value {
79+
.css-zj0253 * .token.attr-value {
8080
color: #0360B9 !important;
8181
}
8282

83-
.css-1m7olli * .token.attr-name{
83+
.css-zj0253 * .token.attr-name {
8484
color: #e50000 !important;
8585
}
8686

‎index.html‎

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,57 @@
11
<!DOCTYPE html>
22
<html lang="en">
3-
<head>
4-
<meta charset="utf-8" />
5-
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
6-
<title>Microsoft Graph Toolkit Test</title>
7-
<meta name="viewport" content="width=device-width, initial-scale=1" />
83

9-
<link href="https://cdnjs.cloudflare.com/ajax/libs/normalize/8.0.1/normalize.min.css" rel="stylesheet" />
10-
<!-- <script src="./node_modules/@webcomponents/webcomponentsjs/webcomponents-loader.js"></script> -->
4+
<head>
5+
<meta charset="utf-8" />
6+
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
7+
<title>Microsoft Graph Toolkit Test</title>
8+
<meta name="viewport" content="width=device-width, initial-scale=1" />
119

12-
<script src="https://unpkg.com/@microsoft/teams-js/dist/MicrosoftTeams.min.js" crossorigin="anonymous"></script>
10+
<link href="https://cdnjs.cloudflare.com/ajax/libs/normalize/8.0.1/normalize.min.css" rel="stylesheet" />
11+
<!-- <script src="./node_modules/@webcomponents/webcomponentsjs/webcomponents-loader.js"></script> -->
1312

14-
<!-- <script src="./packages/mgt/dist/bundle/mgt-loader.js"></script> -->
13+
<script src="https://unpkg.com/@microsoft/teams-js/dist/MicrosoftTeams.min.js" crossorigin="anonymous"></script>
1514

16-
<script type="module" src="./packages/mgt/dist/es6/index.js"></script>
17-
</head>
15+
<!-- <script src="./packages/mgt/dist/bundle/mgt-loader.js"></script> -->
1816

19-
<body>
20-
<!-- <mgt-teams-provider
17+
<script type="module" src="./packages/mgt/dist/es6/index.js"></script>
18+
</head>
19+
20+
<body>
21+
<!-- <mgt-teams-provider
2122
client-id="a974dfa0-9f57-49b9-95db-90f04ce2111a"
2223
auth-popup-url="auth.html"
2324
></mgt-teams-provider> -->
2425

25-
<!-- <mgt-teams-msal2-provider
26+
<!-- <mgt-teams-msal2-provider
2627
client-id="72482bff-ecae-44f5-8fdc-513b7f5602e7"
2728
scopes="user.read,user.read.all,mail.readBasic,people.read,people.read.all,sites.read.all,user.readbasic.all,contacts.read,presence.read,presence.read.all,tasks.readwrite,tasks.read,calendars.read,group.read.all"
2829
auth-popup-url="auth.html"
2930
></mgt-teams-msal2-provider> -->
3031

31-
<!-- Teams Msal2 provider in SSO mode (see "teams-sso-node" sample) -->
32-
<!-- <mgt-teams-msal2-provider
32+
<!-- Teams Msal2 provider in SSO mode (see "teams-sso-node" sample) -->
33+
<!-- <mgt-teams-msal2-provider
3334
client-id="72482bff-ecae-44f5-8fdc-513b7f5602e7"
3435
scopes="user.read,user.read.all,mail.readBasic,people.read,people.read.all,sites.read.all,user.readbasic.all,contacts.read,presence.read,presence.read.all,tasks.readwrite,tasks.read,calendars.read,group.read.all"
3536
auth-popup-url="auth.html"
3637
sso-url="http://localhost:5000/api/token"
3738
http-method="POST"
3839
></mgt-teams-msal2-provider> -->
3940

40-
<!-- <mgt-msal-provider
41+
<!-- <mgt-msal-provider
4142
client-id="a974dfa0-9f57-49b9-95db-90f04ce2111a"
4243
scopes="user.read,user.read.all,mail.readBasic,people.read,people.read.all,sites.read.all,user.readbasic.all,contacts.read,presence.read,presence.read.all,tasks.readwrite,tasks.read,calendars.read,group.read.all"
4344
redirect-uri="http://localhost:3000"
4445
depends-on="mgt-teams-provider"
4546
></mgt-msal-provider> -->
4647

47-
<!-- <mgt-msal2-provider
48+
<!-- <mgt-msal2-provider
4849
client-id="2dfea037-938a-4ed8-9b35-c05708a1b241"
4950
redirect-uri="http://localhost:3000"
5051
scopes="user.read,user.read.all,mail.readBasic,people.read,people.read.all,sites.read.all,user.readbasic.all,contacts.read,presence.read,presence.read.all,tasks.readwrite,tasks.read,calendars.read,group.read.all,files.read,files.read.all,files.readwrite,files.readwrite.all"
5152
></mgt-msal2-provider> -->
5253

53-
<mgt-mock-provider></mgt-mock-provider>
54+
<mgt-mock-provider></mgt-mock-provider>
5455

5556
<h1>Developer test page</h1>
5657
<main>

‎package.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@
116116
"tslint": "^6.1.3",
117117
"tslint-config-prettier": "^1.18.0",
118118
"tslint-microsoft-contrib": "^6.2.0",
119-
"typescript": "^3.7.5",
119+
"typescript": "^4.8.2",
120120
"web-component-analyzer": "^1.1.6",
121121
"whatwg-fetch": "^3.5.0"
122122
},
@@ -134,6 +134,7 @@
134134
},
135135
"resolutions": {
136136
"react": "16.13.1",
137-
"react-dom": "16.13.1"
137+
"react-dom": "16.13.1",
138+
"responselike": "2.0.0"
138139
}
139140
}

‎packages/mgt-components/src/components/mgt-people-picker/mgt-people-picker.ts‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -916,10 +916,9 @@ export class MgtPeoplePicker extends MgtTemplatedComponent {
916916
};
917917
return html`
918918
<li
919-
role="option"
919+
role="listitem"
920920
@keydown="${this.onUserKeyDown}"
921921
aria-label=" ${this.strings.suggestedContact} ${person.displayName}"
922-
id="${person.displayName}"
923922
tabindex="0"
924923
class="${classMap(listPersonClasses)}"
925924
@click="${e => this.onPersonClick(person)}">
@@ -994,7 +993,13 @@ export class MgtPeoplePicker extends MgtTemplatedComponent {
994993
const input = this.userInput.toLowerCase();
995994
const provider = Providers.globalProvider;
996995

997-
if (!people && provider && provider.state === ProviderState.SignedIn) {
996+
if (people) {
997+
if (input) {
998+
const displayNameMatch = people.filter(person => person?.displayName.toLowerCase().includes(input));
999+
people = displayNameMatch;
1000+
}
1001+
this._showLoading = false;
1002+
} else if (!people && provider && provider.state === ProviderState.SignedIn) {
9981003
const graph = provider.graph.forComponent(this);
9991004

10001005
if (!input.length && this._isFocused) {
@@ -1227,7 +1232,7 @@ export class MgtPeoplePicker extends MgtTemplatedComponent {
12271232
*/
12281233
private async getGroupsForGroupIds(graph: IGraph, people: IDynamicPerson[]) {
12291234
const groups = await getGroupsForGroupIds(graph, this.groupIds, this.groupFilters);
1230-
for (const group of groups as IDynamicPerson[]) {
1235+
for (let group of groups as IDynamicPerson[]) {
12311236
people = people.concat(group);
12321237
}
12331238
people = people.filter(person => person);

0 commit comments

Comments
 (0)