@datagouv/components-next 1.0.2-dev.63 → 1.0.2-dev.65

package/dist/{vue3-xml-viewer.common-BS7y248F.js → vue3-xml-viewer.common-DtXMtQDT.js}

@@ -1,4 +1,4 @@
-import { c as Ke } from "./main-BcqenM8i.js";
+import { c as Ke } from "./main-BoFCVekJ.js";
 import We from "vue";
 function Fe(I, K) {
   for (var V = 0; V < K.length; V++) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@datagouv/components-next",
-  "version": "1.0.2-dev.63",
+  "version": "1.0.2-dev.65",
   "private": false,
   "type": "module",
   "engines": {

package/src/composables/useSearchFilter.ts

@@ -1,4 +1,5 @@
 import { type InjectionKey, type Ref, inject, onMounted, onScopeDispose } from 'vue'
+import { useRoute, useRouter } from 'vue-router'
 import { useRouteQuery } from '@vueuse/router'
 
 export interface CustomFilterEntry {
@@ -69,6 +70,8 @@ export function useSearchFilter(
 
   const { apiParam = urlParam, defaultValue = undefined } = options
 
+  const route = useRoute()
+  const router = useRouter()
   const value = useRouteQuery<string | undefined>(urlParam, defaultValue)
 
   // Register in onMounted to avoid SSR/hydration mismatch: the registry must be
@@ -82,7 +85,19 @@ export function useSearchFilter(
     // own `watch(currentType)` logic that drops built-in filters which don't
     // apply to the new type: a custom filter's applicability is signalled
     // by the consumer via `v-if`, so its unmount is the equivalent signal.
-    value.value = defaultValue
+    //
+    // We cannot use `value.value = defaultValue` here because VueUse's
+    // useRouteQuery registers its own tryOnScopeDispose cleanup that zeroes
+    // the internal `query` variable to undefined (FIFO order, it runs first).
+    // The setter then sees `query === v` and early-returns without ever
+    // calling router.replace(). Instead we read the live route.query directly
+    // (which is router state, not affected by that cleanup) and push the update.
+    if (route.query[urlParam] !== undefined) {
+      const { [urlParam]: _removed, ...restQuery } = route.query
+      router.replace({
+        query: defaultValue === undefined ? restQuery : { ...restQuery, [urlParam]: String(defaultValue) },
+      })
+    }
     context.unregister(urlParam)
   })
 

package/src/main.ts

@@ -23,7 +23,7 @@ import type { Site } from './types/site'
 import type { Weight, WellType } from './types/ui'
 import type { User, UserReference } from './types/users'
 import type { Report, ReportSubject, ReportReason } from './types/reports'
-import type { GlobalSearchConfig, SearchType, SortOption } from './types/search'
+import type { GlobalSearchConfig, SearchType, SearchTypeConfig, SortOption, HiddenFilter, BuiltInFilterKey, DatasetSearchConfig, DatasetSearchFilters, DataserviceSearchConfig, DataserviceSearchFilters, ReuseSearchConfig, ReuseSearchFilters, OrganizationSearchConfig, OrganizationSearchFilters, TopicSearchConfig, TopicSearchFilters } from './types/search'
 import { getDefaultDatasetConfig, getDefaultDataserviceConfig, getDefaultReuseConfig, getDefaultOrganizationConfig, getDefaultTopicConfig, getDefaultGlobalSearchConfig, defaultDatasetSortOptions, defaultDataserviceSortOptions, defaultReuseSortOptions, defaultOrganizationSortOptions } from './types/search'
 import { useSearchFilter } from './composables/useSearchFilter'
 import type { UseSearchFilterOptions } from './composables/useSearchFilter'
@@ -130,7 +130,20 @@ export * from './types/access_types'
 export type {
   GlobalSearchConfig,
   SearchType,
+  SearchTypeConfig,
   SortOption,
+  HiddenFilter,
+  BuiltInFilterKey,
+  DatasetSearchConfig,
+  DatasetSearchFilters,
+  DataserviceSearchConfig,
+  DataserviceSearchFilters,
+  ReuseSearchConfig,
+  ReuseSearchFilters,
+  OrganizationSearchConfig,
+  OrganizationSearchFilters,
+  TopicSearchConfig,
+  TopicSearchFilters,
   UseSearchFilterOptions,
   UseFetchFunction,
   AccessType,

package/src/types/search.ts

@@ -351,6 +351,8 @@ export type TopicSearchConfig = {
 
 export type SearchTypeConfig = DatasetSearchConfig | DataserviceSearchConfig | ReuseSearchConfig | OrganizationSearchConfig | TopicSearchConfig
 
+export type BuiltInFilterKey = keyof DatasetSearchFilters | keyof DataserviceSearchFilters | keyof ReuseSearchFilters | keyof OrganizationSearchFilters | keyof TopicSearchFilters
+
 export type SearchType = SearchTypeConfig['class']
 
 export type GlobalSearchConfig = SearchTypeConfig[]