@redneckz/wildless-cms-uni-blocks 0.14.564 → 0.14.566

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.
Files changed (75) hide show
  1. package/bundle/bundle.umd.js +42 -38
  2. package/bundle/bundle.umd.min.js +1 -1
  3. package/bundle/components/CalculatorDeposit/{utils.d.ts → normalize.d.ts} +1 -0
  4. package/bundle/ui-kit/DatePicker/Calendar.d.ts +1 -0
  5. package/dist/components/CalculatorDeposit/CalculatorDeposit.js +5 -13
  6. package/dist/components/CalculatorDeposit/CalculatorDeposit.js.map +1 -1
  7. package/dist/components/CalculatorDeposit/{utils.d.ts → normalize.d.ts} +1 -0
  8. package/{mobile/dist/components/CalculatorDeposit/utils.js → dist/components/CalculatorDeposit/normalize.js} +12 -2
  9. package/dist/components/CalculatorDeposit/normalize.js.map +1 -0
  10. package/dist/hooks/useForm.js +1 -1
  11. package/dist/hooks/useForm.js.map +1 -1
  12. package/dist/ui-kit/DatePicker/Calendar.d.ts +1 -0
  13. package/dist/ui-kit/DatePicker/Calendar.js +5 -2
  14. package/dist/ui-kit/DatePicker/Calendar.js.map +1 -1
  15. package/dist/ui-kit/DatePicker/DatePicker.js +1 -1
  16. package/dist/ui-kit/DatePicker/DatePicker.js.map +1 -1
  17. package/lib/common.css +1 -1
  18. package/lib/components/CalculatorDeposit/CalculatorDeposit.js +4 -12
  19. package/lib/components/CalculatorDeposit/CalculatorDeposit.js.map +1 -1
  20. package/{mobile/bundle/components/CalculatorDeposit/utils.d.ts → lib/components/CalculatorDeposit/normalize.d.ts} +1 -0
  21. package/lib/components/CalculatorDeposit/{utils.js → normalize.js} +10 -1
  22. package/lib/components/CalculatorDeposit/normalize.js.map +1 -0
  23. package/lib/hooks/useForm.js +1 -1
  24. package/lib/hooks/useForm.js.map +1 -1
  25. package/lib/ui-kit/DatePicker/Calendar.d.ts +1 -0
  26. package/lib/ui-kit/DatePicker/Calendar.js +5 -2
  27. package/lib/ui-kit/DatePicker/Calendar.js.map +1 -1
  28. package/lib/ui-kit/DatePicker/DatePicker.js +1 -1
  29. package/lib/ui-kit/DatePicker/DatePicker.js.map +1 -1
  30. package/mobile/bundle/bundle.umd.js +42 -38
  31. package/mobile/bundle/bundle.umd.min.js +1 -1
  32. package/{lib/components/CalculatorDeposit/utils.d.ts → mobile/bundle/components/CalculatorDeposit/normalize.d.ts} +1 -0
  33. package/mobile/bundle/ui-kit/DatePicker/Calendar.d.ts +1 -0
  34. package/mobile/dist/components/CalculatorDeposit/CalculatorDeposit.js +5 -13
  35. package/mobile/dist/components/CalculatorDeposit/CalculatorDeposit.js.map +1 -1
  36. package/mobile/dist/components/CalculatorDeposit/normalize.d.ts +18 -0
  37. package/{dist/components/CalculatorDeposit/utils.js → mobile/dist/components/CalculatorDeposit/normalize.js} +12 -2
  38. package/mobile/dist/components/CalculatorDeposit/normalize.js.map +1 -0
  39. package/mobile/dist/hooks/useForm.js +1 -1
  40. package/mobile/dist/hooks/useForm.js.map +1 -1
  41. package/mobile/dist/ui-kit/DatePicker/Calendar.d.ts +1 -0
  42. package/mobile/dist/ui-kit/DatePicker/Calendar.js +5 -2
  43. package/mobile/dist/ui-kit/DatePicker/Calendar.js.map +1 -1
  44. package/mobile/dist/ui-kit/DatePicker/DatePicker.js +1 -1
  45. package/mobile/dist/ui-kit/DatePicker/DatePicker.js.map +1 -1
  46. package/mobile/lib/common.css +1 -1
  47. package/mobile/lib/components/CalculatorDeposit/CalculatorDeposit.js +4 -12
  48. package/mobile/lib/components/CalculatorDeposit/CalculatorDeposit.js.map +1 -1
  49. package/mobile/lib/components/CalculatorDeposit/normalize.d.ts +18 -0
  50. package/mobile/lib/components/CalculatorDeposit/{utils.js → normalize.js} +10 -1
  51. package/mobile/lib/components/CalculatorDeposit/normalize.js.map +1 -0
  52. package/mobile/lib/hooks/useForm.js +1 -1
  53. package/mobile/lib/hooks/useForm.js.map +1 -1
  54. package/mobile/lib/ui-kit/DatePicker/Calendar.d.ts +1 -0
  55. package/mobile/lib/ui-kit/DatePicker/Calendar.js +5 -2
  56. package/mobile/lib/ui-kit/DatePicker/Calendar.js.map +1 -1
  57. package/mobile/lib/ui-kit/DatePicker/DatePicker.js +1 -1
  58. package/mobile/lib/ui-kit/DatePicker/DatePicker.js.map +1 -1
  59. package/mobile/src/components/CalculatorDeposit/CalculatorDeposit.tsx +5 -23
  60. package/mobile/src/components/CalculatorDeposit/{utils.tsx → normalize.tsx} +11 -0
  61. package/mobile/src/hooks/useForm.ts +1 -1
  62. package/mobile/src/ui-kit/DatePicker/Calendar.tsx +6 -2
  63. package/mobile/src/ui-kit/DatePicker/DatePicker.tsx +1 -1
  64. package/package.json +2 -2
  65. package/src/components/CalculatorDeposit/CalculatorDeposit.tsx +5 -23
  66. package/src/components/CalculatorDeposit/{utils.tsx → normalize.tsx} +11 -0
  67. package/src/hooks/useForm.ts +1 -1
  68. package/src/ui-kit/DatePicker/Calendar.tsx +6 -2
  69. package/src/ui-kit/DatePicker/DatePicker.tsx +1 -1
  70. package/dist/components/CalculatorDeposit/utils.js.map +0 -1
  71. package/lib/components/CalculatorDeposit/utils.js.map +0 -1
  72. package/mobile/dist/components/CalculatorDeposit/utils.d.ts +0 -17
  73. package/mobile/dist/components/CalculatorDeposit/utils.js.map +0 -1
  74. package/mobile/lib/components/CalculatorDeposit/utils.d.ts +0 -17
  75. package/mobile/lib/components/CalculatorDeposit/utils.js.map +0 -1
@@ -1 +1 @@
1
- {"version":3,"file":"useForm.js","sourceRoot":"","sources":["../../src/hooks/useForm.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"useForm.js","sourceRoot":"","sources":["../../src/hooks/useForm.ts"],"names":[],"mappings":"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"}
@@ -5,6 +5,7 @@ interface CalendarProps {
5
5
  min?: Date;
6
6
  max?: Date;
7
7
  onDateSelect?: (date: Date) => void;
8
+ setValue?: (value: boolean) => void;
8
9
  }
9
10
  export declare const Calendar: import("@redneckz/uni-jsx").UNIComponent<CalendarProps, any, any>;
10
11
  export {};
@@ -4,8 +4,11 @@ import { useCallback, useMemo } from '@redneckz/uni-jsx/lib/hooks';
4
4
  import { noop } from '../../utils/noop.js';
5
5
  import { renderCalendarCells } from './renderCalendarCells.js';
6
6
  const WEEK_DAYS = ['Пн', 'Вт', 'Ср', 'Чт', 'Пт', 'Сб', 'Вс'];
7
- export const Calendar = JSX(({ today, currentMonth, currentYear, min, max, onDateSelect = noop }) => {
8
- const handleDateClick = useCallback((date) => onDateSelect(date), []);
7
+ export const Calendar = JSX(({ today, currentMonth, currentYear, min, max, onDateSelect = noop, setValue = noop }) => {
8
+ const handleDateClick = useCallback((date) => {
9
+ onDateSelect(date);
10
+ setValue(false);
11
+ }, []);
9
12
  const { firstDayOfWeek, totalDays } = useMemo(() => ({
10
13
  firstDayOfWeek: new Date(currentYear, currentMonth, 1).getDay() - 1,
11
14
  totalDays: new Date(currentYear, currentMonth + 1, 0).getDate(),
@@ -1 +1 @@
1
- {"version":3,"file":"Calendar.js","sourceRoot":"","sources":["../../../src/ui-kit/DatePicker/Calendar.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AACxC,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAE5D,MAAM,SAAS,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;AAW7D,MAAM,CAAC,MAAM,QAAQ,GAAG,GAAG,CACzB,CAAC,EAAE,KAAK,EAAE,YAAY,EAAE,WAAW,EAAE,GAAG,EAAE,GAAG,EAAE,YAAY,GAAG,IAAI,EAAE,EAAE,EAAE;IACtE,MAAM,eAAe,GAAG,WAAW,CAAC,CAAC,IAAU,EAAE,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;IAE5E,MAAM,EAAE,cAAc,EAAE,SAAS,EAAE,GAAG,OAAO,CAC3C,GAAG,EAAE,CAAC,CAAC;QACL,cAAc,EAAE,IAAI,IAAI,CAAC,WAAW,EAAE,YAAY,EAAE,CAAC,CAAC,CAAC,MAAM,EAAE,GAAG,CAAC;QACnE,SAAS,EAAE,IAAI,IAAI,CAAC,WAAW,EAAE,YAAY,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,EAAE;KAChE,CAAC,EACF,CAAC,WAAW,EAAE,YAAY,CAAC,CAC5B,CAAC;IAEF,OAAO,CACL,iBAAO,SAAS,EAAC,SAAS,aACxB,gBAAO,SAAS,EAAC,sBAAsB,YACrC,uBACG,SAAS,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,CAC7B,aAAwB,SAAS,EAAC,KAAK,YACpC,GAAG,IADG,MAAM,CAAC,KAAK,CAAC,CAEjB,CACN,CAAC,GACC,GACC,EACR,0BACG,mBAAmB,CAAC;oBACnB,cAAc;oBACd,KAAK;oBACL,SAAS;oBACT,WAAW;oBACX,YAAY;oBACZ,GAAG;oBACH,GAAG;oBACH,WAAW,EAAE,eAAe;iBAC7B,CAAC,GACI,IACF,CACT,CAAC;AACJ,CAAC,CACF,CAAC"}
1
+ {"version":3,"file":"Calendar.js","sourceRoot":"","sources":["../../../src/ui-kit/DatePicker/Calendar.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AACxC,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAE5D,MAAM,SAAS,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;AAY7D,MAAM,CAAC,MAAM,QAAQ,GAAG,GAAG,CACzB,CAAC,EAAE,KAAK,EAAE,YAAY,EAAE,WAAW,EAAE,GAAG,EAAE,GAAG,EAAE,YAAY,GAAG,IAAI,EAAE,QAAQ,GAAG,IAAI,EAAE,EAAE,EAAE;IACvF,MAAM,eAAe,GAAG,WAAW,CAAC,CAAC,IAAU,EAAE,EAAE;QACjD,YAAY,CAAC,IAAI,CAAC,CAAC;QACnB,QAAQ,CAAC,KAAK,CAAC,CAAC;IAClB,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,MAAM,EAAE,cAAc,EAAE,SAAS,EAAE,GAAG,OAAO,CAC3C,GAAG,EAAE,CAAC,CAAC;QACL,cAAc,EAAE,IAAI,IAAI,CAAC,WAAW,EAAE,YAAY,EAAE,CAAC,CAAC,CAAC,MAAM,EAAE,GAAG,CAAC;QACnE,SAAS,EAAE,IAAI,IAAI,CAAC,WAAW,EAAE,YAAY,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,EAAE;KAChE,CAAC,EACF,CAAC,WAAW,EAAE,YAAY,CAAC,CAC5B,CAAC;IAEF,OAAO,CACL,iBAAO,SAAS,EAAC,SAAS,aACxB,gBAAO,SAAS,EAAC,sBAAsB,YACrC,uBACG,SAAS,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,CAC7B,aAAwB,SAAS,EAAC,KAAK,YACpC,GAAG,IADG,MAAM,CAAC,KAAK,CAAC,CAEjB,CACN,CAAC,GACC,GACC,EACR,0BACG,mBAAmB,CAAC;oBACnB,cAAc;oBACd,KAAK;oBACL,SAAS;oBACT,WAAW;oBACX,YAAY;oBACZ,GAAG;oBACH,GAAG;oBACH,WAAW,EAAE,eAAe;iBAC7B,CAAC,GACI,IACF,CACT,CAAC;AACJ,CAAC,CACF,CAAC"}
@@ -36,7 +36,7 @@ export const DatePicker = JSX(({ className = '', label = '', value, valid = true
36
36
  selectedMonth,
37
37
  showCalendar,
38
38
  });
39
- return (_jsxs("div", { className: style('space-y-xs', className), ref: ref, children: [renderLabel(label), _jsxs("div", { className: "relative", children: [renderDatePickerForm(handleChangeVisibleCalendar, value, valid), showCalendar ? (_jsxs("div", { className: "absolute bg-white z-20 select-none", children: [_jsxs("div", { className: "flex gap-s", children: [_jsx("div", { className: "my-auto", onClick: handlePrevMonth, children: _jsx(Icon, { ...ICON_PROPS, className: "-rotate-90 cursor-pointer" }) }), _jsx(Select, { onChange: handleSelectMonth, value: { key: months[selectedMonth] }, options: monthsOptions, ...SELECT_PROPS }), _jsx(Select, { onChange: handleSelectYear, value: { key: String(selectedYear) }, options: yearsOptions, ...SELECT_PROPS }), _jsx("div", { className: "my-auto", onClick: handleNextMonth, children: _jsx(Icon, { ...ICON_PROPS, className: "rotate-90 cursor-pointer" }) })] }), _jsx(Calendar, { today: value, currentMonth: selectedMonth, currentYear: selectedYear, onDateSelect: onChange, min: minDate, max: maxDate })] })) : null] })] }));
39
+ return (_jsxs("div", { className: style('space-y-xs', className), ref: ref, children: [renderLabel(label), _jsxs("div", { className: "relative", children: [renderDatePickerForm(handleChangeVisibleCalendar, value, valid), showCalendar ? (_jsxs("div", { className: "absolute bg-white z-20 select-none bottom-full", children: [_jsxs("div", { className: "flex gap-s", children: [_jsx("div", { className: "my-auto", onClick: handlePrevMonth, children: _jsx(Icon, { ...ICON_PROPS, className: "-rotate-90 cursor-pointer" }) }), _jsx(Select, { onChange: handleSelectMonth, value: { key: months[selectedMonth] }, options: monthsOptions, ...SELECT_PROPS }), _jsx(Select, { onChange: handleSelectYear, value: { key: String(selectedYear) }, options: yearsOptions, ...SELECT_PROPS }), _jsx("div", { className: "my-auto", onClick: handleNextMonth, children: _jsx(Icon, { ...ICON_PROPS, className: "rotate-90 cursor-pointer" }) })] }), _jsx(Calendar, { today: value, currentMonth: selectedMonth, currentYear: selectedYear, onDateSelect: onChange, min: minDate, max: maxDate })] })) : null] })] }));
40
40
  });
41
41
  const renderDatePickerForm = (handleChangeVisibleCalendar, value, valid) => (_jsxs("div", { onClick: handleChangeVisibleCalendar, className: style(formStyle, valid ? 'border-gray' : 'border-error'), children: [_jsx(Paragraph, { children: value && formatDate(value) }), _jsx(Icon, { ...ICON_PROPS, name: "CalendarIcon" })] }));
42
42
  //# sourceMappingURL=DatePicker.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"DatePicker.js","sourceRoot":"","sources":["../../../src/ui-kit/DatePicker/DatePicker.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"DatePicker.js","sourceRoot":"","sources":["../../../src/ui-kit/DatePicker/DatePicker.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AACvD,OAAO,EAAE,OAAO,EAAE,MAAM,qCAAqC,CAAC;AAG9D,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAE1C,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AAEpC,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAE9D,MAAM,UAAU,GAAgF;IAC9F,IAAI,EAAE,aAAa;IACnB,WAAW,EAAE,OAAO;IACpB,KAAK,EAAE,IAAI;IACX,MAAM,EAAE,IAAI;CACb,CAAC;AAEF,MAAM,YAAY,GAAuE;IACvF,SAAS,EAAE,UAAU;IACrB,WAAW,EAAE,OAAO;IACpB,QAAQ,EAAE,KAAK;CAChB,CAAC;AAEF,MAAM,SAAS,GACb,oFAAoF;IACpF,2DAA2D,CAAC;AAS9D,MAAM,CAAC,MAAM,UAAU,GAAG,GAAG,CAC3B,CAAC,EAAE,SAAS,GAAG,EAAE,EAAE,KAAK,GAAG,EAAE,EAAE,KAAK,EAAE,KAAK,GAAG,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE;IAClF,MAAM,CAAC,YAAY,EAAE,EAAE,QAAQ,EAAE,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC;IACpD,MAAM,CAAC,aAAa,EAAE,gBAAgB,CAAC,GAAG,QAAQ,CAAC,KAAK,EAAE,QAAQ,EAAE,IAAI,IAAI,IAAI,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC/F,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,QAAQ,CAC9C,KAAK,EAAE,WAAW,EAAE,IAAI,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CACjD,CAAC;IAEF,MAAM,EACJ,eAAe,EACf,eAAe,EACf,iBAAiB,EACjB,gBAAgB,EAChB,aAAa,EACb,YAAY,EACZ,2BAA2B,EAC3B,GAAG,GACJ,GAAG,oBAAoB,CAAC;QACvB,YAAY,EAAE,eAAe;QAC7B,aAAa,EAAE,gBAAgB;QAC/B,cAAc,EAAE,QAAQ;QACxB,YAAY;QACZ,aAAa;QACb,YAAY;KACb,CAAC,CAAC;IAEH,OAAO,CACL,eAAK,SAAS,EAAE,KAAK,CAAC,YAAY,EAAE,SAAS,CAAC,EAAE,GAAG,EAAE,GAAG,aACrD,WAAW,CAAC,KAAK,CAAC,EACnB,eAAK,SAAS,EAAC,UAAU,aACtB,oBAAoB,CAAC,2BAA2B,EAAE,KAAK,EAAE,KAAK,CAAC,EAC/D,YAAY,CAAC,CAAC,CAAC,CACd,eAAK,SAAS,EAAC,gDAAgD,aAC7D,eAAK,SAAS,EAAC,YAAY,aACzB,cAAK,SAAS,EAAC,SAAS,EAAC,OAAO,EAAE,eAAe,YAC/C,KAAC,IAAI,OAAK,UAAU,EAAE,SAAS,EAAC,2BAA2B,GAAG,GAC1D,EACN,KAAC,MAAM,IACL,QAAQ,EAAE,iBAAiB,EAC3B,KAAK,EAAE,EAAE,GAAG,EAAE,MAAM,CAAC,aAAa,CAAC,EAAE,EACrC,OAAO,EAAE,aAAa,KAClB,YAAY,GAChB,EACF,KAAC,MAAM,IACL,QAAQ,EAAE,gBAAgB,EAC1B,KAAK,EAAE,EAAE,GAAG,EAAE,MAAM,CAAC,YAAY,CAAC,EAAE,EACpC,OAAO,EAAE,YAAY,KACjB,YAAY,GAChB,EACF,cAAK,SAAS,EAAC,SAAS,EAAC,OAAO,EAAE,eAAe,YAC/C,KAAC,IAAI,OAAK,UAAU,EAAE,SAAS,EAAC,0BAA0B,GAAG,GACzD,IACF,EACN,KAAC,QAAQ,IACP,KAAK,EAAE,KAAK,EACZ,YAAY,EAAE,aAAa,EAC3B,WAAW,EAAE,YAAY,EACzB,YAAY,EAAE,QAAQ,EACtB,GAAG,EAAE,OAAO,EACZ,GAAG,EAAE,OAAO,GACZ,IACE,CACP,CAAC,CAAC,CAAC,IAAI,IACJ,IACF,CACP,CAAC;AACJ,CAAC,CACF,CAAC;AAEF,MAAM,oBAAoB,GAAG,CAC3B,2BAAuC,EACvC,KAAuB,EACvB,KAAc,EACd,EAAE,CAAC,CACH,eACE,OAAO,EAAE,2BAA2B,EACpC,SAAS,EAAE,KAAK,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,cAAc,CAAC,aAEnE,KAAC,SAAS,cAAE,KAAK,IAAI,UAAU,CAAC,KAAK,CAAC,GAAa,EACnD,KAAC,IAAI,OAAK,UAAU,EAAE,IAAI,EAAC,cAAc,GAAG,IACxC,CACP,CAAC"}
@@ -20,7 +20,7 @@ import { UniBlock } from '../../UniBlock/UniBlock';
20
20
  import { type UniBlockProps } from '../../UniBlock/UniBlockProps';
21
21
  import { style } from '../../utils/style';
22
22
  import { isDefaultParams } from '../CalculatorCredit/isDefaultParams';
23
- import { type CalculatorDepositContent, type DepositParams } from './CalculatorDepositContent';
23
+ import { type CalculatorDepositContent } from './CalculatorDepositContent';
24
24
  import {
25
25
  getDepositCalculatorParams,
26
26
  type DepositCalculatorData,
@@ -28,15 +28,9 @@ import {
28
28
  type TariffsButtonContent,
29
29
  } from './getDepositCalculatorParams';
30
30
  import { isRubles } from './isRubles';
31
+ import { getRows, normalizeDepositParams } from './normalize';
31
32
  import { renderDepositParamsForm } from './renderDepositParamsForm';
32
33
  import { renderDepositResult } from './renderDepositResult';
33
- import {
34
- getRows,
35
- normalizeCurrency,
36
- normalizeMoneyValue,
37
- normalizeMonthValue,
38
- normalizeReplenishWithdrawn,
39
- } from './utils';
40
34
 
41
35
  const MAP = {
42
36
  isMonthlyInterestPayment: 'isMonthlyInterestPayment',
@@ -71,20 +65,8 @@ export const CalculatorDeposit = UniBlock<CalculatorDepositProps>(
71
65
  }) => {
72
66
  const { rows } = calcSource ?? {};
73
67
  const currencyOptions = rows?.map((_) => _.currency) ?? [DEFAULT_CURRENCY];
74
- const normalize = useCallback(
75
- (_: DepositParams) =>
76
- !rows
77
- ? _
78
- : {
79
- ..._,
80
- ...normalizeReplenishWithdrawn(_),
81
- ...normalizeMoneyValue(_, rows),
82
- ...normalizeMonthValue(_, rows),
83
- ...normalizeCurrency(_, rows),
84
- },
68
+ const normalize = useCallback(normalizeDepositParams(rows), [rows]);
85
69
 
86
- [rows],
87
- );
88
70
  const [userInputParams, { field }] = useForm(
89
71
  {
90
72
  moneyValue: getMoneyDefaultValue(defaultParams, DEPOSIT_DEFAULT_SUM),
@@ -105,7 +87,7 @@ export const CalculatorDeposit = UniBlock<CalculatorDepositProps>(
105
87
  const calcParams = getDepositCalculatorParams(userInputParams, row, paramsViewSettings);
106
88
  const { rate, income, finalSum, type = '' } = calcParams;
107
89
 
108
- const handleDefaultParamsCals = () => {
90
+ const handleDefaultParamsCals = useCallback(() => {
109
91
  setDefaultParamsCalc({
110
92
  field,
111
93
  defParams: getDefaultParamsMax(row, isNewClient) as DepositCalculatorSourceBookParams,
@@ -113,7 +95,7 @@ export const CalculatorDeposit = UniBlock<CalculatorDepositProps>(
113
95
  monthsValue: 'minMonths',
114
96
  map: MAP,
115
97
  });
116
- };
98
+ }, [field, rows]);
117
99
 
118
100
  useEffect(() => {
119
101
  if (!isDefaultParams(defaultParams) && row) {
@@ -5,6 +5,17 @@ import { type DepositParams } from './CalculatorDepositContent';
5
5
  import { type DepositCalculatorRowsData } from './getDepositCalculatorParams';
6
6
  import { isRubles } from './isRubles';
7
7
 
8
+ export const normalizeDepositParams = (rows?: DepositCalculatorRowsData[]) => (_: DepositParams) =>
9
+ !rows
10
+ ? _
11
+ : {
12
+ ..._,
13
+ ...normalizeReplenishWithdrawn(_),
14
+ ...normalizeMoneyValue(_, rows),
15
+ ...normalizeMonthValue(_, rows),
16
+ ...normalizeCurrency(_, rows),
17
+ };
18
+
8
19
  export const normalizeMonthValue = (_: DepositParams, rows?: DepositCalculatorRowsData[]) => {
9
20
  const { minMonths, maxMonths } = getRangeByKeys(
10
21
  ['minMonths', 'maxMonths'],
@@ -115,4 +115,4 @@ export const useForm = <FormState extends Record<string, any>>(
115
115
  };
116
116
 
117
117
  const shellowCompare = (a: Record<string, any>, b: Record<string, any>): boolean =>
118
- Object.keys({ ...a, ...b }).every((key) => a[key] === b[key]);
118
+ a && b && Object.keys({ ...a, ...b }).every((key) => a[key] === b[key]);
@@ -12,11 +12,15 @@ interface CalendarProps {
12
12
  min?: Date;
13
13
  max?: Date;
14
14
  onDateSelect?: (date: Date) => void;
15
+ setValue?: (value: boolean) => void;
15
16
  }
16
17
 
17
18
  export const Calendar = JSX<CalendarProps>(
18
- ({ today, currentMonth, currentYear, min, max, onDateSelect = noop }) => {
19
- const handleDateClick = useCallback((date: Date) => onDateSelect(date), []);
19
+ ({ today, currentMonth, currentYear, min, max, onDateSelect = noop, setValue = noop }) => {
20
+ const handleDateClick = useCallback((date: Date) => {
21
+ onDateSelect(date);
22
+ setValue(false);
23
+ }, []);
20
24
 
21
25
  const { firstDayOfWeek, totalDays } = useMemo(
22
26
  () => ({
@@ -71,7 +71,7 @@ export const DatePicker = JSX<DatePickerProps>(
71
71
  <div className="relative">
72
72
  {renderDatePickerForm(handleChangeVisibleCalendar, value, valid)}
73
73
  {showCalendar ? (
74
- <div className="absolute bg-white z-20 select-none">
74
+ <div className="absolute bg-white z-20 select-none bottom-full">
75
75
  <div className="flex gap-s">
76
76
  <div className="my-auto" onClick={handlePrevMonth}>
77
77
  <Icon {...ICON_PROPS} className="-rotate-90 cursor-pointer" />
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@redneckz/wildless-cms-uni-blocks",
3
- "version": "0.14.564",
3
+ "version": "0.14.566",
4
4
  "private": false,
5
5
  "license": "MIT",
6
6
  "author": "ЦК",
@@ -210,7 +210,7 @@
210
210
  "path": "lib/common.css"
211
211
  },
212
212
  {
213
- "limit": "68 kB",
213
+ "limit": "69 kB",
214
214
  "path": "bundle/bundle.umd.min.js"
215
215
  }
216
216
  ],
@@ -20,7 +20,7 @@ import { UniBlock } from '../../UniBlock/UniBlock';
20
20
  import { type UniBlockProps } from '../../UniBlock/UniBlockProps';
21
21
  import { style } from '../../utils/style';
22
22
  import { isDefaultParams } from '../CalculatorCredit/isDefaultParams';
23
- import { type CalculatorDepositContent, type DepositParams } from './CalculatorDepositContent';
23
+ import { type CalculatorDepositContent } from './CalculatorDepositContent';
24
24
  import {
25
25
  getDepositCalculatorParams,
26
26
  type DepositCalculatorData,
@@ -28,15 +28,9 @@ import {
28
28
  type TariffsButtonContent,
29
29
  } from './getDepositCalculatorParams';
30
30
  import { isRubles } from './isRubles';
31
+ import { getRows, normalizeDepositParams } from './normalize';
31
32
  import { renderDepositParamsForm } from './renderDepositParamsForm';
32
33
  import { renderDepositResult } from './renderDepositResult';
33
- import {
34
- getRows,
35
- normalizeCurrency,
36
- normalizeMoneyValue,
37
- normalizeMonthValue,
38
- normalizeReplenishWithdrawn,
39
- } from './utils';
40
34
 
41
35
  const MAP = {
42
36
  isMonthlyInterestPayment: 'isMonthlyInterestPayment',
@@ -71,20 +65,8 @@ export const CalculatorDeposit = UniBlock<CalculatorDepositProps>(
71
65
  }) => {
72
66
  const { rows } = calcSource ?? {};
73
67
  const currencyOptions = rows?.map((_) => _.currency) ?? [DEFAULT_CURRENCY];
74
- const normalize = useCallback(
75
- (_: DepositParams) =>
76
- !rows
77
- ? _
78
- : {
79
- ..._,
80
- ...normalizeReplenishWithdrawn(_),
81
- ...normalizeMoneyValue(_, rows),
82
- ...normalizeMonthValue(_, rows),
83
- ...normalizeCurrency(_, rows),
84
- },
68
+ const normalize = useCallback(normalizeDepositParams(rows), [rows]);
85
69
 
86
- [rows],
87
- );
88
70
  const [userInputParams, { field }] = useForm(
89
71
  {
90
72
  moneyValue: getMoneyDefaultValue(defaultParams, DEPOSIT_DEFAULT_SUM),
@@ -105,7 +87,7 @@ export const CalculatorDeposit = UniBlock<CalculatorDepositProps>(
105
87
  const calcParams = getDepositCalculatorParams(userInputParams, row, paramsViewSettings);
106
88
  const { rate, income, finalSum, type = '' } = calcParams;
107
89
 
108
- const handleDefaultParamsCals = () => {
90
+ const handleDefaultParamsCals = useCallback(() => {
109
91
  setDefaultParamsCalc({
110
92
  field,
111
93
  defParams: getDefaultParamsMax(row, isNewClient) as DepositCalculatorSourceBookParams,
@@ -113,7 +95,7 @@ export const CalculatorDeposit = UniBlock<CalculatorDepositProps>(
113
95
  monthsValue: 'minMonths',
114
96
  map: MAP,
115
97
  });
116
- };
98
+ }, [field, rows]);
117
99
 
118
100
  useEffect(() => {
119
101
  if (!isDefaultParams(defaultParams) && row) {
@@ -5,6 +5,17 @@ import { type DepositParams } from './CalculatorDepositContent';
5
5
  import { type DepositCalculatorRowsData } from './getDepositCalculatorParams';
6
6
  import { isRubles } from './isRubles';
7
7
 
8
+ export const normalizeDepositParams = (rows?: DepositCalculatorRowsData[]) => (_: DepositParams) =>
9
+ !rows
10
+ ? _
11
+ : {
12
+ ..._,
13
+ ...normalizeReplenishWithdrawn(_),
14
+ ...normalizeMoneyValue(_, rows),
15
+ ...normalizeMonthValue(_, rows),
16
+ ...normalizeCurrency(_, rows),
17
+ };
18
+
8
19
  export const normalizeMonthValue = (_: DepositParams, rows?: DepositCalculatorRowsData[]) => {
9
20
  const { minMonths, maxMonths } = getRangeByKeys(
10
21
  ['minMonths', 'maxMonths'],
@@ -115,4 +115,4 @@ export const useForm = <FormState extends Record<string, any>>(
115
115
  };
116
116
 
117
117
  const shellowCompare = (a: Record<string, any>, b: Record<string, any>): boolean =>
118
- Object.keys({ ...a, ...b }).every((key) => a[key] === b[key]);
118
+ a && b && Object.keys({ ...a, ...b }).every((key) => a[key] === b[key]);
@@ -12,11 +12,15 @@ interface CalendarProps {
12
12
  min?: Date;
13
13
  max?: Date;
14
14
  onDateSelect?: (date: Date) => void;
15
+ setValue?: (value: boolean) => void;
15
16
  }
16
17
 
17
18
  export const Calendar = JSX<CalendarProps>(
18
- ({ today, currentMonth, currentYear, min, max, onDateSelect = noop }) => {
19
- const handleDateClick = useCallback((date: Date) => onDateSelect(date), []);
19
+ ({ today, currentMonth, currentYear, min, max, onDateSelect = noop, setValue = noop }) => {
20
+ const handleDateClick = useCallback((date: Date) => {
21
+ onDateSelect(date);
22
+ setValue(false);
23
+ }, []);
20
24
 
21
25
  const { firstDayOfWeek, totalDays } = useMemo(
22
26
  () => ({
@@ -71,7 +71,7 @@ export const DatePicker = JSX<DatePickerProps>(
71
71
  <div className="relative">
72
72
  {renderDatePickerForm(handleChangeVisibleCalendar, value, valid)}
73
73
  {showCalendar ? (
74
- <div className="absolute bg-white z-20 select-none">
74
+ <div className="absolute bg-white z-20 select-none bottom-full">
75
75
  <div className="flex gap-s">
76
76
  <div className="my-auto" onClick={handlePrevMonth}>
77
77
  <Icon {...ICON_PROPS} className="-rotate-90 cursor-pointer" />
@@ -1 +0,0 @@
1
- {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/components/CalculatorDeposit/utils.tsx"],"names":[],"mappings":";;AAAA,uEAAsE;AAEtE,6CAA0C;AAG1C,yCAAsC;AAE/B,MAAM,mBAAmB,GAAG,CAAC,CAAgB,EAAE,IAAkC,EAAE,EAAE;IAC1F,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,IAAA,6BAAc,EAC7C,CAAC,WAAW,EAAE,WAAW,CAAC,EAC1B,IAAA,eAAO,EAAC,IAAI,EAAE,CAAC,EAAE,QAAQ,CAAC,CAC3B,CAAC;IACF,MAAM,WAAW,GAAG,CAAC,CAAC,WAAW,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,SAAS,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC;IAE7E,OAAO,EAAE,WAAW,EAAE,IAAA,aAAK,EAAC,WAAW,EAAE,SAAS,EAAE,SAAS,CAAC,EAAE,CAAC;AACnE,CAAC,CAAC;AARW,QAAA,mBAAmB,uBAQ9B;AAEK,MAAM,mBAAmB,GAAG,CAAC,CAAgB,EAAE,IAAkC,EAAE,EAAE;IAC1F,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,IAAA,6BAAc,EAAC,CAAC,QAAQ,EAAE,QAAQ,CAAC,EAAE,IAAA,eAAO,EAAC,IAAI,EAAE,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC;IAC5F,MAAM,UAAU,GAAG,CAAC,CAAC,UAAU,IAAI,MAAM,CAAC;IAE1C,OAAO,EAAE,UAAU,EAAE,IAAA,aAAK,EAAC,UAAU,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC;AAC3D,CAAC,CAAC;AALW,QAAA,mBAAmB,uBAK9B;AACK,MAAM,iBAAiB,GAAG,CAAC,CAAgB,EAAE,IAAkC,EAAE,EAAE,CAAC,CAAC;IAC1F,QAAQ,EAAE,CAAC,EAAE,QAAQ,IAAI,IAAI,EAAE,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC;CAC/D,CAAC,CAAC;AAFU,QAAA,iBAAiB,qBAE3B;AAEI,MAAM,2BAA2B,GAAG,CAAC,CAAgB,EAAE,EAAE;IAC9D,MAAM,SAAS,GAAG,IAAA,mBAAQ,EAAC,CAAC,EAAE,QAAQ,EAAE,GAAG,CAAC,CAAC;IAE7C,OAAO,EAAE,WAAW,EAAE,SAAS,IAAI,CAAC,EAAE,WAAW,EAAE,WAAW,EAAE,SAAS,IAAI,CAAC,EAAE,WAAW,EAAE,CAAC;AAChG,CAAC,CAAC;AAJW,QAAA,2BAA2B,+BAItC;AACK,MAAM,OAAO,GAAG,CAAC,IAAkC,EAAE,aAAsB,EAAE,EAAE;IACpF,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,QAAQ,CAAC,GAAG,KAAK,aAAa,EAAE,GAAG,CAAC,IAAI,EAAE,CAAC;IAElF,OAAO,KAAK,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC;AACnC,CAAC,CAAC;AAJW,QAAA,OAAO,WAIlB"}
@@ -1 +0,0 @@
1
- {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/components/CalculatorDeposit/utils.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAC;AAEtE,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAG1C,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEtC,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,CAAgB,EAAE,IAAkC,EAAE,EAAE;IAC1F,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,cAAc,CAC7C,CAAC,WAAW,EAAE,WAAW,CAAC,EAC1B,OAAO,CAAC,IAAI,EAAE,CAAC,EAAE,QAAQ,CAAC,CAC3B,CAAC;IACF,MAAM,WAAW,GAAG,CAAC,CAAC,WAAW,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,SAAS,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC;IAE7E,OAAO,EAAE,WAAW,EAAE,KAAK,CAAC,WAAW,EAAE,SAAS,EAAE,SAAS,CAAC,EAAE,CAAC;AACnE,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,CAAgB,EAAE,IAAkC,EAAE,EAAE;IAC1F,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,cAAc,CAAC,CAAC,QAAQ,EAAE,QAAQ,CAAC,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC;IAC5F,MAAM,UAAU,GAAG,CAAC,CAAC,UAAU,IAAI,MAAM,CAAC;IAE1C,OAAO,EAAE,UAAU,EAAE,KAAK,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC;AAC3D,CAAC,CAAC;AACF,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,CAAgB,EAAE,IAAkC,EAAE,EAAE,CAAC,CAAC;IAC1F,QAAQ,EAAE,CAAC,EAAE,QAAQ,IAAI,IAAI,EAAE,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC;CAC/D,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,2BAA2B,GAAG,CAAC,CAAgB,EAAE,EAAE;IAC9D,MAAM,SAAS,GAAG,QAAQ,CAAC,CAAC,EAAE,QAAQ,EAAE,GAAG,CAAC,CAAC;IAE7C,OAAO,EAAE,WAAW,EAAE,SAAS,IAAI,CAAC,EAAE,WAAW,EAAE,WAAW,EAAE,SAAS,IAAI,CAAC,EAAE,WAAW,EAAE,CAAC;AAChG,CAAC,CAAC;AACF,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,IAAkC,EAAE,aAAsB,EAAE,EAAE;IACpF,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,QAAQ,CAAC,GAAG,KAAK,aAAa,EAAE,GAAG,CAAC,IAAI,EAAE,CAAC;IAElF,OAAO,KAAK,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC;AACnC,CAAC,CAAC"}
@@ -1,17 +0,0 @@
1
- import { type Option } from '../../ui-kit/Select/Option';
2
- import { type DepositParams } from './CalculatorDepositContent';
3
- import { type DepositCalculatorRowsData } from './getDepositCalculatorParams';
4
- export declare const normalizeMonthValue: (_: DepositParams, rows?: DepositCalculatorRowsData[]) => {
5
- monthsValue: number;
6
- };
7
- export declare const normalizeMoneyValue: (_: DepositParams, rows?: DepositCalculatorRowsData[]) => {
8
- moneyValue: number;
9
- };
10
- export declare const normalizeCurrency: (_: DepositParams, rows?: DepositCalculatorRowsData[]) => {
11
- currency: Option | undefined;
12
- };
13
- export declare const normalizeReplenishWithdrawn: (_: DepositParams) => {
14
- isReplenish: boolean | undefined;
15
- isWithdrawn: boolean | undefined;
16
- };
17
- export declare const getRows: (rows?: DepositCalculatorRowsData[], currencyValue?: Option) => import("./getDepositCalculatorParams").DepositCalculatorSourceBookParams[] | undefined;
@@ -1 +0,0 @@
1
- {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/components/CalculatorDeposit/utils.tsx"],"names":[],"mappings":";;AAAA,uEAAsE;AAEtE,6CAA0C;AAG1C,yCAAsC;AAE/B,MAAM,mBAAmB,GAAG,CAAC,CAAgB,EAAE,IAAkC,EAAE,EAAE;IAC1F,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,IAAA,6BAAc,EAC7C,CAAC,WAAW,EAAE,WAAW,CAAC,EAC1B,IAAA,eAAO,EAAC,IAAI,EAAE,CAAC,EAAE,QAAQ,CAAC,CAC3B,CAAC;IACF,MAAM,WAAW,GAAG,CAAC,CAAC,WAAW,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,SAAS,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC;IAE7E,OAAO,EAAE,WAAW,EAAE,IAAA,aAAK,EAAC,WAAW,EAAE,SAAS,EAAE,SAAS,CAAC,EAAE,CAAC;AACnE,CAAC,CAAC;AARW,QAAA,mBAAmB,uBAQ9B;AAEK,MAAM,mBAAmB,GAAG,CAAC,CAAgB,EAAE,IAAkC,EAAE,EAAE;IAC1F,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,IAAA,6BAAc,EAAC,CAAC,QAAQ,EAAE,QAAQ,CAAC,EAAE,IAAA,eAAO,EAAC,IAAI,EAAE,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC;IAC5F,MAAM,UAAU,GAAG,CAAC,CAAC,UAAU,IAAI,MAAM,CAAC;IAE1C,OAAO,EAAE,UAAU,EAAE,IAAA,aAAK,EAAC,UAAU,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC;AAC3D,CAAC,CAAC;AALW,QAAA,mBAAmB,uBAK9B;AACK,MAAM,iBAAiB,GAAG,CAAC,CAAgB,EAAE,IAAkC,EAAE,EAAE,CAAC,CAAC;IAC1F,QAAQ,EAAE,CAAC,EAAE,QAAQ,IAAI,IAAI,EAAE,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC;CAC/D,CAAC,CAAC;AAFU,QAAA,iBAAiB,qBAE3B;AAEI,MAAM,2BAA2B,GAAG,CAAC,CAAgB,EAAE,EAAE;IAC9D,MAAM,SAAS,GAAG,IAAA,mBAAQ,EAAC,CAAC,EAAE,QAAQ,EAAE,GAAG,CAAC,CAAC;IAE7C,OAAO,EAAE,WAAW,EAAE,SAAS,IAAI,CAAC,EAAE,WAAW,EAAE,WAAW,EAAE,SAAS,IAAI,CAAC,EAAE,WAAW,EAAE,CAAC;AAChG,CAAC,CAAC;AAJW,QAAA,2BAA2B,+BAItC;AACK,MAAM,OAAO,GAAG,CAAC,IAAkC,EAAE,aAAsB,EAAE,EAAE;IACpF,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,QAAQ,CAAC,GAAG,KAAK,aAAa,EAAE,GAAG,CAAC,IAAI,EAAE,CAAC;IAElF,OAAO,KAAK,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC;AACnC,CAAC,CAAC;AAJW,QAAA,OAAO,WAIlB"}
@@ -1,17 +0,0 @@
1
- import { type Option } from '../../ui-kit/Select/Option';
2
- import { type DepositParams } from './CalculatorDepositContent';
3
- import { type DepositCalculatorRowsData } from './getDepositCalculatorParams';
4
- export declare const normalizeMonthValue: (_: DepositParams, rows?: DepositCalculatorRowsData[]) => {
5
- monthsValue: number;
6
- };
7
- export declare const normalizeMoneyValue: (_: DepositParams, rows?: DepositCalculatorRowsData[]) => {
8
- moneyValue: number;
9
- };
10
- export declare const normalizeCurrency: (_: DepositParams, rows?: DepositCalculatorRowsData[]) => {
11
- currency: Option | undefined;
12
- };
13
- export declare const normalizeReplenishWithdrawn: (_: DepositParams) => {
14
- isReplenish: boolean | undefined;
15
- isWithdrawn: boolean | undefined;
16
- };
17
- export declare const getRows: (rows?: DepositCalculatorRowsData[], currencyValue?: Option) => import("./getDepositCalculatorParams").DepositCalculatorSourceBookParams[] | undefined;
@@ -1 +0,0 @@
1
- {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/components/CalculatorDeposit/utils.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAC;AAEtE,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAG1C,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEtC,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,CAAgB,EAAE,IAAkC,EAAE,EAAE;IAC1F,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,cAAc,CAC7C,CAAC,WAAW,EAAE,WAAW,CAAC,EAC1B,OAAO,CAAC,IAAI,EAAE,CAAC,EAAE,QAAQ,CAAC,CAC3B,CAAC;IACF,MAAM,WAAW,GAAG,CAAC,CAAC,WAAW,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,SAAS,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC;IAE7E,OAAO,EAAE,WAAW,EAAE,KAAK,CAAC,WAAW,EAAE,SAAS,EAAE,SAAS,CAAC,EAAE,CAAC;AACnE,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,CAAgB,EAAE,IAAkC,EAAE,EAAE;IAC1F,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,cAAc,CAAC,CAAC,QAAQ,EAAE,QAAQ,CAAC,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC;IAC5F,MAAM,UAAU,GAAG,CAAC,CAAC,UAAU,IAAI,MAAM,CAAC;IAE1C,OAAO,EAAE,UAAU,EAAE,KAAK,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC;AAC3D,CAAC,CAAC;AACF,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,CAAgB,EAAE,IAAkC,EAAE,EAAE,CAAC,CAAC;IAC1F,QAAQ,EAAE,CAAC,EAAE,QAAQ,IAAI,IAAI,EAAE,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC;CAC/D,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,2BAA2B,GAAG,CAAC,CAAgB,EAAE,EAAE;IAC9D,MAAM,SAAS,GAAG,QAAQ,CAAC,CAAC,EAAE,QAAQ,EAAE,GAAG,CAAC,CAAC;IAE7C,OAAO,EAAE,WAAW,EAAE,SAAS,IAAI,CAAC,EAAE,WAAW,EAAE,WAAW,EAAE,SAAS,IAAI,CAAC,EAAE,WAAW,EAAE,CAAC;AAChG,CAAC,CAAC;AACF,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,IAAkC,EAAE,aAAsB,EAAE,EAAE;IACpF,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,QAAQ,CAAC,GAAG,KAAK,aAAa,EAAE,GAAG,CAAC,IAAI,EAAE,CAAC;IAElF,OAAO,KAAK,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC;AACnC,CAAC,CAAC"}