@toptal/picasso-page 5.0.4 → 5.0.5
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-package/src/PageArticle/PageArticle.d.ts.map +1 -1
- package/dist-package/src/PageArticle/PageArticle.js +2 -8
- package/dist-package/src/PageArticle/PageArticle.js.map +1 -1
- package/package.json +1 -1
- package/src/PageArticle/PageArticle.tsx +2 -11
- package/dist-package/src/PageArticle/styles.d.ts +0 -4
- package/dist-package/src/PageArticle/styles.d.ts.map +0 -1
- package/dist-package/src/PageArticle/styles.js +0 -11
- package/dist-package/src/PageArticle/styles.js.map +0 -1
- package/src/PageArticle/styles.ts +0 -14
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PageArticle.d.ts","sourceRoot":"","sources":["../../../src/PageArticle/PageArticle.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,OAAO,CAAA;
|
|
1
|
+
{"version":3,"file":"PageArticle.d.ts","sourceRoot":"","sources":["../../../src/PageArticle/PageArticle.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,OAAO,CAAA;AAEtD,OAAO,KAAK,EAAE,SAAS,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAA;AAI7E,MAAM,WAAW,KAAM,SAAQ,SAAS,EAAE,cAAc,CAAC,cAAc,CAAC;IACtE,oDAAoD;IACpD,QAAQ,EAAE,SAAS,CAAA;CACpB;AAED,eAAO,MAAM,WAAW,EAAE,oBAAoB,CAAC,KAAK,CAgBlD,CAAA;AAMF,eAAe,WAAW,CAAA"}
|
|
@@ -10,17 +10,11 @@ var __rest = (this && this.__rest) || function (s, e) {
|
|
|
10
10
|
return t;
|
|
11
11
|
};
|
|
12
12
|
import React, { forwardRef } from 'react';
|
|
13
|
-
import { makeStyles } from '@material-ui/core/styles';
|
|
14
|
-
import cx from 'classnames';
|
|
15
13
|
import { Container } from '@toptal/picasso-container';
|
|
16
|
-
import
|
|
17
|
-
const useStyles = makeStyles(styles, {
|
|
18
|
-
name: 'PicassoPageArticle',
|
|
19
|
-
});
|
|
14
|
+
import { twMerge } from '@toptal/picasso-tailwind-merge';
|
|
20
15
|
export const PageArticle = forwardRef(function PageArticle(props, ref) {
|
|
21
16
|
const { children, className, style } = props, rest = __rest(props, ["children", "className", "style"]);
|
|
22
|
-
|
|
23
|
-
return (React.createElement(Container, Object.assign({}, rest, { ref: ref, className: cx(classes.root, className), style: style }), children));
|
|
17
|
+
return (React.createElement(Container, Object.assign({}, rest, { ref: ref, className: twMerge('flex-1 my-0 mx-4 md:mx-8', className), style: style }), children));
|
|
24
18
|
});
|
|
25
19
|
PageArticle.defaultProps = {};
|
|
26
20
|
PageArticle.displayName = 'PageArticle';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PageArticle.js","sourceRoot":"","sources":["../../../src/PageArticle/PageArticle.tsx"],"names":[],"mappings":";;;;;;;;;;;AACA,OAAO,KAAK,EAAE,EAAE,UAAU,EAAE,MAAM,OAAO,CAAA;AAEzC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"PageArticle.js","sourceRoot":"","sources":["../../../src/PageArticle/PageArticle.tsx"],"names":[],"mappings":";;;;;;;;;;;AACA,OAAO,KAAK,EAAE,EAAE,UAAU,EAAE,MAAM,OAAO,CAAA;AAEzC,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAA;AACrD,OAAO,EAAE,OAAO,EAAE,MAAM,gCAAgC,CAAA;AAOxD,MAAM,CAAC,MAAM,WAAW,GAAgC,UAAU,CAGhE,SAAS,WAAW,CAAC,KAAK,EAAE,GAAG;IAC/B,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,KAAK,KAAc,KAAK,EAAd,IAAI,UAAK,KAAK,EAA/C,kCAAuC,CAAQ,CAAA;IAErD,OAAO,CACL,oBAAC,SAAS,oBACJ,IAAI,IACR,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,OAAO,CAAC,0BAA0B,EAAE,SAAS,CAAC,EACzD,KAAK,EAAE,KAAK,KAEX,QAAQ,CACC,CACb,CAAA;AACH,CAAC,CAAC,CAAA;AAEF,WAAW,CAAC,YAAY,GAAG,EAAE,CAAA;AAE7B,WAAW,CAAC,WAAW,GAAG,aAAa,CAAA;AAEvC,eAAe,WAAW,CAAA"}
|
package/package.json
CHANGED
|
@@ -1,34 +1,25 @@
|
|
|
1
1
|
import type { ReactNode, HTMLAttributes } from 'react'
|
|
2
2
|
import React, { forwardRef } from 'react'
|
|
3
|
-
import type { Theme } from '@material-ui/core/styles'
|
|
4
|
-
import { makeStyles } from '@material-ui/core/styles'
|
|
5
|
-
import cx from 'classnames'
|
|
6
3
|
import type { BaseProps, OverridableComponent } from '@toptal/picasso-shared'
|
|
7
4
|
import { Container } from '@toptal/picasso-container'
|
|
8
|
-
|
|
9
|
-
import styles from './styles'
|
|
5
|
+
import { twMerge } from '@toptal/picasso-tailwind-merge'
|
|
10
6
|
|
|
11
7
|
export interface Props extends BaseProps, HTMLAttributes<HTMLDivElement> {
|
|
12
8
|
/** Custom components that render content of page */
|
|
13
9
|
children: ReactNode
|
|
14
10
|
}
|
|
15
11
|
|
|
16
|
-
const useStyles = makeStyles<Theme>(styles, {
|
|
17
|
-
name: 'PicassoPageArticle',
|
|
18
|
-
})
|
|
19
|
-
|
|
20
12
|
export const PageArticle: OverridableComponent<Props> = forwardRef<
|
|
21
13
|
HTMLDivElement,
|
|
22
14
|
Props
|
|
23
15
|
>(function PageArticle(props, ref) {
|
|
24
16
|
const { children, className, style, ...rest } = props
|
|
25
|
-
const classes = useStyles()
|
|
26
17
|
|
|
27
18
|
return (
|
|
28
19
|
<Container
|
|
29
20
|
{...rest}
|
|
30
21
|
ref={ref}
|
|
31
|
-
className={
|
|
22
|
+
className={twMerge('flex-1 my-0 mx-4 md:mx-8', className)}
|
|
32
23
|
style={style}
|
|
33
24
|
>
|
|
34
25
|
{children}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"styles.d.ts","sourceRoot":"","sources":["../../../src/PageArticle/styles.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAA;8CAGhB,KAAK;AAA1C,wBAUI"}
|
|
@@ -1,11 +0,0 @@
|
|
|
1
|
-
import { createStyles } from '@material-ui/core/styles';
|
|
2
|
-
export default ({ screens, layout }) => createStyles({
|
|
3
|
-
root: {
|
|
4
|
-
flex: 1,
|
|
5
|
-
margin: `0 ${layout.contentMobilePaddingHorizontal}`,
|
|
6
|
-
[screens('md', 'lg', 'xl')]: {
|
|
7
|
-
margin: `0 ${layout.contentPaddingHorizontal}`,
|
|
8
|
-
},
|
|
9
|
-
},
|
|
10
|
-
});
|
|
11
|
-
//# sourceMappingURL=styles.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"styles.js","sourceRoot":"","sources":["../../../src/PageArticle/styles.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AAEvD,eAAe,CAAC,EAAE,OAAO,EAAE,MAAM,EAAS,EAAE,EAAE,CAC5C,YAAY,CAAC;IACX,IAAI,EAAE;QACJ,IAAI,EAAE,CAAC;QACP,MAAM,EAAE,KAAK,MAAM,CAAC,8BAA8B,EAAE;QAEpD,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,EAAE;YAC3B,MAAM,EAAE,KAAK,MAAM,CAAC,wBAAwB,EAAE;SAC/C;KACF;CACF,CAAC,CAAA"}
|
|
@@ -1,14 +0,0 @@
|
|
|
1
|
-
import type { Theme } from '@material-ui/core/styles'
|
|
2
|
-
import { createStyles } from '@material-ui/core/styles'
|
|
3
|
-
|
|
4
|
-
export default ({ screens, layout }: Theme) =>
|
|
5
|
-
createStyles({
|
|
6
|
-
root: {
|
|
7
|
-
flex: 1,
|
|
8
|
-
margin: `0 ${layout.contentMobilePaddingHorizontal}`,
|
|
9
|
-
|
|
10
|
-
[screens('md', 'lg', 'xl')]: {
|
|
11
|
-
margin: `0 ${layout.contentPaddingHorizontal}`,
|
|
12
|
-
},
|
|
13
|
-
},
|
|
14
|
-
})
|