comments

m.berezin · m.berezin · commit f0b8437695bc · 2018-06-28T13:50:53.000+03:00
diff --git a/src/react/createComponents/createComponents.h.ts b/src/react/createComponents/createComponents.h.ts
diff --git a/src/react/createComponents/createComponents.ts b/src/react/createComponents/createComponents.ts
@@ -1,36 +1,38 @@
-import { StatelessComponent } from 'react'
+// tslint:disable-next-line no-unused-variable // Needed for declarations
+import PropTypes from 'prop-types'
+// tslint:disable-next-line no-unused-variable // Needed for declarations
+import React, { ReactElement, StatelessComponent } from 'react'
+// tslint:disable-next-line no-unused-variable // Needed for declarations
+import RxJS from 'rxjs'
 import { createConsume, createConsumer, createField, createForm } from '..'
 import { Stapp } from '../../core/createApp/createApp.h'
 import { FormBaseState } from '../../modules/formBase/formBase.h'
 import { ConsumerHoc } from '../createConsume/createConsume.h'
-import { ConsumerClass } from '../createConsumer/createConsumer.h'
+import { ConsumerProps } from '../createConsumer/createConsumer.h'
 import { FieldProps } from '../createField/createField.h'
 import { FormProps } from '../createForm/createForm.h'
-import { StappComponents } from './createComponents.h'
 
-export const createComponents = <State extends FormBaseState, Api>(
-  app: Stapp<State, Api>
-): StappComponents<State, Api> => {
-  let Consumer: ConsumerClass<State, Api, any, any, any>
+export const createComponents = <State extends FormBaseState, Api>(app: Stapp<State, Api>) => {
+  const Consumer = createConsumer(app)
   let consume: ConsumerHoc<State, Api>
   let Form: StatelessComponent<FormProps>
-  let Field: StatelessComponent<FieldProps<State, Api>>
+  let Field: <Extra>(
+    config: FieldProps<State, Extra>
+  ) => ReactElement<ConsumerProps<State, Api, any, any, any>>
 
   return {
-    get Consumer() {
-      return Consumer || (Consumer = createConsumer(app))
-    },
+    Consumer,
 
     get consume() {
-      return consume || (consume = createConsume(this.Consumer))
+      return consume || (consume = createConsume(Consumer))
     },
 
     get Form() {
-      return Form || (Form = createForm(this.Consumer))
+      return Form || (Form = createForm(Consumer))
     },
 
     get Field() {
-      return Field || (Field = createField(this.Consumer))
+      return Field || (Field = createField(Consumer))
     }
   }
 }
diff --git a/src/react/createConsumer/createConsumer.ts b/src/react/createConsumer/createConsumer.ts
@@ -1,6 +1,8 @@
 import shallowEqual from 'fbjs/lib/shallowEqual'
 // tslint:disable-next-line no-unused-variable // Needed for declarations
-import { Component } from 'react'
+import PropTypes from 'prop-types'
+// tslint:disable-next-line no-unused-variable // Needed for declarations
+import React, { Component } from 'react'
 import { debounceTime } from 'rxjs/operators/debounceTime'
 import { distinctUntilChanged } from 'rxjs/operators/distinctUntilChanged'
 import { map } from 'rxjs/operators/map'
@@ -14,7 +16,7 @@ import { renderPropType, selectorType } from '../helpers/propTypes'
 import { Subscription } from 'rxjs/Subscription'
 import { Stapp } from '../../core/createApp/createApp.h'
 import { renderComponent } from '../helpers/renderComponent'
-import { ConsumerClass, ConsumerProps } from './createConsumer.h'
+import { ConsumerProps } from './createConsumer.h'
 
 // tslint:disable-next-line no-unused-variable // Needed for declarations
 // import { Requireable } from 'prop-types'
@@ -33,9 +35,7 @@ const consumerPropTypes = {
 /**
  * Creates Consumer component
  */
-export const createConsumer = <State, Api>(
-  app: Stapp<State, Api>
-): ConsumerClass<State, Api, any, any, any> => {
+export const createConsumer = <State, Api>(app: Stapp<State, Api>) => {
   return class Consumer extends Component<ConsumerProps<State, Api, any, any, any>> {
     static app = app
 
diff --git a/src/react/createForm/createForm.tsx b/src/react/createForm/createForm.tsx
@@ -46,7 +46,7 @@ import { FormProps } from './createForm.h'
  *
  * See more examples in the examples folder.
  *
- * @param app Stapp application
+ * @param Consumer
  */
 export const createForm = <State, Api>(
   Consumer: ConsumerClass<State, Api, any, any, any>

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ import { FormProps } from './createForm.h'`
`46`	`46`	`*`
`47`	`47`	`* See more examples in the examples folder.`
`48`	`48`	`*`
`49`		`- * @param app Stapp application`
	`49`	`+ * @param Consumer`
`50`	`50`	`*/`
`51`	`51`	`export const createForm = <State, Api>(`
`52`	`52`	`Consumer: ConsumerClass<State, Api, any, any, any>`