@newskit-render/shared-components 4.26.0 → 4.26.1
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/cjs/Calendar/Calendar.js +10 -7
- package/dist/cjs/Calendar/Calendar.js.map +1 -1
- package/dist/cjs/utils/dateUtils.d.ts +1 -1
- package/dist/cjs/utils/dateUtils.js +8 -9
- package/dist/cjs/utils/dateUtils.js.map +1 -1
- package/dist/esm/Calendar/Calendar.js +10 -7
- package/dist/esm/Calendar/Calendar.js.map +1 -1
- package/dist/esm/utils/dateUtils.d.ts +1 -1
- package/dist/esm/utils/dateUtils.js +8 -9
- package/dist/esm/utils/dateUtils.js.map +1 -1
- package/package.json +1 -1
|
@@ -92,7 +92,9 @@ var Calendar = function (_a) {
|
|
|
92
92
|
/* istanbul ignore next */
|
|
93
93
|
numberOfMonths = _c === void 0 ? 2 : _c, setDates = _a.setDates;
|
|
94
94
|
var today = new Date();
|
|
95
|
-
|
|
95
|
+
var tomorrow = today;
|
|
96
|
+
tomorrow.setDate(today.getDate() + 1);
|
|
97
|
+
tomorrow.setHours(0, 0, 0, 0); // For strict date comparison
|
|
96
98
|
var _d = (0, react_1.useState)(false), calendarVisible = _d[0], setCalendarVisible = _d[1];
|
|
97
99
|
var _e = (0, react_1.useState)(''), start = _e[0], setStart = _e[1];
|
|
98
100
|
var _f = (0, react_1.useState)(''), end = _f[0], setEnd = _f[1];
|
|
@@ -117,14 +119,14 @@ var Calendar = function (_a) {
|
|
|
117
119
|
return;
|
|
118
120
|
}
|
|
119
121
|
if (!startDate && !selectedEnd) {
|
|
120
|
-
setDates(
|
|
122
|
+
setDates(tomorrow, selectedStart);
|
|
121
123
|
setFocusedInputName('');
|
|
122
124
|
setCalendarVisible(false);
|
|
123
125
|
return;
|
|
124
126
|
}
|
|
125
127
|
var newEndDate = selectedEnd || selectedStart;
|
|
126
128
|
if (startDate && newEndDate < startDate) {
|
|
127
|
-
setDates(
|
|
129
|
+
setDates(tomorrow, newEndDate);
|
|
128
130
|
/* istanbul ignore next */
|
|
129
131
|
if (startDateInputRef === null || startDateInputRef === void 0 ? void 0 : startDateInputRef.current)
|
|
130
132
|
startDateInputRef.current.focus();
|
|
@@ -150,7 +152,8 @@ var Calendar = function (_a) {
|
|
|
150
152
|
if (!dateInputValidationPattern.test(value))
|
|
151
153
|
return;
|
|
152
154
|
setEnd(value);
|
|
153
|
-
var date = (0, utils_1.compareAndFormatDate)(
|
|
155
|
+
var date = (0, utils_1.compareAndFormatDate)(tomorrow, value, startDate);
|
|
156
|
+
/* istanbul ignore next */
|
|
154
157
|
if (date) {
|
|
155
158
|
setDates(startDate, date);
|
|
156
159
|
setCalendarVisible(false);
|
|
@@ -163,11 +166,11 @@ var Calendar = function (_a) {
|
|
|
163
166
|
if (!dateInputValidationPattern.test(value))
|
|
164
167
|
return;
|
|
165
168
|
setStart(value);
|
|
166
|
-
var date = (0, utils_1.compareAndFormatDate)(
|
|
169
|
+
var date = (0, utils_1.compareAndFormatDate)(tomorrow, value);
|
|
170
|
+
/* istanbul ignore next */
|
|
167
171
|
if (date) {
|
|
168
172
|
setDates(date, endDate);
|
|
169
173
|
setCalendarVisible(false);
|
|
170
|
-
/* istanbul ignore next */
|
|
171
174
|
if (endDateInputRef === null || endDateInputRef === void 0 ? void 0 : endDateInputRef.current)
|
|
172
175
|
endDateInputRef.current.focus();
|
|
173
176
|
return;
|
|
@@ -257,7 +260,7 @@ var Calendar = function (_a) {
|
|
|
257
260
|
calendarVisible && focusedInputName === types_1.DateRangeInputIds.end && (react_1.default.createElement("div", { className: "chevron" })))),
|
|
258
261
|
react_1.default.createElement(CalendarStylesTheme_1.CalendarWrapper, null,
|
|
259
262
|
react_1.default.createElement(CalendarStylesTheme_1.Container, __assign({ className: "calendar-custom-container", stylePreset: overrides.calendar.calendarCustomContainer.stylePreset }, overrides),
|
|
260
|
-
react_1.default.createElement(react_datepicker_1.default, { selected: startDate, startDate: startDate, endDate: endDate, monthsShown: numberOfMonths, selectsRange: true, inline: true, minDate:
|
|
263
|
+
react_1.default.createElement(react_datepicker_1.default, { selected: startDate, startDate: startDate, endDate: endDate, monthsShown: numberOfMonths, selectsRange: true, inline: true, minDate: tomorrow, onChange: handleDatePickerChange, onMonthChange: handleOnMonthChange, disabledKeyboardNavigation: true, showDisabledMonthNavigation: true, ref: datePickerRef })))));
|
|
261
264
|
};
|
|
262
265
|
exports.Calendar = Calendar;
|
|
263
266
|
//# sourceMappingURL=Calendar.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Calendar.js","sourceRoot":"","sources":["../../../src/Calendar/Calendar.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAA0D;AAC1D,sEAAyC;AACzC,mCAAuC;AACvC,qEAAyF;AAEzF,6DAK8B;AAC9B,uCAA6C;AAC7C,iCAAqE;AACrE,kCAAqE;AAErE,2BAA2B;AAC3B,IAAM,0BAA0B,GAAG,YAAY,CAAA,CAAC,iCAAiC;AAEjF,IAAM,sBAAsB,GAAG,IAAA,uBAAa,EAAC,2BAAkB,CAAC,CAAA;AAEzD,IAAM,QAAQ,GAAuC,UAAC,EAO5D;QANC,iBAA4B,EAA5B,SAAS,mBAAG,2BAAgB,KAAA,EAC5B,SAAS,eAAA,EACT,OAAO,aAAA;IACP,0BAA0B;IAC1B,sBAAkB;IADlB,0BAA0B;IAC1B,cAAc,mBAAG,CAAC,KAAA,EAClB,QAAQ,cAAA;IAER,IAAM,KAAK,GAAG,IAAI,IAAI,EAAE,CAAA;IACxB,KAAK,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAA,CAAC,6BAA6B;
|
|
1
|
+
{"version":3,"file":"Calendar.js","sourceRoot":"","sources":["../../../src/Calendar/Calendar.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
export declare const formatDateToDDMMYYYY: (date: Date | null) => string;
|
|
2
|
-
export declare const compareAndFormatDate: (
|
|
2
|
+
export declare const compareAndFormatDate: (earliestDate: Date, value: string, startDate?: Date | null) => Date | null;
|
|
3
3
|
export declare const addOrdinalSuffix: (number: number) => string;
|
|
@@ -12,18 +12,17 @@ var formatDateToDDMMYYYY = function (date) {
|
|
|
12
12
|
return date.toLocaleDateString('en-GB', dateFormatOptions);
|
|
13
13
|
};
|
|
14
14
|
exports.formatDateToDDMMYYYY = formatDateToDDMMYYYY;
|
|
15
|
-
var compareAndFormatDate = function (
|
|
15
|
+
var compareAndFormatDate = function (earliestDate, value, startDate) {
|
|
16
16
|
var dateInputPattern = /^(0[1-9]|[12][0-9]|3[01])\/(0[1-9]|1[0-2])\/\d{4}$/;
|
|
17
17
|
var isValid = dateInputPattern.test(value);
|
|
18
|
-
|
|
19
|
-
compareWith.setHours(0, 0, 0, 0);
|
|
20
|
-
if (isValid) {
|
|
21
|
-
var _a = value.split('/'), day = _a[0], month = _a[1], year = _a[2];
|
|
22
|
-
var date = new Date(parseInt(year), parseInt(month) - 1, parseInt(day)); // -1 because month is 0-based
|
|
23
|
-
if (date >= compareWith) {
|
|
24
|
-
return date;
|
|
25
|
-
}
|
|
18
|
+
if (!isValid)
|
|
26
19
|
return null;
|
|
20
|
+
var compareWith = startDate ? new Date(startDate) : earliestDate;
|
|
21
|
+
compareWith.setHours(0, 0, 0, 0);
|
|
22
|
+
var _a = value.split('/'), day = _a[0], month = _a[1], year = _a[2];
|
|
23
|
+
var date = new Date(parseInt(year), parseInt(month) - 1, parseInt(day)); // -1 because month is 0-based
|
|
24
|
+
if (date >= compareWith) {
|
|
25
|
+
return date;
|
|
27
26
|
}
|
|
28
27
|
return null;
|
|
29
28
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dateUtils.js","sourceRoot":"","sources":["../../../src/utils/dateUtils.ts"],"names":[],"mappings":";;;AAAA,IAAM,iBAAiB,GAA+B;IACpD,IAAI,EAAE,SAAS;IACf,KAAK,EAAE,SAAS;IAChB,GAAG,EAAE,SAAS;CACf,CAAA;AAEM,IAAM,oBAAoB,GAAG,UAAC,IAAiB;IACpD,IAAI,CAAC,IAAI,IAAI,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;QAAE,OAAO,EAAE,CAAA;IAE7C,OAAO,IAAI,CAAC,kBAAkB,CAAC,OAAO,EAAE,iBAAiB,CAAC,CAAA;AAC5D,CAAC,CAAA;AAJY,QAAA,oBAAoB,wBAIhC;AAEM,IAAM,oBAAoB,GAAG,UAClC,
|
|
1
|
+
{"version":3,"file":"dateUtils.js","sourceRoot":"","sources":["../../../src/utils/dateUtils.ts"],"names":[],"mappings":";;;AAAA,IAAM,iBAAiB,GAA+B;IACpD,IAAI,EAAE,SAAS;IACf,KAAK,EAAE,SAAS;IAChB,GAAG,EAAE,SAAS;CACf,CAAA;AAEM,IAAM,oBAAoB,GAAG,UAAC,IAAiB;IACpD,IAAI,CAAC,IAAI,IAAI,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;QAAE,OAAO,EAAE,CAAA;IAE7C,OAAO,IAAI,CAAC,kBAAkB,CAAC,OAAO,EAAE,iBAAiB,CAAC,CAAA;AAC5D,CAAC,CAAA;AAJY,QAAA,oBAAoB,wBAIhC;AAEM,IAAM,oBAAoB,GAAG,UAClC,YAAkB,EAClB,KAAa,EACb,SAAuB;IAEvB,IAAM,gBAAgB,GAAG,oDAAoD,CAAA;IAC7E,IAAM,OAAO,GAAG,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;IAE5C,IAAI,CAAC,OAAO;QAAE,OAAO,IAAI,CAAA;IAEzB,IAAM,WAAW,GAAG,SAAS,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,YAAY,CAAA;IAClE,WAAW,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAA;IAE1B,IAAA,KAAqB,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,EAApC,GAAG,QAAA,EAAE,KAAK,QAAA,EAAE,IAAI,QAAoB,CAAA;IAC3C,IAAM,IAAI,GAAG,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAA,CAAC,8BAA8B;IAExG,IAAI,IAAI,IAAI,WAAW,EAAE;QACvB,OAAO,IAAI,CAAA;KACZ;IAED,OAAO,IAAI,CAAA;AACb,CAAC,CAAA;AArBY,QAAA,oBAAoB,wBAqBhC;AAEM,IAAM,gBAAgB,GAAG,UAAC,MAAc;IAC7C,IAAM,eAAe,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAA;IAChD,IAAM,aAAa,GAAG,MAAM,GAAG,GAAG,CAAA;IAClC,IAAM,MAAM,GACV,eAAe,CAAC,CAAC,aAAa,GAAG,EAAE,CAAC,GAAG,EAAE,CAAC;QAC1C,eAAe,CAAC,aAAa,CAAC;QAC9B,eAAe,CAAC,CAAC,CAAC,CAAA;IAEpB,OAAO,UAAG,MAAM,SAAG,MAAM,CAAE,CAAA;AAC7B,CAAC,CAAA;AATY,QAAA,gBAAgB,oBAS5B"}
|
|
@@ -63,7 +63,9 @@ export var Calendar = function (_a) {
|
|
|
63
63
|
/* istanbul ignore next */
|
|
64
64
|
numberOfMonths = _c === void 0 ? 2 : _c, setDates = _a.setDates;
|
|
65
65
|
var today = new Date();
|
|
66
|
-
|
|
66
|
+
var tomorrow = today;
|
|
67
|
+
tomorrow.setDate(today.getDate() + 1);
|
|
68
|
+
tomorrow.setHours(0, 0, 0, 0); // For strict date comparison
|
|
67
69
|
var _d = useState(false), calendarVisible = _d[0], setCalendarVisible = _d[1];
|
|
68
70
|
var _e = useState(''), start = _e[0], setStart = _e[1];
|
|
69
71
|
var _f = useState(''), end = _f[0], setEnd = _f[1];
|
|
@@ -88,14 +90,14 @@ export var Calendar = function (_a) {
|
|
|
88
90
|
return;
|
|
89
91
|
}
|
|
90
92
|
if (!startDate && !selectedEnd) {
|
|
91
|
-
setDates(
|
|
93
|
+
setDates(tomorrow, selectedStart);
|
|
92
94
|
setFocusedInputName('');
|
|
93
95
|
setCalendarVisible(false);
|
|
94
96
|
return;
|
|
95
97
|
}
|
|
96
98
|
var newEndDate = selectedEnd || selectedStart;
|
|
97
99
|
if (startDate && newEndDate < startDate) {
|
|
98
|
-
setDates(
|
|
100
|
+
setDates(tomorrow, newEndDate);
|
|
99
101
|
/* istanbul ignore next */
|
|
100
102
|
if (startDateInputRef === null || startDateInputRef === void 0 ? void 0 : startDateInputRef.current)
|
|
101
103
|
startDateInputRef.current.focus();
|
|
@@ -121,7 +123,8 @@ export var Calendar = function (_a) {
|
|
|
121
123
|
if (!dateInputValidationPattern.test(value))
|
|
122
124
|
return;
|
|
123
125
|
setEnd(value);
|
|
124
|
-
var date = compareAndFormatDate(
|
|
126
|
+
var date = compareAndFormatDate(tomorrow, value, startDate);
|
|
127
|
+
/* istanbul ignore next */
|
|
125
128
|
if (date) {
|
|
126
129
|
setDates(startDate, date);
|
|
127
130
|
setCalendarVisible(false);
|
|
@@ -134,11 +137,11 @@ export var Calendar = function (_a) {
|
|
|
134
137
|
if (!dateInputValidationPattern.test(value))
|
|
135
138
|
return;
|
|
136
139
|
setStart(value);
|
|
137
|
-
var date = compareAndFormatDate(
|
|
140
|
+
var date = compareAndFormatDate(tomorrow, value);
|
|
141
|
+
/* istanbul ignore next */
|
|
138
142
|
if (date) {
|
|
139
143
|
setDates(date, endDate);
|
|
140
144
|
setCalendarVisible(false);
|
|
141
|
-
/* istanbul ignore next */
|
|
142
145
|
if (endDateInputRef === null || endDateInputRef === void 0 ? void 0 : endDateInputRef.current)
|
|
143
146
|
endDateInputRef.current.focus();
|
|
144
147
|
return;
|
|
@@ -228,6 +231,6 @@ export var Calendar = function (_a) {
|
|
|
228
231
|
calendarVisible && focusedInputName === DateRangeInputIds.end && (React.createElement("div", { className: "chevron" })))),
|
|
229
232
|
React.createElement(CalendarWrapper, null,
|
|
230
233
|
React.createElement(Container, __assign({ className: "calendar-custom-container", stylePreset: overrides.calendar.calendarCustomContainer.stylePreset }, overrides),
|
|
231
|
-
React.createElement(DatePicker, { selected: startDate, startDate: startDate, endDate: endDate, monthsShown: numberOfMonths, selectsRange: true, inline: true, minDate:
|
|
234
|
+
React.createElement(DatePicker, { selected: startDate, startDate: startDate, endDate: endDate, monthsShown: numberOfMonths, selectsRange: true, inline: true, minDate: tomorrow, onChange: handleDatePickerChange, onMonthChange: handleOnMonthChange, disabledKeyboardNavigation: true, showDisabledMonthNavigation: true, ref: datePickerRef })))));
|
|
232
235
|
};
|
|
233
236
|
//# sourceMappingURL=Calendar.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Calendar.js","sourceRoot":"","sources":["../../../src/Calendar/Calendar.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,KAAK,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AAC1D,OAAO,UAAU,MAAM,kBAAkB,CAAA;AACzC,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAA;AACvC,OAAO,EAAE,YAAY,IAAI,kBAAkB,EAAE,MAAM,sCAAsC,CAAA;AAEzF,OAAO,EACL,cAAc,EACd,eAAe,EACf,aAAa,EACb,SAAS,GACV,MAAM,uBAAuB,CAAA;AAC9B,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAA;AAC7C,OAAO,EAA4B,iBAAiB,EAAE,MAAM,SAAS,CAAA;AACrE,OAAO,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAA;AAErE,2BAA2B;AAC3B,IAAM,0BAA0B,GAAG,YAAY,CAAA,CAAC,iCAAiC;AAEjF,IAAM,sBAAsB,GAAG,aAAa,CAAC,kBAAkB,CAAC,CAAA;AAEhE,MAAM,CAAC,IAAM,QAAQ,GAAuC,UAAC,EAO5D;QANC,iBAA4B,EAA5B,SAAS,mBAAG,gBAAgB,KAAA,EAC5B,SAAS,eAAA,EACT,OAAO,aAAA;IACP,0BAA0B;IAC1B,sBAAkB;IADlB,0BAA0B;IAC1B,cAAc,mBAAG,CAAC,KAAA,EAClB,QAAQ,cAAA;IAER,IAAM,KAAK,GAAG,IAAI,IAAI,EAAE,CAAA;IACxB,KAAK,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAA,CAAC,6BAA6B;
|
|
1
|
+
{"version":3,"file":"Calendar.js","sourceRoot":"","sources":["../../../src/Calendar/Calendar.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
export declare const formatDateToDDMMYYYY: (date: Date | null) => string;
|
|
2
|
-
export declare const compareAndFormatDate: (
|
|
2
|
+
export declare const compareAndFormatDate: (earliestDate: Date, value: string, startDate?: Date | null) => Date | null;
|
|
3
3
|
export declare const addOrdinalSuffix: (number: number) => string;
|
|
@@ -8,18 +8,17 @@ export var formatDateToDDMMYYYY = function (date) {
|
|
|
8
8
|
return '';
|
|
9
9
|
return date.toLocaleDateString('en-GB', dateFormatOptions);
|
|
10
10
|
};
|
|
11
|
-
export var compareAndFormatDate = function (
|
|
11
|
+
export var compareAndFormatDate = function (earliestDate, value, startDate) {
|
|
12
12
|
var dateInputPattern = /^(0[1-9]|[12][0-9]|3[01])\/(0[1-9]|1[0-2])\/\d{4}$/;
|
|
13
13
|
var isValid = dateInputPattern.test(value);
|
|
14
|
-
|
|
15
|
-
compareWith.setHours(0, 0, 0, 0);
|
|
16
|
-
if (isValid) {
|
|
17
|
-
var _a = value.split('/'), day = _a[0], month = _a[1], year = _a[2];
|
|
18
|
-
var date = new Date(parseInt(year), parseInt(month) - 1, parseInt(day)); // -1 because month is 0-based
|
|
19
|
-
if (date >= compareWith) {
|
|
20
|
-
return date;
|
|
21
|
-
}
|
|
14
|
+
if (!isValid)
|
|
22
15
|
return null;
|
|
16
|
+
var compareWith = startDate ? new Date(startDate) : earliestDate;
|
|
17
|
+
compareWith.setHours(0, 0, 0, 0);
|
|
18
|
+
var _a = value.split('/'), day = _a[0], month = _a[1], year = _a[2];
|
|
19
|
+
var date = new Date(parseInt(year), parseInt(month) - 1, parseInt(day)); // -1 because month is 0-based
|
|
20
|
+
if (date >= compareWith) {
|
|
21
|
+
return date;
|
|
23
22
|
}
|
|
24
23
|
return null;
|
|
25
24
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dateUtils.js","sourceRoot":"","sources":["../../../src/utils/dateUtils.ts"],"names":[],"mappings":"AAAA,IAAM,iBAAiB,GAA+B;IACpD,IAAI,EAAE,SAAS;IACf,KAAK,EAAE,SAAS;IAChB,GAAG,EAAE,SAAS;CACf,CAAA;AAED,MAAM,CAAC,IAAM,oBAAoB,GAAG,UAAC,IAAiB;IACpD,IAAI,CAAC,IAAI,IAAI,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;QAAE,OAAO,EAAE,CAAA;IAE7C,OAAO,IAAI,CAAC,kBAAkB,CAAC,OAAO,EAAE,iBAAiB,CAAC,CAAA;AAC5D,CAAC,CAAA;AAED,MAAM,CAAC,IAAM,oBAAoB,GAAG,UAClC,
|
|
1
|
+
{"version":3,"file":"dateUtils.js","sourceRoot":"","sources":["../../../src/utils/dateUtils.ts"],"names":[],"mappings":"AAAA,IAAM,iBAAiB,GAA+B;IACpD,IAAI,EAAE,SAAS;IACf,KAAK,EAAE,SAAS;IAChB,GAAG,EAAE,SAAS;CACf,CAAA;AAED,MAAM,CAAC,IAAM,oBAAoB,GAAG,UAAC,IAAiB;IACpD,IAAI,CAAC,IAAI,IAAI,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;QAAE,OAAO,EAAE,CAAA;IAE7C,OAAO,IAAI,CAAC,kBAAkB,CAAC,OAAO,EAAE,iBAAiB,CAAC,CAAA;AAC5D,CAAC,CAAA;AAED,MAAM,CAAC,IAAM,oBAAoB,GAAG,UAClC,YAAkB,EAClB,KAAa,EACb,SAAuB;IAEvB,IAAM,gBAAgB,GAAG,oDAAoD,CAAA;IAC7E,IAAM,OAAO,GAAG,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;IAE5C,IAAI,CAAC,OAAO;QAAE,OAAO,IAAI,CAAA;IAEzB,IAAM,WAAW,GAAG,SAAS,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,YAAY,CAAA;IAClE,WAAW,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAA;IAE1B,IAAA,KAAqB,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,EAApC,GAAG,QAAA,EAAE,KAAK,QAAA,EAAE,IAAI,QAAoB,CAAA;IAC3C,IAAM,IAAI,GAAG,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAA,CAAC,8BAA8B;IAExG,IAAI,IAAI,IAAI,WAAW,EAAE;QACvB,OAAO,IAAI,CAAA;KACZ;IAED,OAAO,IAAI,CAAA;AACb,CAAC,CAAA;AAED,MAAM,CAAC,IAAM,gBAAgB,GAAG,UAAC,MAAc;IAC7C,IAAM,eAAe,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAA;IAChD,IAAM,aAAa,GAAG,MAAM,GAAG,GAAG,CAAA;IAClC,IAAM,MAAM,GACV,eAAe,CAAC,CAAC,aAAa,GAAG,EAAE,CAAC,GAAG,EAAE,CAAC;QAC1C,eAAe,CAAC,aAAa,CAAC;QAC9B,eAAe,CAAC,CAAC,CAAC,CAAA;IAEpB,OAAO,UAAG,MAAM,SAAG,MAAM,CAAE,CAAA;AAC7B,CAAC,CAAA"}
|