Merge pull request #43 from TheCodeRaccoons/Fix-Issue-41

Fix issue 41

Author: JorchCortez

Dist/WebflowOnly/CMSFilter.js

@@ -222,52 +222,63 @@ class CMSFilter {
     }
 
     SortItems() {
-        if(!this.sortOptions) return;
+        if (!this.sortOptions) return;
 
         let [key, order] = this.sortOptions.value.split('-');
+        this.filteredItems = this.filteredItems.filter(item => !item.hasAttribute('wt-renderstatic-element'));
         this.filteredItems.sort((a, b) => {
             let aValue = a.dataset[key];
             let bValue = b.dataset[key];
 
+            // Handle null or undefined values
+            if (aValue === undefined || aValue === null) aValue = '';
+            if (bValue === undefined || bValue === null) bValue = '';
+    
+            // Handle numeric values
             if (!isNaN(aValue) && !isNaN(bValue)) {
                 aValue = parseFloat(aValue);
                 bValue = parseFloat(bValue);
             }
-            else if (Date.parse(aValue) && Date.parse(bValue)) {
+            // Handle date values
+            else if (!isNaN(Date.parse(aValue)) && !isNaN(Date.parse(bValue))) {
                 aValue = new Date(aValue);
                 bValue = new Date(bValue);
             }
+            // Handle text values
+            else {
+                aValue = aValue.toString().toLowerCase();
+                bValue = bValue.toString().toLowerCase();
+            }
 
             if (order === 'asc') {
-                return aValue > bValue ? 1 : -1;
+                return aValue > bValue ? 1 : aValue < bValue ? -1 : 0;
             } else {
-                return aValue < bValue ? 1 : -1;
+                return aValue < bValue ? 1 : aValue > bValue ? -1 : 0;
             }
         });
-    }   
+    }
 
     ApplyFilters() {
         const filters = this.GetFilters();
-        this.currentPage = 1; //Reset pagination to first page
+        this.currentPage = 1; // Reset pagination to first page
         this.filteredItems = this.allItems.filter(item => {
             return Object.keys(filters).every(category => {
                 const values = [...filters[category]];
-                if(values.length === 0) return values.length === 0;
+                if (values.length === 0) return true;
 
                 let matchingText = item.querySelector(`[wt-cmsfilter-category="${category}"]`)?.innerText.toLowerCase() || '';
                 matchingText = matchingText.replace(/(?:&nbsp;|\s)+/gi, ' ');
 
                 if (category === '*') {
-                    return values.length === 0 || 
-                        values.some(value => matchingText.includes(value.toLowerCase())) ||
+                    return values.some(value => matchingText.includes(value.toLowerCase())) ||
                         Object.values(item.dataset).some(dataValue => 
                             values.some(value => dataValue.toLowerCase().includes(value.toLowerCase()))
                         );
                 } else {
-                    return values.length === 0 || values.some(value => {
+                    return values.some(value => {
                         if (typeof value === 'object') {
                             const itemValue = parseFloat(item.dataset[category]);
-                            if(value.from !== null && value.to !== null) {
+                            if (value.from !== null && value.to !== null) {
                                 return itemValue >= value.from && itemValue <= value.to;
                             } else if (value.from !== null && value.to == null) {
                                 return itemValue >= value.from;