From baa711c9fe62a67fb0375f466859abc1f6ad550d Mon Sep 17 00:00:00 2001
From: Lee Rowlands <lee.rowlands@previousnext.com.au>
Date: Fri, 14 May 2021 11:40:51 +1000
Subject: [PATCH] Issue #3107130 by PCate, kishor_kolekar, ravi.shankar,
 Vidushi Mehta, rajneeshb, Kristen Pol, thalles, quietone, alexpott:
 Responsive image field formatter list should be sorted by label, not machine
 name

---
 .../src/Plugin/Field/FieldFormatter/ResponsiveImageFormatter.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/modules/responsive_image/src/Plugin/Field/FieldFormatter/ResponsiveImageFormatter.php b/core/modules/responsive_image/src/Plugin/Field/FieldFormatter/ResponsiveImageFormatter.php
index ee51250888d5..331c278e0c05 100644
--- a/core/modules/responsive_image/src/Plugin/Field/FieldFormatter/ResponsiveImageFormatter.php
+++ b/core/modules/responsive_image/src/Plugin/Field/FieldFormatter/ResponsiveImageFormatter.php
@@ -127,6 +127,7 @@ public static function defaultSettings() {
   public function settingsForm(array $form, FormStateInterface $form_state) {
     $responsive_image_options = [];
     $responsive_image_styles = $this->responsiveImageStyleStorage->loadMultiple();
+    uasort($responsive_image_styles, '\Drupal\responsive_image\Entity\ResponsiveImageStyle::sort');
     if ($responsive_image_styles && !empty($responsive_image_styles)) {
       foreach ($responsive_image_styles as $machine_name => $responsive_image_style) {
         if ($responsive_image_style->hasImageStyleMappings()) {
-- 
GitLab