refactor getReloadParams to a cleaner way

inertiajs · Oct 20, 2024 · c1df10a · c1df10a
1 parent 8ce1fbc
commit c1df10a
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 10 deletions.
diff --git a/packages/react/src/WhenVisible.ts b/packages/react/src/WhenVisible.ts
@@ -26,10 +26,13 @@ const WhenVisible = ({ children, data, params, buffer, as, always, fallback }: W
       throw new Error('You must provide either a `data` or `params` prop.')
     }
 
-    return {
-      ...params,
-      ...(data && { only: Array.isArray(data) ? data : [data] }),
+    const reloadParams: Partial<ReloadOptions> = params || {} ;
+
+    if (data) {
+      reloadParams.only = (Array.isArray(data) ? data : [data]) as string[];
     }
+
+    return reloadParams;
   }
 
   useEffect(() => {

diff --git a/packages/svelte/src/components/WhenVisible.svelte b/packages/svelte/src/components/WhenVisible.svelte
@@ -66,10 +66,13 @@
       throw new Error('You must provide either a `data` or `params` prop.')
     }
 
-    return {
-      ...params,
-      ...(data && { only: Array.isArray(data) ? data : [data] }),
+    const reloadParams: Partial<ReloadOptions> = params || {} ;
+
+    if (data) {
+      reloadParams.only = (Array.isArray(data) ? data : [data]) as string[];
     }
+
+    return reloadParams;
   }
 </script>
 

diff --git a/packages/vue3/src/whenVisible.ts b/packages/vue3/src/whenVisible.ts
@@ -74,14 +74,19 @@ export default defineComponent({
   },
   methods: {
     getReloadParams(): Partial<ReloadOptions> {
-      if (!this.$props.params && !this.$props.data) {
+      const { params, data } = this.$props;
+
+      if (!params && !data) {
         throw new Error('You must provide either a `data` or `params` prop.')
       }
 
-      return {
-        ...this.$props.params,
-        ...(this.$props.data && { only: Array.isArray(this.$props.data) ? this.$props.data : [this.$props.data] }),
+      const reloadParams: Partial<ReloadOptions> = params || {} ;
+
+      if (data) {
+        reloadParams.only = (Array.isArray(data) ? data : [data]) as string[];
       }
+
+      return reloadParams;
     },
   },
   render() {