@toptal/picasso-page 4.0.3 → 4.0.4

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":"PageHead.d.ts","sourceRoot":"","sources":["../../../src/PageHead/PageHead.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AACtC,OAAO,KAAqB,MAAM,OAAO,CAAA;AAGzC,OAAO,KAAK,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAA;AAMvE,MAAM,WAAW,KAAM,SAAQ,SAAS;IACtC,cAAc;IACd,QAAQ,CAAC,EAAE,SAAS,CAAA;IACpB,2CAA2C;IAC3C,YAAY,CAAC,EAAE,OAAO,CAAA;IACtB,2CAA2C;IAC3C,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB;AA+ED,eAAO,MAAM,QAAQ,8EAkBnB,CAAA;;;;;;;;;;;;;;;;AASF,wBAKE"}
1
+ {"version":3,"file":"PageHead.d.ts","sourceRoot":"","sources":["../../../src/PageHead/PageHead.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AACtC,OAAO,KAAqB,MAAM,OAAO,CAAA;AACzC,OAAO,KAAK,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAA;AAKvE,MAAM,WAAW,KAAM,SAAQ,SAAS;IACtC,cAAc;IACd,QAAQ,CAAC,EAAE,SAAS,CAAA;IACpB,2CAA2C;IAC3C,YAAY,CAAC,EAAE,OAAO,CAAA;IACtB,2CAA2C;IAC3C,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB;AA4ED,eAAO,MAAM,QAAQ,8EAoBnB,CAAA;;;;;;;;;;;;;;;;AASF,wBAKE"}
@@ -10,17 +10,9 @@ 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
14
  import { Typography } from '@toptal/picasso-typography';
17
- import styles from './styles';
18
- const useStyles = makeStyles(styles, {
19
- name: 'PicassoPageHead',
20
- });
21
- const useMainStyles = makeStyles(styles, {
22
- name: 'PicassoPageHeadMain',
23
- });
15
+ import { twMerge } from '@toptal/picasso-tailwind-merge';
24
16
  const Title = (_a) => {
25
17
  var { titleCase, children, className } = _a, rest = __rest(_a, ["titleCase", "children", "className"]);
26
18
  return (React.createElement(Typography, Object.assign({ variant: 'heading', size: 'large', titleCase: titleCase, className: className }, rest), children));
@@ -31,23 +23,25 @@ const Tabs = (_a) => {
31
23
  };
32
24
  const Main = (props) => {
33
25
  const { className, children, enableMinHeight } = props, rest = __rest(props, ["className", "children", "enableMinHeight"]);
34
- const classes = useMainStyles(props);
35
- return (React.createElement(Container, Object.assign({ flex: true, justifyContent: 'space-between', alignItems: 'center', className: cx({
36
- [classes.main]: !enableMinHeight,
37
- [classes.mainEnableMinHeight]: enableMinHeight,
38
- }, className) }, rest), children));
26
+ return (React.createElement(Container, Object.assign({ flex: true, justifyContent: 'space-between', alignItems: 'center', className: twMerge(enableMinHeight ? 'py-3 min-h-[3.375em]' : 'h-[3.375em]', className) }, rest), children));
39
27
  };
40
28
  const Actions = (_a) => {
41
29
  var { children, className } = _a, rest = __rest(_a, ["children", "className"]);
42
30
  return (React.createElement(Container, Object.assign({ flex: true, alignItems: 'center', className: className }, rest), children));
43
31
  };
32
+ const borderPseudoElement = [
33
+ 'after:content-[""]',
34
+ 'after:absolute',
35
+ 'after:inset-x-0',
36
+ 'after:bottom-0',
37
+ 'after:z-0',
38
+ 'after:bg-gray-200',
39
+ 'after:h-[1px]',
40
+ ];
44
41
  export const PageHead = forwardRef(function PageHead(props, ref) {
45
42
  const { children, noBorder, rightPadding, className } = props;
46
- const classes = useStyles();
47
- return (React.createElement(Container, { ref: ref, className: cx(classes.root, className, {
48
- [classes.withBorder]: !noBorder,
49
- [classes.rightPadding]: rightPadding,
50
- }) }, children));
43
+ const withBorder = !noBorder;
44
+ return (React.createElement(Container, { ref: ref, className: twMerge('relative', withBorder && borderPseudoElement, rightPadding && 'pr-8', className) }, children));
51
45
  });
52
46
  PageHead.defaultProps = {
53
47
  rightPadding: false,
@@ -1 +1 @@
1
- {"version":3,"file":"PageHead.js","sourceRoot":"","sources":["../../../src/PageHead/PageHead.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"PageHead.js","sourceRoot":"","sources":["../../../src/PageHead/PageHead.tsx"],"names":[],"mappings":";;;;;;;;;;;AACA,OAAO,KAAK,EAAE,EAAE,UAAU,EAAE,MAAM,OAAO,CAAA;AAEzC,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAA;AACrD,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AACvD,OAAO,EAAE,OAAO,EAAE,MAAM,gCAAgC,CAAA;AAWxD,MAAM,KAAK,GAAG,CAAC,EAKwC,EAAE,EAAE;QAL5C,EACb,SAAS,EACT,QAAQ,EACR,SAAS,OAE4C,EADlD,IAAI,cAJM,sCAKd,CADQ;IAEP,OAAO,CACL,oBAAC,UAAU,kBACT,OAAO,EAAC,SAAS,EACjB,IAAI,EAAC,OAAO,EACZ,SAAS,EAAE,SAAS,EACpB,SAAS,EAAE,SAAS,IAChB,IAAI,GAEP,QAAQ,CACE,CACd,CAAA;AACH,CAAC,CAAA;AAED,MAAM,IAAI,GAAG,CAAC,EAIwB,EAAE,EAAE;QAJ5B,EACZ,QAAQ,EACR,SAAS,OAE2B,EADjC,IAAI,cAHK,yBAIb,CADQ;IAEP,OAAO,CACL,oBAAC,SAAS,kBAAC,SAAS,EAAE,SAAS,IAAM,IAAI,GACtC,QAAQ,CACC,CACb,CAAA;AACH,CAAC,CAAA;AAED,MAAM,IAAI,GAAG,CACX,KAAsE,EACtE,EAAE;IACF,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,eAAe,KAAc,KAAK,EAAd,IAAI,UAAK,KAAK,EAAzD,4CAAiD,CAAQ,CAAA;IAE/D,OAAO,CACL,oBAAC,SAAS,kBACR,IAAI,QACJ,cAAc,EAAC,eAAe,EAC9B,UAAU,EAAC,QAAQ,EACnB,SAAS,EAAE,OAAO,CAChB,eAAe,CAAC,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAC,aAAa,EACxD,SAAS,CACV,IACG,IAAI,GAEP,QAAQ,CACC,CACb,CAAA;AACH,CAAC,CAAA;AAED,MAAM,OAAO,GAAG,CAAC,EAIqB,EAAE,EAAE;QAJzB,EACf,QAAQ,EACR,SAAS,OAE2B,EADjC,IAAI,cAHQ,yBAIhB,CADQ;IAEP,OAAO,CACL,oBAAC,SAAS,kBAAC,IAAI,QAAC,UAAU,EAAC,QAAQ,EAAC,SAAS,EAAE,SAAS,IAAM,IAAI,GAC/D,QAAQ,CACC,CACb,CAAA;AACH,CAAC,CAAA;AAED,MAAM,mBAAmB,GAAG;IAC1B,oBAAoB;IACpB,gBAAgB;IAChB,iBAAiB;IACjB,gBAAgB;IAChB,WAAW;IACX,mBAAmB;IACnB,eAAe;CAChB,CAAA;AAED,MAAM,CAAC,MAAM,QAAQ,GAAG,UAAU,CAAwB,SAAS,QAAQ,CACzE,KAAK,EACL,GAAG;IAEH,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,YAAY,EAAE,SAAS,EAAE,GAAG,KAAK,CAAA;IAC7D,MAAM,UAAU,GAAG,CAAC,QAAQ,CAAA;IAE5B,OAAO,CACL,oBAAC,SAAS,IACR,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,OAAO,CAChB,UAAU,EACV,UAAU,IAAI,mBAAmB,EACjC,YAAY,IAAI,MAAM,EACtB,SAAS,CACV,IAEA,QAAQ,CACC,CACb,CAAA;AACH,CAAC,CAAC,CAAA;AAEF,QAAQ,CAAC,YAAY,GAAG;IACtB,YAAY,EAAE,KAAK;IACnB,QAAQ,EAAE,KAAK;CAChB,CAAA;AAED,QAAQ,CAAC,WAAW,GAAG,UAAU,CAAA;AAEjC,eAAe,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE;IACrC,KAAK;IACL,IAAI;IACJ,IAAI;IACJ,OAAO;CACR,CAAC,CAAA"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@toptal/picasso-page",
3
- "version": "4.0.3",
3
+ "version": "4.0.4",
4
4
  "description": "Toptal UI components library - Page",
5
5
  "publishConfig": {
6
6
  "access": "public"
@@ -22,7 +22,7 @@
22
22
  },
23
23
  "homepage": "https://github.com/toptal/picasso/tree/master/packages/picasso#readme",
24
24
  "dependencies": {
25
- "@toptal/picasso-accordion": "2.0.12",
25
+ "@toptal/picasso-accordion": "2.1.0",
26
26
  "@toptal/picasso-autocomplete": "4.0.3",
27
27
  "@toptal/picasso-avatar": "6.1.0",
28
28
  "@toptal/picasso-badge": "3.0.0",
@@ -1,12 +1,9 @@
1
1
  import type { ReactNode } from 'react'
2
2
  import React, { forwardRef } from 'react'
3
- import { makeStyles } from '@material-ui/core/styles'
4
- import cx from 'classnames'
5
3
  import type { TextLabelProps, BaseProps } from '@toptal/picasso-shared'
6
4
  import { Container } from '@toptal/picasso-container'
7
5
  import { Typography } from '@toptal/picasso-typography'
8
-
9
- import styles from './styles'
6
+ import { twMerge } from '@toptal/picasso-tailwind-merge'
10
7
 
11
8
  export interface Props extends BaseProps {
12
9
  /** Content */
@@ -17,14 +14,6 @@ export interface Props extends BaseProps {
17
14
  noBorder?: boolean
18
15
  }
19
16
 
20
- const useStyles = makeStyles(styles, {
21
- name: 'PicassoPageHead',
22
- })
23
-
24
- const useMainStyles = makeStyles(styles, {
25
- name: 'PicassoPageHeadMain',
26
- })
27
-
28
17
  const Title = ({
29
18
  titleCase,
30
19
  children,
@@ -61,18 +50,13 @@ const Main = (
61
50
  ) => {
62
51
  const { className, children, enableMinHeight, ...rest } = props
63
52
 
64
- const classes = useMainStyles(props)
65
-
66
53
  return (
67
54
  <Container
68
55
  flex
69
56
  justifyContent='space-between'
70
57
  alignItems='center'
71
- className={cx(
72
- {
73
- [classes.main]: !enableMinHeight,
74
- [classes.mainEnableMinHeight]: enableMinHeight,
75
- },
58
+ className={twMerge(
59
+ enableMinHeight ? 'py-3 min-h-[3.375em]' : 'h-[3.375em]',
76
60
  className
77
61
  )}
78
62
  {...rest}
@@ -94,20 +78,32 @@ const Actions = ({
94
78
  )
95
79
  }
96
80
 
81
+ const borderPseudoElement = [
82
+ 'after:content-[""]',
83
+ 'after:absolute',
84
+ 'after:inset-x-0',
85
+ 'after:bottom-0',
86
+ 'after:z-0',
87
+ 'after:bg-gray-200',
88
+ 'after:h-[1px]',
89
+ ]
90
+
97
91
  export const PageHead = forwardRef<HTMLDivElement, Props>(function PageHead(
98
92
  props,
99
93
  ref
100
94
  ) {
101
95
  const { children, noBorder, rightPadding, className } = props
102
- const classes = useStyles()
96
+ const withBorder = !noBorder
103
97
 
104
98
  return (
105
99
  <Container
106
100
  ref={ref}
107
- className={cx(classes.root, className, {
108
- [classes.withBorder]: !noBorder,
109
- [classes.rightPadding]: rightPadding,
110
- })}
101
+ className={twMerge(
102
+ 'relative',
103
+ withBorder && borderPseudoElement,
104
+ rightPadding && 'pr-8',
105
+ className
106
+ )}
111
107
  >
112
108
  {children}
113
109
  </Container>
@@ -1,4 +0,0 @@
1
- import type { Theme } from '@material-ui/core/styles';
2
- declare const _default: ({ palette }: Theme) => import("@material-ui/styles").StyleRules<{}, "main" | "root" | "withBorder" | "rightPadding" | "mainEnableMinHeight">;
3
- export default _default;
4
- //# sourceMappingURL=styles.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"styles.d.ts","sourceRoot":"","sources":["../../../src/PageHead/styles.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAA;sCAGxB,KAAK;AAAlC,wBA6BI"}
@@ -1,31 +0,0 @@
1
- import { createStyles } from '@material-ui/core/styles';
2
- export default ({ palette }) => createStyles({
3
- root: {
4
- position: 'relative',
5
- },
6
- withBorder: {
7
- // underline effect for the container
8
- '&::after': {
9
- position: 'absolute',
10
- content: '""',
11
- bottom: 0,
12
- left: 0,
13
- right: 0,
14
- height: 1,
15
- backgroundColor: palette.grey.lighter2,
16
- zIndex: 0,
17
- },
18
- },
19
- rightPadding: {
20
- paddingRight: '2rem',
21
- },
22
- main: {
23
- height: '3.375em',
24
- },
25
- mainEnableMinHeight: {
26
- paddingTop: '0.75rem',
27
- paddingBottom: '0.75rem',
28
- minHeight: '3.375em',
29
- },
30
- });
31
- //# sourceMappingURL=styles.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"styles.js","sourceRoot":"","sources":["../../../src/PageHead/styles.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AAEvD,eAAe,CAAC,EAAE,OAAO,EAAS,EAAE,EAAE,CACpC,YAAY,CAAC;IACX,IAAI,EAAE;QACJ,QAAQ,EAAE,UAAU;KACrB;IACD,UAAU,EAAE;QACV,qCAAqC;QACrC,UAAU,EAAE;YACV,QAAQ,EAAE,UAAU;YACpB,OAAO,EAAE,IAAI;YACb,MAAM,EAAE,CAAC;YACT,IAAI,EAAE,CAAC;YACP,KAAK,EAAE,CAAC;YACR,MAAM,EAAE,CAAC;YACT,eAAe,EAAE,OAAO,CAAC,IAAI,CAAC,QAAQ;YACtC,MAAM,EAAE,CAAC;SACV;KACF;IACD,YAAY,EAAE;QACZ,YAAY,EAAE,MAAM;KACrB;IACD,IAAI,EAAE;QACJ,MAAM,EAAE,SAAS;KAClB;IACD,mBAAmB,EAAE;QACnB,UAAU,EAAE,SAAS;QACrB,aAAa,EAAE,SAAS;QACxB,SAAS,EAAE,SAAS;KACrB;CACF,CAAC,CAAA"}
@@ -1,33 +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
- root: {
7
- position: 'relative',
8
- },
9
- withBorder: {
10
- // underline effect for the container
11
- '&::after': {
12
- position: 'absolute',
13
- content: '""',
14
- bottom: 0,
15
- left: 0,
16
- right: 0,
17
- height: 1,
18
- backgroundColor: palette.grey.lighter2,
19
- zIndex: 0,
20
- },
21
- },
22
- rightPadding: {
23
- paddingRight: '2rem',
24
- },
25
- main: {
26
- height: '3.375em',
27
- },
28
- mainEnableMinHeight: {
29
- paddingTop: '0.75rem',
30
- paddingBottom: '0.75rem',
31
- minHeight: '3.375em',
32
- },
33
- })