@toptal/picasso-drawer 3.0.33 → 3.0.34

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":"Drawer.d.ts","sourceRoot":"","sources":["../../../src/Drawer/Drawer.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAA;AAExE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AAWtC,OAAO,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,UAAU,CAAA;AAIrD,MAAM,WAAW,KAAM,SAAQ,SAAS;IACtC,+CAA+C;IAC/C,MAAM,CAAC,EAAE,UAAU,CAAA;IACnB,qBAAqB;IACrB,QAAQ,EAAE,SAAS,CAAA;IACnB,uFAAuF;IACvF,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,6CAA6C;IAC7C,IAAI,EAAE,OAAO,CAAA;IACb,+BAA+B;IAC/B,KAAK,CAAC,EAAE,SAAS,CAAA;IACjB,+DAA+D;IAC/D,OAAO,CAAC,EAAE,MAAM,IAAI,CAAA;IACpB,sBAAsB;IACtB,KAAK,CAAC,EAAE,SAAS,CAAA;IACjB,kKAAkK;IAClK,eAAe,CAAC,EAAE,eAAe,CAAA;IACjC,iDAAiD;IACjD,sBAAsB,CAAC,EAAE,OAAO,CAAA;IAChC,yCAAyC;IACzC,mBAAmB,CAAC,EAAE,OAAO,CAAA;IAC7B,iEAAiE;IACjE,eAAe,CAAC,EAAE,OAAO,CAAA;CAC1B;AAiBD,eAAO,MAAM,MAAM;YAAW,KAAK;;;;;;;;CA2FlC,CAAA;AAWD,eAAe,MAAM,CAAA"}
1
+ {"version":3,"file":"Drawer.d.ts","sourceRoot":"","sources":["../../../src/Drawer/Drawer.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAA;AAExE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AAYtC,OAAO,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,UAAU,CAAA;AAIrD,MAAM,WAAW,KAAM,SAAQ,SAAS;IACtC,+CAA+C;IAC/C,MAAM,CAAC,EAAE,UAAU,CAAA;IACnB,qBAAqB;IACrB,QAAQ,EAAE,SAAS,CAAA;IACnB,uFAAuF;IACvF,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,6CAA6C;IAC7C,IAAI,EAAE,OAAO,CAAA;IACb,+BAA+B;IAC/B,KAAK,CAAC,EAAE,SAAS,CAAA;IACjB,+DAA+D;IAC/D,OAAO,CAAC,EAAE,MAAM,IAAI,CAAA;IACpB,sBAAsB;IACtB,KAAK,CAAC,EAAE,SAAS,CAAA;IACjB,kKAAkK;IAClK,eAAe,CAAC,EAAE,eAAe,CAAA;IACjC,iDAAiD;IACjD,sBAAsB,CAAC,EAAE,OAAO,CAAA;IAChC,yCAAyC;IACzC,mBAAmB,CAAC,EAAE,OAAO,CAAA;IAC7B,iEAAiE;IACjE,eAAe,CAAC,EAAE,OAAO,CAAA;CAC1B;AAiBD,eAAO,MAAM,MAAM;YAAW,KAAK;;;;;;;;CAkGlC,CAAA;AAWD,eAAe,MAAM,CAAA"}
@@ -1,6 +1,5 @@
1
1
  import React, { useRef } from 'react';
2
2
  import { Modal } from '@mui/base/Modal';
3
- import cx from 'classnames';
4
3
  import { useDrawer, usePicassoRoot } from '@toptal/picasso-provider';
5
4
  import { CloseMinor16 } from '@toptal/picasso-icons';
6
5
  import { ButtonCircular } from '@toptal/picasso-button';
@@ -8,6 +7,7 @@ import { Slide } from '@toptal/picasso-slide';
8
7
  import { Backdrop } from '@toptal/picasso-backdrop';
9
8
  import { Container } from '@toptal/picasso-container';
10
9
  import { useIsomorphicLayoutEffect, usePageScrollLock, } from '@toptal/picasso-utils';
10
+ import { twMerge } from '@toptal/picasso-tailwind-merge';
11
11
  import { DrawerTitle } from '../DrawerTitle';
12
12
  import { DrawerPaper } from '../DrawerPaper';
13
13
  const widthClassName = {
@@ -42,14 +42,14 @@ export const Drawer = (props) => {
42
42
  }
43
43
  };
44
44
  const backdropProps = { invisible: transparentBackdrop };
45
- return (React.createElement(Modal, { open: open, ref: ref, className: cx(className, 'z-drawer inset-0', { fixed: !disableBackdrop }), slots: {
45
+ return (React.createElement(Modal, { open: open, ref: ref, className: twMerge(className, 'z-drawer inset-0', !disableBackdrop && 'fixed'), slots: {
46
46
  backdrop: disableBackdrop ? undefined : Backdrop,
47
47
  }, slotProps: {
48
48
  backdrop: backdropProps,
49
49
  }, "data-testid": testId, "data-private": dataPrivate, style: style, closeAfterTransition: true, onClose: handleOnClose, disablePortal: disablePortal, container: container, disableScrollLock: true, disableEscapeKeyDown: false },
50
50
  React.createElement(Slide, { in: open, direction: oppositeDirection[anchor], timeout: transitionProps === null || transitionProps === void 0 ? void 0 : transitionProps.timeout, onExited: transitionProps === null || transitionProps === void 0 ? void 0 : transitionProps.onExited },
51
51
  React.createElement(DrawerPaper, { anchor: anchor },
52
- React.createElement(Container, { flex: true, direction: 'column', className: cx('max-w-full relative flex-1', widthClassName[width]) },
52
+ React.createElement(Container, { flex: true, direction: 'column', className: twMerge('max-w-full relative flex-1', widthClassName[width]) },
53
53
  React.createElement(DrawerTitle, { title: title }),
54
54
  React.createElement(Container, { flex: true, className: 'flex-1' }, children),
55
55
  React.createElement(ButtonCircular, { variant: 'flat', icon: React.createElement(CloseMinor16, null), onClick: handleOnClose, className: 'absolute right-6 top-4', "aria-label": 'Close drawer' }))))));
@@ -1 +1 @@
1
- {"version":3,"file":"Drawer.js","sourceRoot":"","sources":["../../../src/Drawer/Drawer.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,MAAM,EAAE,MAAM,OAAO,CAAA;AACrC,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAA;AACvC,OAAO,EAAE,MAAM,YAAY,CAAA;AAE3B,OAAO,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAA;AAEpE,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAA;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAA;AACvD,OAAO,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAA;AAC7C,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAA;AACnD,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAA;AACrD,OAAO,EACL,yBAAyB,EACzB,iBAAiB,GAClB,MAAM,uBAAuB,CAAA;AAG9B,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAC5C,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AA2B5C,MAAM,cAAc,GAA8B;IAChD,YAAY,EAAE,cAAc;IAC5B,MAAM,EAAE,sDAAsD;IAC9D,OAAO,EAAE,WAAW;IACpB,MAAM,EAAE,WAAW;IACnB,IAAI,EAAE,WAAW;CAClB,CAAA;AAED,MAAM,iBAAiB,GAAG;IACxB,IAAI,EAAE,OAAO;IACb,KAAK,EAAE,MAAM;IACb,GAAG,EAAE,MAAM;IACX,MAAM,EAAE,IAAI;CACJ,CAAA;AAEV,MAAM,CAAC,MAAM,MAAM,GAAG,CAAC,KAAY,EAAE,EAAE;IACrC,MAAM,EACJ,QAAQ,EACR,aAAa,EACb,IAAI,EACJ,OAAO,EACP,KAAK,EACL,KAAK,GAAG,SAAS,EACjB,eAAe,EACf,sBAAsB,GAAG,IAAI,EAC7B,mBAAmB,EACnB,eAAe,EACf,MAAM,GAAG,OAAO,EAChB,SAAS,EACT,KAAK,EACL,aAAa,EAAE,MAAM,EACrB,cAAc,EAAE,WAAW,GAC5B,GAAG,KAAK,CAAA;IACT,MAAM,EAAE,YAAY,EAAE,GAAG,SAAS,EAAE,CAAA;IACpC,MAAM,SAAS,GAAG,cAAc,EAAE,CAAA;IAClC,MAAM,GAAG,GAAG,MAAM,CAAiB,IAAI,CAAC,CAAA;IAExC,iBAAiB,CAAC,OAAO,CAAC,sBAAsB,IAAI,IAAI,CAAC,CAAC,CAAA;IAE1D,yBAAyB,CAAC,GAAG,EAAE;QAC7B,YAAY,CAAC,IAAI,CAAC,CAAA;QAElB,MAAM,OAAO,GAAG,GAAG,EAAE;YACnB,YAAY,CAAC,KAAK,CAAC,CAAA;QACrB,CAAC,CAAA;QAED,OAAO,OAAO,CAAA;IAChB,CAAC,EAAE,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC,CAAA;IAExB,MAAM,aAAa,GAAG,GAAG,EAAE;QACzB,IAAI,OAAO,EAAE;YACX,OAAO,EAAE,CAAA;SACV;IACH,CAAC,CAAA;IAED,MAAM,aAAa,GAAG,EAAE,SAAS,EAAE,mBAAmB,EAAE,CAAA;IAExD,OAAO,CACL,oBAAC,KAAK,IACJ,IAAI,EAAE,IAAI,EACV,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,EAAE,CAAC,SAAS,EAAE,kBAAkB,EAAE,EAAE,KAAK,EAAE,CAAC,eAAe,EAAE,CAAC,EACzE,KAAK,EAAE;YACL,QAAQ,EAAE,eAAe,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ;SACjD,EACD,SAAS,EAAE;YACT,QAAQ,EAAE,aAAa;SACxB,iBACY,MAAM,kBACL,WAAW,EACzB,KAAK,EAAE,KAAK,EACZ,oBAAoB,QACpB,OAAO,EAAE,aAAa,EACtB,aAAa,EAAE,aAAa,EAC5B,SAAS,EAAE,SAAS,EACpB,iBAAiB,QACjB,oBAAoB,EAAE,KAAK;QAE3B,oBAAC,KAAK,IACJ,EAAE,EAAE,IAAI,EACR,SAAS,EAAE,iBAAiB,CAAC,MAAM,CAAC,EACpC,OAAO,EAAE,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,OAAO,EACjC,QAAQ,EAAE,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,QAAQ;YAEnC,oBAAC,WAAW,IAAC,MAAM,EAAE,MAAM;gBACzB,oBAAC,SAAS,IACR,IAAI,QACJ,SAAS,EAAC,QAAQ,EAClB,SAAS,EAAE,EAAE,CAAC,4BAA4B,EAAE,cAAc,CAAC,KAAK,CAAC,CAAC;oBAElE,oBAAC,WAAW,IAAC,KAAK,EAAE,KAAK,GAAI;oBAC7B,oBAAC,SAAS,IAAC,IAAI,QAAC,SAAS,EAAC,QAAQ,IAC/B,QAAQ,CACC;oBACZ,oBAAC,cAAc,IACb,OAAO,EAAC,MAAM,EACd,IAAI,EAAE,oBAAC,YAAY,OAAG,EACtB,OAAO,EAAE,aAAa,EACtB,SAAS,EAAC,wBAAwB,gBACvB,cAAc,GACzB,CACQ,CACA,CACR,CACF,CACT,CAAA;AACH,CAAC,CAAA;AAED,MAAM,CAAC,WAAW,GAAG,QAAQ,CAAA;AAE7B,MAAM,CAAC,YAAY,GAAG;IACpB,MAAM,EAAE,OAAO;IACf,aAAa,EAAE,KAAK;IACpB,OAAO,EAAE,GAAG,EAAE,GAAE,CAAC;IACjB,KAAK,EAAE,SAAS;CACjB,CAAA;AAED,eAAe,MAAM,CAAA"}
1
+ {"version":3,"file":"Drawer.js","sourceRoot":"","sources":["../../../src/Drawer/Drawer.tsx"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"DrawerPaper.d.ts","sourceRoot":"","sources":["../../../src/DrawerPaper/DrawerPaper.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAqB,MAAM,OAAO,CAAA;AAEzC,OAAO,KAAK,EAAE,cAAc,EAAO,MAAM,OAAO,CAAA;AAGhD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAA;AAE1C,UAAU,UAAW,SAAQ,cAAc,CAAC,cAAc,CAAC;IACzD,MAAM,CAAC,EAAE,UAAU,CAAA;CACpB;AAED,QAAA,MAAM,WAAW,mFA6BhB,CAAA;AAED,eAAe,WAAW,CAAA"}
1
+ {"version":3,"file":"DrawerPaper.d.ts","sourceRoot":"","sources":["../../../src/DrawerPaper/DrawerPaper.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAqB,MAAM,OAAO,CAAA;AACzC,OAAO,KAAK,EAAE,cAAc,EAAO,MAAM,OAAO,CAAA;AAIhD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAA;AAE1C,UAAU,UAAW,SAAQ,cAAc,CAAC,cAAc,CAAC;IACzD,MAAM,CAAC,EAAE,UAAU,CAAA;CACpB;AAED,QAAA,MAAM,WAAW,mFA2BhB,CAAA;AAED,eAAe,WAAW,CAAA"}
@@ -1,13 +1,10 @@
1
1
  import React, { forwardRef } from 'react';
2
- import cx from 'classnames';
3
2
  import { Paper } from '@toptal/picasso-paper';
3
+ import { twMerge } from '@toptal/picasso-tailwind-merge';
4
4
  const DrawerPaper = forwardRef(({ children, anchor = 'right', className, style }, ref) => {
5
- return (React.createElement(Paper, { style: style, ref: ref, tabIndex: -1, elevation: 16, className: cx(className, 'fixed top-0 h-full flex flex-col outline-0 z-drawer', 'max-w-full overflow-y-auto webkit-overflow-scrolling-touch', {
6
- 'left-0 right-auto': anchor === 'left',
7
- 'left-auto right-0': anchor === 'right',
8
- 'bottom-auto top-0 left-0 right-0 h-auto max-h-full': anchor === 'top',
9
- 'bottom-0 top-auto left-0 right-0 h-auto max-h-full': anchor === 'bottom',
10
- }) }, children));
5
+ return (React.createElement(Paper, { style: style, ref: ref, tabIndex: -1, elevation: 16, className: twMerge(className, 'fixed top-0 h-full flex flex-col outline-0 z-drawer', 'max-w-full overflow-y-auto webkit-overflow-scrolling-touch', anchor === 'left' && 'left-0 right-auto', anchor === 'right' && 'left-auto right-0', anchor === 'top' &&
6
+ 'bottom-auto top-0 left-0 right-0 h-auto max-h-full', anchor === 'bottom' &&
7
+ 'bottom-0 top-auto left-0 right-0 h-auto max-h-full') }, children));
11
8
  });
12
9
  export default DrawerPaper;
13
10
  //# sourceMappingURL=DrawerPaper.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"DrawerPaper.js","sourceRoot":"","sources":["../../../src/DrawerPaper/DrawerPaper.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,UAAU,EAAE,MAAM,OAAO,CAAA;AACzC,OAAO,EAAE,MAAM,YAAY,CAAA;AAE3B,OAAO,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAA;AAQ7C,MAAM,WAAW,GAAG,UAAU,CAC5B,CACE,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,EAAE,SAAS,EAAE,KAAK,EAAc,EAC5D,GAAwB,EACxB,EAAE;IACF,OAAO,CACL,oBAAC,KAAK,IACJ,KAAK,EAAE,KAAK,EACZ,GAAG,EAAE,GAAG,EACR,QAAQ,EAAE,CAAC,CAAC,EACZ,SAAS,EAAE,EAAE,EACb,SAAS,EAAE,EAAE,CACX,SAAS,EACT,qDAAqD,EACrD,4DAA4D,EAC5D;YACE,mBAAmB,EAAE,MAAM,KAAK,MAAM;YACtC,mBAAmB,EAAE,MAAM,KAAK,OAAO;YACvC,oDAAoD,EAClD,MAAM,KAAK,KAAK;YAClB,oDAAoD,EAClD,MAAM,KAAK,QAAQ;SACtB,CACF,IAEA,QAAQ,CACH,CACT,CAAA;AACH,CAAC,CACF,CAAA;AAED,eAAe,WAAW,CAAA"}
1
+ {"version":3,"file":"DrawerPaper.js","sourceRoot":"","sources":["../../../src/DrawerPaper/DrawerPaper.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,UAAU,EAAE,MAAM,OAAO,CAAA;AAEzC,OAAO,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAA;AAC7C,OAAO,EAAE,OAAO,EAAE,MAAM,gCAAgC,CAAA;AAQxD,MAAM,WAAW,GAAG,UAAU,CAC5B,CACE,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,EAAE,SAAS,EAAE,KAAK,EAAc,EAC5D,GAAwB,EACxB,EAAE;IACF,OAAO,CACL,oBAAC,KAAK,IACJ,KAAK,EAAE,KAAK,EACZ,GAAG,EAAE,GAAG,EACR,QAAQ,EAAE,CAAC,CAAC,EACZ,SAAS,EAAE,EAAE,EACb,SAAS,EAAE,OAAO,CAChB,SAAS,EACT,qDAAqD,EACrD,4DAA4D,EAC5D,MAAM,KAAK,MAAM,IAAI,mBAAmB,EACxC,MAAM,KAAK,OAAO,IAAI,mBAAmB,EACzC,MAAM,KAAK,KAAK;YACd,oDAAoD,EACtD,MAAM,KAAK,QAAQ;YACjB,oDAAoD,CACvD,IAEA,QAAQ,CACH,CACT,CAAA;AACH,CAAC,CACF,CAAA;AAED,eAAe,WAAW,CAAA"}
@@ -1 +1 @@
1
- {"version":3,"file":"DrawerTitle.d.ts","sourceRoot":"","sources":["../../../src/DrawerTitle/DrawerTitle.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AAEtC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAA;AAIvD,MAAM,WAAW,KAAM,SAAQ,SAAS;IACtC,KAAK,CAAC,EAAE,SAAS,CAAA;CAClB;AAED,eAAO,MAAM,WAAW;gBAAe,KAAK;;CAoB3C,CAAA;AAID,eAAe,WAAW,CAAA"}
1
+ {"version":3,"file":"DrawerTitle.d.ts","sourceRoot":"","sources":["../../../src/DrawerTitle/DrawerTitle.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AAEtC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAA;AAGvD,MAAM,WAAW,KAAM,SAAQ,SAAS;IACtC,KAAK,CAAC,EAAE,SAAS,CAAA;CAClB;AAED,eAAO,MAAM,WAAW;gBAAe,KAAK;;CAgB3C,CAAA;AAID,eAAe,WAAW,CAAA"}
@@ -1,6 +1,5 @@
1
1
  import React from 'react';
2
2
  import { Typography } from '@toptal/picasso-typography';
3
- import { Container } from '@toptal/picasso-container';
4
3
  export const DrawerTitle = ({ title }) => {
5
4
  if (!title) {
6
5
  return null;
@@ -8,7 +7,7 @@ export const DrawerTitle = ({ title }) => {
8
7
  if (React.isValidElement(title)) {
9
8
  return title;
10
9
  }
11
- return (React.createElement(Container, { flex: true, alignItems: 'center', className: 'border-gray-100 border-0 border-solid border-b py-4 pr-[4rem] pl-6' },
10
+ return (React.createElement("div", { className: 'flex items-center border-gray-100 border-0 border-solid border-b py-4 pr-[4rem] pl-6' },
12
11
  React.createElement(Typography, { variant: 'heading', size: 'medium', className: 'grow' }, title)));
13
12
  };
14
13
  DrawerTitle.displayName = 'DrawerTitle';
@@ -1 +1 @@
1
- {"version":3,"file":"DrawerTitle.js","sourceRoot":"","sources":["../../../src/DrawerTitle/DrawerTitle.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AACvD,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAA;AAMrD,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,EAAE,KAAK,EAAS,EAAE,EAAE;IAC9C,IAAI,CAAC,KAAK,EAAE;QACV,OAAO,IAAI,CAAA;KACZ;IAED,IAAI,KAAK,CAAC,cAAc,CAAC,KAAK,CAAC,EAAE;QAC/B,OAAO,KAAK,CAAA;KACb;IAED,OAAO,CACL,oBAAC,SAAS,IACR,IAAI,QACJ,UAAU,EAAC,QAAQ,EACnB,SAAS,EAAC,oEAAoE;QAE9E,oBAAC,UAAU,IAAC,OAAO,EAAC,SAAS,EAAC,IAAI,EAAC,QAAQ,EAAC,SAAS,EAAC,MAAM,IACzD,KAAK,CACK,CACH,CACb,CAAA;AACH,CAAC,CAAA;AAED,WAAW,CAAC,WAAW,GAAG,aAAa,CAAA;AAEvC,eAAe,WAAW,CAAA"}
1
+ {"version":3,"file":"DrawerTitle.js","sourceRoot":"","sources":["../../../src/DrawerTitle/DrawerTitle.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AAMvD,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,EAAE,KAAK,EAAS,EAAE,EAAE;IAC9C,IAAI,CAAC,KAAK,EAAE;QACV,OAAO,IAAI,CAAA;KACZ;IAED,IAAI,KAAK,CAAC,cAAc,CAAC,KAAK,CAAC,EAAE;QAC/B,OAAO,KAAK,CAAA;KACb;IAED,OAAO,CACL,6BAAK,SAAS,EAAC,sFAAsF;QACnG,oBAAC,UAAU,IAAC,OAAO,EAAC,SAAS,EAAC,IAAI,EAAC,QAAQ,EAAC,SAAS,EAAC,MAAM,IACzD,KAAK,CACK,CACT,CACP,CAAA;AACH,CAAC,CAAA;AAED,WAAW,CAAC,WAAW,GAAG,aAAa,CAAA;AAEvC,eAAe,WAAW,CAAA"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@toptal/picasso-drawer",
3
- "version": "3.0.33",
3
+ "version": "3.0.34",
4
4
  "description": "Toptal UI components library - Drawer",
5
5
  "publishConfig": {
6
6
  "access": "public"
@@ -30,8 +30,7 @@
30
30
  "@toptal/picasso-container": "3.1.2",
31
31
  "@toptal/picasso-icons": "1.12.1",
32
32
  "@toptal/picasso-typography": "4.0.3",
33
- "@toptal/picasso-utils": "3.1.0",
34
- "classnames": "^2.5.1"
33
+ "@toptal/picasso-utils": "3.1.0"
35
34
  },
36
35
  "sideEffects": [
37
36
  "**/styles.ts",
@@ -41,13 +40,15 @@
41
40
  "@material-ui/core": "4.12.4",
42
41
  "@toptal/picasso-provider": "*",
43
42
  "@toptal/picasso-tailwind": ">=2.7",
43
+ "@toptal/picasso-tailwind-merge": "^2.0.0",
44
44
  "react": ">=16.12.0 < 19.0.0"
45
45
  },
46
46
  "exports": {
47
47
  ".": "./dist-package/src/index.js"
48
48
  },
49
49
  "devDependencies": {
50
- "@toptal/picasso-provider": "5.0.0"
50
+ "@toptal/picasso-provider": "5.0.0",
51
+ "@toptal/picasso-tailwind-merge": "2.0.3"
51
52
  },
52
53
  "files": [
53
54
  "dist-package/**",
@@ -1,6 +1,5 @@
1
1
  import React, { useRef } from 'react'
2
2
  import { Modal } from '@mui/base/Modal'
3
- import cx from 'classnames'
4
3
  import type { BaseProps, TransitionProps } from '@toptal/picasso-shared'
5
4
  import { useDrawer, usePicassoRoot } from '@toptal/picasso-provider'
6
5
  import type { ReactNode } from 'react'
@@ -13,6 +12,7 @@ import {
13
12
  useIsomorphicLayoutEffect,
14
13
  usePageScrollLock,
15
14
  } from '@toptal/picasso-utils'
15
+ import { twMerge } from '@toptal/picasso-tailwind-merge'
16
16
 
17
17
  import type { AnchorType, WidthType } from '../types'
18
18
  import { DrawerTitle } from '../DrawerTitle'
@@ -104,7 +104,11 @@ export const Drawer = (props: Props) => {
104
104
  <Modal
105
105
  open={open}
106
106
  ref={ref}
107
- className={cx(className, 'z-drawer inset-0', { fixed: !disableBackdrop })}
107
+ className={twMerge(
108
+ className,
109
+ 'z-drawer inset-0',
110
+ !disableBackdrop && 'fixed'
111
+ )}
108
112
  slots={{
109
113
  backdrop: disableBackdrop ? undefined : Backdrop,
110
114
  }}
@@ -131,7 +135,10 @@ export const Drawer = (props: Props) => {
131
135
  <Container
132
136
  flex
133
137
  direction='column'
134
- className={cx('max-w-full relative flex-1', widthClassName[width])}
138
+ className={twMerge(
139
+ 'max-w-full relative flex-1',
140
+ widthClassName[width]
141
+ )}
135
142
  >
136
143
  <DrawerTitle title={title} />
137
144
  <Container flex className='flex-1'>
@@ -1,7 +1,7 @@
1
1
  import React, { forwardRef } from 'react'
2
- import cx from 'classnames'
3
2
  import type { HTMLAttributes, Ref } from 'react'
4
3
  import { Paper } from '@toptal/picasso-paper'
4
+ import { twMerge } from '@toptal/picasso-tailwind-merge'
5
5
 
6
6
  import type { AnchorType } from '../types'
7
7
 
@@ -20,18 +20,16 @@ const DrawerPaper = forwardRef(
20
20
  ref={ref}
21
21
  tabIndex={-1}
22
22
  elevation={16}
23
- className={cx(
23
+ className={twMerge(
24
24
  className,
25
25
  'fixed top-0 h-full flex flex-col outline-0 z-drawer',
26
26
  'max-w-full overflow-y-auto webkit-overflow-scrolling-touch',
27
- {
28
- 'left-0 right-auto': anchor === 'left',
29
- 'left-auto right-0': anchor === 'right',
30
- 'bottom-auto top-0 left-0 right-0 h-auto max-h-full':
31
- anchor === 'top',
32
- 'bottom-0 top-auto left-0 right-0 h-auto max-h-full':
33
- anchor === 'bottom',
34
- }
27
+ anchor === 'left' && 'left-0 right-auto',
28
+ anchor === 'right' && 'left-auto right-0',
29
+ anchor === 'top' &&
30
+ 'bottom-auto top-0 left-0 right-0 h-auto max-h-full',
31
+ anchor === 'bottom' &&
32
+ 'bottom-0 top-auto left-0 right-0 h-auto max-h-full'
35
33
  )}
36
34
  >
37
35
  {children}
@@ -2,7 +2,6 @@ import type { ReactNode } from 'react'
2
2
  import React from 'react'
3
3
  import type { BaseProps } from '@toptal/picasso-shared'
4
4
  import { Typography } from '@toptal/picasso-typography'
5
- import { Container } from '@toptal/picasso-container'
6
5
 
7
6
  export interface Props extends BaseProps {
8
7
  title?: ReactNode
@@ -18,15 +17,11 @@ export const DrawerTitle = ({ title }: Props) => {
18
17
  }
19
18
 
20
19
  return (
21
- <Container
22
- flex
23
- alignItems='center'
24
- className='border-gray-100 border-0 border-solid border-b py-4 pr-[4rem] pl-6'
25
- >
20
+ <div className='flex items-center border-gray-100 border-0 border-solid border-b py-4 pr-[4rem] pl-6'>
26
21
  <Typography variant='heading' size='medium' className='grow'>
27
22
  {title}
28
23
  </Typography>
29
- </Container>
24
+ </div>
30
25
  )
31
26
  }
32
27
 
@@ -1,4 +0,0 @@
1
- import type { Theme } from '@material-ui/core/styles';
2
- declare const _default: ({ palette }: Theme) => import("@material-ui/styles").StyleRules<{}, "header">;
3
- export default _default;
4
- //# sourceMappingURL=styles.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"styles.d.ts","sourceRoot":"","sources":["../../../src/DrawerTitle/styles.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAA;sCAGxB,KAAK;AAAlC,wBAMI"}
@@ -1,8 +0,0 @@
1
- import { createStyles } from '@material-ui/core/styles';
2
- export default ({ palette }) => createStyles({
3
- header: {
4
- borderBottom: `1px solid ${palette.grey.lighter}`,
5
- padding: '1rem 4rem 1rem 1.5rem',
6
- },
7
- });
8
- //# sourceMappingURL=styles.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"styles.js","sourceRoot":"","sources":["../../../src/DrawerTitle/styles.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AAEvD,eAAe,CAAC,EAAE,OAAO,EAAS,EAAE,EAAE,CACpC,YAAY,CAAC;IACX,MAAM,EAAE;QACN,YAAY,EAAE,aAAa,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE;QACjD,OAAO,EAAE,uBAAuB;KACjC;CACF,CAAC,CAAA"}
@@ -1,10 +0,0 @@
1
- import type { Theme } from '@material-ui/core/styles'
2
- import { createStyles } from '@material-ui/core/styles'
3
-
4
- export default ({ palette }: Theme) =>
5
- createStyles({
6
- header: {
7
- borderBottom: `1px solid ${palette.grey.lighter}`,
8
- padding: '1rem 4rem 1rem 1.5rem',
9
- },
10
- })