@toptal/picasso-image 1.0.4-alpha-FX-NULL-fix-checkbox-class-b75438bf7.127 → 2.0.1-alpha-fx-5546-fix-overview-c9a7f8fb5.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":"Image.d.ts","sourceRoot":"","sources":["../../../src/Image/Image.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,OAAO,CAAA;AAC9C,OAAO,KAAqB,MAAM,OAAO,CAAA;AAIzC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAA;AAIvD,aAAK,WAAW,GAAG,WAAW,GAAG,UAAU,CAAA;AAE3C,MAAM,WAAW,KAAM,SAAQ,SAAS,EAAE,iBAAiB,CAAC,gBAAgB,CAAC;IAC3E,qBAAqB;IACrB,GAAG,EAAE,MAAM,CAAA;IACX,gBAAgB;IAChB,GAAG,EAAE,MAAM,CAAA;IACX,6BAA6B;IAC7B,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,uBAAuB;IACvB,OAAO,CAAC,EAAE,WAAW,CAAA;CACtB;AAID,eAAO,MAAM,KAAK,gFAgChB,CAAA;AAQF,eAAe,KAAK,CAAA"}
1
+ {"version":3,"file":"Image.d.ts","sourceRoot":"","sources":["../../../src/Image/Image.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,OAAO,CAAA;AAC9C,OAAO,KAAqB,MAAM,OAAO,CAAA;AACzC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAA;AAGvD,aAAK,WAAW,GAAG,WAAW,GAAG,UAAU,CAAA;AAE3C,MAAM,WAAW,KAAM,SAAQ,SAAS,EAAE,iBAAiB,CAAC,gBAAgB,CAAC;IAC3E,qBAAqB;IACrB,GAAG,EAAE,MAAM,CAAA;IACX,gBAAgB;IAChB,GAAG,EAAE,MAAM,CAAA;IACX,6BAA6B;IAC7B,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,uBAAuB;IACvB,OAAO,CAAC,EAAE,WAAW,CAAA;CACtB;AAED,eAAO,MAAM,KAAK,gFA6BhB,CAAA;AAQF,eAAe,KAAK,CAAA"}
@@ -10,16 +10,10 @@ var __rest = (this && this.__rest) || function (s, e) {
10
10
  return t;
11
11
  };
12
12
  import React, { forwardRef } from 'react';
13
- import cx from 'classnames';
14
- import { makeStyles } from '@material-ui/core/styles';
15
- import styles from './styles';
16
- const useStyles = makeStyles(styles, { name: 'PicassoImage' });
13
+ import { twMerge } from '@toptal/picasso-tailwind-merge';
17
14
  export const Image = forwardRef(function Image(props, ref) {
18
15
  const { src, srcSet, alt, className, variant = 'rectangle', style } = props, rest = __rest(props, ["src", "srcSet", "alt", "className", "variant", "style"]);
19
- const classes = useStyles();
20
- return (React.createElement("img", Object.assign({}, rest, { ref: ref, src: src, srcSet: srcSet, alt: alt, className: cx({
21
- [classes.circular]: variant === 'circular',
22
- }, classes.root, className), style: style })));
16
+ return (React.createElement("img", Object.assign({}, rest, { ref: ref, src: src, srcSet: srcSet, alt: alt, className: twMerge(variant === 'circular' && 'rounded-full', 'block', className), style: style })));
23
17
  });
24
18
  Image.defaultProps = {
25
19
  variant: 'rectangle',
@@ -1 +1 @@
1
- {"version":3,"file":"Image.js","sourceRoot":"","sources":["../../../src/Image/Image.tsx"],"names":[],"mappings":";;;;;;;;;;;AACA,OAAO,KAAK,EAAE,EAAE,UAAU,EAAE,MAAM,OAAO,CAAA;AACzC,OAAO,EAAE,MAAM,YAAY,CAAA;AAE3B,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAA;AAGrD,OAAO,MAAM,MAAM,UAAU,CAAA;AAe7B,MAAM,SAAS,GAAG,UAAU,CAAQ,MAAM,EAAE,EAAE,IAAI,EAAE,cAAc,EAAE,CAAC,CAAA;AAErE,MAAM,CAAC,MAAM,KAAK,GAAG,UAAU,CAA0B,SAAS,KAAK,CACrE,KAAK,EACL,GAAG;IAEH,MAAM,EACJ,GAAG,EACH,MAAM,EACN,GAAG,EACH,SAAS,EACT,OAAO,GAAG,WAAW,EACrB,KAAK,KAEH,KAAK,EADJ,IAAI,UACL,KAAK,EARH,yDAQL,CAAQ,CAAA;IACT,MAAM,OAAO,GAAG,SAAS,EAAE,CAAA;IAE3B,OAAO,CACL,6CACM,IAAI,IACR,GAAG,EAAE,GAAG,EACR,GAAG,EAAE,GAAG,EACR,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,EAAE,CACX;YACE,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,OAAO,KAAK,UAAU;SAC3C,EACD,OAAO,CAAC,IAAI,EACZ,SAAS,CACV,EACD,KAAK,EAAE,KAAK,IACZ,CACH,CAAA;AACH,CAAC,CAAC,CAAA;AAEF,KAAK,CAAC,YAAY,GAAG;IACnB,OAAO,EAAE,WAAW;CACrB,CAAA;AAED,KAAK,CAAC,WAAW,GAAG,OAAO,CAAA;AAE3B,eAAe,KAAK,CAAA"}
1
+ {"version":3,"file":"Image.js","sourceRoot":"","sources":["../../../src/Image/Image.tsx"],"names":[],"mappings":";;;;;;;;;;;AACA,OAAO,KAAK,EAAE,EAAE,UAAU,EAAE,MAAM,OAAO,CAAA;AAEzC,OAAO,EAAE,OAAO,EAAE,MAAM,gCAAgC,CAAA;AAexD,MAAM,CAAC,MAAM,KAAK,GAAG,UAAU,CAA0B,SAAS,KAAK,CACrE,KAAK,EACL,GAAG;IAEH,MAAM,EACJ,GAAG,EACH,MAAM,EACN,GAAG,EACH,SAAS,EACT,OAAO,GAAG,WAAW,EACrB,KAAK,KAEH,KAAK,EADJ,IAAI,UACL,KAAK,EARH,yDAQL,CAAQ,CAAA;IAET,OAAO,CACL,6CACM,IAAI,IACR,GAAG,EAAE,GAAG,EACR,GAAG,EAAE,GAAG,EACR,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,OAAO,CAChB,OAAO,KAAK,UAAU,IAAI,cAAc,EACxC,OAAO,EACP,SAAS,CACV,EACD,KAAK,EAAE,KAAK,IACZ,CACH,CAAA;AACH,CAAC,CAAC,CAAA;AAEF,KAAK,CAAC,YAAY,GAAG;IACnB,OAAO,EAAE,WAAW;CACrB,CAAA;AAED,KAAK,CAAC,WAAW,GAAG,OAAO,CAAA;AAE3B,eAAe,KAAK,CAAA"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@toptal/picasso-image",
3
- "version": "1.0.4-alpha-FX-NULL-fix-checkbox-class-b75438bf7.127+b75438bf7",
3
+ "version": "2.0.1-alpha-fx-5546-fix-overview-c9a7f8fb5.0+c9a7f8fb5",
4
4
  "description": "Toptal UI components library - Image",
5
5
  "publishConfig": {
6
6
  "access": "public"
@@ -22,18 +22,16 @@
22
22
  },
23
23
  "homepage": "https://github.com/toptal/picasso/tree/master/packages/picasso#readme",
24
24
  "dependencies": {
25
- "@toptal/picasso-utils": "1.0.4-alpha-FX-NULL-fix-checkbox-class-b75438bf7.127+b75438bf7",
25
+ "@toptal/picasso-utils": "1.0.4-alpha-fx-5546-fix-overview-c9a7f8fb5.149+c9a7f8fb5",
26
26
  "classnames": "^2.5.1"
27
27
  },
28
28
  "devDependencies": {
29
29
  "@testing-library/react": "^14.1.2"
30
30
  },
31
- "sideEffects": [
32
- "**/styles.ts",
33
- "**/styles.js"
34
- ],
31
+ "sideEffects": false,
35
32
  "peerDependencies": {
36
- "@material-ui/core": "4.12.4",
33
+ "@toptal/picasso-tailwind": ">=2.7",
34
+ "@toptal/picasso-tailwind-merge": "^1.0.1",
37
35
  "react": ">=16.12.0 < 19.0.0"
38
36
  },
39
37
  "exports": {
@@ -44,5 +42,5 @@
44
42
  "!dist-package/tsconfig.tsbuildinfo",
45
43
  "src"
46
44
  ],
47
- "gitHead": "b75438bf79ceee27cb29b794511620f600b62864"
45
+ "gitHead": "c9a7f8fb543ed2ceca8bf086ad9a54578c0552ec"
48
46
  }
@@ -1,11 +1,7 @@
1
1
  import type { ImgHTMLAttributes } from 'react'
2
2
  import React, { forwardRef } from 'react'
3
- import cx from 'classnames'
4
- import type { Theme } from '@material-ui/core/styles'
5
- import { makeStyles } from '@material-ui/core/styles'
6
3
  import type { BaseProps } from '@toptal/picasso-shared'
7
-
8
- import styles from './styles'
4
+ import { twMerge } from '@toptal/picasso-tailwind-merge'
9
5
 
10
6
  type VariantType = 'rectangle' | 'circular'
11
7
 
@@ -20,8 +16,6 @@ export interface Props extends BaseProps, ImgHTMLAttributes<HTMLImageElement> {
20
16
  variant?: VariantType
21
17
  }
22
18
 
23
- const useStyles = makeStyles<Theme>(styles, { name: 'PicassoImage' })
24
-
25
19
  export const Image = forwardRef<HTMLImageElement, Props>(function Image(
26
20
  props,
27
21
  ref
@@ -35,7 +29,6 @@ export const Image = forwardRef<HTMLImageElement, Props>(function Image(
35
29
  style,
36
30
  ...rest
37
31
  } = props
38
- const classes = useStyles()
39
32
 
40
33
  return (
41
34
  <img
@@ -44,11 +37,9 @@ export const Image = forwardRef<HTMLImageElement, Props>(function Image(
44
37
  src={src}
45
38
  srcSet={srcSet}
46
39
  alt={alt}
47
- className={cx(
48
- {
49
- [classes.circular]: variant === 'circular',
50
- },
51
- classes.root,
40
+ className={twMerge(
41
+ variant === 'circular' && 'rounded-full',
42
+ 'block',
52
43
  className
53
44
  )}
54
45
  style={style}
@@ -4,7 +4,7 @@ exports[`Image circular variant render 1`] = `
4
4
  <div>
5
5
  <img
6
6
  alt="Circular image"
7
- class="PicassoImage-circular PicassoImage-root"
7
+ class="rounded-full block"
8
8
  src="localhost"
9
9
  />
10
10
  </div>
@@ -14,7 +14,7 @@ exports[`Image renders 1`] = `
14
14
  <div>
15
15
  <img
16
16
  alt="Default image"
17
- class="PicassoImage-root"
17
+ class="block"
18
18
  src="localhost"
19
19
  />
20
20
  </div>
@@ -1,3 +0,0 @@
1
- declare const _default: () => import("@material-ui/styles").StyleRules<{}, "root" | "circular">;
2
- export default _default;
3
- //# sourceMappingURL=styles.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"styles.d.ts","sourceRoot":"","sources":["../../../src/Image/styles.ts"],"names":[],"mappings":";AAEA,wBAQI"}
@@ -1,10 +0,0 @@
1
- import { createStyles } from '@material-ui/core/styles';
2
- export default () => createStyles({
3
- root: {
4
- display: 'block',
5
- },
6
- circular: {
7
- borderRadius: '50%',
8
- },
9
- });
10
- //# sourceMappingURL=styles.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"styles.js","sourceRoot":"","sources":["../../../src/Image/styles.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AAEvD,eAAe,GAAG,EAAE,CAClB,YAAY,CAAC;IACX,IAAI,EAAE;QACJ,OAAO,EAAE,OAAO;KACjB;IACD,QAAQ,EAAE;QACR,YAAY,EAAE,KAAK;KACpB;CACF,CAAC,CAAA"}
@@ -1,11 +0,0 @@
1
- import { createStyles } from '@material-ui/core/styles'
2
-
3
- export default () =>
4
- createStyles({
5
- root: {
6
- display: 'block',
7
- },
8
- circular: {
9
- borderRadius: '50%',
10
- },
11
- })