Prevent forwarding undefined options (#529)

Author: marcospassos

package-lock.json

@@ -42,7 +42,7 @@
     "react-dom": "^16.8.0  || ^17.0.0 || ^18.0.0 || ^19.0.0"
   },
   "dependencies": {
-    "@croct/plug": "^0.17.1",
+    "@croct/plug": "^0.17.2",
     "@croct/sdk": "^0.18.0"
   },
   "devDependencies": {

package.json

@@ -309,8 +309,6 @@ describe('useContent (CSR)', () => {
             .calls[0][0]
             .loader();
 
-        expect(fetch).toHaveBeenCalledWith('slot-id', {
-            preferredLocale: undefined,
-        });
+        expect(jest.mocked(fetch).mock.calls[0][1]).toStrictEqual({});
     });
 });

src/hooks/useContent.test.ts

@@ -25,13 +25,14 @@ function useCsrContent<I, F>(
         fallback: fallbackContent,
         initial: initialContent,
         staleWhileLoading = false,
+        preferredLocale,
         ...fetchOptions
     } = options;
 
-    const preferredLocale = normalizePreferredLocale(fetchOptions.preferredLocale);
+    const normalizedLocale = normalizePreferredLocale(preferredLocale);
     const defaultContent = useMemo(
-        () => getSlotContent(id, preferredLocale) as SlotContent|null ?? undefined,
-        [id, preferredLocale],
+        () => getSlotContent(id, normalizedLocale) as SlotContent|null ?? undefined,
+        [id, normalizedLocale],
     );
     const fallback = fallbackContent === undefined ? defaultContent : fallbackContent;
     const [initial, setInitial] = useState<SlotContent | I | F | undefined>(
@@ -44,13 +45,13 @@ function useCsrContent<I, F>(
         cacheKey: hash(
             `useContent:${cacheKey ?? ''}`
             + `:${id}`
-            + `:${preferredLocale ?? ''}`
+            + `:${normalizedLocale ?? ''}`
             + `:${JSON.stringify(fetchOptions.attributes ?? {})}`,
         ),
         loader: () => croct.fetch(id, {
             ...fetchOptions,
-            preferredLocale: preferredLocale,
-            fallback: fallback,
+            ...(normalizedLocale !== undefined ? {preferredLocale: normalizedLocale} : {}),
+            ...(fallback !== undefined ? {fallback: fallback} : {}),
         }).then(({content}) => content),
         initial: initial,
         expiration: expiration,