Remove context logic

preactjs · Feb 18, 2022 · 7d7790d · 7d7790d
1 parent 829fae4
commit 7d7790d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 32 deletions.
diff --git a/src/RootFinder.ts b/src/RootFinder.ts
@@ -1,11 +1,6 @@
 import { Component } from 'preact';
 
-export default class RootFinder extends Component<{ context: any }> {
-  // I'm not sure if this is needed… It might help with legacy context 🤷
-  getChildContext() {
-    return this.props.context;
-  }
-
+export default class RootFinder extends Component {
   render() {
     return this.props.children;
   }

diff --git a/src/wrapWithWrappingComponent.ts b/src/wrapWithWrappingComponent.ts
@@ -9,7 +9,7 @@ export default function wrapWithWrappingComponent(
   node: ReactElement,
   options: ShallowRendererProps = {}
 ) {
-  const { wrappingComponent, wrappingComponentProps = {}, context } = options;
+  const { wrappingComponent, wrappingComponentProps = {} } = options;
 
   if (!wrappingComponent) {
     return node;
@@ -24,15 +24,9 @@ export default function wrapWithWrappingComponent(
     nodeWithValidChildren.props.children = childElements(nodeWithValidChildren);
   }
 
-  const rootFinderContext =
-    (wrappingComponentProps as { context: any })?.context || context;
-  const rootFinderProps = rootFinderContext
-    ? { context: rootFinderContext }
-    : null;
-
   return createElement(
     wrappingComponent,
     wrappingComponentProps,
-    createElement(RootFinder, rootFinderProps, nodeWithValidChildren)
+    createElement(RootFinder, null, nodeWithValidChildren)
   );
 }
diff --git a/test/integration_test.tsx b/test/integration_test.tsx
@@ -523,37 +523,22 @@ describe('integration tests', () => {
       );
     });
 
-    it('passes context option to RootFinder', () => {
-      function Component() {
-        return <span>test</span>;
-      }
-      const wrapper = shallow(<Component />, {
-        wrappingComponent: WrappingComponent,
-        context: { test: 'abc' },
-      });
-
-      const output = debugWrappedComponent(wrapper);
-      assert.equal(
-        output,
-        '<div><RootFinder context={{...}}><Component /></RootFinder></div>'
-      );
-    });
-
-    it('passes wrappingComponentProps.context option to wrappingComponent and RootFinder', () => {
+    it('passes wrappingComponentProps to wrappingComponent', () => {
       function Component() {
         return <span>test</span>;
       }
       const wrapper = shallow(<Component />, {
         wrappingComponent: WrappingComponent,
         wrappingComponentProps: {
+          foo: 'bar',
           context: { test: 'abc' },
         },
       });
 
       const output = debugWrappedComponent(wrapper);
       assert.equal(
         output,
-        '<div context={{...}}><RootFinder context={{...}}><Component /></RootFinder></div>'
+        '<div foo="bar" context={{...}}><RootFinder><Component /></RootFinder></div>'
       );
     });