fix(composables): use a trust parameter to conditionally run composables

freddy38510 · Jul 18, 2022 · 77071ca · 77071ca
1 parent 9410ff3
commit 77071ca
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/src/composables/useHydrateOnInteraction.js b/src/composables/useHydrateOnInteraction.js
@@ -2,10 +2,10 @@ import { getCurrentInstance, onMounted, unref } from 'vue';
 import getRootElements from '../utils/get-root-elements';
 
 export default function useHydrateOnInteraction(
-  { hydrate, onCleanup },
+  { willPerformHydration, hydrate, onCleanup },
   events = ['focus']
 ) {
-  if (!hydrate || typeof hydrate !== 'function') {
+  if (!willPerformHydration) {
     return;
   }
 

diff --git a/src/composables/useHydrateWhenIdle.js b/src/composables/useHydrateWhenIdle.js
@@ -1,10 +1,10 @@
 import { getCurrentInstance } from 'vue';
 
 export default function useHydrateWhenIdle(
-  { hydrate, onCleanup },
+  { willPerformHydration, hydrate, onCleanup },
   timeout = 2000
 ) {
-  if (!hydrate || typeof hydrate !== 'function') {
+  if (!willPerformHydration) {
     return;
   }
 

diff --git a/src/composables/useHydrateWhenTriggered.js b/src/composables/useHydrateWhenTriggered.js
@@ -1,10 +1,10 @@
 import { watch, isRef, getCurrentInstance } from 'vue';
 
 export default function useHydrateWhenTriggered(
-  { hydrate, onCleanup },
+  { willPerformHydration, hydrate, onCleanup },
   trigger
 ) {
-  if (!hydrate || typeof hydrate !== 'function') {
+  if (!willPerformHydration) {
     return;
   }
 

diff --git a/src/composables/useHydrateWhenVisible.js b/src/composables/useHydrateWhenVisible.js
@@ -2,10 +2,10 @@ import { getCurrentInstance, onMounted } from 'vue';
 import { createHydrationObserver, getRootElements } from '../utils';
 
 export default function useHydrateWhenVisible(
-  { hydrate, onCleanup },
+  { willPerformHydration, hydrate, onCleanup },
   observerOptions
 ) {
-  if (!hydrate || typeof hydrate !== 'function') {
+  if (!willPerformHydration) {
     return;
   }