refactor incorporator

Author: staltz

src/Incorporator.ts

@@ -0,0 +1,64 @@
+import {PureComponent, createElement} from 'react';
+import {Scope} from './scope';
+
+type Props = {
+  targetProps: any;
+  targetRef: any;
+  target: any;
+  scope: Scope;
+};
+
+type State = {
+  flip: boolean;
+};
+
+export default class Incorporator extends PureComponent<Props, State> {
+  constructor(props: Props) {
+    super(props);
+    this.state = {flip: false};
+    this.selector = props.targetProps.sel;
+  }
+
+  private selector: string | symbol;
+  private unsubscribe: any;
+
+  public componentDidMount() {
+    this.unsubscribe = this.props.scope.subscribe(this.selector, () => {
+      this.setState((prev: any) => ({flip: !prev.flip}));
+    });
+  }
+
+  private incorporateHandlers<P>(props: P, scope: Scope): P {
+    const handlers = scope.getSelectorHandlers(this.selector);
+    for (const evType of Object.keys(handlers)) {
+      const onFoo = `on${evType[0].toUpperCase()}${evType.slice(1)}`;
+      props[onFoo] = (ev: any) => handlers[evType]._n(ev);
+    }
+    return props;
+  }
+
+  private materializeTargetProps() {
+    const {targetProps, targetRef, scope} = this.props;
+    let output = {...targetProps};
+    output = this.incorporateHandlers(output, scope);
+    if (targetRef) {
+      output.ref = targetRef;
+    }
+    delete output.sel;
+    return output;
+  }
+
+  public render() {
+    const {target} = this.props;
+    const targetProps = this.materializeTargetProps();
+    if (targetProps.children) {
+      return createElement(target, targetProps, targetProps.children);
+    } else {
+      return createElement(target, targetProps);
+    }
+  }
+
+  public componentWillUnmount() {
+    this.unsubscribe();
+  }
+}

src/convert.ts

@@ -1,22 +1,7 @@
-import {
-  PureComponent,
-  Component,
-  ProviderProps,
-  ReactNodeArray,
-  ReactPortal,
-  ReactElement,
-  createElement,
-  ComponentType,
-} from 'react';
+import {PureComponent, ReactElement, createElement, ComponentType} from 'react';
 import {Stream, Subscription} from 'xstream';
 import {ScopeContext} from './context';
-import {
-  Sources,
-  Drivers,
-  MatchingDrivers,
-  MatchingMain,
-  setup,
-} from '@cycle/run';
+import {MatchingDrivers, MatchingMain, setup} from '@cycle/run';
 import {ReactSource} from './ReactSource';
 import {StreamRenderer} from './StreamRenderer';
 

src/incorporate.ts

@@ -1,81 +1,10 @@
-import {
-  PureComponent,
-  createElement,
-  Component,
-  ComponentElement,
-  ComponentClass,
-  StatelessComponent,
-  InputHTMLAttributes,
-  DetailedReactHTMLElement,
-  forwardRef,
-} from 'react';
+import {createElement, forwardRef} from 'react';
 import {Scope} from './scope';
 import {ScopeContext} from './context';
+import Incorporator from './Incorporator';
 
 const wrapperComponents: Map<any, React.ComponentType<any>> = new Map();
 
-type Props = {
-  targetProps: any;
-  targetRef: any;
-  target: any;
-  scope: Scope;
-};
-
-type State = {
-  flip: boolean;
-};
-
-export class Incorporator extends PureComponent<Props, State> {
-  constructor(props: Props) {
-    super(props);
-    this.state = {flip: false};
-    this.selector = props.targetProps.sel;
-  }
-
-  private selector: string | symbol;
-  private unsubscribe: any;
-
-  public componentDidMount() {
-    this.unsubscribe = this.props.scope.subscribe(this.selector, () => {
-      this.setState((prev: any) => ({flip: !prev.flip}));
-    });
-  }
-
-  private incorporateHandlers<P>(props: P, scope: Scope): P {
-    const handlers = scope.getSelectorHandlers(this.selector);
-    for (const evType of Object.keys(handlers)) {
-      const onFoo = `on${evType[0].toUpperCase()}${evType.slice(1)}`;
-      props[onFoo] = (ev: any) => handlers[evType]._n(ev);
-    }
-    return props;
-  }
-
-  private materializeTargetProps() {
-    const {targetProps, targetRef, scope} = this.props;
-    let output = {...targetProps};
-    output = this.incorporateHandlers(output, scope);
-    if (targetRef) {
-      output.ref = targetRef;
-    }
-    delete output.sel;
-    return output;
-  }
-
-  public render() {
-    const {target} = this.props;
-    const targetProps = this.materializeTargetProps();
-    if (targetProps.children) {
-      return createElement(target, targetProps, targetProps.children);
-    } else {
-      return createElement(target, targetProps);
-    }
-  }
-
-  public componentWillUnmount() {
-    this.unsubscribe();
-  }
-}
-
 export function incorporate(type: any) {
   if (!wrapperComponents.has(type)) {
     wrapperComponents.set(