Feature/publish (#80)

DovydasNavickas · web-flow · commit b385d20b0310 · 2017-06-17T00:15:31.000+03:00
* Element ref setting can get element undefined.

* Publish fixes.

* onChange calls updated.

* Protected methods naming unified.
diff --git a/common/config/rush/npm-shrinkwrap.json b/common/config/rush/npm-shrinkwrap.json
diff --git a/package.json b/package.json
@@ -5,7 +5,8 @@
     "generate": "rush generate",
     "tools-build": "ts-node ./tools/rush-tools.ts run gulp-build -e simplr-mvdir",
     "source-build": "ts-node ./tools/rush-tools.ts run build -e simplr-mvdir",
-    "test": "ts-node ./tools/rush-tools.ts run test-tsc -e simplr-mvdir"
+    "test": "ts-node ./tools/rush-tools.ts run test-tsc -e simplr-mvdir",
+    "rush-tools": "ts-node ./tools/rush-tools.ts"
   },
   "devDependencies": {
     "@microsoft/rush": "^3.0.9",
diff --git a/packages/simplr-forms-dom/package.json b/packages/simplr-forms-dom/package.json
@@ -1,6 +1,6 @@
 {
   "name": "simplr-forms-dom",
-  "version": "4.0.1-beta",
+  "version": "4.0.1-beta.2",
   "description": "DOM components for simplr-forms.",
   "repository": "SimplrJS/simplr-forms",
   "homepage": "https://github.com/SimplrJS/simplr-forms",
@@ -60,7 +60,7 @@
     "prop-types": "^15.5.10",
     "react": "^15.6.1",
     "react-dom": "^15.6.1",
-    "simplr-forms": "^4.0.1-beta",
+    "simplr-forms": "^4.0.1-beta.2",
     "tslib": "^1.7.1",
     "typed-immutable-record": "^0.0.6"
   },
diff --git a/packages/simplr-forms-dom/src/abstractions/base-dom-field.tsx b/packages/simplr-forms-dom/src/abstractions/base-dom-field.tsx
@@ -67,7 +67,7 @@ export abstract class BaseDomField<TProps extends DomFieldProps, TState extends
         return restProps;
     }
 
-    protected SetElementRef = (element: TUnderlyingElement): void => {
+    protected SetElementRef = (element: TUnderlyingElement | undefined): void => {
         this.Element = element;
     }
 
diff --git a/packages/simplr-forms-dom/src/components/checkbox.tsx b/packages/simplr-forms-dom/src/components/checkbox.tsx
@@ -40,14 +40,14 @@ export class CheckBox extends BaseDomField<CheckBoxProps, BaseDomFieldState, HTM
 
         if (this.props.onChange != null) {
             event.persist();
-            this.props.onChange(event, newValue, this.FieldId, this.FormId);
+            this.props.onChange(event, newValue, this.FieldId, this.FormStore);
         }
 
         const formStoreState = this.FormStore.GetState();
         const formProps = formStoreState.Form.Props as FormProps;
         if (formProps.onChange != null) {
             event.persist();
-            formProps.onChange(event, newValue, this.FieldId, this.FormId);
+            formProps.onChange(event, newValue, this.FieldId, this.FormStore);
         }
     }
 
diff --git a/packages/simplr-forms-dom/src/components/email.tsx b/packages/simplr-forms-dom/src/components/email.tsx
@@ -39,14 +39,14 @@ export class Email extends BaseDomField<EmailProps, BaseDomFieldState, HTMLInput
 
         if (this.props.onChange != null) {
             event.persist();
-            this.props.onChange(event, newValue, this.FieldId, this.FormId);
+            this.props.onChange(event, newValue, this.FieldId, this.FormStore);
         }
 
         const formStoreState = this.FormStore.GetState();
         const formProps = formStoreState.Form.Props as FormProps;
         if (formProps.onChange != null) {
             event.persist();
-            formProps.onChange(event, newValue, this.FieldId, this.FormId);
+            formProps.onChange(event, newValue, this.FieldId, this.FormStore);
         }
     }
 
diff --git a/packages/simplr-forms-dom/src/components/fields-array.tsx b/packages/simplr-forms-dom/src/components/fields-array.tsx
@@ -16,9 +16,9 @@ interface Dictionary {
 }
 
 export class FieldsArray extends BaseFieldsArray<FieldsArrayProps, FieldsArrayState> {
-    public Element: HTMLDivElement;
+    public Element: HTMLDivElement | undefined;
 
-    private setElementRef = (element: HTMLDivElement): void => {
+    protected SetElementRef = (element: HTMLDivElement | undefined): void => {
         this.Element = element;
     }
 
@@ -34,7 +34,7 @@ export class FieldsArray extends BaseFieldsArray<FieldsArrayProps, FieldsArraySt
 
     render(): JSX.Element | null {
         return <div
-            ref={this.setElementRef}
+            ref={this.SetElementRef}
             {...this.GetHTMLProps(this.props) }
         >
             {this.props.children}
diff --git a/packages/simplr-forms-dom/src/components/fields-group.tsx b/packages/simplr-forms-dom/src/components/fields-group.tsx
@@ -16,9 +16,9 @@ interface Dictionary {
 }
 
 export class FieldsGroup extends BaseFieldsGroup<FieldsGroupProps, FieldsGroupState> {
-    public Element: HTMLDivElement;
+    public Element: HTMLDivElement | undefined;
 
-    private setElementRef = (element: HTMLDivElement): void => {
+    protected SetElementRef = (element: HTMLDivElement | undefined): void => {
         this.Element = element;
     }
 
@@ -33,7 +33,7 @@ export class FieldsGroup extends BaseFieldsGroup<FieldsGroupProps, FieldsGroupSt
 
     render(): JSX.Element | null {
         return <div
-            ref={this.setElementRef}
+            ref={this.SetElementRef}
             {...this.GetHTMLProps(this.props) }
         >
             {this.props.children}
diff --git a/packages/simplr-forms-dom/src/components/form.tsx b/packages/simplr-forms-dom/src/components/form.tsx
@@ -4,13 +4,15 @@ import { BaseForm } from "simplr-forms";
 import { FormProps } from "../contracts/form";
 
 export class Form extends BaseForm<FormProps, {}> {
-    public Element: HTMLFormElement;
+    public Element: HTMLFormElement | undefined;
 
-    protected SetElementRef = (element: HTMLFormElement) => {
+    protected SetElementRef = (element: HTMLFormElement | undefined) => {
         this.Element = element;
-        this.FormStore.SetFormSubmitCallback(() => {
-            element.dispatchEvent(new Event("submit"));
-        });
+        if (this.FormStore != null && element != null) {
+            this.FormStore.SetFormSubmitCallback(() => {
+                element.dispatchEvent(new Event("submit"));
+            });
+        }
     }
 
     static defaultProps: FormProps = {
diff --git a/packages/simplr-forms-dom/src/components/number.tsx b/packages/simplr-forms-dom/src/components/number.tsx
@@ -44,14 +44,14 @@ export class Number extends BaseDomField<NumberProps, BaseDomFieldState> {
 
         if (this.props.onChange != null) {
             event.persist();
-            this.props.onChange(event, newValue, this.FieldId, this.FormId);
+            this.props.onChange(event, newValue, this.FieldId, this.FormStore);
         }
 
         const formStoreState = this.FormStore.GetState();
         const formProps = formStoreState.Form.Props as FormProps;
         if (formProps.onChange != null) {
             event.persist();
-            formProps.onChange(event, newValue, this.FieldId, this.FormId);
+            formProps.onChange(event, newValue, this.FieldId, this.FormStore);
         }
     }
 
diff --git a/packages/simplr-forms-dom/src/components/password.tsx b/packages/simplr-forms-dom/src/components/password.tsx
@@ -39,14 +39,14 @@ export class Password extends BaseDomField<PasswordProps, BaseDomFieldState> {
 
         if (this.props.onChange != null) {
             event.persist();
-            this.props.onChange(event, newValue, this.FieldId, this.FormId);
+            this.props.onChange(event, newValue, this.FieldId, this.FormStore);
         }
 
         const formStoreState = this.FormStore.GetState();
         const formProps = formStoreState.Form.Props as FormProps;
         if (formProps.onChange != null) {
             event.persist();
-            formProps.onChange(event, newValue, this.FieldId, this.FormId);
+            formProps.onChange(event, newValue, this.FieldId, this.FormStore);
         }
     }
 
diff --git a/packages/simplr-forms-dom/src/components/radio-group.tsx b/packages/simplr-forms-dom/src/components/radio-group.tsx
@@ -66,7 +66,7 @@ export class RadioGroup extends BaseDomField<RadioGroupProps, BaseFieldState> {
         const formProps = formStoreState.Form.Props as FormProps;
         if (formProps.onChange != null) {
             event.persist();
-            formProps.onChange(event, newValue, this.FieldId, this.FormId);
+            formProps.onChange(event, newValue, this.FieldId, this.FormStore);
         }
     }
 
diff --git a/packages/simplr-forms-dom/src/components/radio.tsx b/packages/simplr-forms-dom/src/components/radio.tsx
@@ -139,7 +139,7 @@ export class Radio extends BaseContainer<RadioProps, RadioState> {
         return otherProps;
     }
 
-    protected SetElementRef = (element: HTMLInputElement) => {
+    protected SetElementRef = (element: HTMLInputElement | undefined) => {
         this.Element = element;
     }
 
diff --git a/packages/simplr-forms-dom/src/components/search.tsx b/packages/simplr-forms-dom/src/components/search.tsx
@@ -40,14 +40,14 @@ export class Search extends BaseDomField<SearchProps, BaseDomFieldState> {
 
         if (this.props.onChange != null) {
             event.persist();
-            this.props.onChange(event, newValue, this.FieldId, this.FormId);
+            this.props.onChange(event, newValue, this.FieldId, this.FormStore);
         }
 
         const formStoreState = this.FormStore.GetState();
         const formProps = formStoreState.Form.Props as FormProps;
         if (formProps.onChange != null) {
             event.persist();
-            formProps.onChange(event, newValue, this.FieldId, this.FormId);
+            formProps.onChange(event, newValue, this.FieldId, this.FormStore);
         }
     }
 
diff --git a/packages/simplr-forms-dom/src/components/select.tsx b/packages/simplr-forms-dom/src/components/select.tsx
@@ -91,14 +91,14 @@ export class Select extends BaseDomField<SelectProps, SelectState> {
 
         if (this.props.onChange != null) {
             event.persist();
-            this.props.onChange(event, newValue, this.FieldId, this.FormId);
+            this.props.onChange(event, newValue, this.FieldId, this.FormStore);
         }
 
         const formStoreState = this.FormStore.GetState();
         const formProps = formStoreState.Form.Props as FormProps;
         if (formProps.onChange != null) {
             event.persist();
-            formProps.onChange(event, newValue, this.FieldId, this.FormId);
+            formProps.onChange(event, newValue, this.FieldId, this.FormStore);
         }
     }
 
diff --git a/packages/simplr-forms-dom/src/components/text.tsx b/packages/simplr-forms-dom/src/components/text.tsx
@@ -47,14 +47,14 @@ export class Text extends BaseDomField<TextProps, BaseDomFieldState, HTMLInputEl
 
         if (this.props.onChange != null) {
             event.persist();
-            this.props.onChange(event, newValue, this.FieldId, this.FormId);
+            this.props.onChange(event, newValue, this.FieldId, this.FormStore);
         }
 
         const formStoreState = this.FormStore.GetState();
         const formProps = formStoreState.Form.Props as FormProps;
         if (formProps.onChange != null) {
             event.persist();
-            formProps.onChange(event, newValue, this.FieldId, this.FormId);
+            formProps.onChange(event, newValue, this.FieldId, this.FormStore);
         }
     }
 
diff --git a/packages/simplr-forms-dom/src/components/textarea.tsx b/packages/simplr-forms-dom/src/components/textarea.tsx
@@ -47,14 +47,14 @@ export class TextArea extends BaseDomField<TextAreaProps, BaseDomFieldState> {
 
         if (this.props.onChange != null) {
             event.persist();
-            this.props.onChange(event, newValue, this.FieldId, this.FormId);
+            this.props.onChange(event, newValue, this.FieldId, this.FormStore);
         }
 
         const formStoreState = this.FormStore.GetState();
         const formProps = formStoreState.Form.Props as FormProps;
         if (formProps.onChange != null) {
             event.persist();
-            formProps.onChange(event, newValue, this.FieldId, this.FormId);
+            formProps.onChange(event, newValue, this.FieldId, this.FormStore);
         }
     }
 
diff --git a/packages/simplr-forms-dom/src/contracts/field.ts b/packages/simplr-forms-dom/src/contracts/field.ts
@@ -21,7 +21,7 @@ export type FieldOnChangeCallback<TElement> = (
     event: React.FormEvent<TElement>,
     newValue: FieldValue,
     fieldId: string,
-    formId: string
+    store: FormStore
 ) => void;
 
 
diff --git a/packages/simplr-forms/package.json b/packages/simplr-forms/package.json
@@ -1,6 +1,6 @@
 {
   "name": "simplr-forms",
-  "version": "4.0.1-beta",
+  "version": "4.0.1-beta.2",
   "description": "Shared simplr-forms logic.",
   "repository": "SimplrJS/simplr-forms",
   "homepage": "https://github.com/SimplrJS/simplr-forms",
@@ -46,6 +46,7 @@
     "simplr-mvdir": "0.0.1-beta.8",
     "sinon": "^2.3.4",
     "source-map-loader": "^0.2.1",
+    "react-test-renderer": "^15.6.1",
     "ts-jest": "^20.0.6",
     "ts-loader": "^2.1.0",
     "tslint": "^5.4.3",
diff --git a/packages/simplr-forms/src/stores/form-store.ts b/packages/simplr-forms/src/stores/form-store.ts
@@ -60,6 +60,10 @@ export class FormStore extends ActionEmitter {
         return this.State;
     }
 
+    public GetFormId(): string {
+        return this.FormId;
+    }
+
     /**
      * ========================
      *  Public API
diff --git a/packages/simplr-validation/package.json b/packages/simplr-validation/package.json
@@ -1,6 +1,6 @@
 {
   "name": "simplr-validation",
-  "version": "4.0.1-alpha",
+  "version": "4.0.1-beta.5",
   "description": "Validation library for simplr-forms.",
   "repository": "SimplrJS/simplr-forms",
   "homepage": "https://github.com/SimplrJS/simplr-forms",
@@ -17,6 +17,7 @@
     "test-tslint": "tslint --config ./tslint.json --project . --exclude ./__tests__/* && echo TsLint test successfully passed.",
     "test-tsc": "tsc -p . --noEmit",
     "uglifyjs": "echo \"Uglify is not implemented\" && exit 1",
+    "prepublishOnly": "npm run build",
     "gulp-build": "tsc -p ./tools/tsconfig.gulp.json",
     "gulp-watch": "npm run gulp-build -- -w"
   },
@@ -57,7 +58,7 @@
     "action-emitter": "^0.2.1",
     "immutable": "^3.8.1",
     "react": "^15.6.1",
-    "simplr-forms": "^4.0.1-beta",
+    "simplr-forms": "^4.0.1-beta.2",
     "validator": "^7.0.0"
   },
   "jest": {
diff --git a/packages/simplr-validation/src/subscribers/subscriber.ts b/packages/simplr-validation/src/subscribers/subscriber.ts
@@ -12,7 +12,7 @@ export class Subscriber {
 export class SubscriberContainerClass {
     private instance: Subscriber;
 
-    SetSubscriber(newHandler: Subscriber, disposeOldOne: boolean = true) {
+    SetSubscriber(newHandler: Subscriber, disposeOldOne: boolean = true): void {
         if (disposeOldOne) {
             if (this.instance != null) {
                 delete this.instance;
@@ -21,11 +21,14 @@ export class SubscriberContainerClass {
         this.instance = newHandler;
     }
 
-    get Subscriber() {
+    get Subscriber(): Subscriber {
+        return this.instance;
+    }
+
+    Initialize(): void {
         if (this.instance == null) {
             this.instance = new Subscriber();
         }
-        return this.instance;
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ export abstract class BaseDomField<TProps extends DomFieldProps, TState extends`
`67`	`67`	`return restProps;`
`68`	`68`	`}`
`69`	`69`
`70`		`- protected SetElementRef = (element: TUnderlyingElement): void => {`
	`70`	`+ protected SetElementRef = (element: TUnderlyingElement \| undefined): void => {`
`71`	`71`	`this.Element = element;`
`72`	`72`	`}`
`73`	`73`
Original file line number	Diff line number	Diff line change
`@@ -40,14 +40,14 @@ export class CheckBox extends BaseDomField<CheckBoxProps, BaseDomFieldState, HTM`
`40`	`40`
`41`	`41`	`if (this.props.onChange != null) {`
`42`	`42`	`event.persist();`
`43`		`- this.props.onChange(event, newValue, this.FieldId, this.FormId);`
	`43`	`+ this.props.onChange(event, newValue, this.FieldId, this.FormStore);`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`const formStoreState = this.FormStore.GetState();`
`47`	`47`	`const formProps = formStoreState.Form.Props as FormProps;`
`48`	`48`	`if (formProps.onChange != null) {`
`49`	`49`	`event.persist();`
`50`		`- formProps.onChange(event, newValue, this.FieldId, this.FormId);`
	`50`	`+ formProps.onChange(event, newValue, this.FieldId, this.FormStore);`
`51`	`51`	`}`
`52`	`52`	`}`
`53`	`53`
Original file line number	Diff line number	Diff line change
`@@ -39,14 +39,14 @@ export class Email extends BaseDomField<EmailProps, BaseDomFieldState, HTMLInput`
`39`	`39`
`40`	`40`	`if (this.props.onChange != null) {`
`41`	`41`	`event.persist();`
`42`		`- this.props.onChange(event, newValue, this.FieldId, this.FormId);`
	`42`	`+ this.props.onChange(event, newValue, this.FieldId, this.FormStore);`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`const formStoreState = this.FormStore.GetState();`
`46`	`46`	`const formProps = formStoreState.Form.Props as FormProps;`
`47`	`47`	`if (formProps.onChange != null) {`
`48`	`48`	`event.persist();`
`49`		`- formProps.onChange(event, newValue, this.FieldId, this.FormId);`
	`49`	`+ formProps.onChange(event, newValue, this.FieldId, this.FormStore);`
`50`	`50`	`}`
`51`	`51`	`}`
`52`	`52`
Original file line number	Diff line number	Diff line change
`@@ -16,9 +16,9 @@ interface Dictionary {`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`export class FieldsArray extends BaseFieldsArray<FieldsArrayProps, FieldsArrayState> {`
`19`		`- public Element: HTMLDivElement;`
	`19`	`+ public Element: HTMLDivElement \| undefined;`
`20`	`20`
`21`		`- private setElementRef = (element: HTMLDivElement): void => {`
	`21`	`+ protected SetElementRef = (element: HTMLDivElement \| undefined): void => {`
`22`	`22`	`this.Element = element;`
`23`	`23`	`}`
`24`	`24`
`@@ -34,7 +34,7 @@ export class FieldsArray extends BaseFieldsArray<FieldsArrayProps, FieldsArraySt`
`34`	`34`
`35`	`35`	`render(): JSX.Element \| null {`
`36`	`36`	`return <div`
`37`		`- ref={this.setElementRef}`
	`37`	`+ ref={this.SetElementRef}`
`38`	`38`	`{...this.GetHTMLProps(this.props) }`
`39`	`39`	`>`
`40`	`40`	`{this.props.children}`
Original file line number	Diff line number	Diff line change
`@@ -44,14 +44,14 @@ export class Number extends BaseDomField<NumberProps, BaseDomFieldState> {`
`44`	`44`
`45`	`45`	`if (this.props.onChange != null) {`
`46`	`46`	`event.persist();`
`47`		`- this.props.onChange(event, newValue, this.FieldId, this.FormId);`
	`47`	`+ this.props.onChange(event, newValue, this.FieldId, this.FormStore);`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`const formStoreState = this.FormStore.GetState();`
`51`	`51`	`const formProps = formStoreState.Form.Props as FormProps;`
`52`	`52`	`if (formProps.onChange != null) {`
`53`	`53`	`event.persist();`
`54`		`- formProps.onChange(event, newValue, this.FieldId, this.FormId);`
	`54`	`+ formProps.onChange(event, newValue, this.FieldId, this.FormStore);`
`55`	`55`	`}`
`56`	`56`	`}`
`57`	`57`