Merge pull request #909 from eisbuk/enhancement/react-redux-firebase-…

…firestore-updates

Enhancement/react redux firebase firestore updates

packages/react-redux-firebase-firestore/src/hooks/useUpdateSubscription.ts

@@ -0,0 +1,39 @@
+import { useEffect } from "react";
+import { useDispatch, useSelector } from "react-redux";
+
+import { CollectionSubscription } from "../types";
+
+import { getFirestoreListeners } from "../selectors";
+
+import { updateSubscription } from "../thunks/subscribe";
+
+import { getCollectionPath, getConstraintForColl } from "../utils/utils";
+
+const useUpdateSubscription = (
+  subscription: CollectionSubscription,
+  deps: any[]
+): void => {
+  const dispatch = useDispatch();
+  const collection = subscription.collection;
+
+  const listeners = useSelector(getFirestoreListeners);
+
+  useEffect(() => {
+    const listener = listeners[collection];
+
+    if (!subscription.meta || !listener) return;
+
+    const meta = { ...listener.meta, ...subscription.meta };
+
+    dispatch(
+      updateSubscription({
+        storeAs: collection,
+        collPath: getCollectionPath(subscription.collection, meta),
+        constraint: getConstraintForColl(subscription.collection, meta),
+        meta,
+      })
+    );
+  }, deps);
+};
+
+export default useUpdateSubscription;

packages/react-redux-firebase-firestore/src/index.ts

@@ -1,8 +1,8 @@
-import { createFirestoreReducer } from "./reducer";
-import useFirestoreSubscribe from "./hooks/useFirestoreSubscribe";
-import usePaginateFirestore from "./hooks/usePaginateFirestore";
+export { createFirestoreReducer } from "./reducer";
 
-export { createFirestoreReducer, useFirestoreSubscribe, usePaginateFirestore };
+export { default as useFirestoreSubscribe } from "./hooks/useFirestoreSubscribe";
+export { default as usePaginateFirestore } from "./hooks/usePaginateFirestore";
+export { default as useUpdateSubscription } from "./hooks/useUpdateSubscription";
 
 export * from "./types";
 export * from "./actions";

packages/react-redux-firebase-firestore/src/thunks/subscribe.ts

@@ -107,10 +107,6 @@ export const updateSubscription: SubscribeFunction =
       if (rangeInStore && rangeProperty === rangeInStore[0]) {
         const [, storeRangeStart, storeRangeEnd] = rangeInStore;
         switch (true) {
-          // exit early if ranges are the same
-          case rangeStart >= storeRangeStart && rangeEnd <= storeRangeEnd:
-            return;
-
           // extend range in both directions: should happed rarely (or never) in production
           case rangeStart < storeRangeStart && rangeEnd > storeRangeEnd:
             // unsubscribe from old range