Context gets its own export object

emmanmills · Jun 1, 2021 · 9bbf7f4 · 9bbf7f4
1 parent 8c809f6
commit 9bbf7f4
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 35 deletions.
diff --git a/src/__tests__/lib/containers/MarkdownSynapse.test.tsx b/src/__tests__/lib/containers/MarkdownSynapse.test.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react'
-import { mount, shallow } from 'enzyme'
+import { mount } from 'enzyme'
 import MarkdownSynapse, {
   MarkdownSynapseProps,
 } from '../../../lib/containers/MarkdownSynapse'
@@ -8,14 +8,10 @@ import SynapseImage from '../../../lib/containers/widgets/SynapseImage'
 import SynapseVideo from '../../../lib/containers/widgets/SynapseVideo'
 import { delay } from '../../../lib/utils/SynapseClient'
 import { _TIME_DELAY } from '../../../lib/utils/SynapseConstants'
-import {
-  MOCK_CONTEXT,
-  SynapseTestContext,
-} from '../../../mocks/MockSynapseContext'
+import { SynapseTestContext } from '../../../mocks/MockSynapseContext'
 import {
   SynapseContextProvider,
   SynapseContextType,
-  withSynapseContextConsumer,
 } from '../../../lib/utils/SynapseContext'
 import { render, screen } from '@testing-library/react'
 

diff --git a/src/lib/index.ts b/src/lib/index.ts
@@ -38,7 +38,11 @@ import PageProgress from './containers/PageProgress'
 import ProjectViewCarousel from './containers/home_page/project_view_carousel/ProjectViewCarousel'
 import EntityFinder from './containers/entity_finder/EntityFinder'
 import ExperimentalMode from './containers/ExperimentalMode'
-import { SynapseContextProvider } from './utils/SynapseContext'
+import {
+  SynapseContextProvider,
+  SynapseContextConsumer,
+  useSynapseContext,
+} from './utils/SynapseContext'
 
 // we exclude this from main.scss because react doesn't like importing an svg
 // with a relative import.
@@ -47,6 +51,12 @@ import { SynapseConstants, SynapseClient } from './utils'
 import { EvaluationCard } from './containers/evaluation_queues/EvaluationCard'
 import { EvaluationEditorPage } from './containers/evaluation_queues/EvaluationEditorPage'
 
+const SynapseContext = {
+  SynapseContextProvider,
+  SynapseContextConsumer,
+  useSynapseContext,
+}
+
 const SynapseComponents = {
   Facets,
   Login,
@@ -87,7 +97,6 @@ const SynapseComponents = {
   ProjectViewCarousel,
   EntityFinder,
   ExperimentalMode,
-  SynapseContextProvider,
 }
 
-export { SynapseClient, SynapseConstants, SynapseComponents }
+export { SynapseClient, SynapseConstants, SynapseComponents, SynapseContext }
diff --git a/src/lib/rollup.index.ts b/src/lib/rollup.index.ts
@@ -18,7 +18,17 @@ import { SynapseHomepage } from './containers/SynapseHomepage'
 import { EvaluationEditorPage } from './containers/evaluation_queues/EvaluationEditorPage'
 import { EntityFinder } from './containers/entity_finder/EntityFinder'
 import ErrorPage from './containers/ErrorPage'
-import { SynapseContextProvider } from './utils/SynapseContext'
+import {
+  SynapseContextProvider,
+  SynapseContextConsumer,
+  useSynapseContext,
+} from './utils/SynapseContext'
+
+const SynapseContext = {
+  SynapseContextProvider,
+  SynapseContextConsumer,
+  useSynapseContext,
+}
 
 const SynapseComponents = {
   Login,
@@ -38,7 +48,6 @@ const SynapseComponents = {
   SynapseHomepage,
   EntityFinder,
   ErrorPage,
-  SynapseContextProvider,
 }
 
-export { SynapseComponents, SynapseConstants, SynapseClient }
+export { SynapseComponents, SynapseConstants, SynapseClient, SynapseContext }
diff --git a/src/lib/utils/SynapseContext.tsx b/src/lib/utils/SynapseContext.tsx
@@ -55,26 +55,3 @@ export function useSynapseContext(): SynapseContextType {
   }
   return context
 }
-
-/**
- * This lets us wrap a class component that accepts a synapseContext prop
- * 
- * We need this because we have class components that have tests that rely on the Enzyme shallow
- * renderer, which is not currently compatible with the contextType API. 
- *
- * @see SWC-5612
- */
-export const withSynapseContextConsumer = <
-  P extends { synapseContext: SynapseContextType }
->(
-  Component: React.ComponentType<P>,
-): React.FC<P> =>
-  function _(props: P) {
-    return (
-      <SynapseContextConsumer>
-        {synapseContext => (
-          <Component {...(props as P)} synapseContext={synapseContext} />
-        )}
-      </SynapseContextConsumer>
-    )
-  }