@k-int/stripes-kint-components 2.6.3 → 2.6.4

package/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 2.6.4 2022-06-21
+  * Custom property weight sorting not working as expected
+
 ## 2.6.3 2022-06-21
   * Null safety issue
 

package/es/lib/CustomProperties/Filter/CustomPropertiesFilter.js

@@ -82,6 +82,9 @@ var CustomPropertiesFilter = function CustomPropertiesFilter(_ref) {
       {
         path: 'retired'
       }, // Place retired custprops at the end
+      {
+        path: 'weight'
+      }, // Within those groups, sort by weight first
       {
         path: 'label'
       } // Within those groups, sort by label

package/es/lib/CustomProperties/View/CustomPropertiesViewCtx.js

@@ -85,9 +85,12 @@ var CustomPropertiesViewCtx = function CustomPropertiesViewCtx(_ref) {
         path: 'primary',
         direction: 'desc'
       }, // Primary properties should display before optional
+      {
+        path: 'weight'
+      }, // Within those groups, sort by weight
       {
         path: 'label'
-      } // Within those groups, sort by label
+      } // For those with the same weight, sort by label
       ]
     }
   }),

package/es/lib/hooks/useCustomProperties.js

@@ -42,6 +42,8 @@ var useCustomProperties = function useCustomProperties(_ref) {
     },
     sort: [{
       path: 'weight'
+    }, {
+      path: 'label'
     }],
     filters: [],
     stats: false,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@k-int/stripes-kint-components",
-  "version": "2.6.3",
+  "version": "2.6.4",
   "description": "Stripes Component library for K-Int specific applications",
   "sideEffects": [
     "*.css"

package/src/lib/CustomProperties/Filter/CustomPropertiesFilter.js

@@ -33,6 +33,7 @@ const CustomPropertiesFilter = ({
       sort: [
         { path: 'ctx' }, // Group by ctx
         { path: 'retired' }, // Place retired custprops at the end
+        { path: 'weight' }, // Within those groups, sort by weight first
         { path: 'label' } // Within those groups, sort by label
       ],
     }

package/src/lib/CustomProperties/View/CustomPropertiesViewCtx.js

@@ -50,7 +50,9 @@ const CustomPropertiesViewCtx = ({
       sort: [
         { path: 'retired' }, // Place retired custprops at the end
         { path: 'primary', direction: 'desc' }, // Primary properties should display before optional
-        { path: 'label' } // Within those groups, sort by label
+        { path: 'weight' }, // Within those groups, sort by weight
+        { path: 'label' } // For those with the same weight, sort by label
+
       ]
     }
   });

package/src/lib/hooks/useCustomProperties.js

@@ -23,9 +23,8 @@ const useCustomProperties = ({
       ContextKey: 'ctx'
     },
     sort: [
-      {
-        path: 'weight'
-      }
+      { path: 'weight' },
+      { path: 'label' }
     ],
     filters: [],
     stats: false,