Skip to content

Commit 412c250

Browse files
committed
Merge remote-tracking branch 'origin/next/fluentui' into merge/wc-registration
2 parents 244b27c + 21549f8 commit 412c250

File tree

3 files changed

+19
-9
lines changed

3 files changed

+19
-9
lines changed

.storybook/addons/codeEditorAddon/editor.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ export class EditorElement extends LitElement {
177177
}
178178

179179
disconnectedCallback() {
180-
this.editor.removeEventListener('fileUpdated');
180+
this.editor.dispose();
181181
window.removeEventListener('resize', this.handleResize);
182182
}
183183

packages/mgt-components/src/components/mgt-people-picker/mgt-people-picker.scss

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -337,6 +337,14 @@ mgt-flyout {
337337
}
338338
}
339339
}
340+
&__person-wrapper-highlighted {
341+
&__overflow {
342+
&__close-icon {
343+
right: auto !important;
344+
left: 0px !important;
345+
}
346+
}
347+
}
340348
}
341349
.people-person-text-area {
342350
margin-right: 13px;

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

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -494,7 +494,6 @@ export class MgtPeoplePicker extends MgtTemplatedComponent {
494494
private _userFilters: string;
495495
private _groupFilters: string;
496496
private _peopleFilters: string;
497-
498497
private defaultPeople: IDynamicPerson[];
499498

500499
// tracking of user arrow key input for selection
@@ -516,14 +515,14 @@ export class MgtPeoplePicker extends MgtTemplatedComponent {
516515
private _mouseLeaveTimeout;
517516
private _mouseEnterTimeout;
518517
private _isKeyboardFocus: boolean = true;
518+
private _dir: string = this.direction;
519519

520520
constructor() {
521521
super();
522522
this.clearState();
523523
this._showLoading = true;
524524
this.showMax = 6;
525525
this.disableImages = false;
526-
this.direction = this.dir;
527526

528527
this.disabled = false;
529528
this.allowAnyEmail = false;
@@ -622,9 +621,11 @@ export class MgtPeoplePicker extends MgtTemplatedComponent {
622621
'people-picker': true,
623622
disabled: this.disabled
624623
};
625-
626624
return html`
627-
<div dir=${this.direction} class=${classMap(inputClasses)} @click=${e => this.focus(e)}>
625+
<div
626+
dir=${this._dir}
627+
class=${classMap(inputClasses)}
628+
@click=${(opts: FocusOptions) => this.focus(opts)}>
628629
<div
629630
aria-expanded="false"
630631
aria-haspopup="listbox"
@@ -722,7 +723,6 @@ export class MgtPeoplePicker extends MgtTemplatedComponent {
722723
@keyup="${this.onUserKeyUp}"
723724
@blur=${this.lostFocus}
724725
@click=${this.handleFlyout}
725-
@focus=${e => this.focus(e)}
726726
?disabled=${this.disabled}
727727
/>
728728
</div>
@@ -956,7 +956,7 @@ export class MgtPeoplePicker extends MgtTemplatedComponent {
956956
show-presence
957957
view="twoLines"
958958
line2-property="jobTitle,mail"
959-
dir=${this.direction}
959+
dir=${this._dir}
960960
.personDetails=${person}
961961
.fetchImage=${!this.disableImages}>
962962
</mgt-person>`
@@ -1002,7 +1002,7 @@ export class MgtPeoplePicker extends MgtTemplatedComponent {
10021002
} else if (!people && provider && provider.state === ProviderState.SignedIn) {
10031003
const graph = provider.graph.forComponent(this);
10041004

1005-
if (!input.length && this._isFocused) {
1005+
if (!input.length) {
10061006
if (this.defaultPeople) {
10071007
people = this.defaultPeople;
10081008
} else {
@@ -1088,8 +1088,10 @@ export class MgtPeoplePicker extends MgtTemplatedComponent {
10881088
}
10891089
this.defaultPeople = people;
10901090
}
1091+
if (this._isFocused) {
1092+
this._showLoading = false;
1093+
}
10911094
}
1092-
this._showLoading = false;
10931095

10941096
if (
10951097
(this.defaultSelectedUserIds || this.defaultSelectedGroupIds) &&

0 commit comments

Comments
 (0)