@gpa-gemstone/react-forms 1.1.40 → 1.1.42

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -9,6 +9,7 @@ interface IProps<T> {
9
9
  Feedback?: string;
10
10
  Format?: string;
11
11
  Type?: ('datetime-local' | 'date');
12
+ Help?: string | JSX.Element;
12
13
  }
13
14
  export default function DateTimePicker<T>(props: IProps<T>): JSX.Element;
14
15
  export {};
package/lib/DatePicker.js CHANGED
@@ -37,18 +37,24 @@ var React = require("react");
37
37
  var moment = require("moment");
38
38
  var DateTimePopup_1 = require("./DateTimeUI/DateTimePopup");
39
39
  var helper_functions_1 = require("@gpa-gemstone/helper-functions");
40
+ var HelperMessage_1 = require("./HelperMessage");
40
41
  function DateTimePicker(props) {
41
42
  // Formats that will be used for dateBoxes
42
43
  var boxFormat = "YYYY-MM-DD" + (props.Type === undefined || props.Type === 'date' ? "" : "[T]HH:mm:ss");
43
44
  var recordFormat = props.Format !== undefined ? props.Format : "YYYY-MM-DD" + (props.Type === undefined || props.Type === 'date' ? "" : "[T]HH:mm:ss.SSS[Z]");
44
45
  var parse = function (r) { return moment(props.Record[props.Field], recordFormat); };
45
46
  var divRef = React.useRef(null);
47
+ var _a = React.useState(""), guid = _a[0], setGuid = _a[1];
48
+ var _b = React.useState(false), showHelp = _b[0], setShowHelp = _b[1];
46
49
  // Adds a buffer between the outside props and what the box is reading to prevent box overwriting every render with a keystroke
47
- var _a = React.useState(parse(props.Record).format(boxFormat)), boxRecord = _a[0], setBoxRecord = _a[1];
48
- var _b = React.useState(parse(props.Record)), pickerRecord = _b[0], setPickerRecord = _b[1];
49
- var _c = React.useState(false), showOverlay = _c[0], setShowOverlay = _c[1];
50
- var _d = React.useState(0), top = _d[0], setTop = _d[1];
51
- var _e = React.useState(0), left = _e[0], setLeft = _e[1];
50
+ var _c = React.useState(parse(props.Record).format(boxFormat)), boxRecord = _c[0], setBoxRecord = _c[1];
51
+ var _d = React.useState(parse(props.Record)), pickerRecord = _d[0], setPickerRecord = _d[1];
52
+ var _e = React.useState(false), showOverlay = _e[0], setShowOverlay = _e[1];
53
+ var _f = React.useState(0), top = _f[0], setTop = _f[1];
54
+ var _g = React.useState(0), left = _g[0], setLeft = _g[1];
55
+ React.useEffect(function () {
56
+ setGuid((0, helper_functions_1.CreateGuid)());
57
+ }, []);
52
58
  React.useEffect(function () {
53
59
  setPickerRecord(parse(props.Record));
54
60
  setBoxRecord(parse(props.Record).format(boxFormat));
@@ -66,6 +72,11 @@ function DateTimePicker(props) {
66
72
  }, [pickerRecord]);
67
73
  React.useLayoutEffect(function () {
68
74
  var node = (divRef.current !== null ? (0, helper_functions_1.GetNodeSize)(divRef.current) : { top: top, left: left, height: 0, width: 0 });
75
+ if (node.height === 0 && node.width === 0) {
76
+ setLeft(0);
77
+ setTop(-9999);
78
+ return;
79
+ }
69
80
  setLeft(node.left + 0.5 * node.width);
70
81
  setTop(node.top + node.height + 10);
71
82
  });
@@ -77,10 +88,29 @@ function DateTimePicker(props) {
77
88
  if (evt.target.closest(".gpa-gemstone-datetime") == null)
78
89
  setShowOverlay(false);
79
90
  }
91
+ var showLabel = props.Label !== "";
92
+ var showHelpIcon = props.Help !== undefined;
93
+ var label = props.Label === undefined ? props.Field : props.Label;
80
94
  return (React.createElement("div", { className: "form-group", ref: divRef },
95
+ showHelpIcon || showLabel ?
96
+ React.createElement("label", null,
97
+ showLabel ? label : '',
98
+ showHelpIcon ? React.createElement("div", { style: {
99
+ width: 20,
100
+ height: 20,
101
+ borderRadius: '50%',
102
+ display: 'inline-block',
103
+ background: '#0D6EFD',
104
+ marginLeft: 10,
105
+ textAlign: 'center',
106
+ fontWeight: 'bold'
107
+ }, onMouseEnter: function () { return setShowHelp(true); }, onMouseLeave: function () { return setShowHelp(false); } }, " ? ") : null) : null,
108
+ showHelpIcon ?
109
+ React.createElement(HelperMessage_1.default, { Show: showHelp, Target: guid }, props.Help)
110
+ : null,
81
111
  (props.Label !== "") ?
82
112
  React.createElement("label", null, props.Label == null ? props.Field : props.Label) : null,
83
- React.createElement("input", { className: "gpa-gemstone-datetime form-control" + (props.Valid(props.Field) ? '' : ' is-invalid'), type: props.Type === undefined ? 'date' : props.Type, onChange: function (evt) {
113
+ React.createElement("input", { "data-help": guid, className: "gpa-gemstone-datetime form-control" + (props.Valid(props.Field) ? '' : ' is-invalid'), type: props.Type === undefined ? 'date' : props.Type, onChange: function (evt) {
84
114
  setBoxRecord(evt.target.value);
85
115
  }, onFocus: function () { setShowOverlay(true); }, value: boxRecord, disabled: props.Disabled === undefined ? false : props.Disabled, onClick: function (e) { e.preventDefault(); }, step: "1" }),
86
116
  React.createElement("div", { className: "invalid-feedback" }, props.Feedback == null ? props.Field.toString() + ' is a required field.' : props.Feedback),
@@ -31,8 +31,8 @@ function Calender(props) {
31
31
  var _d = React.useState('month'), mode = _d[0], setMode = _d[1];
32
32
  var _e = React.useState('None'), hover = _e[0], setHover = _e[1];
33
33
  React.useEffect(function () {
34
- setMonth(props.DateTime.month());
35
- setYear(props.DateTime.year());
34
+ setMonth(isNaN(props.DateTime.month()) ? 0 : props.DateTime.month());
35
+ setYear(isNaN(props.DateTime.year()) ? moment.utc().year() : props.DateTime.year());
36
36
  }, [props.DateTime]);
37
37
  React.useEffect(function () {
38
38
  var d1 = moment([year, month, 1]).startOf('week');
@@ -84,6 +84,8 @@ function Calender(props) {
84
84
  }
85
85
  function setDate(d) {
86
86
  var ud = moment(props.DateTime);
87
+ if (!ud.isValid())
88
+ ud = moment.utc().startOf('d');
87
89
  ud.year(d.year()).month(d.month()).date(d.date());
88
90
  props.Setter(ud);
89
91
  }
@@ -39,8 +39,12 @@ function Clock(props) {
39
39
  var h = parseInt(hour, 10);
40
40
  var m = parseInt(minute, 10);
41
41
  var s = parseInt(second, 10);
42
+ if (isNaN(h) || isNaN(m) || isNaN(s))
43
+ return;
42
44
  if (h !== props.DateTime.hour() || m !== props.DateTime.minute() || s !== props.DateTime.second()) {
43
45
  var d = moment(props.DateTime);
46
+ if (!d.isValid())
47
+ d = moment.utc().startOf('d');
44
48
  d.hour(h).minute(m).second(s);
45
49
  props.Setter(d);
46
50
  }
@@ -99,6 +103,10 @@ var TimeInput = function (props) {
99
103
  var _a = React.useState(props.value.toString()), val = _a[0], setVal = _a[1];
100
104
  var _b = React.useState(false), error = _b[0], setError = _b[1];
101
105
  React.useEffect(function () {
106
+ if (props.value.length > 5) {
107
+ setVal("");
108
+ return;
109
+ }
102
110
  setVal(props.value.toString());
103
111
  }, [props.value]);
104
112
  React.useEffect(function () {
package/lib/Input.js CHANGED
@@ -100,7 +100,7 @@ function Input(props) {
100
100
  showHelpIcon ?
101
101
  React.createElement(HelperMessage_1.default, { Show: showHelp, Target: guid }, props.Help)
102
102
  : null,
103
- React.createElement("input", { "data-help": guid, type: props.Type === undefined ? 'text' : props.Type, className: props.Valid(props.Field) ? 'form-control' : 'form-control is-invalid', onChange: function (evt) { return valueChange(evt.target.value); }, value: heldVal, disabled: props.Disabled == null ? false : props.Disabled, onBlur: onBlur }),
103
+ React.createElement("input", { "data-help": guid, type: props.Type === undefined ? 'text' : props.Type, className: props.Valid(props.Field) ? 'form-control' : 'form-control is-invalid', onChange: function (evt) { return valueChange(evt.target.value); }, value: heldVal, disabled: props.Disabled == null ? false : props.Disabled, onBlur: onBlur, step: 'any' }),
104
104
  React.createElement("div", { className: "invalid-feedback" }, props.Feedback == null ? props.Field + ' is a required field.' : props.Feedback)));
105
105
  }
106
106
  exports.default = Input;
@@ -2,12 +2,12 @@
2
2
  interface IProps {
3
3
  Label?: string;
4
4
  Options: {
5
- Value: number;
5
+ Value: number | string;
6
6
  Text: string;
7
7
  Selected: boolean;
8
8
  }[];
9
9
  OnChange: (evt: any, Options: {
10
- Value: number;
10
+ Value: number | string;
11
11
  Text: string;
12
12
  Selected: boolean;
13
13
  }[]) => void;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@gpa-gemstone/react-forms",
3
- "version": "1.1.40",
3
+ "version": "1.1.42",
4
4
  "description": "React Form modules for gpa webapps",
5
5
  "main": "lib/index.js",
6
6
  "types": "lib/index.d.ts",
@@ -43,7 +43,7 @@
43
43
  "typescript": "4.4.4"
44
44
  },
45
45
  "dependencies": {
46
- "@gpa-gemstone/helper-functions": "0.0.21",
46
+ "@gpa-gemstone/helper-functions": "0.0.22",
47
47
  "@types/react": "^17.0.14",
48
48
  "@types/styled-components": "^5.1.11",
49
49
  "moment": "2.29.4",