feat: trigger loading after mount

bettyblocks · Jul 29, 2020 · 752a193 · 752a193
1 parent 816209c
commit 752a193
Show file tree

Hide file tree

Showing 7 changed files with 51 additions and 22 deletions.
diff --git a/src/components/autoComplete.js b/src/components/autoComplete.js
@@ -136,9 +136,13 @@
       };
     }, [searchParam]);
 
-    if (loading) {
-      B.triggerEvent('onLoad', loading);
-    }
+    const mounted = useRef(true);
+    useEffect(() => {
+      if (!mounted.current && loading) {
+        B.triggerEvent('onLoad', loading);
+      }
+      mounted.current = false;
+    }, [loading]);
 
     if (err && !displayError) {
       B.triggerEvent('onError', err.message);

diff --git a/src/components/checkbox.js b/src/components/checkbox.js
@@ -57,9 +57,13 @@
     const { loading, error: err, data, refetch } =
       model && useGetAll(model, { filter, skip: 0, take: 50 });
 
-    if (loading) {
-      B.triggerEvent('onLoad', loading);
-    }
+    const mounted = useRef(true);
+    useEffect(() => {
+      if (!mounted.current && loading) {
+        B.triggerEvent('onLoad', loading);
+      }
+      mounted.current = false;
+    }, [loading]);
 
     if (err && !displayError) {
       B.triggerEvent('onError', err.message);

diff --git a/src/components/dataList.js b/src/components/dataList.js
@@ -96,15 +96,20 @@
           });
         }, []);
 
+        const mounted = useRef(true);
+        useEffect(() => {
+          if (!mounted.current && loading) {
+            B.triggerEvent('onLoad', loading);
+          }
+          mounted.current = false;
+        }, [loading]);
+
         const canvasLayout = () => {
           if (!model) {
             return builderLayout();
           }
 
-          if (loading) {
-            B.triggerEvent('onLoad', loading);
-            return 'loading...';
-          }
+          if (loading) return 'loading...';
 
           if (error && !displayError) {
             B.triggerEvent('onError', error.message);

diff --git a/src/components/dataTable.js b/src/components/dataTable.js
@@ -134,9 +134,13 @@
       repeat();
     });
 
-    if (loading) {
-      B.triggerEvent('onLoad', loading);
-    }
+    const mounted = useRef(true);
+    useEffect(() => {
+      if (!mounted.current && loading) {
+        B.triggerEvent('onLoad', loading);
+      }
+      mounted.current = false;
+    }, [loading]);
 
     if (error && !displayError) {
       B.triggerEvent('onError', error.message);

diff --git a/src/components/form.js b/src/components/form.js
@@ -65,9 +65,13 @@
           B.triggerEvent('onLoad', loading);
         }
 
-        if (isFetching) {
-          B.triggerEvent('onLoad', isFetching);
-        }
+        const mounted = useRef(true);
+        useEffect(() => {
+          if (!mounted.current && isFetching) {
+            B.triggerEvent('onLoad', isFetching);
+          }
+          mounted.current = false;
+        }, [isFetching]);
 
         if (err && !displayError) {
           B.triggerEvent('onError', formErrorMessage || err.message);

diff --git a/src/components/radio.js b/src/components/radio.js
@@ -65,9 +65,13 @@
     const { loading, error: err, data, refetch } =
       model && useGetAll(model, { filter, skip: 0, take: 50 });
 
-    if (loading) {
-      B.triggerEvent('onLoad', loading);
-    }
+    const mounted = useRef(true);
+    useEffect(() => {
+      if (!mounted.current && loading) {
+        B.triggerEvent('onLoad', loading);
+      }
+      mounted.current = false;
+    }, [loading]);
 
     if (err && !displayError) {
       B.triggerEvent('onError', err.message);

diff --git a/src/components/select.js b/src/components/select.js
@@ -48,9 +48,13 @@
     const { loading, error, data, refetch } =
       model && useGetAll(model, { filter, skip: 0, take: 50 });
 
-    if (loading) {
-      B.triggerEvent('onLoad', loading);
-    }
+    const mounted = useRef(true);
+    useEffect(() => {
+      if (!mounted.current && loading) {
+        B.triggerEvent('onLoad', loading);
+      }
+      mounted.current = false;
+    }, [loading]);
 
     if (error && !displayError) {
       B.triggerEvent('onError', error.message);