@apexcura/ui-components 0.0.14-Beta286 → 0.0.14-Beta287
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/index.js +9 -14
- package/dist/index.mjs +9 -14
- package/package.json +1 -1
package/dist/index.js
CHANGED
|
@@ -879,15 +879,15 @@ var DateRangePickerElement = (props) => {
|
|
|
879
879
|
const { value } = props;
|
|
880
880
|
const { RangePicker } = import_antd15.DatePicker;
|
|
881
881
|
const dateValues = value ? value.map((date) => (0, import_dayjs2.default)(date, "DD-MM-YYYY")) : null;
|
|
882
|
+
const today = (0, import_dayjs2.default)();
|
|
882
883
|
const handleChange = (dates, dateStrings) => {
|
|
883
884
|
if (dates) {
|
|
884
885
|
let [start, end] = dates;
|
|
885
|
-
|
|
886
|
-
|
|
887
|
-
|
|
888
|
-
|
|
889
|
-
|
|
890
|
-
start = today2;
|
|
886
|
+
if (end && end.isAfter(today)) {
|
|
887
|
+
end = today;
|
|
888
|
+
} else if (start && end && end.isBefore(today)) {
|
|
889
|
+
start = today;
|
|
890
|
+
end = null;
|
|
891
891
|
}
|
|
892
892
|
const adjustedDates = [start, end].map((date) => date ? date.format("DD-MM-YYYY") : null);
|
|
893
893
|
props.onChange && props.onChange(adjustedDates);
|
|
@@ -895,7 +895,6 @@ var DateRangePickerElement = (props) => {
|
|
|
895
895
|
props.onChange && props.onChange("");
|
|
896
896
|
}
|
|
897
897
|
};
|
|
898
|
-
const today = (0, import_dayjs2.default)();
|
|
899
898
|
let rangePresets = [
|
|
900
899
|
{ label: "Last 7 Days", value: [(0, import_dayjs2.default)().subtract(6, "d"), today] },
|
|
901
900
|
{ label: "Last 14 Days", value: [(0, import_dayjs2.default)().subtract(13, "d"), today] },
|
|
@@ -918,15 +917,11 @@ var DateRangePickerElement = (props) => {
|
|
|
918
917
|
const handleCalendarChange = (dates) => {
|
|
919
918
|
if (dates) {
|
|
920
919
|
let [start, end] = dates;
|
|
921
|
-
|
|
922
|
-
|
|
923
|
-
start = today2;
|
|
924
|
-
}
|
|
925
|
-
if (start && end && (start.isSame(today2) || end.isAfter(today2))) {
|
|
926
|
-
start = today2;
|
|
920
|
+
if (start && end && end.isBefore(today)) {
|
|
921
|
+
start = today;
|
|
927
922
|
end = null;
|
|
928
923
|
}
|
|
929
|
-
const adjustedDates = [start, end]
|
|
924
|
+
const adjustedDates = [start, end];
|
|
930
925
|
props.onChange && props.onChange(adjustedDates);
|
|
931
926
|
}
|
|
932
927
|
};
|
package/dist/index.mjs
CHANGED
|
@@ -812,15 +812,15 @@ var DateRangePickerElement = (props) => {
|
|
|
812
812
|
const { value } = props;
|
|
813
813
|
const { RangePicker } = DatePicker2;
|
|
814
814
|
const dateValues = value ? value.map((date) => dayjs2(date, "DD-MM-YYYY")) : null;
|
|
815
|
+
const today = dayjs2();
|
|
815
816
|
const handleChange = (dates, dateStrings) => {
|
|
816
817
|
if (dates) {
|
|
817
818
|
let [start, end] = dates;
|
|
818
|
-
|
|
819
|
-
|
|
820
|
-
|
|
821
|
-
|
|
822
|
-
|
|
823
|
-
start = today2;
|
|
819
|
+
if (end && end.isAfter(today)) {
|
|
820
|
+
end = today;
|
|
821
|
+
} else if (start && end && end.isBefore(today)) {
|
|
822
|
+
start = today;
|
|
823
|
+
end = null;
|
|
824
824
|
}
|
|
825
825
|
const adjustedDates = [start, end].map((date) => date ? date.format("DD-MM-YYYY") : null);
|
|
826
826
|
props.onChange && props.onChange(adjustedDates);
|
|
@@ -828,7 +828,6 @@ var DateRangePickerElement = (props) => {
|
|
|
828
828
|
props.onChange && props.onChange("");
|
|
829
829
|
}
|
|
830
830
|
};
|
|
831
|
-
const today = dayjs2();
|
|
832
831
|
let rangePresets = [
|
|
833
832
|
{ label: "Last 7 Days", value: [dayjs2().subtract(6, "d"), today] },
|
|
834
833
|
{ label: "Last 14 Days", value: [dayjs2().subtract(13, "d"), today] },
|
|
@@ -851,15 +850,11 @@ var DateRangePickerElement = (props) => {
|
|
|
851
850
|
const handleCalendarChange = (dates) => {
|
|
852
851
|
if (dates) {
|
|
853
852
|
let [start, end] = dates;
|
|
854
|
-
|
|
855
|
-
|
|
856
|
-
start = today2;
|
|
857
|
-
}
|
|
858
|
-
if (start && end && (start.isSame(today2) || end.isAfter(today2))) {
|
|
859
|
-
start = today2;
|
|
853
|
+
if (start && end && end.isBefore(today)) {
|
|
854
|
+
start = today;
|
|
860
855
|
end = null;
|
|
861
856
|
}
|
|
862
|
-
const adjustedDates = [start, end]
|
|
857
|
+
const adjustedDates = [start, end];
|
|
863
858
|
props.onChange && props.onChange(adjustedDates);
|
|
864
859
|
}
|
|
865
860
|
};
|