@toptal/picasso-popper 1.1.1-alpha-HG-917-fix-overlapping-sidebar-295fb9c4b.9 → 1.1.1-alpha-HG-917-fix-overlapping-sidebar-3957b1ee3.11
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":"Popper.d.ts","sourceRoot":"","sources":["../../../src/Popper/Popper.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AACtC,OAAO,KAAiC,MAAM,OAAO,CAAA;
|
|
1
|
+
{"version":3,"file":"Popper.d.ts","sourceRoot":"","sources":["../../../src/Popper/Popper.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AACtC,OAAO,KAAiC,MAAM,OAAO,CAAA;AAErD,OAAO,KAAK,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,WAAW,CAAA;AAC/D,OAAO,KAAK,QAAQ,MAAM,WAAW,CAAA;AACrC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAA;AAOvD,oBAAY,mBAAmB,GAC3B,YAAY,GACZ,cAAc,GACd,QAAQ,GACR,UAAU,GACV,YAAY,GACZ,MAAM,GACN,WAAW,GACX,aAAa,GACb,OAAO,GACP,SAAS,GACT,WAAW,GACX,KAAK,CAAA;AAET,MAAM,WAAW,KAAM,SAAQ,SAAS;IACtC,QAAQ,CAAC,EAAE,SAAS,CAAA;IACpB,qCAAqC;IACrC,IAAI,EAAE,OAAO,CAAA;IACb,sFAAsF;IACtF,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,uBAAuB;IACvB,SAAS,CAAC,EAAE,mBAAmB,CAAA;IAC/B,iDAAiD;IACjD,aAAa,CAAC,EAAE,aAAa,CAAA;IAC7B,+CAA+C;IAC/C,WAAW,CAAC,EAAE,OAAO,CAAA;IACrB;;;;OAIG;IACH,SAAS,CAAC,EAAE,WAAW,GAAG,CAAC,MAAM,WAAW,CAAC,CAAA;IAC7C;;;OAGG;IACH,QAAQ,EAAE,IAAI,GAAG,eAAe,GAAG,CAAC,MAAM,eAAe,CAAC,CAAA;IAC1D,0DAA0D;IAC1D,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,mBAAmB;IACnB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,yDAAyD;IACzD,iBAAiB,CAAC,EAAE,OAAO,CAAA;CAC5B;AAoBD,eAAO,MAAM,gBAAgB,kBACZ,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAiB5B,CAAA;AAqBF,eAAO,MAAM,MAAM,wEAkEjB,CAAA;AAYF,eAAe,MAAM,CAAA"}
|
|
@@ -10,12 +10,12 @@ var __rest = (this && this.__rest) || function (s, e) {
|
|
|
10
10
|
return t;
|
|
11
11
|
};
|
|
12
12
|
import React, { forwardRef, useContext } from 'react';
|
|
13
|
-
import cx from 'classnames';
|
|
14
13
|
import { Popper as MUIPopper } from '@material-ui/core';
|
|
15
14
|
import { useIsomorphicLayoutEffect } from '@toptal/picasso-shared';
|
|
16
15
|
import { usePicassoRoot, useBreakpoint } from '@toptal/picasso-provider';
|
|
17
16
|
import { useWidthOf } from '@toptal/picasso-utils';
|
|
18
17
|
import ModalContext from '@toptal/picasso-modal-context';
|
|
18
|
+
import { twMerge } from '@toptal/picasso-tailwind-merge';
|
|
19
19
|
const getAnchorEl = (anchorEl) => (typeof anchorEl === 'function' ? anchorEl() : anchorEl);
|
|
20
20
|
const getPreventOverflowOptions = (isInsideModal) => {
|
|
21
21
|
if (isInsideModal) {
|
|
@@ -62,7 +62,7 @@ export const Popper = forwardRef(function Popper(props, ref) {
|
|
|
62
62
|
}
|
|
63
63
|
}, [isCompactLayout, open]);
|
|
64
64
|
const memoizedPopperOptions = React.useMemo(() => getPopperOptions(popperOptions, isInsideModal), [popperOptions, isInsideModal]);
|
|
65
|
-
return (React.createElement(MUIPopper, Object.assign({ open: open, container: container || picassoRootContainer, anchorEl: anchorEl, className:
|
|
65
|
+
return (React.createElement(MUIPopper, Object.assign({ open: open, container: container || picassoRootContainer, anchorEl: anchorEl, className: twMerge('z-modal', 'xs:max-md:w-screen xs:max-md:max-w-screen xs:max-md:p-0 xs:max-md:m-0', '[&[x-out-of-boundaries]]:hidden', className), popperRef: ref, popperOptions: memoizedPopperOptions, disablePortal: disablePortal, keepMounted: keepMounted, style: Object.assign(Object.assign({}, style), anchorElWidthStyle) }, rest), children));
|
|
66
66
|
});
|
|
67
67
|
Popper.defaultProps = {
|
|
68
68
|
open: false,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Popper.js","sourceRoot":"","sources":["../../../src/Popper/Popper.tsx"],"names":[],"mappings":";;;;;;;;;;;AACA,OAAO,KAAK,EAAE,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,OAAO,CAAA;AACrD,OAAO,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"Popper.js","sourceRoot":"","sources":["../../../src/Popper/Popper.tsx"],"names":[],"mappings":";;;;;;;;;;;AACA,OAAO,KAAK,EAAE,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,OAAO,CAAA;AACrD,OAAO,EAAE,MAAM,IAAI,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAIvD,OAAO,EAAE,yBAAyB,EAAE,MAAM,wBAAwB,CAAA;AAClE,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAA;AACxE,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAA;AAClD,OAAO,YAAY,MAAM,+BAA+B,CAAA;AACxD,OAAO,EAAE,OAAO,EAAE,MAAM,gCAAgC,CAAA;AA+CxD,MAAM,WAAW,GAAG,CAClB,QAA0D,EAC1D,EAAE,CAAC,CAAC,OAAO,QAAQ,KAAK,UAAU,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAA;AAE7D,MAAM,yBAAyB,GAAG,CAAC,aAAsB,EAAE,EAAE;IAC3D,IAAI,aAAa,EAAE;QACjB,OAAO;YACL,iBAAiB,EAAE,cAAc;YACjC,OAAO,EAAE,CAAC;SACX,CAAA;KACF;IAED,OAAO;QACL,iBAAiB,EAAE,UAAU;QAC7B,OAAO,EAAE,CAAC;KACX,CAAA;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAC9B,aAA4B,EAC5B,aAAa,GAAG,KAAK,EACrB,EAAE;;IAAC,OAAA,iCACA,aAAa,KAEhB,SAAS,kCACJ,aAAa,CAAC,SAAS,KAC1B,IAAI,kBACF,OAAO,EAAE,IAAI,IACV,MAAA,aAAa,CAAC,SAAS,0CAAE,IAAI,GAElC,eAAe,gCACb,OAAO,EAAE,IAAI,IACV,yBAAyB,CAAC,aAAa,CAAC,GACxC,MAAA,aAAa,CAAC,SAAS,0CAAE,eAAe,QAG/C,CAAA;CAAA,CAAA;AAEF,MAAM,aAAa,GAAG,CAAC,EACrB,QAAQ,EACR,SAAS,EACT,KAAK,GAC2C,EAAE,EAAE;IACpD,MAAM,gBAAgB,GAAG,WAAW,CAAC,QAAQ,CAAC,CAAA;IAC9C,MAAM,aAAa,GAAG,UAAU,CAAkB,gBAAgB,CAAC,CAAA;IAEnE,IAAI,KAAK,EAAE;QACT,OAAO,EAAE,KAAK,EAAE,CAAA;KACjB;IAED,IAAI,SAAS,EAAE;QACb,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,CAAA;KAChC;IAED,OAAO,EAAE,CAAA;AACX,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,MAAM,GAAG,UAAU,CAAkB,SAAS,MAAM,CAAC,KAAK,EAAE,GAAG;IAC1E,MAAM,EACJ,QAAQ,EACR,IAAI,EACJ,QAAQ,EACR,SAAS,EACT,SAAS,EACT,aAAa,GAAG,EAAE,EAClB,WAAW,EACX,SAAS,EACT,KAAK,EACL,iBAAiB,EACjB,aAAa,EACb,KAAK,KAEH,KAAK,EADJ,IAAI,UACL,KAAK,EAdH,+JAcL,CAAQ,CAAA;IAET,MAAM,oBAAoB,GAAG,cAAc,EAAE,CAAA;IAC7C,MAAM,aAAa,GAAG,UAAU,CAAC,YAAY,CAAC,CAAA;IAE9C,MAAM,yBAAyB,GAAG,aAAa,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAA;IACnE,MAAM,eAAe,GAAG,iBAAiB,IAAI,yBAAyB,CAAA;IACtE,MAAM,UAAU,GAAG,aAAa,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAA;IAChE,MAAM,kBAAkB,GAAG,CAAC,eAAe,IAAI,UAAU,CAAA;IAEzD,yBAAyB,CAAC,GAAG,EAAE;QAC7B,IAAI,eAAe,IAAI,IAAI,IAAI,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,KAAK,MAAM,EAAE;YACtE,MAAM,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAA;YAEzC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,GAAG,MAAM,CAAA;YAErC,OAAO,GAAG,EAAE;gBACV,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,GAAG,IAAI,CAAA;YACrC,CAAC,CAAA;SACF;IACH,CAAC,EAAE,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC,CAAA;IAE3B,MAAM,qBAAqB,GAAG,KAAK,CAAC,OAAO,CACzC,GAAG,EAAE,CAAC,gBAAgB,CAAC,aAAa,EAAE,aAAa,CAAC,EACpD,CAAC,aAAa,EAAE,aAAa,CAAC,CAC/B,CAAA;IAED,OAAO,CACL,oBAAC,SAAS,kBACR,IAAI,EAAE,IAAI,EACV,SAAS,EAAE,SAAS,IAAI,oBAAoB,EAC5C,QAAQ,EAAE,QAAQ,EAClB,SAAS,EAAE,OAAO,CAChB,SAAS,EACT,uEAAuE,EACvE,iCAAiC,EACjC,SAAS,CACV,EACD,SAAS,EAAE,GAAG,EACd,aAAa,EAAE,qBAAqB,EACpC,aAAa,EAAE,aAAa,EAC5B,WAAW,EAAE,WAAW,EACxB,KAAK,kCACA,KAAK,GACL,kBAAkB,KAEnB,IAAI,GAEP,QAAQ,CACC,CACb,CAAA;AACH,CAAC,CAAC,CAAA;AAEF,MAAM,CAAC,YAAY,GAAG;IACpB,IAAI,EAAE,KAAK;IACX,aAAa,EAAE,KAAK;IACpB,SAAS,EAAE,QAAQ;IACnB,aAAa,EAAE,EAAE;IACjB,SAAS,EAAE,IAAI;CAChB,CAAA;AAED,MAAM,CAAC,WAAW,GAAG,QAAQ,CAAA;AAE7B,eAAe,MAAM,CAAA"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@toptal/picasso-popper",
|
|
3
|
-
"version": "1.1.1-alpha-HG-917-fix-overlapping-sidebar-
|
|
3
|
+
"version": "1.1.1-alpha-HG-917-fix-overlapping-sidebar-3957b1ee3.11+3957b1ee3",
|
|
4
4
|
"description": "Toptal UI components library - Popper",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"access": "public"
|
|
@@ -22,22 +22,19 @@
|
|
|
22
22
|
},
|
|
23
23
|
"homepage": "https://github.com/toptal/picasso/tree/master/packages/picasso#readme",
|
|
24
24
|
"dependencies": {
|
|
25
|
-
"@toptal/picasso-modal-context": "1.0.2-alpha-HG-917-fix-overlapping-sidebar-
|
|
26
|
-
"@toptal/picasso-shared": "15.0.1-alpha-HG-917-fix-overlapping-sidebar-
|
|
27
|
-
"@toptal/picasso-utils": "3.1.1-alpha-HG-917-fix-overlapping-sidebar-
|
|
28
|
-
|
|
29
|
-
},
|
|
30
|
-
"sideEffects": [
|
|
31
|
-
"**/styles.ts",
|
|
32
|
-
"**/styles.js"
|
|
33
|
-
],
|
|
25
|
+
"@toptal/picasso-modal-context": "1.0.2-alpha-HG-917-fix-overlapping-sidebar-3957b1ee3.459+3957b1ee3",
|
|
26
|
+
"@toptal/picasso-shared": "15.0.1-alpha-HG-917-fix-overlapping-sidebar-3957b1ee3.357+3957b1ee3",
|
|
27
|
+
"@toptal/picasso-utils": "3.1.1-alpha-HG-917-fix-overlapping-sidebar-3957b1ee3.11+3957b1ee3"
|
|
28
|
+
},
|
|
34
29
|
"peerDependencies": {
|
|
35
30
|
"@material-ui/core": "4.12.4",
|
|
36
31
|
"@toptal/picasso-provider": "*",
|
|
32
|
+
"@toptal/picasso-tailwind": ">=2.5.0",
|
|
33
|
+
"@toptal/picasso-tailwind-merge": "^2.0.0",
|
|
37
34
|
"react": ">=16.12.0 < 19.0.0"
|
|
38
35
|
},
|
|
39
36
|
"devDependencies": {
|
|
40
|
-
"@toptal/picasso-provider": "5.0.1-alpha-HG-917-fix-overlapping-sidebar-
|
|
37
|
+
"@toptal/picasso-provider": "5.0.1-alpha-HG-917-fix-overlapping-sidebar-3957b1ee3.278+3957b1ee3",
|
|
41
38
|
"popper.js": "^1.16.1"
|
|
42
39
|
},
|
|
43
40
|
"exports": {
|
|
@@ -48,5 +45,5 @@
|
|
|
48
45
|
"!dist-package/tsconfig.tsbuildinfo",
|
|
49
46
|
"src"
|
|
50
47
|
],
|
|
51
|
-
"gitHead": "
|
|
48
|
+
"gitHead": "3957b1ee38417e2370b7cfd8546a9b66b395befe"
|
|
52
49
|
}
|
package/src/Popper/Popper.tsx
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import type { ReactNode } from 'react'
|
|
2
2
|
import React, { forwardRef, useContext } from 'react'
|
|
3
|
-
import cx from 'classnames'
|
|
4
3
|
import { Popper as MUIPopper } from '@material-ui/core'
|
|
5
4
|
import type { ReferenceObject, PopperOptions } from 'popper.js'
|
|
6
5
|
import type PopperJs from 'popper.js'
|
|
@@ -9,6 +8,7 @@ import { useIsomorphicLayoutEffect } from '@toptal/picasso-shared'
|
|
|
9
8
|
import { usePicassoRoot, useBreakpoint } from '@toptal/picasso-provider'
|
|
10
9
|
import { useWidthOf } from '@toptal/picasso-utils'
|
|
11
10
|
import ModalContext from '@toptal/picasso-modal-context'
|
|
11
|
+
import { twMerge } from '@toptal/picasso-tailwind-merge'
|
|
12
12
|
|
|
13
13
|
export type PopperPlacementType =
|
|
14
14
|
| 'bottom-end'
|
|
@@ -159,9 +159,9 @@ export const Popper = forwardRef<PopperJs, Props>(function Popper(props, ref) {
|
|
|
159
159
|
open={open}
|
|
160
160
|
container={container || picassoRootContainer}
|
|
161
161
|
anchorEl={anchorEl}
|
|
162
|
-
className={
|
|
162
|
+
className={twMerge(
|
|
163
163
|
'z-modal',
|
|
164
|
-
'xs:max-
|
|
164
|
+
'xs:max-md:w-screen xs:max-md:max-w-screen xs:max-md:p-0 xs:max-md:m-0',
|
|
165
165
|
'[&[x-out-of-boundaries]]:hidden',
|
|
166
166
|
className
|
|
167
167
|
)}
|