@toptal/picasso-page 5.2.3 → 5.3.0

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":"SidebarLogo.d.ts","sourceRoot":"","sources":["../../../src/SidebarLogo/SidebarLogo.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,OAAO,CAAA;AACtD,OAAO,KAAqB,MAAM,OAAO,CAAA;AACzC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAA;AASvD,MAAM,WAAW,KACf,SAAQ,SAAS,EACf,cAAc,CAAC,cAAc,GAAG,eAAe,CAAC;IAClD,QAAQ,CAAC,EAAE,SAAS,CAAA;IACpB,yDAAyD;IACzD,aAAa,CAAC,EAAE,SAAS,CAAA;IACzB,uDAAuD;IACvD,QAAQ,CAAC,EAAE,SAAS,CAAA;CACrB;AAMD,eAAO,MAAM,WAAW,8EAwBvB,CAAA;AAMD,eAAe,WAAW,CAAA"}
1
+ {"version":3,"file":"SidebarLogo.d.ts","sourceRoot":"","sources":["../../../src/SidebarLogo/SidebarLogo.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,OAAO,CAAA;AACtD,OAAO,KAAqB,MAAM,OAAO,CAAA;AACzC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAA;AAMvD,MAAM,WAAW,KACf,SAAQ,SAAS,EACf,cAAc,CAAC,cAAc,GAAG,eAAe,CAAC;IAClD,QAAQ,CAAC,EAAE,SAAS,CAAA;IACpB,yDAAyD;IACzD,aAAa,CAAC,EAAE,SAAS,CAAA;IACzB,uDAAuD;IACvD,QAAQ,CAAC,EAAE,SAAS,CAAA;CACrB;AAED,eAAO,MAAM,WAAW,8EAsBvB,CAAA;AAMD,eAAe,WAAW,CAAA"}
@@ -10,20 +10,14 @@ 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';
14
- import cx from 'classnames';
13
+ import { twMerge } from '@toptal/picasso-tailwind-merge';
15
14
  import { Container } from '@toptal/picasso-container';
16
- import styles from './styles';
17
15
  import { useSidebarContext } from '../PageSidebar/SidebarContextProvider';
18
- const useStyles = makeStyles(styles, {
19
- name: 'PicassoSidebarLogo',
20
- });
21
16
  export const SidebarLogo = forwardRef(function SidebarLogo(_a, ref) {
22
17
  var { children, collapsedLogo, fullLogo, className } = _a, rest = __rest(_a, ["children", "collapsedLogo", "fullLogo", "className"]);
23
- const classes = useStyles();
24
18
  const { isCollapsed: isSidebarCollapsed } = useSidebarContext();
25
19
  const logo = isSidebarCollapsed ? collapsedLogo : fullLogo;
26
- return (React.createElement(Container, Object.assign({}, rest, { className: cx(classes.root, className), ref: ref, bottom: 'xsmall', left: 'large' }),
20
+ return (React.createElement(Container, Object.assign({}, rest, { className: twMerge('flex-shrink-0 block overflow-hidden', className), ref: ref, bottom: 'xsmall', left: 'large' }),
27
21
  logo,
28
22
  children));
29
23
  });
@@ -1 +1 @@
1
- {"version":3,"file":"SidebarLogo.js","sourceRoot":"","sources":["../../../src/SidebarLogo/SidebarLogo.tsx"],"names":[],"mappings":";;;;;;;;;;;AACA,OAAO,KAAK,EAAE,EAAE,UAAU,EAAE,MAAM,OAAO,CAAA;AAGzC,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAC9C,OAAO,EAAE,MAAM,YAAY,CAAA;AAC3B,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAA;AAErD,OAAO,MAAM,MAAM,UAAU,CAAA;AAC7B,OAAO,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAA;AAYzE,MAAM,SAAS,GAAG,UAAU,CAAQ,MAAM,EAAE;IAC1C,IAAI,EAAE,oBAAoB;CAC3B,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,WAAW,GAAG,UAAU,CACnC,SAAS,WAAW,CAClB,EAAyD,EACzD,GAAG;QADH,EAAE,QAAQ,EAAE,aAAa,EAAE,QAAQ,EAAE,SAAS,OAAW,EAAN,IAAI,cAAvD,sDAAyD,CAAF;IAGvD,MAAM,OAAO,GAAG,SAAS,EAAE,CAAA;IAE3B,MAAM,EAAE,WAAW,EAAE,kBAAkB,EAAE,GAAG,iBAAiB,EAAE,CAAA;IAE/D,MAAM,IAAI,GAAG,kBAAkB,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,QAAQ,CAAA;IAE1D,OAAO,CACL,oBAAC,SAAS,oBACJ,IAAI,IACR,SAAS,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,SAAS,CAAC,EACtC,GAAG,EAAE,GAAG,EACR,MAAM,EAAC,QAAQ,EACf,IAAI,EAAC,OAAO;QAEX,IAAI;QACJ,QAAQ,CACC,CACb,CAAA;AACH,CAAC,CACF,CAAA;AAED,WAAW,CAAC,YAAY,GAAG,EAAE,CAAA;AAE7B,WAAW,CAAC,WAAW,GAAG,aAAa,CAAA;AAEvC,eAAe,WAAW,CAAA"}
1
+ {"version":3,"file":"SidebarLogo.js","sourceRoot":"","sources":["../../../src/SidebarLogo/SidebarLogo.tsx"],"names":[],"mappings":";;;;;;;;;;;AACA,OAAO,KAAK,EAAE,EAAE,UAAU,EAAE,MAAM,OAAO,CAAA;AAEzC,OAAO,EAAE,OAAO,EAAE,MAAM,gCAAgC,CAAA;AACxD,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAA;AAErD,OAAO,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAA;AAYzE,MAAM,CAAC,MAAM,WAAW,GAAG,UAAU,CACnC,SAAS,WAAW,CAClB,EAAyD,EACzD,GAAG;QADH,EAAE,QAAQ,EAAE,aAAa,EAAE,QAAQ,EAAE,SAAS,OAAW,EAAN,IAAI,cAAvD,sDAAyD,CAAF;IAGvD,MAAM,EAAE,WAAW,EAAE,kBAAkB,EAAE,GAAG,iBAAiB,EAAE,CAAA;IAE/D,MAAM,IAAI,GAAG,kBAAkB,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,QAAQ,CAAA;IAE1D,OAAO,CACL,oBAAC,SAAS,oBACJ,IAAI,IACR,SAAS,EAAE,OAAO,CAAC,qCAAqC,EAAE,SAAS,CAAC,EACpE,GAAG,EAAE,GAAG,EACR,MAAM,EAAC,QAAQ,EACf,IAAI,EAAC,OAAO;QAEX,IAAI;QACJ,QAAQ,CACC,CACb,CAAA;AACH,CAAC,CACF,CAAA;AAED,WAAW,CAAC,YAAY,GAAG,EAAE,CAAA;AAE7B,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-page",
3
- "version": "5.2.3",
3
+ "version": "5.3.0",
4
4
  "description": "Toptal UI components library - Page",
5
5
  "publishConfig": {
6
6
  "access": "public"
@@ -1,12 +1,9 @@
1
1
  import type { ReactNode, HTMLAttributes } from 'react'
2
2
  import React, { forwardRef } from 'react'
3
3
  import type { BaseProps } from '@toptal/picasso-shared'
4
- import type { Theme } from '@material-ui/core'
5
- import { makeStyles } from '@material-ui/core'
6
- import cx from 'classnames'
4
+ import { twMerge } from '@toptal/picasso-tailwind-merge'
7
5
  import { Container } from '@toptal/picasso-container'
8
6
 
9
- import styles from './styles'
10
7
  import { useSidebarContext } from '../PageSidebar/SidebarContextProvider'
11
8
 
12
9
  export interface Props
@@ -19,17 +16,11 @@ export interface Props
19
16
  fullLogo?: ReactNode
20
17
  }
21
18
 
22
- const useStyles = makeStyles<Theme>(styles, {
23
- name: 'PicassoSidebarLogo',
24
- })
25
-
26
19
  export const SidebarLogo = forwardRef<HTMLDivElement, Props>(
27
20
  function SidebarLogo(
28
21
  { children, collapsedLogo, fullLogo, className, ...rest },
29
22
  ref
30
23
  ) {
31
- const classes = useStyles()
32
-
33
24
  const { isCollapsed: isSidebarCollapsed } = useSidebarContext()
34
25
 
35
26
  const logo = isSidebarCollapsed ? collapsedLogo : fullLogo
@@ -37,7 +28,7 @@ export const SidebarLogo = forwardRef<HTMLDivElement, Props>(
37
28
  return (
38
29
  <Container
39
30
  {...rest}
40
- className={cx(classes.root, className)}
31
+ className={twMerge('flex-shrink-0 block overflow-hidden', className)}
41
32
  ref={ref}
42
33
  bottom='xsmall'
43
34
  left='large'
@@ -6,7 +6,7 @@ exports[`SidebarLogo renders 1`] = `
6
6
  class="Picasso-root"
7
7
  >
8
8
  <div
9
- class="mb-2 ml-8 PicassoSidebarLogo-root"
9
+ class="mb-2 ml-8 flex-shrink block overflow-hidden"
10
10
  >
11
11
  <svg
12
12
  class="PicassoSvgLogo-root text-[1.875rem] align-baseline text-blue [--logo-text [--logo-emblem"
@@ -1,3 +0,0 @@
1
- declare const _default: () => import("@material-ui/styles").StyleRules<{}, "root">;
2
- export default _default;
3
- //# sourceMappingURL=styles.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"styles.d.ts","sourceRoot":"","sources":["../../../src/SidebarLogo/styles.ts"],"names":[],"mappings":";AAEA,wBAOI"}
@@ -1,9 +0,0 @@
1
- import { createStyles } from '@material-ui/core/styles';
2
- export default () => createStyles({
3
- root: {
4
- flexShrink: 0,
5
- display: 'block',
6
- overflow: 'hidden',
7
- },
8
- });
9
- //# sourceMappingURL=styles.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"styles.js","sourceRoot":"","sources":["../../../src/SidebarLogo/styles.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AAEvD,eAAe,GAAG,EAAE,CAClB,YAAY,CAAC;IACX,IAAI,EAAE;QACJ,UAAU,EAAE,CAAC;QACb,OAAO,EAAE,OAAO;QAChB,QAAQ,EAAE,QAAQ;KACnB;CACF,CAAC,CAAA"}
@@ -1,10 +0,0 @@
1
- import { createStyles } from '@material-ui/core/styles'
2
-
3
- export default () =>
4
- createStyles({
5
- root: {
6
- flexShrink: 0,
7
- display: 'block',
8
- overflow: 'hidden',
9
- },
10
- })