@modul/mbui 0.0.19-beta-pv-53151-a141d744 → 0.0.19-beta-pv-53151-acf19c73
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/Button/ButtonWidget.js +1 -1
- package/dist/Button/ButtonWidget.js.map +1 -1
- package/dist/DatePicker/DatePicker.d.ts +1 -0
- package/dist/DatePicker/DatePicker.js +2 -2
- package/dist/DatePicker/DatePicker.js.map +1 -1
- package/package.json +1 -1
- package/src/Button/ButtonWidget.tsx +1 -2
- package/src/DatePicker/DatePicker.tsx +3 -2
|
@@ -27,7 +27,7 @@ const Icon = ({ children }) => {
|
|
|
27
27
|
return React.createElement("span", { className: "flex justify-center items-center bg-primary-light [&+span]:ml-[16px] rounded-full text-primary size-[40px]" }, children);
|
|
28
28
|
};
|
|
29
29
|
const Content = ({ children, className }) => {
|
|
30
|
-
return React.createElement("span", { className: className }, children);
|
|
30
|
+
return React.createElement("span", { className: (0, utils_1.cn)('text-dark', className) }, children);
|
|
31
31
|
};
|
|
32
32
|
const ButtonWidget = ({ className, asChild = false, ...props }) => {
|
|
33
33
|
const Comp = asChild ? react_slot_1.Slot : 'button';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ButtonWidget.js","sourceRoot":"","sources":["../../src/Button/ButtonWidget.tsx"],"names":[],"mappings":";;;;AAAA,0DAA8B;AAC9B,qDAA2C;AAE3C,0CAAmC;AAEnC,MAAM,aAAa,GAAG;;;;;;;;;;;;;;;;;CAiBrB,CAAA;AAWD,MAAM,IAAI,GAAqB,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE;IAC/C,OAAO,8BAAM,SAAS,EAAC,4GAA4G,IAAE,QAAQ,CAAQ,CAAA;AACtJ,CAAC,CAAA;AAED,MAAM,OAAO,GAAqB,CAAC,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE,EAAE;IAC7D,OAAO,8BAAM,SAAS,EAAE,SAAS,IAAG,QAAQ,CAAQ,CAAA;
|
|
1
|
+
{"version":3,"file":"ButtonWidget.js","sourceRoot":"","sources":["../../src/Button/ButtonWidget.tsx"],"names":[],"mappings":";;;;AAAA,0DAA8B;AAC9B,qDAA2C;AAE3C,0CAAmC;AAEnC,MAAM,aAAa,GAAG;;;;;;;;;;;;;;;;;CAiBrB,CAAA;AAWD,MAAM,IAAI,GAAqB,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE;IAC/C,OAAO,8BAAM,SAAS,EAAC,4GAA4G,IAAE,QAAQ,CAAQ,CAAA;AACtJ,CAAC,CAAA;AAED,MAAM,OAAO,GAAqB,CAAC,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE,EAAE;IAC7D,OAAO,8BAAM,SAAS,EAAE,IAAA,UAAE,EAAC,WAAW,EAAE,SAAS,CAAC,IAAG,QAAQ,CAAQ,CAAA;AACtE,CAAC,CAAA;AAQD,MAAM,YAAY,GAA+C,CAAC,EAAE,SAAS,EAAE,OAAO,GAAG,KAAK,EAAE,GAAG,KAAK,EAAE,EAAE,EAAE;IAC5G,MAAM,IAAI,GAAG,OAAO,CAAC,CAAC,CAAC,iBAAI,CAAC,CAAC,CAAC,QAAQ,CAAA;IACtC,OAAO,CACN,oBAAC,IAAI,IACJ,SAAS,EAAE,IAAA,UAAE,EAAC,aAAa,EAAE,SAAS,CAAC,KACnC,KAAK,GACR,CACF,CAAA;AACF,CAAC,CAAA;AAWO,oCAAY;AARrB,YAAY,CAAC,WAAW,GAAG,cAAc,CAAA;AAEzC,YAAY,CAAC,IAAI,GAAG,IAAI,CAAA;AACxB,YAAY,CAAC,IAAI,CAAC,WAAW,GAAG,mBAAmB,CAAA;AAEnD,YAAY,CAAC,OAAO,GAAG,OAAO,CAAA;AAC9B,YAAY,CAAC,OAAO,CAAC,WAAW,GAAG,sBAAsB,CAAA"}
|
|
@@ -10,11 +10,11 @@ const Icon_1 = require("../../src/Icon");
|
|
|
10
10
|
const Popover_1 = require("../../src/Popover");
|
|
11
11
|
const locale_1 = require("date-fns/locale");
|
|
12
12
|
const trigegrClasses = 'inline-flex items-center px-[12px] h-[44px] text-left border-input border rounded-sm';
|
|
13
|
-
const DatePicker = ({ placeholder, triggerDisabled, date, classTrigger, ...props }) => {
|
|
13
|
+
const DatePicker = ({ placeholder, triggerDisabled, date, classTrigger, dateFormat = 'PPP', ...props }) => {
|
|
14
14
|
return (React.createElement(Popover_1.Popover, null,
|
|
15
15
|
React.createElement(Popover_1.Popover.Trigger, { asChild: true },
|
|
16
16
|
React.createElement("button", { className: (0, utils_1.cn)(trigegrClasses, { 'bg-light text-light': triggerDisabled }, classTrigger), disabled: triggerDisabled },
|
|
17
|
-
date ? React.createElement("span", { className: 'w-[calc(100%-26px)] truncate' }, (0, date_fns_1.format)(date,
|
|
17
|
+
date ? React.createElement("span", { className: 'w-[calc(100%-26px)] truncate' }, (0, date_fns_1.format)(date, dateFormat, { locale: locale_1.ru })) : React.createElement("span", { className: 'w-[calc(100%-26px)] text-light truncate' }, placeholder),
|
|
18
18
|
React.createElement(Icon_1.Calendar, { width: 18, height: 18, className: "ml-[8px] text-light shrink-0" }))),
|
|
19
19
|
React.createElement(Popover_1.Popover.Content, { className: "bg-page p-0 w-auto", align: "center" },
|
|
20
20
|
React.createElement(Calendar_1.Calendar, { ...props }))));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DatePicker.js","sourceRoot":"","sources":["../../src/DatePicker/DatePicker.tsx"],"names":[],"mappings":";;;;AAAA,0DAA8B;AAC9B,uCAAiC;AACjC,0CAAmC;AACnC,iDAA6C;AAC7C,yCAAyD;AACzD,+CAA2C;AAC3C,4CAAoC;AAEpC,MAAM,cAAc,GAAG,sFAAsF,CAAA;
|
|
1
|
+
{"version":3,"file":"DatePicker.js","sourceRoot":"","sources":["../../src/DatePicker/DatePicker.tsx"],"names":[],"mappings":";;;;AAAA,0DAA8B;AAC9B,uCAAiC;AACjC,0CAAmC;AACnC,iDAA6C;AAC7C,yCAAyD;AACzD,+CAA2C;AAC3C,4CAAoC;AAEpC,MAAM,cAAc,GAAG,sFAAsF,CAAA;AAY7G,MAAM,UAAU,GAAqB,CAAC,EAAC,WAAW,EAAE,eAAe,EAAE,IAAI,EAAE,YAAY,EAAE,UAAU,GAAG,KAAK,EAAI,GAAG,KAAK,EAAC,EAAE,EAAE;IAE3H,OAAO,CACN,oBAAC,iBAAO;QACP,oBAAC,iBAAO,CAAC,OAAO,IAAC,OAAO;YACvB,gCAAQ,SAAS,EAAE,IAAA,UAAE,EAAC,cAAc,EAAE,EAAC,qBAAqB,EAAC,eAAe,EAAC,EAAE,YAAY,CAAC,EAAE,QAAQ,EAAE,eAAe;gBACrH,IAAI,CAAC,CAAC,CAAC,8BAAM,SAAS,EAAC,8BAA8B,IAAE,IAAA,iBAAM,EAAC,IAAI,EAAE,UAAU,EAAE,EAAC,MAAM,EAAE,WAAE,EAAC,CAAC,CAAQ,CAAC,CAAC,CAAC,8BAAM,SAAS,EAAC,yCAAyC,IAAE,WAAW,CAAQ;gBACvL,oBAAC,eAAY,IAAC,KAAK,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,SAAS,EAAC,8BAA8B,GAAG,CACxE,CACQ;QAClB,oBAAC,iBAAO,CAAC,OAAO,IACf,SAAS,EAAC,oBAAoB,EAC9B,KAAK,EAAC,QAAQ;YAEd,oBAAC,mBAAQ,OAAK,KAAK,GAAG,CACL,CACT,CACV,CAAA;AACF,CAAC,CAAA;AAEQ,gCAAU"}
|
package/package.json
CHANGED
|
@@ -36,7 +36,7 @@ const Icon: React.FC<IProps> = ({ children }) => {
|
|
|
36
36
|
}
|
|
37
37
|
|
|
38
38
|
const Content: React.FC<IProps> = ({ children, className }) => {
|
|
39
|
-
return <span className={className}>{children}</span>
|
|
39
|
+
return <span className={cn('text-dark', className)}>{children}</span>
|
|
40
40
|
}
|
|
41
41
|
|
|
42
42
|
interface IButtonWidgetProps {
|
|
@@ -47,7 +47,6 @@ interface IButtonWidgetProps {
|
|
|
47
47
|
|
|
48
48
|
const ButtonWidget: React.FC<ButtonProps> & IButtonWidgetProps = ({ className, asChild = false, ...props }) => {
|
|
49
49
|
const Comp = asChild ? Slot : 'button'
|
|
50
|
-
|
|
51
50
|
return (
|
|
52
51
|
<Comp
|
|
53
52
|
className={cn(buttonClasses, className)}
|
|
@@ -9,6 +9,7 @@ import { ru } from 'date-fns/locale'
|
|
|
9
9
|
const trigegrClasses = 'inline-flex items-center px-[12px] h-[44px] text-left border-input border rounded-sm'
|
|
10
10
|
|
|
11
11
|
interface IProps {
|
|
12
|
+
dateFormat?: any,
|
|
12
13
|
mode?: any;
|
|
13
14
|
placeholder?: string,
|
|
14
15
|
date?: Date,
|
|
@@ -17,13 +18,13 @@ interface IProps {
|
|
|
17
18
|
onSelect?: (value: Date) => void
|
|
18
19
|
}
|
|
19
20
|
|
|
20
|
-
const DatePicker: React.FC<IProps> = ({placeholder, triggerDisabled, date, classTrigger,
|
|
21
|
+
const DatePicker: React.FC<IProps> = ({placeholder, triggerDisabled, date, classTrigger, dateFormat = 'PPP', ...props}) => {
|
|
21
22
|
|
|
22
23
|
return (
|
|
23
24
|
<Popover>
|
|
24
25
|
<Popover.Trigger asChild>
|
|
25
26
|
<button className={cn(trigegrClasses, {'bg-light text-light':triggerDisabled}, classTrigger)} disabled={triggerDisabled}>
|
|
26
|
-
{date ? <span className='w-[calc(100%-26px)] truncate'>{format(date ,
|
|
27
|
+
{date ? <span className='w-[calc(100%-26px)] truncate'>{format(date ,dateFormat, {locale: ru})}</span> : <span className='w-[calc(100%-26px)] text-light truncate'>{placeholder}</span>}
|
|
27
28
|
<CalendarIcon width={18} height={18} className="ml-[8px] text-light shrink-0" />
|
|
28
29
|
</button>
|
|
29
30
|
</Popover.Trigger>
|