@toptal/picasso-page 5.2.1 → 5.2.2
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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SidebarMenu.d.ts","sourceRoot":"","sources":["../../../src/SidebarMenu/SidebarMenu.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAA;AAEvD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,OAAO,CAAA;AAC3C,OAAO,KAA6C,MAAM,OAAO,CAAA;AAOjE,MAAM,WAAW,KAAM,SAAQ,SAAS,EAAE,cAAc,CAAC,gBAAgB,CAAC;IACxE,0DAA0D;IAC1D,MAAM,CAAC,EAAE,OAAO,CAAA;CACjB;AAED,eAAO,MAAM,WAAW,
|
|
1
|
+
{"version":3,"file":"SidebarMenu.d.ts","sourceRoot":"","sources":["../../../src/SidebarMenu/SidebarMenu.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAA;AAEvD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,OAAO,CAAA;AAC3C,OAAO,KAA6C,MAAM,OAAO,CAAA;AAOjE,MAAM,WAAW,KAAM,SAAQ,SAAS,EAAE,cAAc,CAAC,gBAAgB,CAAC;IACxE,0DAA0D;IAC1D,MAAM,CAAC,EAAE,OAAO,CAAA;CACjB;AAED,eAAO,MAAM,WAAW,gFAqEvB,CAAA;AAQD,eAAe,WAAW,CAAA"}
|
|
@@ -9,7 +9,7 @@ var __rest = (this && this.__rest) || function (s, e) {
|
|
|
9
9
|
}
|
|
10
10
|
return t;
|
|
11
11
|
};
|
|
12
|
-
import
|
|
12
|
+
import { twMerge } from '@toptal/picasso-tailwind-merge';
|
|
13
13
|
import React, { forwardRef, useCallback, useEffect } from 'react';
|
|
14
14
|
import { Menu } from '@toptal/picasso-menu';
|
|
15
15
|
import { useSidebarContext } from '../PageSidebar/SidebarContextProvider';
|
|
@@ -44,10 +44,7 @@ export const SidebarMenu = forwardRef(function SidebarMenu(props, ref) {
|
|
|
44
44
|
}
|
|
45
45
|
return child;
|
|
46
46
|
});
|
|
47
|
-
return (React.createElement(Menu, Object.assign({}, rest, { allowNestedNavigation: false, ref: ref, style: style, className:
|
|
48
|
-
['order-[99]']: bottom,
|
|
49
|
-
['p-2']: parentMenu === null || parentMenu === void 0 ? void 0 : parentMenu.compact,
|
|
50
|
-
}, className) }), items));
|
|
47
|
+
return (React.createElement(Menu, Object.assign({}, rest, { allowNestedNavigation: false, ref: ref, style: style, className: twMerge('shadow-0 order-1 [&_&]:flex-1 flex-grow-0 flex-shrink-1 max-w-full', bottom && 'order-[99]', (parentMenu === null || parentMenu === void 0 ? void 0 : parentMenu.compact) && 'p-2', className) }), items));
|
|
51
48
|
});
|
|
52
49
|
SidebarMenu.defaultProps = {
|
|
53
50
|
bottom: false,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SidebarMenu.js","sourceRoot":"","sources":["../../../src/SidebarMenu/SidebarMenu.tsx"],"names":[],"mappings":";;;;;;;;;;;AACA,OAAO,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"SidebarMenu.js","sourceRoot":"","sources":["../../../src/SidebarMenu/SidebarMenu.tsx"],"names":[],"mappings":";;;;;;;;;;;AACA,OAAO,EAAE,OAAO,EAAE,MAAM,gCAAgC,CAAA;AAExD,OAAO,KAAK,EAAE,EAAE,UAAU,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AACjE,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAA;AAE3C,OAAO,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAA;AAEzE,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAA;AAOlD,MAAM,CAAC,MAAM,WAAW,GAAG,UAAU,CACnC,SAAS,WAAW,CAAC,KAAK,EAAE,GAAG;IAC7B,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,QAAQ,KAAc,KAAK,EAAd,IAAI,UAAK,KAAK,EAAvD,4CAA+C,CAAQ,CAAA;IAC7D,MAAM,EAAE,sBAAsB,EAAE,SAAS,EAAE,UAAU,EAAE,GACrD,iBAAiB,EAAE,CAAA;IAErB,MAAM,EACJ,OAAO,EACP,eAAe,EACf,kBAAkB,EAClB,WAAW,EAAE,kBAAkB,GAChC,GAAG,iBAAiB,EAAE,CAAA;IAEvB,MAAM,iBAAiB,GAAG,WAAW,CAAC,kBAAkB,EAAE;QACxD,kBAAkB;KACnB,CAAC,CAAA;IAEF,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,eAAe,GAAG,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,IAAI,CAC3D,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,cAAc,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,KAAK,CAAC,QAAQ,CAC7D,CAAA;QAED,IAAI,eAAe,IAAI,sBAAsB,KAAK,SAAS,EAAE;YAC3D,kBAAkB,CAAC,sBAAsB,CAAC,CAAA;SAC3C;IACH,CAAC,EAAE,CAAC,sBAAsB,EAAE,kBAAkB,EAAE,QAAQ,CAAC,CAAC,CAAA;IAE1D,MAAM,KAAK,GAAG,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;QAC1D,IAAI,KAAK,CAAC,cAAc,CAAC,KAAK,CAAC,EAAE;YAC/B,MAAM,SAAS,GAA8B;gBAC3C,OAAO;gBACP,SAAS;gBACT,OAAO,EAAE,kBAAkB,IAAI,CAAC,SAAS;aAC1C,CAAA;YAED,MAAM,eAAe,GAA8B;gBACjD,KAAK;gBACL,MAAM,EAAE,iBAAiB;gBACzB,UAAU,EAAE,eAAe,KAAK,KAAK;aACtC,CAAA;YAED,MAAM,QAAQ,mCACT,SAAS,GACT,CAAC,KAAK,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,CAAC,CACpD,CAAA;YAED,OAAO,KAAK,CAAC,YAAY,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAA;SAC3C;QAED,OAAO,KAAK,CAAA;IACd,CAAC,CAAC,CAAA;IAEF,OAAO,CACL,oBAAC,IAAI,oBACC,IAAI,IACR,qBAAqB,EAAE,KAAK,EAC5B,GAAG,EAAE,GAAG,EACR,KAAK,EAAE,KAAK,EACZ,SAAS,EAAE,OAAO,CAChB,oEAAoE,EACpE,MAAM,IAAI,YAAY,EACtB,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,OAAO,KAAI,KAAK,EAC5B,SAAS,CACV,KAEA,KAAK,CACD,CACR,CAAA;AACH,CAAC,CACF,CAAA;AAED,WAAW,CAAC,YAAY,GAAG;IACzB,MAAM,EAAE,KAAK;CACd,CAAA;AAED,WAAW,CAAC,WAAW,GAAG,aAAa,CAAA;AAEvC,eAAe,WAAW,CAAA"}
|
package/package.json
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { BaseProps } from '@toptal/picasso-shared'
|
|
2
|
-
import
|
|
2
|
+
import { twMerge } from '@toptal/picasso-tailwind-merge'
|
|
3
3
|
import type { HTMLAttributes } from 'react'
|
|
4
4
|
import React, { forwardRef, useCallback, useEffect } from 'react'
|
|
5
5
|
import { Menu } from '@toptal/picasso-menu'
|
|
@@ -71,12 +71,10 @@ export const SidebarMenu = forwardRef<HTMLUListElement, Props>(
|
|
|
71
71
|
allowNestedNavigation={false}
|
|
72
72
|
ref={ref}
|
|
73
73
|
style={style}
|
|
74
|
-
className={
|
|
74
|
+
className={twMerge(
|
|
75
75
|
'shadow-0 order-1 [&_&]:flex-1 flex-grow-0 flex-shrink-1 max-w-full',
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
['p-2']: parentMenu?.compact,
|
|
79
|
-
},
|
|
76
|
+
bottom && 'order-[99]',
|
|
77
|
+
parentMenu?.compact && 'p-2',
|
|
80
78
|
className
|
|
81
79
|
)}
|
|
82
80
|
>
|