@pdg/react-form 1.0.75 → 1.0.77
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.
- package/dist/@private/PrivateMonthPicker/PrivateMonthPickerMonthList/PrivateMonthPickerMonthList.types.d.ts +2 -1
- package/dist/@types/types.d.ts +2 -2
- package/dist/index.esm.js +53 -38
- package/dist/index.esm.js.map +1 -1
- package/dist/index.js +53 -38
- package/dist/index.js.map +1 -1
- package/package.json +1 -1
package/dist/index.js
CHANGED
|
@@ -565,7 +565,10 @@ function AutoTypeForwardRef(render) {
|
|
|
565
565
|
{
|
|
566
566
|
var startValue = value[0];
|
|
567
567
|
var endValue = value[1];
|
|
568
|
-
value = [
|
|
568
|
+
value = [
|
|
569
|
+
startValue ? startValue : { year: '', month: '' },
|
|
570
|
+
endValue ? endValue : { year: '', month: '' },
|
|
571
|
+
];
|
|
569
572
|
}
|
|
570
573
|
break;
|
|
571
574
|
default:
|
|
@@ -594,40 +597,36 @@ function AutoTypeForwardRef(render) {
|
|
|
594
597
|
switch (itemCommands.getType()) {
|
|
595
598
|
case 'FormDateRangePicker':
|
|
596
599
|
{
|
|
600
|
+
var commands = itemCommands;
|
|
597
601
|
var value = getItemFormValue(itemCommands);
|
|
598
|
-
data[
|
|
599
|
-
data[
|
|
602
|
+
data[commands.getFormValueFromName()] = value[0];
|
|
603
|
+
data[commands.getFormValueToName()] = value[1];
|
|
600
604
|
}
|
|
601
605
|
break;
|
|
602
606
|
case 'FormMonthPicker':
|
|
603
607
|
{
|
|
608
|
+
var commands = itemCommands;
|
|
604
609
|
var value = getItemFormValue(itemCommands);
|
|
605
|
-
data[
|
|
606
|
-
data[
|
|
610
|
+
data[commands.getFormValueYearName()] = value.year;
|
|
611
|
+
data[commands.getFormValueMonthName()] = value.month;
|
|
607
612
|
}
|
|
608
613
|
break;
|
|
609
614
|
case 'FormYearRangePicker':
|
|
610
615
|
{
|
|
616
|
+
var commands = itemCommands;
|
|
611
617
|
var value = getItemFormValue(itemCommands);
|
|
612
|
-
data[
|
|
613
|
-
data[
|
|
618
|
+
data[commands.getFormValueFromName()] = value[0];
|
|
619
|
+
data[commands.getFormValueToName()] = value[1];
|
|
614
620
|
}
|
|
615
621
|
break;
|
|
616
622
|
case 'FormMonthRangePicker':
|
|
617
623
|
{
|
|
624
|
+
var commands = itemCommands;
|
|
618
625
|
var value = getItemFormValue(itemCommands);
|
|
619
|
-
data[
|
|
620
|
-
|
|
621
|
-
|
|
622
|
-
data[
|
|
623
|
-
? value[0].month
|
|
624
|
-
: '';
|
|
625
|
-
data[itemCommands.getFormValueToYearName()] = notEmpty(value[1])
|
|
626
|
-
? value[1].year
|
|
627
|
-
: '';
|
|
628
|
-
data[itemCommands.getFormValueToMonthName()] = notEmpty(value[1])
|
|
629
|
-
? value[1].month
|
|
630
|
-
: '';
|
|
626
|
+
data[commands.getFormValueFromYearName()] = value[0].year;
|
|
627
|
+
data[commands.getFormValueFromMonthName()] = value[0].month;
|
|
628
|
+
data[commands.getFormValueToYearName()] = value[1].year;
|
|
629
|
+
data[commands.getFormValueToMonthName()] = value[1].month;
|
|
631
630
|
}
|
|
632
631
|
break;
|
|
633
632
|
default:
|
|
@@ -719,12 +718,13 @@ function AutoTypeForwardRef(render) {
|
|
|
719
718
|
switch (valueItem.getType()) {
|
|
720
719
|
case 'FormDateRangePicker':
|
|
721
720
|
case 'FormYearRangePicker': {
|
|
721
|
+
var commands_1 = valueItem;
|
|
722
722
|
var value = getItemFormValue(valueItem, !!isReset);
|
|
723
723
|
if (notEmpty(subKey)) {
|
|
724
|
-
if (subKey ===
|
|
724
|
+
if (subKey === commands_1.getFormValueFromNameSuffix()) {
|
|
725
725
|
return value[0];
|
|
726
726
|
}
|
|
727
|
-
else if (subKey ===
|
|
727
|
+
else if (subKey === commands_1.getFormValueToNameSuffix()) {
|
|
728
728
|
return value[1];
|
|
729
729
|
}
|
|
730
730
|
else {
|
|
@@ -736,12 +736,13 @@ function AutoTypeForwardRef(render) {
|
|
|
736
736
|
}
|
|
737
737
|
}
|
|
738
738
|
case 'FormMonthPicker': {
|
|
739
|
+
var commands_2 = valueItem;
|
|
739
740
|
var value = getItemFormValue(valueItem, !!isReset);
|
|
740
741
|
if (notEmpty(subKey)) {
|
|
741
|
-
if (subKey ===
|
|
742
|
+
if (subKey === commands_2.getFormValueYearNameSuffix()) {
|
|
742
743
|
return value.year;
|
|
743
744
|
}
|
|
744
|
-
else if (subKey ===
|
|
745
|
+
else if (subKey === commands_2.getFormValueMonthNameSuffix()) {
|
|
745
746
|
return value.month;
|
|
746
747
|
}
|
|
747
748
|
else {
|
|
@@ -753,18 +754,19 @@ function AutoTypeForwardRef(render) {
|
|
|
753
754
|
}
|
|
754
755
|
}
|
|
755
756
|
case 'FormMonthRangePicker': {
|
|
757
|
+
var commands_3 = valueItem;
|
|
756
758
|
var value = getItemFormValue(valueItem, !!isReset);
|
|
757
759
|
if (notEmpty(subKey)) {
|
|
758
|
-
if (subKey ===
|
|
760
|
+
if (subKey === commands_3.getFormValueFromYearNameSuffix()) {
|
|
759
761
|
return value[0].year;
|
|
760
762
|
}
|
|
761
|
-
else if (subKey ===
|
|
763
|
+
else if (subKey === commands_3.getFormValueFromMonthNameSuffix()) {
|
|
762
764
|
return value[0].month;
|
|
763
765
|
}
|
|
764
|
-
else if (subKey ===
|
|
766
|
+
else if (subKey === commands_3.getFormValueToYearNameSuffix()) {
|
|
765
767
|
return value[1].year;
|
|
766
768
|
}
|
|
767
|
-
else if (subKey ===
|
|
769
|
+
else if (subKey === commands_3.getFormValueToMonthNameSuffix()) {
|
|
768
770
|
return value[1].month;
|
|
769
771
|
}
|
|
770
772
|
else {
|
|
@@ -11881,7 +11883,7 @@ var PrivateYearRangePicker = function (_a) {
|
|
|
11881
11883
|
}
|
|
11882
11884
|
}, [disableFuture, maxYear, nowYear]);
|
|
11883
11885
|
var displayValue = React.useMemo(function () {
|
|
11884
|
-
var defaultYear =
|
|
11886
|
+
var defaultYear = nowYear;
|
|
11885
11887
|
if (minAvailableYear > defaultYear) {
|
|
11886
11888
|
defaultYear = minYear;
|
|
11887
11889
|
}
|
|
@@ -11889,12 +11891,12 @@ var PrivateYearRangePicker = function (_a) {
|
|
|
11889
11891
|
defaultYear = maxAvailableYear;
|
|
11890
11892
|
}
|
|
11891
11893
|
if (value) {
|
|
11892
|
-
return [value[0] || defaultYear, value[1] || defaultYear];
|
|
11894
|
+
return [value[0] || value[1] || defaultYear, value[1] || value[0] || defaultYear];
|
|
11893
11895
|
}
|
|
11894
11896
|
else {
|
|
11895
11897
|
return [defaultYear, defaultYear];
|
|
11896
11898
|
}
|
|
11897
|
-
}, [maxAvailableYear, minAvailableYear, minYear, value]);
|
|
11899
|
+
}, [maxAvailableYear, minAvailableYear, minYear, nowYear, value]);
|
|
11898
11900
|
var displayValueError = React.useMemo(function () { return [
|
|
11899
11901
|
displayValue[0] < minAvailableYear || displayValue[0] > maxAvailableYear,
|
|
11900
11902
|
displayValue[1] < minAvailableYear || displayValue[1] > maxAvailableYear,
|
|
@@ -12148,7 +12150,7 @@ var templateObject_1$4, templateObject_2$2, templateObject_3$1, templateObject_4
|
|
|
12148
12150
|
return value;
|
|
12149
12151
|
}
|
|
12150
12152
|
else {
|
|
12151
|
-
var year =
|
|
12153
|
+
var year = selectFromYear || selectToYear || nowYear;
|
|
12152
12154
|
if (minAvailableYear > year) {
|
|
12153
12155
|
year = minAvailableYear;
|
|
12154
12156
|
}
|
|
@@ -12157,7 +12159,7 @@ var templateObject_1$4, templateObject_2$2, templateObject_3$1, templateObject_4
|
|
|
12157
12159
|
}
|
|
12158
12160
|
return year;
|
|
12159
12161
|
}
|
|
12160
|
-
}, [maxAvailableYear, minAvailableYear, value]);
|
|
12162
|
+
}, [maxAvailableYear, minAvailableYear, nowYear, selectFromYear, selectToYear, value]);
|
|
12161
12163
|
var displayError = React.useMemo(function () { return displayYear < minAvailableYear || displayYear > maxAvailableYear; }, [displayYear, minAvailableYear, maxAvailableYear]);
|
|
12162
12164
|
var prevBtnDisabled = React.useMemo(function () { return displayYear <= minAvailableYear; }, [displayYear, minAvailableYear]);
|
|
12163
12165
|
var nextBtnDisabled = React.useMemo(function () { return displayYear >= maxAvailableYear; }, [displayYear, maxAvailableYear]);
|
|
@@ -12234,7 +12236,7 @@ PrivateMonthPickerMonth.displayName = 'PrivateMonthPickerMonth';
|
|
|
12234
12236
|
PrivateMonthPickerMonth.defaultProps = PrivateMonthPickerMonthDefaultProps;var StyledContainer$1 = material.styled(material.Grid)(templateObject_1$2 || (templateObject_1$2 = __makeTemplateObject(["\n width: 240px;\n padding: 4px;\n"], ["\n width: 240px;\n padding: 4px;\n"])));
|
|
12235
12237
|
var templateObject_1$2;var PrivateMonthPickerMonthList = function (_a) {
|
|
12236
12238
|
// Function ----------------------------------------------------------------------------------------------------------
|
|
12237
|
-
var value = _a.value, minAvailableValue = _a.minAvailableValue, maxAvailableValue = _a.maxAvailableValue, disablePast = _a.disablePast, disableFuture = _a.disableFuture, selectFromValue = _a.selectFromValue, selectToValue = _a.selectToValue, onChange = _a.onChange;
|
|
12239
|
+
var value = _a.value, initDefaultValue = _a.defaultValue, minAvailableValue = _a.minAvailableValue, maxAvailableValue = _a.maxAvailableValue, disablePast = _a.disablePast, disableFuture = _a.disableFuture, selectFromValue = _a.selectFromValue, selectToValue = _a.selectToValue, onChange = _a.onChange;
|
|
12238
12240
|
var valueToYm = React.useCallback(function (v) { return v.year * 100 + v.month; }, []);
|
|
12239
12241
|
var dateToValue = React.useCallback(function (v) { return ({ year: v.year(), month: v.month() + 1 }); }, []);
|
|
12240
12242
|
// Memo --------------------------------------------------------------------------------------------------------------
|
|
@@ -12244,7 +12246,10 @@ var templateObject_1$2;var PrivateMonthPickerMonthList = function (_a) {
|
|
|
12244
12246
|
var minAvailableYm = React.useMemo(function () { return valueToYm(minAvailableValue); }, [minAvailableValue, valueToYm]);
|
|
12245
12247
|
var maxAvailableYm = React.useMemo(function () { return valueToYm(maxAvailableValue); }, [maxAvailableValue, valueToYm]);
|
|
12246
12248
|
var defaultValue = React.useMemo(function () {
|
|
12247
|
-
if (
|
|
12249
|
+
if (initDefaultValue) {
|
|
12250
|
+
return initDefaultValue;
|
|
12251
|
+
}
|
|
12252
|
+
else if (nowYm < minAvailableYm) {
|
|
12248
12253
|
return minAvailableValue;
|
|
12249
12254
|
}
|
|
12250
12255
|
else if (nowYm > maxAvailableYm) {
|
|
@@ -12253,7 +12258,7 @@ var templateObject_1$2;var PrivateMonthPickerMonthList = function (_a) {
|
|
|
12253
12258
|
else {
|
|
12254
12259
|
return nowValue;
|
|
12255
12260
|
}
|
|
12256
|
-
}, [nowYm, minAvailableYm, maxAvailableYm, minAvailableValue, maxAvailableValue, nowValue]);
|
|
12261
|
+
}, [initDefaultValue, nowYm, minAvailableYm, maxAvailableYm, minAvailableValue, maxAvailableValue, nowValue]);
|
|
12257
12262
|
var defaultYear = React.useMemo(function () { return defaultValue.year; }, [defaultValue]);
|
|
12258
12263
|
var defaultMonth = React.useMemo(function () { return defaultValue.month; }, [defaultValue]);
|
|
12259
12264
|
var currentYear = React.useMemo(function () { return (value ? value.year : defaultYear); }, [value, defaultYear]);
|
|
@@ -12347,10 +12352,20 @@ var templateObject_1$1, templateObject_2, templateObject_3, templateObject_4, te
|
|
|
12347
12352
|
return maxAvailableValue;
|
|
12348
12353
|
}
|
|
12349
12354
|
else {
|
|
12350
|
-
return nowValue;
|
|
12355
|
+
return selectFromValue || selectToValue || nowValue;
|
|
12351
12356
|
}
|
|
12352
12357
|
}
|
|
12353
|
-
}, [
|
|
12358
|
+
}, [
|
|
12359
|
+
maxAvailableValue,
|
|
12360
|
+
maxAvailableYm,
|
|
12361
|
+
minAvailableValue,
|
|
12362
|
+
minAvailableYm,
|
|
12363
|
+
nowValue,
|
|
12364
|
+
nowYm,
|
|
12365
|
+
selectFromValue,
|
|
12366
|
+
selectToValue,
|
|
12367
|
+
value,
|
|
12368
|
+
]);
|
|
12354
12369
|
var displayValueDate = React.useMemo(function () { return valueToDate(displayValue); }, [displayValue, valueToDate]);
|
|
12355
12370
|
var displayValueYm = React.useMemo(function () { return displayValue.year * 100 + displayValue.month; }, [displayValue]);
|
|
12356
12371
|
var displayValueError = React.useMemo(function () { return displayValueYm < minAvailableYm || displayValueYm > maxAvailableYm; }, [displayValueYm, maxAvailableYm, minAvailableYm]);
|
|
@@ -12408,7 +12423,7 @@ var templateObject_1$1, templateObject_2, templateObject_3, templateObject_4, te
|
|
|
12408
12423
|
React.createElement("div", null,
|
|
12409
12424
|
React.createElement(PrivateYearPicker, { value: (value === null || value === void 0 ? void 0 : value.year) || null, minYear: minValue.year, maxYear: maxValue.year, disablePast: disablePast, disableFuture: disableFuture, onChange: handleYearChange, hideHeader: true, selectFromYear: selectFromYear, selectToYear: selectToYear })),
|
|
12410
12425
|
React.createElement("div", { style: { borderTop: '1px solid #efefef' } },
|
|
12411
|
-
React.createElement(PrivateMonthPickerMonthList, { value: value, minAvailableValue: minAvailableValue, maxAvailableValue: maxAvailableValue, disablePast: disablePast, disableFuture: disableFuture, selectFromValue: selectFromValue, selectToValue: selectToValue, onChange: handleMonthChange }))));
|
|
12426
|
+
React.createElement(PrivateMonthPickerMonthList, { value: value, defaultValue: selectFromValue || selectToValue, minAvailableValue: minAvailableValue, maxAvailableValue: maxAvailableValue, disablePast: disablePast, disableFuture: disableFuture, selectFromValue: selectFromValue, selectToValue: selectToValue, onChange: handleMonthChange }))));
|
|
12412
12427
|
};
|
|
12413
12428
|
PrivateMonthPicker.displayName = 'PrivateMonthPicker';
|
|
12414
12429
|
PrivateMonthPicker.defaultProps = PrivateMonthPickerDefaultProps;var PrivateMonthRangePickerDefaultProps = {
|