ExtensionPoint now uses binder provided from context

scm-ui/ui-extensions/src/ExtensionPoint.test.tsx

@@ -33,12 +33,6 @@ describe("ExtensionPoint test", () => {
     expect(rendered.text()).toBe("Extension One");
   });
 
-  // We use this wrapper since Enzyme cannot handle React Fragments (see https://github.com/airbnb/enzyme/issues/1213)
-  class ExtensionPointEnzymeFix extends ExtensionPoint {
-    render() {
-      return <div>{super.render()}</div>;
-    }
-  }
   it("should render the given components", () => {
     const labelOne = () => {
       return <label>Extension One</label>;
@@ -50,7 +44,7 @@ describe("ExtensionPoint test", () => {
     mockedBinder.hasExtension.mockReturnValue(true);
     mockedBinder.getExtensions.mockReturnValue([labelOne, labelTwo]);
 
-    const rendered = mount(<ExtensionPointEnzymeFix name="something.special" renderAll={true} />);
+    const rendered = mount(<ExtensionPoint name="something.special" renderAll={true} />);
     const text = rendered.text();
     expect(text).toContain("Extension One");
     expect(text).toContain("Extension Two");
@@ -143,4 +137,12 @@ describe("ExtensionPoint test", () => {
     const text = rendered.text();
     expect(text).toBe("Hello Trillian");
   });
+
+  it("should not render nothing without extension and without default", () => {
+    mockedBinder.hasExtension.mockReturnValue(false);
+
+    const rendered = mount(<ExtensionPoint name="something.special" />);
+    const text = rendered.text();
+    expect(text).toBe("");
+  });
 });

scm-ui/ui-extensions/src/ExtensionPoint.tsx

@@ -1,18 +1,15 @@
 import * as React from "react";
-import binder from "./binder";
+import { Binder } from "./binder";
+import { FC, ReactNode } from "react";
+import useBinder from "./useBinder";
 
 type Props = {
   name: string;
   renderAll?: boolean;
   props?: object;
-  children?: React.ReactNode;
 };
 
-/**
+const renderAllExtensions = (binder: Binder, name: string, props?: object) => {
- * ExtensionPoint renders components which are bound to an extension point.
- */
-class ExtensionPoint extends React.Component<Props> {
-  renderAll(name: string, props?: object) {
   const extensions = binder.getExtensions(name, props);
   return (
     <>
@@ -21,33 +18,34 @@ class ExtensionPoint extends React.Component<Props> {
       })}
     </>
   );
-  }
+};
 
-  renderSingle(name: string, props?: object) {
+const renderSingleExtension = (binder: Binder, name: string, props?: object) => {
   const Component = binder.getExtension(name, props);
   if (!Component) {
     return null;
   }
   return <Component {...props} />;
-  }
+};
 
-  renderDefault() {
+const renderDefault = (children: ReactNode) => {
-    const { children } = this.props;
   if (children) {
     return <>{children}</>;
   }
   return null;
-  }
+};
 
-  render() {
+/**
-    const { name, renderAll, props } = this.props;
+ * ExtensionPoint renders components which are bound to an extension point.
+ */
+const ExtensionPoint: FC<Props> = ({ name, renderAll, props, children }) => {
+  const binder = useBinder();
   if (!binder.hasExtension(name, props)) {
-      return this.renderDefault();
+    return renderDefault(children);
   } else if (renderAll) {
-      return this.renderAll(name, props);
+    return renderAllExtensions(binder, name, props);
   }
-    return this.renderSingle(name, props);
+  return renderSingleExtension(binder, name, props);
-  }
+};
-}
 
 export default ExtensionPoint;

scm-ui/ui-extensions/src/binder.test.ts

@@ -4,7 +4,7 @@ describe("binder tests", () => {
   let binder: Binder;
 
   beforeEach(() => {
-    binder = new Binder();
+    binder = new Binder("testing");
   });
 
   it("should return an empty array for non existing extension points", () => {