@data-fair/lib-vue 1.22.0 → 1.23.0

package/concept-filters.d.ts

@@ -1,2 +1,3 @@
+export declare function getConceptFilters(searchParams: Record<string, string>, datasetId?: string): Record<string, string>;
 export declare function useConceptFilters(reactiveSearchParams: Record<string, string>, datasetId?: string): Record<string, string>;
 export default useConceptFilters;

package/concept-filters.js

@@ -1,22 +1,26 @@
 // filter reactiveSearchParams to conceptFilters (params prefixed by _c_)
 import { reactive, watch } from 'vue';
+export function getConceptFilters(searchParams, datasetId) {
+    const conceptFilters = {};
+    const datasetFiltersPrefix = datasetId && `_d_${datasetId}_`;
+    for (const key of Object.keys(searchParams)) {
+        if (key.startsWith('_c_'))
+            conceptFilters[key] = searchParams[key];
+        if (datasetFiltersPrefix && key.startsWith(datasetFiltersPrefix)) {
+            conceptFilters[key.replace(datasetFiltersPrefix, '')] = searchParams[key];
+        }
+    }
+    return conceptFilters;
+}
 export function useConceptFilters(reactiveSearchParams, datasetId) {
     const conceptFilters = reactive({});
-    const datasetFiltersPrefix = datasetId && `_d_${datasetId}_`;
+    // we use a watch and mutations on a reactive to prevent triggering reactivity on unrelated changes in reactive search params
     watch(reactiveSearchParams, () => {
-        for (const key of Object.keys(reactiveSearchParams)) {
-            if (key.startsWith('_c_'))
-                conceptFilters[key] = reactiveSearchParams[key];
-            if (datasetFiltersPrefix && key.startsWith(datasetFiltersPrefix)) {
-                conceptFilters[key.replace(datasetFiltersPrefix, '')] = reactiveSearchParams[key];
-            }
-        }
+        const newConceptFilters = getConceptFilters(reactiveSearchParams, datasetId);
+        Object.assign(conceptFilters, newConceptFilters);
         for (const key of Object.keys(conceptFilters)) {
-            if (key.startsWith('_c_') && reactiveSearchParams[key] === undefined)
-                delete conceptFilters[key];
-            if (datasetFiltersPrefix && !key.startsWith('_c_') && reactiveSearchParams[datasetFiltersPrefix + key] === undefined) {
+            if (!(key in newConceptFilters))
                 delete conceptFilters[key];
-            }
         }
     }, { immediate: true });
     return conceptFilters;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@data-fair/lib-vue",
-  "version": "1.22.0",
+  "version": "1.23.0",
   "description": "Composables and other utilities for Vue applications in the data-fair stack.",
   "main": "index.js",
   "files": [