svelte-common 4.12.0 → 4.13.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svelte-common",
-  "version": "4.12.0",
+  "version": "4.13.1",
   "publishConfig": {
     "access": "public"
   },
@@ -44,7 +44,7 @@
     "documentation": "^14.0.0",
     "mf-styling": "^1.4.0",
     "npm-pkgbuild": "^10.14.8",
-    "semantic-release": "^19.0.4",
+    "semantic-release": "^19.0.5",
     "stylelint": "^14.11.0",
     "stylelint-config-standard": "^28.0.0",
     "svelte": "^3.49.0",

package/src/sorting.mjs

@@ -45,12 +45,13 @@ export function sortable(node, store) {
     );
 
     for (const peer of node.parentElement.children) {
-      const sort = peer.getAttribute("aria-sort");
+      let sort = peer.getAttribute("aria-sort");
 
       if (sort) {
         if (peer !== node) {
           if (sort !== SORT_NONE) {
-            peer.setAttribute("aria-sort", SORT_NONE);
+            sort = SORT_NONE;
+            peer.setAttribute("aria-sort", sort);
           }
         }
 
@@ -64,16 +65,26 @@ export function sortable(node, store) {
 /**
  * Generate a sort function for a given sort by set.
  * @param {Object} sortBy
+ * @param {Object} getters
  * @return {Function} sorter
  */
-export function sorter(sortBy)
-{
-  for(const [key,value] of Object.entries(sortBy)) {
-    switch(value) {
-      case SORT_ASCENDING: 
-        return (a,b) => a[key].localeCompare(b[key]);
-      case SORT_DESCENDING:
-        return (b,a) => a[key].localeCompare(b[key]);
+export function sorter(sortBy, getters = {}) {
+  if (sortBy) {
+    for (const [key, value] of Object.entries(sortBy)) {
+      const getter = getters[key];
+
+      switch (value) {
+        case SORT_ASCENDING:
+          if (getter) {
+            return (a, b) => getter(a).localeCompare(getter(b));
+          }
+          return (a, b) => a[key].localeCompare(b[key]);
+        case SORT_DESCENDING:
+          if (getter) {
+            return (b, a) => getter(a).localeCompare(getter(b));
+          }
+          return (b, a) => a[key].localeCompare(b[key]);
+      }
     }
   }
 }