Skip to content

Commit 63ad055

Browse files
authored
fix: task assignment button (#2528)
make assign button a button for keyboard users stop page scrolling when up/down key in people-picker remove background colors from mgt-tasks fixes background color for file list
1 parent a83ae28 commit 63ad055

File tree

7 files changed

+30
-27
lines changed

7 files changed

+30
-27
lines changed

packages/mgt-components/src/components/mgt-file-list/mgt-file-list.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ $progress-ring-size: var(--progress-ring-size, 24px);
7777
--file-padding: 10px 20px 10px 20px;
7878
--file-padding-inline-start: 24px;
7979
--file-border-radius: 2px;
80-
--file-background-color: var(--file-item-background-color, var(--neutral-layer-1));
80+
--file-background-color: var(--file-item-background-color, var(--neutral-layer-floating));
8181
}
8282
}
8383
}

packages/mgt-components/src/components/mgt-file-list/mgt-file-list.theme.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
@import '../../styles/shared-sass-variables';
99
@import '../../components/mgt-file/mgt-file.theme';
1010

11-
$file-list-background-color: var(--file-list-background-color, var(--neutral-layer-1));
12-
$show-more-button-background-color: var(--show-more-button-background-color, var(--neutral-layer-1));
11+
$file-list-background-color: var(--file-list-background-color, var(--neutral-layer-floating));
12+
$show-more-button-background-color: var(--show-more-button-background-color, var(--neutral-layer-floating));
1313
$show-more-button-background-color--hover: var(--show-more-button-background-color-hover, var(-neutral-fill-hover));

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1549,9 +1549,7 @@ export class MgtPeoplePicker extends MgtTemplatedComponent {
15491549

15501550
if (keyName === 'ArrowUp' || keyName === 'ArrowDown') {
15511551
this.handleArrowSelection(event);
1552-
if (this.input.value?.length > 0) {
1553-
event.preventDefault();
1554-
}
1552+
event.preventDefault();
15551553
}
15561554

15571555
if (keyName === 'Enter') {

packages/mgt-components/src/components/mgt-tasks/mgt-tasks.scss

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -436,8 +436,9 @@ $task-new-dropdown-border-radius: var(--task-new-dropdown-border-radius, calc(va
436436

437437
.people {
438438
[slot='no-data'] {
439-
margin-top: 8px;
440-
color: $task-new-person-icon-text-color;
439+
fluent-button::part(control) {
440+
color: $task-new-person-icon-text-color;
441+
}
441442

442443
svg {
443444
fill: $task-new-person-icon-color;

packages/mgt-components/src/components/mgt-tasks/mgt-tasks.theme.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ $task-incomplete-checkbox-hover-bg: var(
4242
);
4343
$task-complete-bg-color: var(--task-complete-background-color, transparent);
4444
$task-incomplete-bg-color: var(--task-incomplete-background-color, var(--neutral-layer-1));
45-
$tasks-background-color: var(--tasks-background-color, var(--neutral-layer-2));
45+
$tasks-background-color: var(--tasks-background-color, transparent);
4646
$input-bg: padding-box linear-gradient(var(--neutral-fill-input-rest), var(--neutral-fill-input-rest)),
4747
border-box var(--neutral-stroke-input-rest);
4848
$input-hover-bg: padding-box linear-gradient(var(--neutral-fill-input-hover), var(--neutral-fill-input-hover)),

packages/mgt-components/src/components/mgt-tasks/mgt-tasks.ts

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1138,6 +1138,7 @@ export class MgtTasks extends MgtTemplatedComponent {
11381138
} else {
11391139
picker.selectedPeople = mgtPeople.people;
11401140
flyout.open();
1141+
setTimeout(() => picker.focus(), 100);
11411142
}
11421143
}
11431144
}
@@ -1211,7 +1212,7 @@ export class MgtTasks extends MgtTemplatedComponent {
12111212
</div>
12121213
`;
12131214

1214-
const taskPeople = this.dataSource !== TasksSource.todo ? this.renderAssignedPeople(task) : null;
1215+
const taskPeople = this.dataSource === TasksSource.todo ? null : this.renderAssignedPeople(task);
12151216

12161217
taskDetails = html`${group} ${folder} ${taskPeople} ${taskDue}`;
12171218
}
@@ -1300,9 +1301,10 @@ export class MgtTasks extends MgtTemplatedComponent {
13001301
};
13011302

13021303
private readonly handlePeopleKeydown = (e: KeyboardEvent, task: ITask) => {
1303-
if (e.key === 'Enter') {
1304+
if (e.key === 'Enter' || e.key === ' ') {
13041305
this.togglePeoplePicker(task);
13051306
e.stopPropagation();
1307+
e.preventDefault();
13061308
}
13071309
};
13081310

@@ -1340,34 +1342,37 @@ export class MgtTasks extends MgtTemplatedComponent {
13401342
<mgt-people
13411343
class="people people-${taskId}"
13421344
.userIds=${assignedPeople}
1343-
person-card=${PersonCardInteraction.none}
1345+
.personCardInteraction=${PersonCardInteraction.none}
13441346
@click=${(e: MouseEvent) => this.handlePeopleClick(e, task)}
1345-
@keydown=${(e: KeyboardEvent) => this.handlePeopleKeydown(e, task)}>
1346-
<template data-type="no-data">
1347+
@keydown=${(e: KeyboardEvent) => this.handlePeopleKeydown(e, task)}
1348+
>
1349+
<template data-type="no-data">
1350+
<fluent-button>
13471351
<span style="display:flex;place-content:start;gap:4px;padding-inline-start:4px">
13481352
<svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" class="svg" fill="currentColor">
13491353
<path d="M9 2a4 4 0 100 8 4 4 0 000-8zM6 6a3 3 0 116 0 3 3 0 01-6 0z"></path>
13501354
<path d="M4 11a2 2 0 00-2 2c0 1.7.83 2.97 2.13 3.8A9.14 9.14 0 009 18c.41 0 .82-.02 1.21-.06A5.5 5.5 0 019.6 17 12 12 0 019 17a8.16 8.16 0 01-4.33-1.05A3.36 3.36 0 013 13a1 1 0 011-1h5.6c.18-.36.4-.7.66-1H4z"></path>
13511355
<path d="M14.5 19a4.5 4.5 0 100-9 4.5 4.5 0 000 9zm0-7c.28 0 .5.22.5.5V14h1.5a.5.5 0 010 1H15v1.5a.5.5 0 01-1 0V15h-1.5a.5.5 0 010-1H14v-1.5c0-.28.22-.5.5-.5z"></path>
13521356
</svg> Assign</span>
1353-
</template>
1357+
</fluent-button>
1358+
</template>
13541359
</mgt-people>`;
13551360

13561361
const picker = mgtHtml`
13571362
<mgt-people-picker
13581363
class="people-picker picker-${taskId}"
13591364
.groupId=${ifDefined(planGroupId)}
13601365
@keydown=${this.handlePeoplePickerKeydown}>
1361-
.groupId=${ifDefined(planGroupId)}
1362-
></mgt-people-picker>`;
1366+
></mgt-people-picker>`;
13631367

13641368
return mgtHtml`
13651369
<mgt-flyout
13661370
light-dismiss
13671371
class=${classMap(taskAssigneeClasses)}
1368-
@closed=${() => this.updateAssignedPeople(task)}>
1369-
<div slot="anchor">${assignedPeopleTemplate}</div>
1370-
<div slot="flyout" part="picker" class="picker">${picker}</div>
1372+
@closed=${() => this.updateAssignedPeople(task)}
1373+
>
1374+
<div slot="anchor">${assignedPeopleTemplate}</div>
1375+
<div slot="flyout" part="picker" class="picker">${picker}</div>
13711376
</mgt-flyout>
13721377
`;
13731378
}

packages/mgt-components/src/components/sub-components/mgt-arrow-options/mgt-arrow-options.scss

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
@import '../../../styles/shared-sass-variables';
1010

1111
$arrow-options-left: var(--arrow-options-left, 0);
12-
$arrow-options-btn-bg-color: var(--arrow-options-button-background-color, var(--neutral-layer-2));
12+
$arrow-options-btn-bg-color: var(--arrow-options-button-background-color, transparent);
1313
$arrow-options-btn-font-size: var(--arrow-options-button-font-size, large);
1414
$arrow-options-btn-font-weight: var(--arrow-options-button-font-weight, 600);
1515
$arrow-options-btn-font-color: var(--arrow-options-button-font-color, var(--accent-base-color));
@@ -19,12 +19,12 @@ $arrow-options-btn-font-color: var(--arrow-options-button-font-color, var(--acce
1919
font-family: $font-family;
2020

2121
.header {
22-
&::part(control){
22+
&::part(control) {
2323
font-size: $arrow-options-btn-font-size;
2424
font-weight: $arrow-options-btn-font-weight;
2525
color: $arrow-options-btn-font-color;
2626
background: $arrow-options-btn-bg-color;
27-
27+
2828
&:hover {
2929
background: var(--neutral-fill-stealth-hover);
3030
}
@@ -36,16 +36,15 @@ $arrow-options-btn-font-color: var(--arrow-options-button-font-color, var(--acce
3636
}
3737
}
3838

39-
.menu{
39+
.menu {
4040
position: absolute;
4141
left: $arrow-options-left;
4242
z-index: 1;
4343
display: none;
44-
45-
&.open{
44+
45+
&.open {
4646
display: block;
4747
width: max-content;
4848
}
4949
}
50-
5150
}

0 commit comments

Comments
 (0)