Refactoring

ehmicky · Dec 26, 2021 · e1b932f · e1b932f
1 parent faffdac
commit e1b932f
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/src/system/footer/shared_2.js b/src/system/footer/shared_2.js
@@ -205,11 +205,14 @@ const sortSystems = function (finalPropDimensions) {
   return finalPropDimensions
     .map(([propEntries, allDimensions]) => {
       const hasNoDimensions = allDimensions.length === 0
-      const propEntriesA = propEntries.sort(([propNameA], [propNameB]) => {
-        const propOrderA = PROP_ORDER.indexOf(propNameA)
-        const propOrderB = PROP_ORDER.indexOf(propNameB)
-        return propOrderA > propOrderB ? 1 : -1
+      const fullPropEntries = propEntries.map(([propName, propValue]) => {
+        const propOrder = PROP_ORDER.indexOf(propName)
+        return [propName, propValue, propOrder]
       })
+      const propEntriesA = fullPropEntries.sort(
+        ([, , propOrderA], [, , propOrderB]) =>
+          propOrderA > propOrderB ? 1 : -1,
+      )
       return { hasNoDimensions, propEntries: propEntriesA, allDimensions }
     })
     .sort((first, second) => {
@@ -226,8 +229,8 @@ const sortSystems = function (finalPropDimensions) {
           return 1
         }
 
-        const propOrderA = PROP_ORDER.indexOf(first.propEntries[index][0])
-        const propOrderB = PROP_ORDER.indexOf(second.propEntries[index][0])
+        const propOrderA = first.propEntries[index][2]
+        const propOrderB = second.propEntries[index][2]
 
         if (propOrderA > propOrderB) {
           return 1