Merge pull request #13 from SimplrJS/hotfix/core

Jest dependency on react addons removed. FormStoreHandlerClass -> FormStoreHandler.

Author: DovydasNavickas

packages/simplr-forms-core/__tests__/abstractions/base-field.test.tsx

@@ -3,15 +3,15 @@ import * as ReactDOM from "react-dom";
 import { shallow, mount } from "enzyme";
 import { spy } from "sinon";
 
-import { FormStoresHandlerClass, FSHContainer } from "../../src/stores/form-stores-handler";
+import { FormStoresHandler, FSHContainer } from "../../src/stores/form-stores-handler";
 import { FormStore } from "../../src/stores/form-store";
 import { MyTestForm } from "../test-components/test-form";
 import { MyTestField, MyFieldProps } from "../test-components/test-field";
 import { FormChildContext } from "../../src/contracts/form";
 
 describe("Field Base", () => {
     beforeEach(() => {
-        FSHContainer.SetFormStoresHandler(new FormStoresHandlerClass(), true);
+        FSHContainer.SetFormStoresHandler(new FormStoresHandler(), true);
     });
 
     it("works", () => {

packages/simplr-forms-core/__tests__/abstractions/base-form.test.tsx

@@ -1,12 +1,12 @@
 import * as React from "react";
 import { shallow, mount } from "enzyme";
 
-import { FSHContainer, FormStoresHandlerClass } from "../../src/stores/form-stores-handler";
+import { FSHContainer, FormStoresHandler } from "../../src/stores/form-stores-handler";
 import { MyTestForm } from "../test-components/test-form";
 
 describe("Form base", () => {
     beforeEach(() => {
-        FSHContainer.SetFormStoresHandler(new FormStoresHandlerClass(), true);
+        FSHContainer.SetFormStoresHandler(new FormStoresHandler(), true);
     });
 
     describe("registers when", () => {

packages/simplr-forms-core/__tests__/stores/form-stores-handler.test.ts

@@ -1,10 +1,10 @@
-import { FSHContainer, FormStoresHandlerClass } from "../../src/stores/form-stores-handler";
-import * as Actions from "../../src/actions/form-stores-handler-actions";
+import { FSHContainer, FormStoresHandler } from "../../src/stores/form-stores-handler";
+import * as Actions from "../../src/actions/form-stores-handler";
 import * as sinon from "Sinon";
 
 describe("Form stores handler", () => {
     it("returns next store unique formId", () => {
-        let storesHandler = new FormStoresHandlerClass();
+        let storesHandler = new FormStoresHandler();
         let a = storesHandler.NextStoreId();
         let b = storesHandler.NextStoreId();
 
@@ -14,7 +14,7 @@ describe("Form stores handler", () => {
     });
 
     it("returns count of currently registered stores", () => {
-        let storesHandler = new FormStoresHandlerClass();
+        let storesHandler = new FormStoresHandler();
         let id = storesHandler.NextStoreId();
         let id2 = storesHandler.NextStoreId();
 
@@ -29,7 +29,7 @@ describe("Form stores handler", () => {
     });
 
     it("registers and gets generated formId", () => {
-        let storesHandler = new FormStoresHandlerClass();
+        let storesHandler = new FormStoresHandler();
         let generatedFormId = storesHandler.RegisterForm();
 
         expect(generatedFormId).toBeTruthy();
@@ -38,7 +38,7 @@ describe("Form stores handler", () => {
     });
 
     it("registers with custom formId", () => {
-        let storesHandler = new FormStoresHandlerClass();
+        let storesHandler = new FormStoresHandler();
         const FORM_ID = "custom-form-id";
 
         expect(storesHandler.RegisterForm(FORM_ID)).toBe(FORM_ID);
@@ -56,13 +56,13 @@ describe("Form stores handler", () => {
         expect(storesHandler.StoresCount).toBe(1);
         expect(storesHandler.Exists(FORM_ID)).toBe(true);
 
-        FSHContainer.SetFormStoresHandler(new FormStoresHandlerClass(), true);
+        FSHContainer.SetFormStoresHandler(new FormStoresHandler(), true);
 
         expect(storesHandler.StoresCount).toBe(0);
     });
 
     it("returns true if form store exists", () => {
-        let storesHandler = new FormStoresHandlerClass();
+        let storesHandler = new FormStoresHandler();
         const FORM_ID = "custom-form-id";
         const ANOTHER_FORM_ID = "another-custom-form-id";
         storesHandler.RegisterForm(FORM_ID);
@@ -72,7 +72,7 @@ describe("Form stores handler", () => {
     });
 
     it("registers and unregisters form", () => {
-        let storesHandler = new FormStoresHandlerClass();
+        let storesHandler = new FormStoresHandler();
         let generatedFormId = storesHandler.RegisterForm();
 
         expect(storesHandler.Exists(generatedFormId)).toBe(true);
@@ -81,14 +81,14 @@ describe("Form stores handler", () => {
     });
 
     it("returns store", () => {
-        let storesHandler = new FormStoresHandlerClass();
+        let storesHandler = new FormStoresHandler();
         let generatedFormId = storesHandler.RegisterForm();
 
         expect(storesHandler.GetStore(generatedFormId)).toBeTruthy();
     });
 
     it("emits register action when registering a new form", () => {
-        const storesHandler = new FormStoresHandlerClass();
+        const storesHandler = new FormStoresHandler();
         const callbackSpy = sinon.spy();
 
         storesHandler.addListener(Actions.FormRegistered, callbackSpy);
@@ -98,7 +98,7 @@ describe("Form stores handler", () => {
     });
 
     it("emits unregister action when unregistering a form", () => {
-        const storesHandler = new FormStoresHandlerClass();
+        const storesHandler = new FormStoresHandler();
         const formId = "form-id";
         const callbackSpy = sinon.spy();
 

packages/simplr-forms-core/package.json

@@ -18,31 +18,32 @@
   "author": "simplrjs <[email protected]> (https://github.com/simplrjs)",
   "license": "AGPL-3.0",
   "devDependencies": {
-    "@types/enzyme": "^2.7.7",
+    "@types/enzyme": "^2.7.9",
     "@types/jest": "^19.2.2",
     "@types/sinon": "^2.1.2",
-    "enzyme": "^2.8.0",
+    "enzyme": "^2.8.2",
     "jest": "^19.0.2",
-    "jest-enzyme": "^3.0.0",
-    "react-addons-test-utils": "^15.5.1",
+    "jest-enzyme": "^3.0.1",
+    "react-dom": "^15.5.4",
+    "react-test-renderer": "^15.5.4",
     "sinon": "^2.1.0",
-    "ts-jest": "^19.0.8",
+    "ts-jest": "^19.0.10",
     "ts-loader": "^2.0.3",
-    "tslint": "^5.0.0",
+    "tslint": "^5.1.0",
     "typescript": "2.3.0",
     "uglify-js": "^2.8.22",
-    "webpack": "^2.3.3"
+    "webpack": "^2.4.1"
   },
   "dependencies": {
     "@types/fbemitter": "^2.0.32",
     "@types/flux": "^3.0.1",
-    "@types/react": "^15.0.21",
-    "@types/react-dom": "^0.14.23",
+    "@types/react": "^15.0.22",
+    "@types/react-dom": "^15.5.0",
     "action-emitter": "^0.2.1",
     "fbemitter": "^2.1.1",
     "immutable": "^3.8.1",
-    "react": "15.4.2",
-    "react-dom": "15.4.2",
+    "react": "15.5.4",
+    "react-dom": "^15.5.4",
     "typed-immutable-record": "^0.0.6"
   },
   "jest": {
@@ -57,4 +58,4 @@
       "js"
     ]
   }
-}
+}

packages/simplr-forms-core/src/abstractions/base-form.ts

@@ -1,7 +1,7 @@
 import * as React from "react";
 
 import * as FormContracts from "../contracts/form";
-import { FSHContainer, FormStoresHandlerClass } from "../stores/form-stores-handler";
+import { FSHContainer, FormStoresHandler } from "../stores/form-stores-handler";
 
 export abstract class BaseForm<TProps extends FormContracts.FormProps, TState> extends React.Component<TProps, TState> {
     protected FormId: string;
@@ -25,7 +25,7 @@ export abstract class BaseForm<TProps extends FormContracts.FormProps, TState> e
         this.registerForm(props);
     }
 
-    protected get FormStoresHandler(): FormStoresHandlerClass {
+    protected get FormStoresHandler(): FormStoresHandler {
         return FSHContainer.FormStoresHandler;
     }
 

packages/simplr-forms-core/src/stores/form-stores-handler.ts

@@ -4,7 +4,7 @@ import { ActionEmitter } from "action-emitter";
 import { FormStore } from "./form-store";
 import * as Actions from "../actions/form-stores-handler";
 
-export class FormStoresHandlerClass extends ActionEmitter {
+export class FormStoresHandler extends ActionEmitter {
     private storesCount: number;
     private formStores: Immutable.Map<string, FormStore>;
 
@@ -120,9 +120,9 @@ export class FormStoresHandlerClass extends ActionEmitter {
 }
 
 export class FSHContainerClass {
-    private instance: FormStoresHandlerClass;
+    private instance: FormStoresHandler;
 
-    SetFormStoresHandler(newHandler: FormStoresHandlerClass, disposeOldOne: boolean = true) {
+    SetFormStoresHandler(newHandler: FormStoresHandler, disposeOldOne: boolean = true) {
         if (disposeOldOne) {
             if (this.instance != null) {
                 // Call internal method to reset stores
@@ -135,10 +135,10 @@ export class FSHContainerClass {
 
     get FormStoresHandler() {
         if (this.instance == null) {
-            this.instance = new FormStoresHandlerClass();
+            this.instance = new FormStoresHandler();
         }
         return this.instance;
     }
 }
 
-export var FSHContainer = new FSHContainerClass();
+export const FSHContainer = new FSHContainerClass();