Merge pull request #76 from jeff-phillips-18/type-updates

fix(componentFactory): Update component factory return type
patternfly · Jul 6, 2023 · 5c4cad6 · 5c4cad6
2 parents f233856 + a3029ba
commit 5c4cad6
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/packages/module/src/Visualization.ts b/packages/module/src/Visualization.ts
@@ -242,7 +242,7 @@ export class Visualization extends Stateful implements Controller {
     return undefined;
   }
 
-  getComponent(kind: ModelKind, type: string): ComponentType<{ element: GraphElement }> {
+  getComponent(kind: ModelKind, type: string): ComponentType<{ element: GraphElement | Graph | Node | Edge }> {
     for (const factory of this.componentFactories) {
       const component = factory(kind, type);
       if (component) {

diff --git a/packages/module/src/components/ElementWrapper.tsx b/packages/module/src/components/ElementWrapper.tsx
@@ -2,13 +2,13 @@ import * as React from 'react';
 import { observer } from 'mobx-react';
 import { computed } from 'mobx';
 import ElementContext from '../utils/ElementContext';
-import { GraphElement, isGraph, isEdge, isNode, Node } from '../types';
+import { Edge, Graph, isGraph, isEdge, isNode, Node } from '../types';
 import { ATTR_DATA_ID, ATTR_DATA_KIND, ATTR_DATA_TYPE } from '../const';
 import ComputeElementDimensions from './ComputeElementDimensions';
 import { useDndManager } from '../behavior/useDndManager';
 
 interface ElementWrapperProps {
-  element: GraphElement;
+  element: Graph | Edge | Node;
 }
 
 const NodeElementComponent: React.FunctionComponent<{ element: Node }> = observer(({ element }) => {

diff --git a/packages/module/src/types.ts b/packages/module/src/types.ts
@@ -302,7 +302,7 @@ export interface WithState {
 
 export type LayoutFactory = (type: string, graph: Graph) => Layout | undefined;
 
-export type ComponentFactory = (kind: ModelKind, type: string) => ComponentType<{ element: GraphElement }> | undefined;
+export type ComponentFactory = (kind: ModelKind, type: string) => ComponentType<{ element: GraphElement | Graph | Edge | Node }> | undefined;
 
 export type ElementFactory = (kind: ModelKind, type: string) => GraphElement | undefined;
 
@@ -320,7 +320,7 @@ export interface Controller extends WithState {
   getEdgeById(id: string): Edge | undefined;
   addElement(element: GraphElement): void;
   removeElement(element: GraphElement): void;
-  getComponent(kind: ModelKind, type: string): ComponentType<{ element: GraphElement }>;
+  getComponent(kind: ModelKind, type: string): ComponentType<{ element: GraphElement | Graph | Edge | Node }>;
   registerLayoutFactory(factory: LayoutFactory): void;
   registerComponentFactory(factory: ComponentFactory): void;
   registerElementFactory(factory: ElementFactory): void;