Merge branch 'tor/a11y/sidebar-attention-requests' into 'master'

Swap sidebar attention requests source order

See merge request gitlab-org/gitlab!83552

app/assets/javascripts/sidebar/components/assignees/uncollapsed_assignee_list.vue

@@ -110,22 +110,16 @@ export default {
         :class="{
           'user-item': !showVerticalList,
           'gl-display-inline-block': !showVerticalList,
-          'gl-display-flex': showVerticalList,
+          'gl-display-grid gl-align-items-center': showVerticalList,
           'gl-mb-3': index !== users.length - 1 && showVerticalList,
         }"
+        class="assignee-attention-grid"
       >
-        <attention-requested-toggle
-          v-if="showVerticalList"
-          :user="user"
-          type="assignee"
-          class="gl-mr-2"
-          @toggle-attention-requested="toggleAttentionRequested"
-        />
         <assignee-avatar-link
           :user="user"
           :issuable-type="issuableType"
           :tooltip-has-name="!showVerticalList"
-          class="gl-word-break-word"
+          class="gl-grid-column-2 gl-grid-row-1 gl-word-break-word"
         >
           <div
             v-if="showVerticalList"
@@ -136,6 +130,13 @@ export default {
             <span>@{{ user.username }}</span>
           </div>
         </assignee-avatar-link>
+        <attention-requested-toggle
+          v-if="showVerticalList"
+          :user="user"
+          type="assignee"
+          class="gl-grid-column-1 gl-grid-row-1 gl-mr-2"
+          @toggle-attention-requested="toggleAttentionRequested"
+        />
       </div>
     </div>
     <div v-if="renderShowMoreSection" class="user-list-more gl-hover-text-blue-800">

app/assets/javascripts/sidebar/components/reviewers/uncollapsed_reviewer_list.vue

@@ -95,27 +95,27 @@ export default {
       v-for="(user, index) in users"
       :key="user.id"
       :class="{ 'gl-mb-3': index !== users.length - 1 }"
+      class="gl-display-grid gl-align-items-center reviewer-attention-grid"
       data-testid="reviewer"
-      class="gl-display-flex"
     >
-      <attention-requested-toggle
-        v-if="glFeatures.mrAttentionRequests"
-        :user="user"
-        type="reviewer"
-        class="gl-mr-2"
-        @toggle-attention-requested="toggleAttentionRequested"
-      />
       <reviewer-avatar-link
         :user="user"
         :root-path="rootPath"
         :issuable-type="issuableType"
-        class="gl-word-break-word gl-mr-2"
+        class="gl-grid-column-2 gl-grid-row-1 gl-word-break-word gl-mr-2"
       >
         <div class="gl-ml-3 gl-line-height-normal gl-display-grid">
           <span>{{ user.name }}</span>
           <span>@{{ user.username }}</span>
         </div>
       </reviewer-avatar-link>
+      <attention-requested-toggle
+        v-if="glFeatures.mrAttentionRequests"
+        :user="user"
+        type="reviewer"
+        class="gl-grid-column-1 gl-grid-row-1 gl-mr-2"
+        @toggle-attention-requested="toggleAttentionRequested"
+      />
       <gl-icon
         v-if="user.approved"
         v-gl-tooltip.left

app/assets/stylesheets/framework/sidebar.scss

@@ -226,3 +226,23 @@
 .edit-link {
   margin-right: -$gl-spacing-scale-2;
 }
+
+.reviewer-attention-grid,
+.assignee-attention-grid {
+  grid-template-columns: min-content 1fr min-content;
+}
+
+/* TODO: These are non-standardized classes, and should be moved into gitlab-ui
+         Please see: https://gitlab.com/gitlab-org/gitlab-ui/-/issues/1780
+*/
+.gl-grid-column-1 {
+  grid-column: 1;
+}
+
+.gl-grid-row-1 {
+  grid-row: 1;
+}
+
+.gl-grid-column-2 {
+  grid-column: 2;
+}