fix(hooks): remove create functions for createWithFirebase and createWithFirestore

* fix(tests): remove old tests for createUseFirestore and createUseFirebase

Author: Scott Prue

src/firebaseConnect.js

@@ -12,8 +12,6 @@ import ReactReduxFirebaseContext from './ReactReduxFirebaseContext'
  * React's Lifecycle hooks.
  * **WARNING!!** This is an advanced feature, and should only be used when
  * needing to access a firebase instance created under a different store key.
- * @param {String} [storeKey='store'] - Name of redux store which contains
- * Firebase state (state.firebase)
  * @return {Function} - HOC that accepts a watchArray and wraps a component
  * @example <caption>Basic</caption>
  * // props.firebase set on App component as firebase object with helpers
@@ -23,7 +21,7 @@ import ReactReduxFirebaseContext from './ReactReduxFirebaseContext'
  * // use the firebaseConnect to wrap a component
  * export default firebaseConnect()(SomeComponent)
  */
-export const createFirebaseConnect = (storeKey = 'store') => (
+export const createFirebaseConnect = () => (
   dataOrFn = []
 ) => WrappedComponent => {
   class FirebaseConnectWrapped extends Component {

src/firestoreConnect.js

@@ -12,8 +12,6 @@ import ReactReduxFirebaseContext from './ReactReduxFirebaseContext'
  * React's Lifecycle hooks.
  * **WARNING!!** This is an advanced feature, and should only be used when
  * needing to access a firebase instance created under a different store key.
- * @param {String} [storeKey='store'] - Name of redux store which contains
- * Firebase state (state.firebase)
  * @return {Function} - HOC that accepts a watchArray and wraps a component
  * @example <caption>Basic</caption>
  * // props.firebase set on App component as firebase object with helpers
@@ -23,7 +21,7 @@ import ReactReduxFirebaseContext from './ReactReduxFirebaseContext'
  * // use the firebaseConnect to wrap a component
  * export default firestoreConnect()(SomeComponent)
  */
-export const createFirestoreConnect = (storeKey = 'store') => (
+export const createFirestoreConnect = () => (
   dataOrFn = []
 ) => WrappedComponent => {
   class FirestoreConnectWrapped extends Component {

src/useFirestoreConnect.js

@@ -9,7 +9,7 @@ import useFirestore from './useFirestore'
  * firestore paths.
  * **WARNING!!** This is an advanced feature, and should only be used when
  * needing to access a firebase instance created under a different store key.
- * Firebase state (state.firestore)
+ * Firestore state (state.firestore)
  * @return {Function} - React hook that accepts watch query
  * @example <caption>Basic</caption>
  * // props.firestore set on App component as firestore object with helpers

src/withFirebase.js

@@ -4,45 +4,6 @@ import hoistStatics from 'hoist-non-react-statics'
 import { wrapDisplayName } from './utils'
 import useFirebase from './useFirebase'
 
-/**
- * @name createWithFirebase
- * @description Function that creates a Higher Order Component that
- * which provides `firebase` and `dispatch` as a props to React Components.
- *
- * **WARNING!!** This is an advanced feature, and should only be used when
- * needing to access a firebase instance created under a different store key.
- * @param {String} [storeKey='store'] - Name of redux store which contains
- * Firebase state (`state.firebase`)
- * @return {Function} - Higher Order Component which accepts an array of
- * watchers config and wraps a React Component
- * @example <caption>Basic</caption>
- * // props.firebase set on App component as firebase object with helpers
- * import { createWithFirebase } from 'react-redux-firebase'
- *
- * // create withFirebase that uses another redux store
- * const withFirebase = createWithFirebase('anotherStore')
- *
- * // use the withFirebase to wrap a component
- * export default withFirebase(SomeComponent)
- */
-export const createWithFirebase = (storeKey = 'store') => WrappedComponent => {
-  const WithFirebase = function WithFirebase(props) {
-    const firebase = useFirebase()
-    return (
-      <WrappedComponent
-        firebase={firebase}
-        dispatch={get(firebase, 'dispatch')}
-        {...props}
-      />
-    )
-  }
-
-  WithFirebase.displayName = wrapDisplayName(WrappedComponent, 'withFirebase')
-  WithFirebase.wrappedComponent = WrappedComponent
-
-  return hoistStatics(WithFirebase, WrappedComponent)
-}
-
 /**
  * @name withFirebase
  * @extends React.Component
@@ -99,4 +60,20 @@ export const createWithFirebase = (storeKey = 'store') => WrappedComponent => {
  *
  * export default enhance(AddTodo)
  */
-export default createWithFirebase()
+export default function withFirebase(WrappedComponent) {
+  const WithFirebase = function WithFirebase(props) {
+    const firebase = useFirebase()
+    return (
+      <WrappedComponent
+        firebase={firebase}
+        dispatch={get(firebase, 'dispatch')}
+        {...props}
+      />
+    )
+  }
+
+  WithFirebase.displayName = wrapDisplayName(WrappedComponent, 'withFirebase')
+  WithFirebase.wrappedComponent = WrappedComponent
+
+  return hoistStatics(WithFirebase, WrappedComponent)
+}

src/withFirestore.js

@@ -5,46 +5,6 @@ import { wrapDisplayName } from './utils'
 import useFirebase from './useFirebase'
 import useFirestore from './useFirestore'
 
-/**
- * @name createWithFirestore
- * @description Function that creates a Higher Order Component that
- * which provides `firebase`, `firestore`, and `dispatch` to React Components.
- *
- * **WARNING!!** This is an advanced feature, and should only be used when
- * needing to access a firebase instance created under a different store key.
- * @param {String} [storeKey='store'] - Name of redux store which contains
- * Firestore state (`state.firestore`)
- * @return {Function} - Higher Order Component which accepts an array of
- * watchers config and wraps a React Component
- * @example <caption>Basic</caption>
- * import { createWithFirestore } from 'react-redux-firebase'
- *
- * // create withFirestore that uses another redux store
- * const withFirestore = createWithFirestore('anotherStore')
- *
- * // use the withFirestore to wrap a component
- * export default withFirestore(SomeComponent)
- */
-export const createWithFirestore = (storeKey = 'store') => WrappedComponent => {
-  const WithFirestore = function WithFirestore(props) {
-    const firebase = useFirebase()
-    const firestore = useFirestore()
-    return (
-      <WrappedComponent
-        firebase={firebase}
-        dispatch={get(firebase, 'dispatch')}
-        firestore={firestore}
-        {...props}
-      />
-    )
-  }
-
-  WithFirestore.displayName = wrapDisplayName(WrappedComponent, 'withFirestore')
-  WithFirestore.wrappedComponent = WrappedComponent
-
-  return hoistStatics(WithFirestore, WrappedComponent)
-}
-
 /**
  * @name withFirestore
  * @extends React.Component
@@ -98,4 +58,22 @@ export const createWithFirestore = (storeKey = 'store') => WrappedComponent => {
  *
  * export default enhance(AddTodo)
  */
-export default createWithFirestore()
+export default function withFirestore(WrappedComponent) {
+  function WithFirestore(props) {
+    const firebase = useFirebase()
+    const firestore = useFirestore()
+    return (
+      <WrappedComponent
+        firebase={firebase}
+        dispatch={get(firebase, 'dispatch')}
+        firestore={firestore}
+        {...props}
+      />
+    )
+  }
+
+  WithFirestore.displayName = wrapDisplayName(WrappedComponent, 'withFirestore')
+  WithFirestore.wrappedComponent = WrappedComponent
+
+  return hoistStatics(WithFirestore, WrappedComponent)
+}

test/unit/useFirebase.spec.js

@@ -2,7 +2,7 @@ import React from 'react'
 import TestUtils from 'react-dom/test-utils'
 import { firebaseWithConfig } from '../utils'
 import ReactReduxFirebaseProvider from '../../src/ReactReduxFirebaseProvider'
-import useFirebase, { createUseFirebase } from '../../src/useFirebase'
+import useFirebase from '../../src/useFirebase'
 
 describe('useFirebase', () => {
   it('return firebase object', () => {
@@ -25,9 +25,3 @@ describe('useFirebase', () => {
     expect(spy.lastCall.args[0]).to.respondTo('push')
   })
 })
-
-describe('createUseFirebase', () => {
-  it('return hook', () => {
-    expect(createUseFirebase()).to.be.a('function')
-  })
-})

test/unit/useFirestore.spec.js

@@ -2,7 +2,7 @@ import React from 'react'
 import TestUtils from 'react-dom/test-utils'
 import { firebaseWithConfig } from '../utils'
 import ReactReduxFirebaseProvider from '../../src/ReactReduxFirebaseProvider'
-import useFirestore, { createUseFirestore } from '../../src/useFirestore'
+import useFirestore from '../../src/useFirestore'
 import { createFirestoreInstance } from 'redux-firestore'
 
 describe('useFirestore', () => {
@@ -27,9 +27,3 @@ describe('useFirestore', () => {
     expect(spy.lastCall.args[0]).to.respondTo('add')
   })
 })
-
-describe('createUseFirestore', () => {
-  it('return hook', () => {
-    expect(createUseFirestore()).to.be.a('function')
-  })
-})

test/unit/withFirebase.spec.js

@@ -1,6 +1,6 @@
 import React from 'react'
 import { createContainer, TestLeaf } from '../utils'
-import withFirebase, { createWithFirebase } from '../../src/withFirebase'
+import withFirebase from '../../src/withFirebase'
 
 let wrapper
 let leaf
@@ -48,9 +48,3 @@ describe('withFirebase', () => {
     expect(leaf).to.match(TestLeaf)
   })
 })
-
-describe('createwithFirebase', () => {
-  it('accepts a different store key', () => {
-    createWithFirebase('store2')
-  })
-})

test/unit/withFirestore.spec.js

@@ -1,6 +1,6 @@
 import React from 'react'
 import { createContainer, TestLeaf } from '../utils'
-import withFirestore, { createWithFirestore } from '../../src/withFirestore'
+import withFirestore from '../../src/withFirestore'
 
 let wrapper
 let leaf
@@ -53,9 +53,3 @@ describe('withFirestore', () => {
     expect(leaf).to.match(TestLeaf)
   })
 })
-
-describe('createwithFirestore', () => {
-  it('accepts a store key', () => {
-    createWithFirestore('store2')
-  })
-})