@autobusal/providers 1.43.2 → 1.43.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autobusal/providers",
-  "version": "1.43.2",
+  "version": "1.43.3",
   "author": "Ferjolt Ozuni",
   "type": "module",
   "main": "index.ts",

package/services.ts

@@ -1,3 +1,4 @@
+import { useEffect, useRef } from 'react';
 import { useSuspenseQuery, UseSuspenseQueryResult } from '@tanstack/react-query';
 import i18next from 'i18next';
 import { useTranslation } from 'react-i18next';
@@ -55,16 +56,53 @@ export const useGetMenu = (): UseSuspenseQueryResult<MenuData> => {
    */
   const { i18n } = useTranslation();
 
-  return useSuspenseQuery({
-    queryKey: ['get-menu', i18n.resolvedLanguage ?? i18next.language],
+  const language = i18n.resolvedLanguage ?? i18next.language;
+
+  /*
+   * Claude - 2026-09-07 (Ferjolt: "when we switch to a language and
+   * immediately switch to another one, this does not work").
+   *
+   * A STABLE KEY, REFETCHED when the language changes - not a key that
+   * contains the language.
+   *
+   * With the language in the key, every switch handed this suspense query a
+   * key it had never loaded, and a suspense query with no data SUSPENDS.
+   * This one is mounted at the app's root (Setup), so the whole tree fell
+   * back to the loading screen - the "refresh" a visitor sees on every
+   * switch - and remounted when the labels arrived. Anything open at that
+   * moment was gone: measured on production, a language chosen while the
+   * previous switch's labels were still loading closed the picker and ran
+   * nothing, because the button it was clicked on no longer belonged to a
+   * mounted tree.
+   *
+   * Refetching an already-loaded key never suspends. The store keeps the
+   * previous language's labels for the few hundred milliseconds the new ones
+   * take, the page stays put, and a second choice lands on a live picker.
+   * `resolvedLanguage` for the reason the 2026-08-29 note gives.
+   */
+  const query = useSuspenseQuery<MenuData>({
+    queryKey: ['get-menu'],
     queryFn: async () => (
       await apiClient
         .get('/api/menus/get')
         .then(response => {
           menuStore.save(response.data);
 
-          return {};
+          // the store is the reader; the query's own data is a token (as before)
+          return {} as MenuData;
         })
     )
-  })
+  });
+
+  const loaded = useRef<string>(language);
+
+  useEffect(() => {
+    if (loaded.current !== language) {
+      loaded.current = language;
+
+      query.refetch();
+    }
+  }, [ language, query ]);
+
+  return query;
 };