DefaultValue, InitialValue and Value fallbacks in RegisterField.

DefaultValue -> RawDefaultValue.

DefaultValue processing added in RegisterField.

Author: DovydasNavickas

packages/simplr-forms-core/__tests__/test-components/test-field.tsx

@@ -30,7 +30,7 @@ export class MyTestField extends BaseField<MyFieldProps, MyFieldState> {
         return "";
     }
 
-    protected get DefaultValue(): FieldValue {
+    protected get RawDefaultValue(): FieldValue {
         if (this.props.defaultValue != null) {
             return this.props.defaultValue;
         }

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

@@ -140,7 +140,7 @@ export abstract class BaseField<TProps extends FieldProps, TState extends BaseFi
         }
 
         // Return default value
-        return this.DefaultValue;
+        return this.RawDefaultValue;
     }
 
     protected ProcessValueBeforeStore(value: FieldValue) {
@@ -236,17 +236,6 @@ export abstract class BaseField<TProps extends FieldProps, TState extends BaseFi
      */
     abstract render(): JSX.Element | null;
 
-    /**
-     * Value before render.
-     * Most common usage is for getting value from field props.
-     *
-     * @readonly
-     * @protected
-     * @type {(FieldContracts.ValueTypes | any)}
-     * @memberOf BaseField
-     */
-    protected abstract get RawValue(): FieldValue;
-
     /**
      * Default field value.
      *
@@ -255,13 +244,24 @@ export abstract class BaseField<TProps extends FieldProps, TState extends BaseFi
      *
      * @memberOf BaseField
      */
-    protected abstract get DefaultValue(): FieldValue;
+    protected abstract get RawDefaultValue(): FieldValue;
 
     /**
      * Initial value.
      */
     protected abstract get RawInitialValue(): FieldValue;
 
+    /**
+     * Value before render.
+     * Most common usage is for getting value from field props.
+     *
+     * @readonly
+     * @protected
+     * @type {(FieldContracts.ValueTypes | any)}
+     * @memberOf BaseField
+     */
+    protected abstract get RawValue(): FieldValue;
+
     /**
      * ========================
      *  Local helper methods
@@ -280,11 +280,12 @@ export abstract class BaseField<TProps extends FieldProps, TState extends BaseFi
             throw new Error(`simplr-forms-core: Duplicate field id '${this.FieldId}'`);
         }
 
+        const defaultValue = this.ProcessValueBeforeStore(this.RawDefaultValue);
         const initialValue = this.ProcessValueBeforeStore(this.RawInitialValue);
         const value = this.ProcessValueBeforeStore(this.RawValue);
         this.FormStore.RegisterField(
             this.FieldId,
-            this.DefaultValue,
+            defaultValue,
             initialValue,
             value,
             this.props,

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

@@ -3,8 +3,6 @@ import * as PropTypes from "prop-types";
 
 import * as FormContracts from "../contracts/form";
 import { FormStore } from "../stores/form-store";
-import { FormError } from "../contracts/error";
-import { ConstructFormError } from "../utils/form-error-helpers";
 import { FSHContainer, FormStoresHandler } from "../stores/form-stores-handler";
 
 export abstract class BaseForm<TProps extends FormContracts.FormProps, TState> extends React.Component<TProps, TState> {

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

@@ -73,16 +73,40 @@ export class FormStore extends ActionEmitter {
     public RegisterField(
         fieldId: string,
         defaultValue: FieldValue,
-        initialValue: FieldValue,
-        value: FieldValue,
+        initialValue?: FieldValue,
+        value?: FieldValue,
         props?: FieldStateProps,
         fieldsGroupId?: string
     ): void {
         // Construct field state
         let fieldState = this.GetInitialFieldState();
+
+        // Set default value without fallbacks
         fieldState.DefaultValue = defaultValue;
-        fieldState.InitialValue = (initialValue != null) ? initialValue : value;
-        fieldState.Value = value;
+
+        // (initialValue)(value)
+        // 0 => null
+        // 1 => not null
+
+        // If neither initialValue, nor value is given
+        // Fallback to defaultValue
+        if (initialValue == null && value == null) {
+            // 0 0
+            fieldState.InitialValue = defaultValue;
+            fieldState.Value = defaultValue;
+        } else if (initialValue != null && value == null) {
+            // 1 0
+            fieldState.InitialValue = initialValue;
+            fieldState.Value = initialValue;
+        } else if (initialValue == null && value != null) {
+            // 0 1
+            fieldState.InitialValue = value;
+            fieldState.Value = value;
+        } else {
+            // 0 0
+            fieldState.InitialValue = initialValue;
+            fieldState.Value = value;
+        }
 
         if (props != null) {
             fieldState.Props = recordify<FieldStateProps, FieldStatePropsRecord>(props);