@gpa-gemstone/react-forms 1.1.73 → 1.1.75

package/lib/DatePicker.js

@@ -59,6 +59,7 @@ function DateTimePicker(props) {
     var _f = React.useState(false), showOverlay = _f[0], setShowOverlay = _f[1];
     var _g = React.useState(0), top = _g[0], setTop = _g[1];
     var _h = React.useState(0), left = _h[0], setLeft = _h[1];
+    var allowNull = React.useMemo(function () { var _a; return (_a = props.AllowEmpty) !== null && _a !== void 0 ? _a : false; }, [props.AllowEmpty]);
     React.useEffect(function () {
         setGuid((0, helper_functions_1.CreateGuid)());
     }, []);
@@ -90,12 +91,11 @@ function DateTimePicker(props) {
     }, [props.Record, props.Field, boxFormat, showOverlay]);
     function setPickerAndRecord(arg) {
         var _a, _b;
-        var _c;
         setPickerRecord(arg);
-        if (((_c = props.AllowEmpty) !== null && _c !== void 0 ? _c : false) && arg === undefined && props.Record[props.Field] !== null)
+        if (allowNull && arg === undefined && props.Record[props.Field] !== null)
             props.Setter(__assign(__assign({}, props.Record), (_a = {}, _a[props.Field] = null, _a)));
-        var valid = arg != undefined && validateDate(arg);
-        if (valid && props.Record[props.Field].toString() !== arg.format(recordFormat))
+        else if ((arg != undefined && validateDate(arg)) &&
+            props.Record[props.Field].toString() !== arg.format(recordFormat))
             props.Setter(__assign(__assign({}, props.Record), (_b = {}, _b[props.Field] = arg.format(recordFormat), _b)));
     }
     // Handle clicks outside the component.
@@ -154,7 +154,11 @@ function DateTimePicker(props) {
     }
     function validateDate(date) {
         var minStartDate = props.MinDate != null ? props.MinDate.startOf('day') : moment("1753-01-01", "YYYY-MM-DD").startOf('day');
-        if (!date.isValid()) {
+        if (allowNull && date == null) {
+            setFeedbackMessage("");
+            return true;
+        }
+        else if (date == null || !date.isValid()) {
             setFeedbackMessage("Please enter a valid date.");
             return false;
         }
@@ -179,13 +183,13 @@ function DateTimePicker(props) {
     };
     function valueChange(value) {
         var _a, _b;
-        var allowNull = props.AllowEmpty === undefined ? false : props.AllowEmpty;
-        var date = moment(value, boxFormat);
+        var date = (value === '') ? undefined : moment(value, boxFormat);
+        var validDate = validateDate(date);
         if (allowNull && value === '') {
             props.Setter(__assign(__assign({}, props.Record), (_a = {}, _a[props.Field] = null, _a)));
             setPickerAndRecord(undefined);
         }
-        else if (validateDate(date)) {
+        else if (validDate) {
             props.Setter(__assign(__assign({}, props.Record), (_b = {}, _b[props.Field] = moment(value, boxFormat).format(recordFormat), _b)));
             setPickerAndRecord(moment(value, boxFormat));
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gpa-gemstone/react-forms",
-  "version": "1.1.73",
+  "version": "1.1.75",
   "description": "React Form modules for gpa webapps",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -45,8 +45,8 @@
     "typescript": "5.5.3"
   },
   "dependencies":   {
-    "@gpa-gemstone/application-typings": "0.0.77",
-    "@gpa-gemstone/gpa-symbols": "0.0.42",
+    "@gpa-gemstone/application-typings": "0.0.78",
+    "@gpa-gemstone/gpa-symbols": "0.0.43",
     "@gpa-gemstone/helper-functions": "0.0.35",
     "@types/react": "^17.0.14",
     "@types/styled-components": "^5.1.11",