svelte-common 4.13.0 → 4.13.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svelte-common",
-  "version": "4.13.0",
+  "version": "4.13.3",
   "publishConfig": {
     "access": "public"
   },
@@ -42,7 +42,7 @@
     "@sveltejs/vite-plugin-svelte": "^1.0.2",
     "ava": "^4.3.1",
     "documentation": "^14.0.0",
-    "mf-styling": "^1.4.0",
+    "mf-styling": "^1.5.0",
     "npm-pkgbuild": "^10.14.8",
     "semantic-release": "^19.0.5",
     "stylelint": "^14.11.0",

package/src/sorting.mjs

@@ -23,7 +23,7 @@ export function toggleOrderBy(orderBy) {
  * Add sortable toggle to a node.
  * Synchronizes store value with node "aria-sort" attribute.
  * @param {Node} node
- * @param {Store} to keep in sync with sorting properties
+ * @param {WritableStore} to keep in sync with sorting properties
  */
 export function sortable(node, store) {
   node.setAttribute("aria-sort", SORT_NONE);
@@ -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);
           }
         }
 
@@ -70,19 +71,28 @@ export function sortable(node, store) {
 export function sorter(sortBy, getters = {}) {
   if (sortBy) {
     for (const [key, value] of Object.entries(sortBy)) {
-      const getter = getters[key];
+      const getter = getters[key] || (object => object[key]);
 
       switch (value) {
         case SORT_ASCENDING:
-          if (getter) {
-            return (a, b) => getter(a).localeCompare(getter(b));
-          }
-          return (a, b) => a[key].localeCompare(b[key]);
+          return (a, b) => {
+            const av = getter(a);
+            if (typeof av === "string") {
+              const bv = getter(b);
+              return typeof bv === "string" ? av.localeCompare(bv) : 1;
+            }
+            return -1;
+          };
+
         case SORT_DESCENDING:
-          if (getter) {
-            return (b, a) => getter(a).localeCompare(getter(b));
-          }
-          return (b, a) => a[key].localeCompare(b[key]);
+          return (a, b) => {
+            const av = getter(a);
+            if (typeof av === "string") {
+              const bv = getter(b);
+              return typeof bv === "string" ? av.localeCompare(bv) : 1;
+            }
+            return -1;
+          };
       }
     }
   }