From 2ce2a5ba4272e890714b0736462168b944507741 Mon Sep 17 00:00:00 2001
From: Jesse Leite <jesseleite@gmail.com>
Date: Wed, 16 Apr 2025 16:33:45 -0400
Subject: [PATCH 1/7] Install fuzzysort (already installed on `ui` branch).

---
 package-lock.json | 7 +++++++
 package.json      | 1 +
 2 files changed, 8 insertions(+)

diff --git a/package-lock.json b/package-lock.json
index e3d09fc08bf..7d0df05505f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -52,6 +52,7 @@
         "cookies-js": "^1.2.2",
         "floating-vue": "^5.2.2",
         "fuse.js": "^7.0.0",
+        "fuzzysort": "^3.1.0",
         "highlight.js": "^11.7.0",
         "imask": "^7.6.1",
         "laravel-echo": "^1.16.0",
@@ -3541,6 +3542,12 @@
         "node": ">=10"
       }
     },
+    "node_modules/fuzzysort": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/fuzzysort/-/fuzzysort-3.1.0.tgz",
+      "integrity": "sha512-sR9BNCjBg6LNgwvxlBd0sBABvQitkLzoVY9MYYROQVX/FvfJ4Mai9LsGhDgd8qYdds0bY77VzYd5iuB+v5rwQQ==",
+      "license": "MIT"
+    },
     "node_modules/get-caller-file": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
diff --git a/package.json b/package.json
index 32863fb9154..96ae2e85b68 100644
--- a/package.json
+++ b/package.json
@@ -61,6 +61,7 @@
     "cookies-js": "^1.2.2",
     "floating-vue": "^5.2.2",
     "fuse.js": "^7.0.0",
+    "fuzzysort": "^3.1.0",
     "highlight.js": "^11.7.0",
     "imask": "^7.6.1",
     "laravel-echo": "^1.16.0",

From 6502536bbc21538183fb6972b26acfb12c11881f Mon Sep 17 00:00:00 2001
From: Jesse Leite <jesseleite@gmail.com>
Date: Wed, 16 Apr 2025 16:34:56 -0400
Subject: [PATCH 2/7] Replace fuse with fuzzysort on fieldtype selector.

---
 .../components/fields/FieldtypeSelector.vue   | 29 +++++++++++--------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/resources/js/components/fields/FieldtypeSelector.vue b/resources/js/components/fields/FieldtypeSelector.vue
index 1788b41ea85..9464707a635 100644
--- a/resources/js/components/fields/FieldtypeSelector.vue
+++ b/resources/js/components/fields/FieldtypeSelector.vue
@@ -73,7 +73,7 @@
 </template>
 
 <script>
-import Fuse from 'fuse.js';
+import fuzzysort from 'fuzzysort';
 import { ref } from 'vue';
 import { mapValues } from 'lodash-es';
 const loadedFieldtypes = ref(null);
@@ -198,17 +198,22 @@ export default {
             let options = this.allFieldtypes;
 
             if (this.search) {
-                const fuse = new Fuse(options, {
-                    findAllMatches: true,
-                    threshold: 0.1,
-                    keys: [
-                        { name: 'text', weight: 1 },
-                        { name: 'categories', weight: 0.1 },
-                        { name: 'keywords', weight: 0.4 },
-                    ],
-                });
-
-                options = fuse.search(this.search).map((result) => result.item);
+                return fuzzysort
+                    .go(this.search, this.allFieldtypes, {
+                        all: true,
+                        keys: [
+                            'text',
+                            obj => obj.categories?.join(),
+                            obj => obj.keywords?.join(),
+                        ],
+                        scoreFn: scores => {
+                            const textScore = scores[0]?.score * 1;
+                            const categoriesScore = scores[1]?.score * 0.1;
+                            const keywordsScore = scores[2]?.score * 0.4;
+                            return Math.max(textScore, categoriesScore, keywordsScore);
+                        },
+                    })
+                    .map(result => result.obj);
             }
 
             return options;

From f13d58712bdc777b28fab7e760a3be9bcf8d3368 Mon Sep 17 00:00:00 2001
From: Jesse Leite <jesseleite@gmail.com>
Date: Wed, 16 Apr 2025 16:50:58 -0400
Subject: [PATCH 3/7] Fix data-list-search regression.

---
 resources/js/components/data-list/Search.vue | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/resources/js/components/data-list/Search.vue b/resources/js/components/data-list/Search.vue
index f9afdc1cd53..cb44101b2b6 100644
--- a/resources/js/components/data-list/Search.vue
+++ b/resources/js/components/data-list/Search.vue
@@ -3,7 +3,7 @@
         type="text"
         ref="input"
         :placeholder="__(placeholder)"
-        :value="value"
+        :value="modelValue"
         @input="emitEvent"
         @keyup.esc="reset"
         autofocus
@@ -15,14 +15,12 @@
 import debounce from '@statamic/util/debounce.js';
 
 export default {
-    props: ['value'],
-
     props: {
         placeholder: {
             type: String,
             default: 'Search...',
         },
-        value: {
+        modelValue: {
             type: String,
             default: '',
         },
@@ -30,11 +28,11 @@ export default {
 
     methods: {
         emitEvent: debounce(function (event) {
-            this.$emit('input', event.target.value);
+            this.$emit('update:model-value', event.target.value);
         }, 300),
 
         reset() {
-            this.$emit('input', '');
+            this.$emit('update:model-value', '');
         },
 
         focus() {

From c0f3e93b3e69e37187f2ed655810d4ce0813e766 Mon Sep 17 00:00:00 2001
From: Jesse Leite <jesseleite@gmail.com>
Date: Wed, 16 Apr 2025 17:13:17 -0400
Subject: [PATCH 4/7] Fix missed underscore to lodash refactor.

---
 .../js/components/data-list/FieldFilter.vue   | 22 +++++++++----------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/resources/js/components/data-list/FieldFilter.vue b/resources/js/components/data-list/FieldFilter.vue
index 9aeb45f9fc5..9968635120d 100644
--- a/resources/js/components/data-list/FieldFilter.vue
+++ b/resources/js/components/data-list/FieldFilter.vue
@@ -52,7 +52,7 @@
 <script>
 import Validator from '../field-conditions/Validator.js';
 import PublishField from '../publish/Field.vue';
-import { sortBy } from 'lodash-es';
+import { sortBy, mapValues } from 'lodash-es';
 import debounce from '@statamic/util/debounce.js';
 
 export default {
@@ -103,20 +103,18 @@ export default {
         isFilterComplete() {
             if (!this.filter) return false;
 
-            let visibleFields = _.chain(this.filter.fields)
+            let visibleFields = this.filter.fields
                 .filter(function (field) {
                     let validator = new Validator(field, this.fieldValues);
                     return validator.passesConditions();
-                }, this)
-                .mapObject((field) => field.handle)
-                .values()
-                .value();
-
-            let allFieldsFilled =
-                _.chain(this.fieldValues)
-                    .filter((value, handle) => visibleFields.includes(handle) && value)
-                    .values()
-                    .value().length === visibleFields.length;
+                }, this);
+
+            visibleFields = mapValues(visibleFields, field => field.handle);
+            visibleFields = Object.values(visibleFields);
+
+            let allFieldsFilled = Object.entries(this.fieldValues || {})
+                .filter(([handle, value]) => visibleFields.includes(handle) && value)
+                .length === visibleFields.length;
 
             return this.field !== null && allFieldsFilled;
         },

From 147606918cbe0dcffc4e677eef73b1db348021d3 Mon Sep 17 00:00:00 2001
From: Jesse Leite <jesseleite@gmail.com>
Date: Wed, 16 Apr 2025 17:31:41 -0400
Subject: [PATCH 5/7] Replace fuse with fuzzysort on `<data-list>` when
 `:search-query` prop is used.

---
 resources/js/components/data-list/DataList.vue | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/resources/js/components/data-list/DataList.vue b/resources/js/components/data-list/DataList.vue
index 3d7b60a0cbd..18191ebd372 100644
--- a/resources/js/components/data-list/DataList.vue
+++ b/resources/js/components/data-list/DataList.vue
@@ -1,5 +1,5 @@
 <script>
-import Fuse from 'fuse.js';
+import fuzzysort from 'fuzzysort';
 import { sortBy } from 'lodash-es';
 
 export default {
@@ -125,14 +125,12 @@ export default {
         filterBySearch(rows) {
             if (!this.searchQuery) return rows;
 
-            const fuse = new Fuse(rows, {
-                findAllMatches: true,
-                threshold: 0.1,
-                minMatchCharLength: 2,
-                keys: this.searchableColumns,
-            });
-
-            return fuse.search(this.searchQuery).map((result) => result.item);
+            return fuzzysort
+                .go(this.searchQuery, rows, {
+                    all: true,
+                    keys: this.searchableColumns,
+                })
+                .map(result => result.obj);
         },
 
         sortRows(rows) {

From e665ba24728840dec7daac8036289f31b79668a1 Mon Sep 17 00:00:00 2001
From: Jesse Leite <jesseleite@gmail.com>
Date: Wed, 16 Apr 2025 17:32:42 -0400
Subject: [PATCH 6/7] Remove fuse.js.

---
 package-lock.json | 9 ---------
 package.json      | 1 -
 2 files changed, 10 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7d0df05505f..e9f8b81505a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -51,7 +51,6 @@
         "codemirror": "5.65.12",
         "cookies-js": "^1.2.2",
         "floating-vue": "^5.2.2",
-        "fuse.js": "^7.0.0",
         "fuzzysort": "^3.1.0",
         "highlight.js": "^11.7.0",
         "imask": "^7.6.1",
@@ -3534,14 +3533,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/fuse.js": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/fuse.js/-/fuse.js-7.0.0.tgz",
-      "integrity": "sha512-14F4hBIxqKvD4Zz/XjDc3y94mNZN6pRv3U13Udo0lNLCWRBUsrMv2xwcF/y/Z5sV6+FQW+/ow68cHpm4sunt8Q==",
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/fuzzysort": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/fuzzysort/-/fuzzysort-3.1.0.tgz",
diff --git a/package.json b/package.json
index 96ae2e85b68..f2c4318dc56 100644
--- a/package.json
+++ b/package.json
@@ -60,7 +60,6 @@
     "codemirror": "5.65.12",
     "cookies-js": "^1.2.2",
     "floating-vue": "^5.2.2",
-    "fuse.js": "^7.0.0",
     "fuzzysort": "^3.1.0",
     "highlight.js": "^11.7.0",
     "imask": "^7.6.1",

From 497cac8c1d7ecbb0d667f09d6eea4c82f197baeb Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Thu, 17 Apr 2025 09:27:37 -0400
Subject: [PATCH 7/7] prettier

---
 resources/js/components/data-list/DataList.vue |  2 +-
 .../js/components/data-list/FieldFilter.vue    | 18 +++++++++---------
 .../js/components/fields/FieldtypeSelector.vue | 10 +++-------
 3 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/resources/js/components/data-list/DataList.vue b/resources/js/components/data-list/DataList.vue
index 18191ebd372..53b488018bb 100644
--- a/resources/js/components/data-list/DataList.vue
+++ b/resources/js/components/data-list/DataList.vue
@@ -130,7 +130,7 @@ export default {
                     all: true,
                     keys: this.searchableColumns,
                 })
-                .map(result => result.obj);
+                .map((result) => result.obj);
         },
 
         sortRows(rows) {
diff --git a/resources/js/components/data-list/FieldFilter.vue b/resources/js/components/data-list/FieldFilter.vue
index 9968635120d..99a52981c78 100644
--- a/resources/js/components/data-list/FieldFilter.vue
+++ b/resources/js/components/data-list/FieldFilter.vue
@@ -103,18 +103,18 @@ export default {
         isFilterComplete() {
             if (!this.filter) return false;
 
-            let visibleFields = this.filter.fields
-                .filter(function (field) {
-                    let validator = new Validator(field, this.fieldValues);
-                    return validator.passesConditions();
-                }, this);
+            let visibleFields = this.filter.fields.filter(function (field) {
+                let validator = new Validator(field, this.fieldValues);
+                return validator.passesConditions();
+            }, this);
 
-            visibleFields = mapValues(visibleFields, field => field.handle);
+            visibleFields = mapValues(visibleFields, (field) => field.handle);
             visibleFields = Object.values(visibleFields);
 
-            let allFieldsFilled = Object.entries(this.fieldValues || {})
-                .filter(([handle, value]) => visibleFields.includes(handle) && value)
-                .length === visibleFields.length;
+            let allFieldsFilled =
+                Object.entries(this.fieldValues || {}).filter(
+                    ([handle, value]) => visibleFields.includes(handle) && value,
+                ).length === visibleFields.length;
 
             return this.field !== null && allFieldsFilled;
         },
diff --git a/resources/js/components/fields/FieldtypeSelector.vue b/resources/js/components/fields/FieldtypeSelector.vue
index 9464707a635..2e0b1aca7a2 100644
--- a/resources/js/components/fields/FieldtypeSelector.vue
+++ b/resources/js/components/fields/FieldtypeSelector.vue
@@ -201,19 +201,15 @@ export default {
                 return fuzzysort
                     .go(this.search, this.allFieldtypes, {
                         all: true,
-                        keys: [
-                            'text',
-                            obj => obj.categories?.join(),
-                            obj => obj.keywords?.join(),
-                        ],
-                        scoreFn: scores => {
+                        keys: ['text', (obj) => obj.categories?.join(), (obj) => obj.keywords?.join()],
+                        scoreFn: (scores) => {
                             const textScore = scores[0]?.score * 1;
                             const categoriesScore = scores[1]?.score * 0.1;
                             const keywordsScore = scores[2]?.score * 0.4;
                             return Math.max(textScore, categoriesScore, keywordsScore);
                         },
                     })
-                    .map(result => result.obj);
+                    .map((result) => result.obj);
             }
 
             return options;