diff --git a/.changelogrc b/.changelogrc index ee7769689c..9e26dfeeb6 100644 --- a/.changelogrc +++ b/.changelogrc @@ -1 +1 @@ -{"**F36 Avatar** `v4.71.2`":["- Shrink image to reduce overlapping with the color border\n","- Round overlay icon for app variant\n"]} \ No newline at end of file +{} \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index f617e02591..2fdcf034c5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,35 @@ The Changelog gives an overview of the changes we've made to Forma 36 +## 11-10-2024 + +**F36 Avatar** `v4.74.0` + +- increase inner white padding for app variant + +## 10-10-2024 + +**F36 Tokens** `v4.1.0` + +- feat(tokens): smaller font-size-2xl +- feat(display-text): smaller line-height to match new font-size-2xl size + +**F36 Typography** `v4.72.0` + +- feat(tokens): smaller font-size-2xl +- feat(display-text): smaller line-height to match new font-size-2xl size + +**F36 Header** `v4.73.0` + +- feat(header): render title as h1 + +## 08-10-2024 + +**F36 Avatar** `v4.71.2` + +- Shrink image to reduce overlapping with the color border +- Round overlay icon for app variant + ## 27-09-2024 `@contentful/f36-components@4.71.1` diff --git a/package-lock.json b/package-lock.json index 42b7dcdf6e..0adb86c9db 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13014,22 +13014,6 @@ "@types/ms": "*" } }, - "node_modules/@types/eslint": { - "version": "8.4.6", - "license": "MIT", - "dependencies": { - "@types/estree": "*", - "@types/json-schema": "*" - } - }, - "node_modules/@types/eslint-scope": { - "version": "3.7.4", - "license": "MIT", - "dependencies": { - "@types/eslint": "*", - "@types/estree": "*" - } - }, "node_modules/@types/estree": { "version": "0.0.51", "license": "MIT" @@ -14145,10 +14129,10 @@ "node": ">=0.4.0" } }, - "node_modules/acorn-import-assertions": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz", - "integrity": "sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==", + "node_modules/acorn-import-attributes": { + "version": "1.9.5", + "resolved": "https://registry.npmjs.org/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz", + "integrity": "sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==", "peerDependencies": { "acorn": "^8" } @@ -19416,9 +19400,9 @@ } }, "node_modules/enhanced-resolve": { - "version": "5.16.0", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.16.0.tgz", - "integrity": "sha512-O+QWCviPNSSLAD9Ucn8Awv+poAkqn3T1XY5/N7kR7rQO9yfSGWkYZDwpJ+iKF7B8rxaQKWngSqACpgzeapSyoA==", + "version": "5.17.1", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz", + "integrity": "sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==", "dependencies": { "graceful-fs": "^4.2.4", "tapable": "^2.2.0" @@ -35756,7 +35740,7 @@ "license": "MIT" }, "node_modules/rollup": { - "version": "2.58.0", + "version": "^2.79.2", "dev": true, "license": "MIT", "bin": { @@ -40167,20 +40151,19 @@ } }, "node_modules/webpack": { - "version": "5.91.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.91.0.tgz", - "integrity": "sha512-rzVwlLeBWHJbmgTC/8TvAcu5vpJNII+MelQpylD4jNERPwpBJOE2lEcko1zJX3QJeLjTTAnQxn/OJ8bjDzVQaw==", + "version": "5.95.0", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.95.0.tgz", + "integrity": "sha512-2t3XstrKULz41MNMBF+cJ97TyHdyQ8HCt//pqErqDvNjU9YQBnZxIHa11VXsi7F3mb5/aO2tuDxdeTPdU7xu9Q==", "dependencies": { - "@types/eslint-scope": "^3.7.3", "@types/estree": "^1.0.5", "@webassemblyjs/ast": "^1.12.1", "@webassemblyjs/wasm-edit": "^1.12.1", "@webassemblyjs/wasm-parser": "^1.12.1", "acorn": "^8.7.1", - "acorn-import-assertions": "^1.9.0", + "acorn-import-attributes": "^1.9.5", "browserslist": "^4.21.10", "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^5.16.0", + "enhanced-resolve": "^5.17.1", "es-module-lexer": "^1.2.1", "eslint-scope": "5.1.1", "events": "^3.2.0", @@ -57537,20 +57520,6 @@ "@types/ms": "*" } }, - "@types/eslint": { - "version": "8.4.6", - "requires": { - "@types/estree": "*", - "@types/json-schema": "*" - } - }, - "@types/eslint-scope": { - "version": "3.7.4", - "requires": { - "@types/eslint": "*", - "@types/estree": "*" - } - }, "@types/estree": { "version": "0.0.51" }, @@ -58359,10 +58328,10 @@ } } }, - "acorn-import-assertions": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz", - "integrity": "sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==", + "acorn-import-attributes": { + "version": "1.9.5", + "resolved": "https://registry.npmjs.org/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz", + "integrity": "sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==", "requires": {} }, "acorn-jsx": { @@ -62002,9 +61971,9 @@ } }, "enhanced-resolve": { - "version": "5.16.0", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.16.0.tgz", - "integrity": "sha512-O+QWCviPNSSLAD9Ucn8Awv+poAkqn3T1XY5/N7kR7rQO9yfSGWkYZDwpJ+iKF7B8rxaQKWngSqACpgzeapSyoA==", + "version": "5.17.1", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz", + "integrity": "sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==", "requires": { "graceful-fs": "^4.2.4", "tapable": "^2.2.0" @@ -72932,7 +72901,7 @@ } }, "rollup": { - "version": "2.58.0", + "version": "^2.79.2", "dev": true, "requires": { "fsevents": "~2.3.2" @@ -75916,20 +75885,19 @@ "dev": true }, "webpack": { - "version": "5.91.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.91.0.tgz", - "integrity": "sha512-rzVwlLeBWHJbmgTC/8TvAcu5vpJNII+MelQpylD4jNERPwpBJOE2lEcko1zJX3QJeLjTTAnQxn/OJ8bjDzVQaw==", + "version": "5.95.0", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.95.0.tgz", + "integrity": "sha512-2t3XstrKULz41MNMBF+cJ97TyHdyQ8HCt//pqErqDvNjU9YQBnZxIHa11VXsi7F3mb5/aO2tuDxdeTPdU7xu9Q==", "requires": { - "@types/eslint-scope": "^3.7.3", "@types/estree": "^1.0.5", "@webassemblyjs/ast": "^1.12.1", "@webassemblyjs/wasm-edit": "^1.12.1", "@webassemblyjs/wasm-parser": "^1.12.1", "acorn": "^8.7.1", - "acorn-import-assertions": "^1.9.0", + "acorn-import-attributes": "^1.9.5", "browserslist": "^4.21.10", "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^5.16.0", + "enhanced-resolve": "^5.17.1", "es-module-lexer": "^1.2.1", "eslint-scope": "5.1.1", "events": "^3.2.0", diff --git a/packages/components/accordion/CHANGELOG.md b/packages/components/accordion/CHANGELOG.md index 3ed920ebe5..00823c206d 100644 --- a/packages/components/accordion/CHANGELOG.md +++ b/packages/components/accordion/CHANGELOG.md @@ -1,5 +1,33 @@ # Change Log +## 4.74.0 + +### Patch Changes + +- Updated dependencies []: + - @contentful/f36-collapse@4.74.0 + - @contentful/f36-core@4.74.0 + - @contentful/f36-typography@4.74.0 + +## 4.73.0 + +### Patch Changes + +- Updated dependencies []: + - @contentful/f36-collapse@4.73.0 + - @contentful/f36-core@4.73.0 + - @contentful/f36-typography@4.73.0 + +## 4.72.0 + +### Patch Changes + +- Updated dependencies [[`0067b57`](https://github.com/contentful/forma-36/commit/0067b57aaadbd05cb878dd5e34d407a80b000281)]: + - @contentful/f36-tokens@4.1.0 + - @contentful/f36-typography@4.72.0 + - @contentful/f36-collapse@4.72.0 + - @contentful/f36-core@4.72.0 + ## 4.71.2 ### Patch Changes diff --git a/packages/components/accordion/package.json b/packages/components/accordion/package.json index 7b40b4878e..dfba3c551b 100644 --- a/packages/components/accordion/package.json +++ b/packages/components/accordion/package.json @@ -1,6 +1,6 @@ { "name": "@contentful/f36-accordion", - "version": "4.71.2", + "version": "4.74.0", "description": "Forma 36: Accordion React Component", "license": "MIT", "files": [ @@ -20,11 +20,11 @@ "build": "tsup" }, "dependencies": { - "@contentful/f36-collapse": "^4.71.2", - "@contentful/f36-core": "^4.71.2", + "@contentful/f36-collapse": "^4.74.0", + "@contentful/f36-core": "^4.74.0", "@contentful/f36-icons": "^4.29.0", - "@contentful/f36-tokens": "^4.0.4", - "@contentful/f36-typography": "^4.71.2", + "@contentful/f36-tokens": "^4.1.0", + "@contentful/f36-typography": "^4.74.0", "emotion": "^10.0.17" }, "peerDependencies": { diff --git a/packages/components/asset/CHANGELOG.md b/packages/components/asset/CHANGELOG.md index 088de37992..fc0cbd5686 100644 --- a/packages/components/asset/CHANGELOG.md +++ b/packages/components/asset/CHANGELOG.md @@ -1,5 +1,33 @@ # Change Log +## 4.74.0 + +### Patch Changes + +- Updated dependencies []: + - @contentful/f36-core@4.74.0 + - @contentful/f36-icon@4.74.0 + - @contentful/f36-typography@4.74.0 + +## 4.73.0 + +### Patch Changes + +- Updated dependencies []: + - @contentful/f36-core@4.73.0 + - @contentful/f36-icon@4.73.0 + - @contentful/f36-typography@4.73.0 + +## 4.72.0 + +### Patch Changes + +- Updated dependencies [[`0067b57`](https://github.com/contentful/forma-36/commit/0067b57aaadbd05cb878dd5e34d407a80b000281)]: + - @contentful/f36-tokens@4.1.0 + - @contentful/f36-typography@4.72.0 + - @contentful/f36-core@4.72.0 + - @contentful/f36-icon@4.72.0 + ## 4.71.2 ### Patch Changes diff --git a/packages/components/asset/package.json b/packages/components/asset/package.json index 9c7d1c4ba9..80b584136c 100644 --- a/packages/components/asset/package.json +++ b/packages/components/asset/package.json @@ -1,16 +1,16 @@ { "name": "@contentful/f36-asset", - "version": "4.71.2", + "version": "4.74.0", "description": "Forma 36: Asset component", "scripts": { "build": "tsup" }, "dependencies": { - "@contentful/f36-core": "^4.71.2", - "@contentful/f36-icon": "^4.71.2", + "@contentful/f36-core": "^4.74.0", + "@contentful/f36-icon": "^4.74.0", "@contentful/f36-icons": "^4.29.0", - "@contentful/f36-tokens": "^4.0.4", - "@contentful/f36-typography": "^4.71.2", + "@contentful/f36-tokens": "^4.1.0", + "@contentful/f36-typography": "^4.74.0", "emotion": "^10.0.17" }, "peerDependencies": { diff --git a/packages/components/autocomplete/CHANGELOG.md b/packages/components/autocomplete/CHANGELOG.md index f719f1b174..c43f169aa3 100644 --- a/packages/components/autocomplete/CHANGELOG.md +++ b/packages/components/autocomplete/CHANGELOG.md @@ -1,5 +1,42 @@ # Change Log +## 4.74.0 + +### Patch Changes + +- Updated dependencies []: + - @contentful/f36-button@4.74.0 + - @contentful/f36-core@4.74.0 + - @contentful/f36-forms@4.74.0 + - @contentful/f36-popover@4.74.0 + - @contentful/f36-skeleton@4.74.0 + - @contentful/f36-typography@4.74.0 + +## 4.73.0 + +### Patch Changes + +- Updated dependencies []: + - @contentful/f36-button@4.73.0 + - @contentful/f36-core@4.73.0 + - @contentful/f36-forms@4.73.0 + - @contentful/f36-popover@4.73.0 + - @contentful/f36-skeleton@4.73.0 + - @contentful/f36-typography@4.73.0 + +## 4.72.0 + +### Patch Changes + +- Updated dependencies [[`0067b57`](https://github.com/contentful/forma-36/commit/0067b57aaadbd05cb878dd5e34d407a80b000281)]: + - @contentful/f36-tokens@4.1.0 + - @contentful/f36-typography@4.72.0 + - @contentful/f36-button@4.72.0 + - @contentful/f36-core@4.72.0 + - @contentful/f36-forms@4.72.0 + - @contentful/f36-popover@4.72.0 + - @contentful/f36-skeleton@4.72.0 + ## 4.71.2 ### Patch Changes diff --git a/packages/components/autocomplete/package.json b/packages/components/autocomplete/package.json index 28d01c509c..fad270ab8a 100644 --- a/packages/components/autocomplete/package.json +++ b/packages/components/autocomplete/package.json @@ -1,19 +1,19 @@ { "name": "@contentful/f36-autocomplete", - "version": "4.71.2", + "version": "4.74.0", "description": "Forma 36: Autocomplete component", "scripts": { "build": "tsup" }, "dependencies": { - "@contentful/f36-button": "^4.71.2", - "@contentful/f36-core": "^4.71.2", - "@contentful/f36-forms": "^4.71.2", + "@contentful/f36-button": "^4.74.0", + "@contentful/f36-core": "^4.74.0", + "@contentful/f36-forms": "^4.74.0", "@contentful/f36-icons": "^4.29.0", - "@contentful/f36-popover": "^4.71.2", - "@contentful/f36-skeleton": "^4.71.2", - "@contentful/f36-tokens": "^4.0.4", - "@contentful/f36-typography": "^4.71.2", + "@contentful/f36-popover": "^4.74.0", + "@contentful/f36-skeleton": "^4.74.0", + "@contentful/f36-tokens": "^4.1.0", + "@contentful/f36-typography": "^4.74.0", "@contentful/f36-utils": "^4.24.3", "downshift": "^6.1.12", "emotion": "^10.0.17" diff --git a/packages/components/avatar/CHANGELOG.md b/packages/components/avatar/CHANGELOG.md index e1ebbb2ec5..a4e39c2168 100644 --- a/packages/components/avatar/CHANGELOG.md +++ b/packages/components/avatar/CHANGELOG.md @@ -1,5 +1,40 @@ # Change Log +## 4.74.0 + +### Minor Changes + +- [#2909](https://github.com/contentful/forma-36/pull/2909) [`af9da8c`](https://github.com/contentful/forma-36/commit/af9da8c85f18a61d0dce86dd4370a86fb5a133c8) Thanks [@andipaetzold](https://github.com/andipaetzold)! - increase inner white padding for app variant + +### Patch Changes + +- Updated dependencies []: + - @contentful/f36-core@4.74.0 + - @contentful/f36-menu@4.74.0 + - @contentful/f36-tooltip@4.74.0 + - @contentful/f36-image@4.74.0 + +## 4.73.0 + +### Patch Changes + +- Updated dependencies []: + - @contentful/f36-core@4.73.0 + - @contentful/f36-menu@4.73.0 + - @contentful/f36-tooltip@4.73.0 + - @contentful/f36-image@4.73.0 + +## 4.72.0 + +### Patch Changes + +- Updated dependencies [[`0067b57`](https://github.com/contentful/forma-36/commit/0067b57aaadbd05cb878dd5e34d407a80b000281)]: + - @contentful/f36-tokens@4.1.0 + - @contentful/f36-core@4.72.0 + - @contentful/f36-menu@4.72.0 + - @contentful/f36-tooltip@4.72.0 + - @contentful/f36-image@4.72.0 + ## 4.71.2 ### Patch Changes diff --git a/packages/components/avatar/package.json b/packages/components/avatar/package.json index e4aef38706..b79402d3ab 100644 --- a/packages/components/avatar/package.json +++ b/packages/components/avatar/package.json @@ -1,16 +1,16 @@ { "name": "@contentful/f36-avatar", - "version": "4.71.2", + "version": "4.74.0", "description": "Forma 36: Avatar component", "scripts": { "build": "tsup" }, "dependencies": { - "@contentful/f36-core": "^4.71.2", - "@contentful/f36-image": "4.71.2", - "@contentful/f36-menu": "^4.71.2", - "@contentful/f36-tokens": "^4.0.5", - "@contentful/f36-tooltip": "^4.71.2", + "@contentful/f36-core": "^4.74.0", + "@contentful/f36-image": "4.74.0", + "@contentful/f36-menu": "^4.74.0", + "@contentful/f36-tokens": "^4.1.0", + "@contentful/f36-tooltip": "^4.74.0", "emotion": "^10.0.17" }, "peerDependencies": { diff --git a/packages/components/avatar/src/Avatar/Avatar.styles.ts b/packages/components/avatar/src/Avatar/Avatar.styles.ts index 8972aa6c30..2fd2687897 100644 --- a/packages/components/avatar/src/Avatar/Avatar.styles.ts +++ b/packages/components/avatar/src/Avatar/Avatar.styles.ts @@ -1,26 +1,33 @@ import { css } from 'emotion'; import tokens from '@contentful/f36-tokens'; import { type AvatarProps } from './Avatar'; +import { type Variant } from './types'; import { - APP_BORDER_RADIUS, applyMuted, avatarColorMap, getColorWidth, + getInnerRadius, + getOuterRadius, getTotalBorderWidth, parseSize, toPixels, type ColorVariant, } from './utils'; -export const getColorVariantStyles = (colorVariant: ColorVariant) => { +export const getColorVariantStyles = ( + variant: Variant, + colorVariant: ColorVariant, + size: number, +) => { const colorToken: string = avatarColorMap[colorVariant]; + const colorWidth = getColorWidth(colorVariant); + const totalBorderWidth = getTotalBorderWidth(variant, colorVariant, size); + return { boxShadow: [ - `0px 0px 0px ${getColorWidth(colorVariant)}px ${colorToken} inset`, - `0px 0px 0px ${getTotalBorderWidth(colorVariant)}px ${ - tokens.colorWhite - } inset`, + `0px 0px 0px ${colorWidth}px ${colorToken} inset`, + `0px 0px 0px ${totalBorderWidth}px ${tokens.colorWhite} inset`, ].join(', '), }; }; @@ -33,22 +40,17 @@ export const getAvatarStyles = ({ colorVariant, }: { size: AvatarProps['size']; - variant: AvatarProps['variant']; + variant: Variant; colorVariant: ColorVariant; }) => { - const borderRadius = variant === 'app' ? APP_BORDER_RADIUS : '100%'; + const borderRadius = getOuterRadius(variant); + const innerBorderRadius = getInnerRadius(variant); - // The inner border radius is smaller than the outer border radius - // See https://github.com/webuild-community/advent-of-sharing/blob/main/2022/day-06.md - const innerBorderRadius = - variant === 'app' - ? APP_BORDER_RADIUS - getTotalBorderWidth(colorVariant) - : '100%'; + const size = parseSize(sizeOption); + const totalBorderWidth = getTotalBorderWidth(variant, colorVariant, size); const isMuted = colorVariant === 'muted'; - const size = parseSize(sizeOption); - return { fallback: css({ backgroundColor: isMuted ? applyMuted(tokens.gray300) : tokens.gray300, @@ -77,7 +79,7 @@ export const getAvatarStyles = ({ width: size, overflow: 'hidden', position: 'relative', - padding: getTotalBorderWidth(colorVariant), + padding: totalBorderWidth, // color variant border '&::after': { @@ -89,7 +91,7 @@ export const getAvatarStyles = ({ position: 'absolute', top: 0, right: 0, - ...getColorVariantStyles(colorVariant), + ...getColorVariantStyles(variant, colorVariant, size), }, }), imageContainer: css( diff --git a/packages/components/avatar/src/Avatar/Avatar.tsx b/packages/components/avatar/src/Avatar/Avatar.tsx index a345dee5ba..0ff43e2126 100644 --- a/packages/components/avatar/src/Avatar/Avatar.tsx +++ b/packages/components/avatar/src/Avatar/Avatar.tsx @@ -11,8 +11,8 @@ import { import { getAvatarStyles } from './Avatar.styles'; import { type ColorVariant, type Size, type SizeInPixel } from './utils'; - -export type Variant = 'app' | 'user'; +import type { Variant } from './types'; +export { type Variant } from './types'; export interface AvatarProps extends CommonProps { alt?: ImageProps['alt']; diff --git a/packages/components/avatar/src/Avatar/types.ts b/packages/components/avatar/src/Avatar/types.ts new file mode 100644 index 0000000000..308340c8d9 --- /dev/null +++ b/packages/components/avatar/src/Avatar/types.ts @@ -0,0 +1 @@ +export type Variant = 'app' | 'user'; diff --git a/packages/components/avatar/src/Avatar/utils.ts b/packages/components/avatar/src/Avatar/utils.ts index 96526ce9d8..41998673ef 100644 --- a/packages/components/avatar/src/Avatar/utils.ts +++ b/packages/components/avatar/src/Avatar/utils.ts @@ -1,6 +1,7 @@ import tokens from '@contentful/f36-tokens'; import { AvatarProps } from './Avatar'; +import { type Variant } from './types'; export const SIZES = ['tiny', 'small', 'medium', 'large'] as const; export type Size = (typeof SIZES)[number]; @@ -8,9 +9,6 @@ export type SizeInPixel = `${number}px`; export type ColorVariant = keyof typeof avatarColorMap; -export const APP_BORDER_RADIUS = 4; -const WHITE_BORDER_WIDTH = 1; - export const avatarColorMap = { primary: tokens.blue500, muted: applyMuted(tokens.gray500), @@ -43,12 +41,24 @@ export function applyMuted(color: string): string { // return `color-mix(in srgb, ${color}, ${tokens.colorWhite} 50%)`; } +export function getWhiteBorderWidth(variant: Variant, size: number): number { + if (variant === 'user') { + return 1; + } + + return size >= 48 ? 3 : 2; +} + export function getColorWidth(colorVariant: ColorVariant): number { return ['muted', 'gray'].includes(colorVariant) ? 1 : 2; } -export function getTotalBorderWidth(colorVariant: ColorVariant): number { - return getColorWidth(colorVariant) + WHITE_BORDER_WIDTH; +export function getTotalBorderWidth( + variant: Variant, + colorVariant: ColorVariant, + size: number, +): number { + return getColorWidth(colorVariant) + getWhiteBorderWidth(variant, size); } /** @@ -76,3 +86,11 @@ export const parseSize = (size: AvatarProps['size']): number => { export function toPixels(size: number): SizeInPixel { return `${size}px`; } + +export function getOuterRadius(variant: Variant): string { + return variant === 'app' ? '4px' : '100%'; +} + +export function getInnerRadius(variant: Variant): string { + return variant === 'app' ? '1px' : '100%'; +} diff --git a/packages/components/badge/CHANGELOG.md b/packages/components/badge/CHANGELOG.md index e699c955a5..b6a92ffb7d 100644 --- a/packages/components/badge/CHANGELOG.md +++ b/packages/components/badge/CHANGELOG.md @@ -1,5 +1,27 @@ # Change Log +## 4.74.0 + +### Patch Changes + +- Updated dependencies []: + - @contentful/f36-core@4.74.0 + +## 4.73.0 + +### Patch Changes + +- Updated dependencies []: + - @contentful/f36-core@4.73.0 + +## 4.72.0 + +### Patch Changes + +- Updated dependencies [[`0067b57`](https://github.com/contentful/forma-36/commit/0067b57aaadbd05cb878dd5e34d407a80b000281)]: + - @contentful/f36-tokens@4.1.0 + - @contentful/f36-core@4.72.0 + ## 4.71.2 ### Patch Changes diff --git a/packages/components/badge/package.json b/packages/components/badge/package.json index a3057736bd..0532c1d0f5 100644 --- a/packages/components/badge/package.json +++ b/packages/components/badge/package.json @@ -1,6 +1,6 @@ { "name": "@contentful/f36-badge", - "version": "4.71.2", + "version": "4.74.0", "description": "Forma 36: Badge React Component", "license": "MIT", "files": [ @@ -20,13 +20,13 @@ "build": "tsup" }, "dependencies": { - "@contentful/f36-core": "^4.71.2", + "@contentful/f36-core": "^4.74.0", "@contentful/f36-icons": "^4.29.0", - "@contentful/f36-tokens": "^4.0.4", + "@contentful/f36-tokens": "^4.1.0", "emotion": "^10.0.17" }, "devDependencies": { - "@contentful/f36-typography": "^4.71.2" + "@contentful/f36-typography": "^4.74.0" }, "peerDependencies": { "react": ">=16.8", diff --git a/packages/components/button/CHANGELOG.md b/packages/components/button/CHANGELOG.md index dc33c0a2c3..223406a24b 100644 --- a/packages/components/button/CHANGELOG.md +++ b/packages/components/button/CHANGELOG.md @@ -1,5 +1,33 @@ # Change Log +## 4.74.0 + +### Patch Changes + +- Updated dependencies []: + - @contentful/f36-core@4.74.0 + - @contentful/f36-spinner@4.74.0 + - @contentful/f36-tooltip@4.74.0 + +## 4.73.0 + +### Patch Changes + +- Updated dependencies []: + - @contentful/f36-core@4.73.0 + - @contentful/f36-spinner@4.73.0 + - @contentful/f36-tooltip@4.73.0 + +## 4.72.0 + +### Patch Changes + +- Updated dependencies [[`0067b57`](https://github.com/contentful/forma-36/commit/0067b57aaadbd05cb878dd5e34d407a80b000281)]: + - @contentful/f36-tokens@4.1.0 + - @contentful/f36-core@4.72.0 + - @contentful/f36-spinner@4.72.0 + - @contentful/f36-tooltip@4.72.0 + ## 4.71.2 ### Patch Changes diff --git a/packages/components/button/package.json b/packages/components/button/package.json index f568fb0707..c89a1a4769 100644 --- a/packages/components/button/package.json +++ b/packages/components/button/package.json @@ -1,20 +1,20 @@ { "name": "@contentful/f36-button", - "version": "4.71.2", + "version": "4.74.0", "description": "Forma 36: Button component", "scripts": { "build": "tsup" }, "dependencies": { - "@contentful/f36-core": "^4.71.2", - "@contentful/f36-spinner": "^4.71.2", - "@contentful/f36-tokens": "^4.0.4", - "@contentful/f36-tooltip": "^4.71.2", + "@contentful/f36-core": "^4.74.0", + "@contentful/f36-spinner": "^4.74.0", + "@contentful/f36-tokens": "^4.1.0", + "@contentful/f36-tooltip": "^4.74.0", "@contentful/f36-utils": "^4.24.3", "emotion": "^10.0.17" }, "devDependencies": { - "@contentful/f36-icon": "^4.71.2", + "@contentful/f36-icon": "^4.74.0", "@contentful/f36-icons": "^4.29.0" }, "peerDependencies": { diff --git a/packages/components/card/CHANGELOG.md b/packages/components/card/CHANGELOG.md index 2d22586fe7..2ee186b4d1 100644 --- a/packages/components/card/CHANGELOG.md +++ b/packages/components/card/CHANGELOG.md @@ -1,5 +1,54 @@ # Change Log +## 4.74.0 + +### Patch Changes + +- Updated dependencies []: + - @contentful/f36-asset@4.74.0 + - @contentful/f36-badge@4.74.0 + - @contentful/f36-button@4.74.0 + - @contentful/f36-core@4.74.0 + - @contentful/f36-drag-handle@4.74.0 + - @contentful/f36-icon@4.74.0 + - @contentful/f36-menu@4.74.0 + - @contentful/f36-skeleton@4.74.0 + - @contentful/f36-tooltip@4.74.0 + - @contentful/f36-typography@4.74.0 + +## 4.73.0 + +### Patch Changes + +- Updated dependencies []: + - @contentful/f36-asset@4.73.0 + - @contentful/f36-badge@4.73.0 + - @contentful/f36-button@4.73.0 + - @contentful/f36-core@4.73.0 + - @contentful/f36-drag-handle@4.73.0 + - @contentful/f36-icon@4.73.0 + - @contentful/f36-menu@4.73.0 + - @contentful/f36-skeleton@4.73.0 + - @contentful/f36-tooltip@4.73.0 + - @contentful/f36-typography@4.73.0 + +## 4.72.0 + +### Patch Changes + +- Updated dependencies [[`0067b57`](https://github.com/contentful/forma-36/commit/0067b57aaadbd05cb878dd5e34d407a80b000281)]: + - @contentful/f36-tokens@4.1.0 + - @contentful/f36-typography@4.72.0 + - @contentful/f36-asset@4.72.0 + - @contentful/f36-badge@4.72.0 + - @contentful/f36-button@4.72.0 + - @contentful/f36-core@4.72.0 + - @contentful/f36-drag-handle@4.72.0 + - @contentful/f36-icon@4.72.0 + - @contentful/f36-menu@4.72.0 + - @contentful/f36-skeleton@4.72.0 + - @contentful/f36-tooltip@4.72.0 + ## 4.71.2 ### Patch Changes diff --git a/packages/components/card/package.json b/packages/components/card/package.json index bd2cec0e24..7569ea290b 100644 --- a/packages/components/card/package.json +++ b/packages/components/card/package.json @@ -1,23 +1,23 @@ { "name": "@contentful/f36-card", - "version": "4.71.2", + "version": "4.74.0", "description": "Forma 36: Card components", "scripts": { "build": "tsup" }, "dependencies": { - "@contentful/f36-asset": "^4.71.2", - "@contentful/f36-badge": "^4.71.2", - "@contentful/f36-button": "^4.71.2", - "@contentful/f36-core": "^4.71.2", - "@contentful/f36-drag-handle": "^4.71.2", - "@contentful/f36-icon": "^4.71.2", + "@contentful/f36-asset": "^4.74.0", + "@contentful/f36-badge": "^4.74.0", + "@contentful/f36-button": "^4.74.0", + "@contentful/f36-core": "^4.74.0", + "@contentful/f36-drag-handle": "^4.74.0", + "@contentful/f36-icon": "^4.74.0", "@contentful/f36-icons": "^4.29.0", - "@contentful/f36-menu": "^4.71.2", - "@contentful/f36-skeleton": "^4.71.2", - "@contentful/f36-tokens": "^4.0.4", - "@contentful/f36-tooltip": "^4.71.2", - "@contentful/f36-typography": "^4.71.2", + "@contentful/f36-menu": "^4.74.0", + "@contentful/f36-skeleton": "^4.74.0", + "@contentful/f36-tokens": "^4.1.0", + "@contentful/f36-tooltip": "^4.74.0", + "@contentful/f36-typography": "^4.74.0", "emotion": "^10.0.17", "truncate": "^3.0.0" }, diff --git a/packages/components/collapse/CHANGELOG.md b/packages/components/collapse/CHANGELOG.md index ddf5e9a8be..5ec8247ac1 100644 --- a/packages/components/collapse/CHANGELOG.md +++ b/packages/components/collapse/CHANGELOG.md @@ -1,5 +1,27 @@ # Change Log +## 4.74.0 + +### Patch Changes + +- Updated dependencies []: + - @contentful/f36-core@4.74.0 + +## 4.73.0 + +### Patch Changes + +- Updated dependencies []: + - @contentful/f36-core@4.73.0 + +## 4.72.0 + +### Patch Changes + +- Updated dependencies [[`0067b57`](https://github.com/contentful/forma-36/commit/0067b57aaadbd05cb878dd5e34d407a80b000281)]: + - @contentful/f36-tokens@4.1.0 + - @contentful/f36-core@4.72.0 + ## 4.71.2 ### Patch Changes diff --git a/packages/components/collapse/package.json b/packages/components/collapse/package.json index b6a0738ed2..2aacc4a2aa 100644 --- a/packages/components/collapse/package.json +++ b/packages/components/collapse/package.json @@ -1,6 +1,6 @@ { "name": "@contentful/f36-collapse", - "version": "4.71.2", + "version": "4.74.0", "description": "Forma 36: Collapse React Component", "license": "MIT", "files": [ @@ -20,8 +20,8 @@ "build": "tsup" }, "dependencies": { - "@contentful/f36-core": "^4.71.2", - "@contentful/f36-tokens": "^4.0.4", + "@contentful/f36-core": "^4.74.0", + "@contentful/f36-tokens": "^4.1.0", "emotion": "^10.0.17" }, "peerDependencies": { diff --git a/packages/components/copybutton/CHANGELOG.md b/packages/components/copybutton/CHANGELOG.md index 852b577518..a0c79a236d 100644 --- a/packages/components/copybutton/CHANGELOG.md +++ b/packages/components/copybutton/CHANGELOG.md @@ -1,5 +1,33 @@ # Change Log +## 4.74.0 + +### Patch Changes + +- Updated dependencies []: + - @contentful/f36-button@4.74.0 + - @contentful/f36-core@4.74.0 + - @contentful/f36-tooltip@4.74.0 + +## 4.73.0 + +### Patch Changes + +- Updated dependencies []: + - @contentful/f36-button@4.73.0 + - @contentful/f36-core@4.73.0 + - @contentful/f36-tooltip@4.73.0 + +## 4.72.0 + +### Patch Changes + +- Updated dependencies [[`0067b57`](https://github.com/contentful/forma-36/commit/0067b57aaadbd05cb878dd5e34d407a80b000281)]: + - @contentful/f36-tokens@4.1.0 + - @contentful/f36-button@4.72.0 + - @contentful/f36-core@4.72.0 + - @contentful/f36-tooltip@4.72.0 + ## 4.71.2 ### Patch Changes diff --git a/packages/components/copybutton/package.json b/packages/components/copybutton/package.json index c19826975e..cb28e64a8e 100644 --- a/packages/components/copybutton/package.json +++ b/packages/components/copybutton/package.json @@ -1,16 +1,16 @@ { "name": "@contentful/f36-copybutton", - "version": "4.71.2", + "version": "4.74.0", "description": "Forma 36: CopyButton component", "scripts": { "build": "tsup" }, "dependencies": { - "@contentful/f36-button": "^4.71.2", - "@contentful/f36-core": "^4.71.2", + "@contentful/f36-button": "^4.74.0", + "@contentful/f36-core": "^4.74.0", "@contentful/f36-icons": "^4.29.0", - "@contentful/f36-tokens": "^4.0.4", - "@contentful/f36-tooltip": "^4.71.2", + "@contentful/f36-tokens": "^4.1.0", + "@contentful/f36-tooltip": "^4.74.0", "emotion": "^10.0.17" }, "peerDependencies": { diff --git a/packages/components/datepicker/CHANGELOG.md b/packages/components/datepicker/CHANGELOG.md index fa9b5b7156..5878da0d41 100644 --- a/packages/components/datepicker/CHANGELOG.md +++ b/packages/components/datepicker/CHANGELOG.md @@ -1,5 +1,39 @@ # @contentful/f36-datepicker +## 4.74.0 + +### Patch Changes + +- Updated dependencies []: + - @contentful/f36-button@4.74.0 + - @contentful/f36-core@4.74.0 + - @contentful/f36-forms@4.74.0 + - @contentful/f36-popover@4.74.0 + - @contentful/f36-typography@4.74.0 + +## 4.73.0 + +### Patch Changes + +- Updated dependencies []: + - @contentful/f36-button@4.73.0 + - @contentful/f36-core@4.73.0 + - @contentful/f36-forms@4.73.0 + - @contentful/f36-popover@4.73.0 + - @contentful/f36-typography@4.73.0 + +## 4.72.0 + +### Patch Changes + +- Updated dependencies [[`0067b57`](https://github.com/contentful/forma-36/commit/0067b57aaadbd05cb878dd5e34d407a80b000281)]: + - @contentful/f36-tokens@4.1.0 + - @contentful/f36-typography@4.72.0 + - @contentful/f36-button@4.72.0 + - @contentful/f36-core@4.72.0 + - @contentful/f36-forms@4.72.0 + - @contentful/f36-popover@4.72.0 + ## 4.71.2 ### Patch Changes diff --git a/packages/components/datepicker/package.json b/packages/components/datepicker/package.json index d28896364d..47b4c55b93 100644 --- a/packages/components/datepicker/package.json +++ b/packages/components/datepicker/package.json @@ -1,18 +1,18 @@ { "name": "@contentful/f36-datepicker", - "version": "4.71.2", + "version": "4.74.0", "description": "Forma 36: Datepicker component", "scripts": { "build": "tsup" }, "dependencies": { - "@contentful/f36-core": "^4.71.2", - "@contentful/f36-typography": "^4.71.2", - "@contentful/f36-forms": "^4.71.2", - "@contentful/f36-popover": "^4.71.2", + "@contentful/f36-core": "^4.74.0", + "@contentful/f36-typography": "^4.74.0", + "@contentful/f36-forms": "^4.74.0", + "@contentful/f36-popover": "^4.74.0", "@contentful/f36-icons": "^4.29.0", - "@contentful/f36-button": "^4.71.2", - "@contentful/f36-tokens": "^4.0.4", + "@contentful/f36-button": "^4.74.0", + "@contentful/f36-tokens": "^4.1.0", "emotion": "^10.0.17", "date-fns": "^2.28.0", "react-day-picker": "^8.7.1", diff --git a/packages/components/datetime/CHANGELOG.md b/packages/components/datetime/CHANGELOG.md index db633cbf50..9b7d179a6a 100644 --- a/packages/components/datetime/CHANGELOG.md +++ b/packages/components/datetime/CHANGELOG.md @@ -1,5 +1,27 @@ # Change Log +## 4.74.0 + +### Patch Changes + +- Updated dependencies []: + - @contentful/f36-core@4.74.0 + +## 4.73.0 + +### Patch Changes + +- Updated dependencies []: + - @contentful/f36-core@4.73.0 + +## 4.72.0 + +### Patch Changes + +- Updated dependencies [[`0067b57`](https://github.com/contentful/forma-36/commit/0067b57aaadbd05cb878dd5e34d407a80b000281)]: + - @contentful/f36-tokens@4.1.0 + - @contentful/f36-core@4.72.0 + ## 4.71.2 ### Patch Changes diff --git a/packages/components/datetime/package.json b/packages/components/datetime/package.json index 56e46d940b..15be74fb25 100644 --- a/packages/components/datetime/package.json +++ b/packages/components/datetime/package.json @@ -1,13 +1,13 @@ { "name": "@contentful/f36-datetime", - "version": "4.71.2", + "version": "4.74.0", "description": "Forma 36: DateTime component", "scripts": { "build": "tsup" }, "dependencies": { - "@contentful/f36-core": "^4.71.2", - "@contentful/f36-tokens": "^4.0.4", + "@contentful/f36-core": "^4.74.0", + "@contentful/f36-tokens": "^4.1.0", "dayjs": "^1.11.5", "emotion": "^10.0.17" }, diff --git a/packages/components/drag-handle/CHANGELOG.md b/packages/components/drag-handle/CHANGELOG.md index 147f208ee0..eab449889b 100644 --- a/packages/components/drag-handle/CHANGELOG.md +++ b/packages/components/drag-handle/CHANGELOG.md @@ -1,5 +1,27 @@ # Change Log +## 4.74.0 + +### Patch Changes + +- Updated dependencies []: + - @contentful/f36-core@4.74.0 + +## 4.73.0 + +### Patch Changes + +- Updated dependencies []: + - @contentful/f36-core@4.73.0 + +## 4.72.0 + +### Patch Changes + +- Updated dependencies [[`0067b57`](https://github.com/contentful/forma-36/commit/0067b57aaadbd05cb878dd5e34d407a80b000281)]: + - @contentful/f36-tokens@4.1.0 + - @contentful/f36-core@4.72.0 + ## 4.71.2 ### Patch Changes diff --git a/packages/components/drag-handle/package.json b/packages/components/drag-handle/package.json index 185dfe6c2e..545e0837ff 100644 --- a/packages/components/drag-handle/package.json +++ b/packages/components/drag-handle/package.json @@ -1,15 +1,15 @@ { "name": "@contentful/f36-drag-handle", - "version": "4.71.2", + "version": "4.74.0", "description": "Forma 36: DragHandle component", "scripts": { "build": "tsup" }, "dependencies": { - "@contentful/f36-core": "^4.71.2", + "@contentful/f36-core": "^4.74.0", "@contentful/f36-icons": "^4.29.0", "@contentful/f36-utils": "^4.24.3", - "@contentful/f36-tokens": "^4.0.4", + "@contentful/f36-tokens": "^4.1.0", "emotion": "^10.0.17" }, "peerDependencies": { diff --git a/packages/components/empty-state/CHANGELOG.md b/packages/components/empty-state/CHANGELOG.md index 92931c2f72..86c2af12cd 100644 --- a/packages/components/empty-state/CHANGELOG.md +++ b/packages/components/empty-state/CHANGELOG.md @@ -1,5 +1,27 @@ # Change Log +## 4.74.0 + +### Patch Changes + +- Updated dependencies []: + - @contentful/f36-typography@4.74.0 + +## 4.73.0 + +### Patch Changes + +- Updated dependencies []: + - @contentful/f36-typography@4.73.0 + +## 4.72.0 + +### Patch Changes + +- Updated dependencies [[`0067b57`](https://github.com/contentful/forma-36/commit/0067b57aaadbd05cb878dd5e34d407a80b000281)]: + - @contentful/f36-tokens@4.1.0 + - @contentful/f36-typography@4.72.0 + ## 4.71.2 ### Patch Changes diff --git a/packages/components/empty-state/package.json b/packages/components/empty-state/package.json index be27e7eb92..b99f78cc90 100644 --- a/packages/components/empty-state/package.json +++ b/packages/components/empty-state/package.json @@ -1,6 +1,6 @@ { "name": "@contentful/f36-empty-state", - "version": "4.71.2", + "version": "4.74.0", "description": "Forma 36: Empty State React Components", "license": "MIT", "files": [ @@ -21,8 +21,8 @@ }, "dependencies": { "emotion": "^10.0.17", - "@contentful/f36-tokens": "^4.0.4", - "@contentful/f36-typography": "^4.71.2" + "@contentful/f36-tokens": "^4.1.0", + "@contentful/f36-typography": "^4.74.0" }, "peerDependencies": { "react": ">=16.8", diff --git a/packages/components/entity-list/CHANGELOG.md b/packages/components/entity-list/CHANGELOG.md index 5c8c74f36f..2f52363709 100644 --- a/packages/components/entity-list/CHANGELOG.md +++ b/packages/components/entity-list/CHANGELOG.md @@ -1,5 +1,48 @@ # Change Log +## 4.74.0 + +### Patch Changes + +- Updated dependencies []: + - @contentful/f36-badge@4.74.0 + - @contentful/f36-button@4.74.0 + - @contentful/f36-core@4.74.0 + - @contentful/f36-drag-handle@4.74.0 + - @contentful/f36-icon@4.74.0 + - @contentful/f36-menu@4.74.0 + - @contentful/f36-skeleton@4.74.0 + - @contentful/f36-typography@4.74.0 + +## 4.73.0 + +### Patch Changes + +- Updated dependencies []: + - @contentful/f36-badge@4.73.0 + - @contentful/f36-button@4.73.0 + - @contentful/f36-core@4.73.0 + - @contentful/f36-drag-handle@4.73.0 + - @contentful/f36-icon@4.73.0 + - @contentful/f36-menu@4.73.0 + - @contentful/f36-skeleton@4.73.0 + - @contentful/f36-typography@4.73.0 + +## 4.72.0 + +### Patch Changes + +- Updated dependencies [[`0067b57`](https://github.com/contentful/forma-36/commit/0067b57aaadbd05cb878dd5e34d407a80b000281)]: + - @contentful/f36-tokens@4.1.0 + - @contentful/f36-typography@4.72.0 + - @contentful/f36-badge@4.72.0 + - @contentful/f36-button@4.72.0 + - @contentful/f36-core@4.72.0 + - @contentful/f36-drag-handle@4.72.0 + - @contentful/f36-icon@4.72.0 + - @contentful/f36-menu@4.72.0 + - @contentful/f36-skeleton@4.72.0 + ## 4.71.2 ### Patch Changes diff --git a/packages/components/entity-list/package.json b/packages/components/entity-list/package.json index 02b75bd0f7..8415a07328 100644 --- a/packages/components/entity-list/package.json +++ b/packages/components/entity-list/package.json @@ -1,21 +1,21 @@ { "name": "@contentful/f36-entity-list", - "version": "4.71.2", + "version": "4.74.0", "description": "Forma 36: EntityList component", "scripts": { "build": "tsup" }, "dependencies": { - "@contentful/f36-badge": "^4.71.2", - "@contentful/f36-button": "^4.71.2", - "@contentful/f36-core": "^4.71.2", - "@contentful/f36-drag-handle": "^4.71.2", - "@contentful/f36-icon": "^4.71.2", + "@contentful/f36-badge": "^4.74.0", + "@contentful/f36-button": "^4.74.0", + "@contentful/f36-core": "^4.74.0", + "@contentful/f36-drag-handle": "^4.74.0", + "@contentful/f36-icon": "^4.74.0", "@contentful/f36-icons": "^4.29.0", - "@contentful/f36-menu": "^4.71.2", - "@contentful/f36-skeleton": "^4.71.2", - "@contentful/f36-tokens": "^4.0.4", - "@contentful/f36-typography": "^4.71.2", + "@contentful/f36-menu": "^4.74.0", + "@contentful/f36-skeleton": "^4.74.0", + "@contentful/f36-tokens": "^4.1.0", + "@contentful/f36-typography": "^4.74.0", "emotion": "^10.0.17" }, "peerDependencies": { diff --git a/packages/components/forms/CHANGELOG.md b/packages/components/forms/CHANGELOG.md index 750e247570..d52d3ca0a1 100644 --- a/packages/components/forms/CHANGELOG.md +++ b/packages/components/forms/CHANGELOG.md @@ -1,5 +1,30 @@ # Change Log +## 4.74.0 + +### Patch Changes + +- Updated dependencies []: + - @contentful/f36-core@4.74.0 + - @contentful/f36-typography@4.74.0 + +## 4.73.0 + +### Patch Changes + +- Updated dependencies []: + - @contentful/f36-core@4.73.0 + - @contentful/f36-typography@4.73.0 + +## 4.72.0 + +### Patch Changes + +- Updated dependencies [[`0067b57`](https://github.com/contentful/forma-36/commit/0067b57aaadbd05cb878dd5e34d407a80b000281)]: + - @contentful/f36-tokens@4.1.0 + - @contentful/f36-typography@4.72.0 + - @contentful/f36-core@4.72.0 + ## 4.71.2 ### Patch Changes diff --git a/packages/components/forms/package.json b/packages/components/forms/package.json index f8ad66d136..0b78ce8220 100644 --- a/packages/components/forms/package.json +++ b/packages/components/forms/package.json @@ -1,15 +1,15 @@ { "name": "@contentful/f36-forms", - "version": "4.71.2", + "version": "4.74.0", "description": "Forma 36: Form React Components", "scripts": { "build": "tsup" }, "dependencies": { - "@contentful/f36-core": "^4.71.2", + "@contentful/f36-core": "^4.74.0", "@contentful/f36-icons": "^4.29.0", - "@contentful/f36-tokens": "^4.0.4", - "@contentful/f36-typography": "^4.71.2", + "@contentful/f36-tokens": "^4.1.0", + "@contentful/f36-typography": "^4.74.0", "@contentful/f36-utils": "^4.24.3", "emotion": "^10.0.17" }, diff --git a/packages/components/header/CHANGELOG.md b/packages/components/header/CHANGELOG.md index 6b8ba39241..3487901a66 100644 --- a/packages/components/header/CHANGELOG.md +++ b/packages/components/header/CHANGELOG.md @@ -1,5 +1,37 @@ # Change Log +## 4.74.0 + +### Patch Changes + +- Updated dependencies []: + - @contentful/f36-button@4.74.0 + - @contentful/f36-core@4.74.0 + - @contentful/f36-typography@4.74.0 + +## 4.73.0 + +### Minor Changes + +- [#2908](https://github.com/contentful/forma-36/pull/2908) [`453ae3d`](https://github.com/contentful/forma-36/commit/453ae3d0e3965934338c78c94a8d8e342461a2ed) Thanks [@denkristoffer](https://github.com/denkristoffer)! - feat(header): render title as h1 + +### Patch Changes + +- Updated dependencies []: + - @contentful/f36-button@4.73.0 + - @contentful/f36-core@4.73.0 + - @contentful/f36-typography@4.73.0 + +## 4.72.0 + +### Patch Changes + +- Updated dependencies [[`0067b57`](https://github.com/contentful/forma-36/commit/0067b57aaadbd05cb878dd5e34d407a80b000281)]: + - @contentful/f36-tokens@4.1.0 + - @contentful/f36-typography@4.72.0 + - @contentful/f36-button@4.72.0 + - @contentful/f36-core@4.72.0 + ## 4.71.2 ### Patch Changes diff --git a/packages/components/header/package.json b/packages/components/header/package.json index aa7e484a45..5e2e1527b7 100644 --- a/packages/components/header/package.json +++ b/packages/components/header/package.json @@ -1,16 +1,16 @@ { "name": "@contentful/f36-header", - "version": "4.71.2", + "version": "4.74.0", "description": "Forma 36: Header component", "scripts": { "build": "tsup" }, "dependencies": { - "@contentful/f36-button": "^4.71.2", - "@contentful/f36-core": "^4.71.2", + "@contentful/f36-button": "^4.74.0", + "@contentful/f36-core": "^4.74.0", "@contentful/f36-icons": "^4.29.0", - "@contentful/f36-tokens": "^4.0.5", - "@contentful/f36-typography": "^4.71.2", + "@contentful/f36-tokens": "^4.1.0", + "@contentful/f36-typography": "^4.74.0", "emotion": "^10.0.17" }, "peerDependencies": { diff --git a/packages/components/header/src/Header.tsx b/packages/components/header/src/Header.tsx index dd8f1bd147..49002f723f 100644 --- a/packages/components/header/src/Header.tsx +++ b/packages/components/header/src/Header.tsx @@ -93,7 +93,9 @@ function _Header( {isValidElement(title) ? ( title ) : ( - {title} + + {title} + )} )} diff --git a/packages/components/header/src/index.ts b/packages/components/header/src/index.ts index 431f59169e..efa03dd13c 100644 --- a/packages/components/header/src/index.ts +++ b/packages/components/header/src/index.ts @@ -1,2 +1,3 @@ export { Header } from './Header'; +export type { HeaderProps } from './Header'; export { HEADER_HEIGHT } from './constants'; diff --git a/packages/components/icon/CHANGELOG.md b/packages/components/icon/CHANGELOG.md index 57763a7095..d91418675d 100644 --- a/packages/components/icon/CHANGELOG.md +++ b/packages/components/icon/CHANGELOG.md @@ -1,5 +1,27 @@ # Change Log +## 4.74.0 + +### Patch Changes + +- Updated dependencies []: + - @contentful/f36-core@4.74.0 + +## 4.73.0 + +### Patch Changes + +- Updated dependencies []: + - @contentful/f36-core@4.73.0 + +## 4.72.0 + +### Patch Changes + +- Updated dependencies [[`0067b57`](https://github.com/contentful/forma-36/commit/0067b57aaadbd05cb878dd5e34d407a80b000281)]: + - @contentful/f36-tokens@4.1.0 + - @contentful/f36-core@4.72.0 + ## 4.71.2 ### Patch Changes diff --git a/packages/components/icon/package.json b/packages/components/icon/package.json index 0dd853664e..55f32078c8 100644 --- a/packages/components/icon/package.json +++ b/packages/components/icon/package.json @@ -1,14 +1,14 @@ { "name": "@contentful/f36-icon", - "version": "4.71.2", + "version": "4.74.0", "description": "Forma 36: Icon component", "license": "MIT", "scripts": { "build": "tsup" }, "dependencies": { - "@contentful/f36-core": "^4.71.2", - "@contentful/f36-tokens": "^4.0.4", + "@contentful/f36-core": "^4.74.0", + "@contentful/f36-tokens": "^4.1.0", "emotion": "^10.0.17" }, "devDependencies": { diff --git a/packages/components/image/CHANGELOG.md b/packages/components/image/CHANGELOG.md index d17afacc03..1589e05895 100644 --- a/packages/components/image/CHANGELOG.md +++ b/packages/components/image/CHANGELOG.md @@ -1,5 +1,30 @@ # Change Log +## 4.74.0 + +### Patch Changes + +- Updated dependencies []: + - @contentful/f36-core@4.74.0 + - @contentful/f36-skeleton@4.74.0 + +## 4.73.0 + +### Patch Changes + +- Updated dependencies []: + - @contentful/f36-core@4.73.0 + - @contentful/f36-skeleton@4.73.0 + +## 4.72.0 + +### Patch Changes + +- Updated dependencies [[`0067b57`](https://github.com/contentful/forma-36/commit/0067b57aaadbd05cb878dd5e34d407a80b000281)]: + - @contentful/f36-tokens@4.1.0 + - @contentful/f36-core@4.72.0 + - @contentful/f36-skeleton@4.72.0 + ## 4.71.2 ### Patch Changes diff --git a/packages/components/image/package.json b/packages/components/image/package.json index 482e559739..c2296fbd15 100644 --- a/packages/components/image/package.json +++ b/packages/components/image/package.json @@ -1,14 +1,14 @@ { "name": "@contentful/f36-image", - "version": "4.71.2", + "version": "4.74.0", "description": "Forma 36: Image component", "scripts": { "build": "tsup" }, "dependencies": { - "@contentful/f36-core": "^4.71.2", - "@contentful/f36-skeleton": "^4.71.2", - "@contentful/f36-tokens": "^4.0.5", + "@contentful/f36-core": "^4.74.0", + "@contentful/f36-skeleton": "^4.74.0", + "@contentful/f36-tokens": "^4.1.0", "emotion": "^10.0.17" }, "peerDependencies": { diff --git a/packages/components/layout/package.json b/packages/components/layout/package.json index 95186f5632..9a1b1a7377 100644 --- a/packages/components/layout/package.json +++ b/packages/components/layout/package.json @@ -6,8 +6,8 @@ "build": "tsup" }, "dependencies": { - "@contentful/f36-core": "^4.71.2", - "@contentful/f36-tokens": "^4.0.5", + "@contentful/f36-core": "^4.74.0", + "@contentful/f36-tokens": "^4.1.0", "emotion": "^10.0.17" }, "peerDependencies": { diff --git a/packages/components/list/CHANGELOG.md b/packages/components/list/CHANGELOG.md index e4feb1b71e..532c8dc665 100644 --- a/packages/components/list/CHANGELOG.md +++ b/packages/components/list/CHANGELOG.md @@ -1,5 +1,27 @@ # Change Log +## 4.74.0 + +### Patch Changes + +- Updated dependencies []: + - @contentful/f36-core@4.74.0 + +## 4.73.0 + +### Patch Changes + +- Updated dependencies []: + - @contentful/f36-core@4.73.0 + +## 4.72.0 + +### Patch Changes + +- Updated dependencies [[`0067b57`](https://github.com/contentful/forma-36/commit/0067b57aaadbd05cb878dd5e34d407a80b000281)]: + - @contentful/f36-tokens@4.1.0 + - @contentful/f36-core@4.72.0 + ## 4.71.2 ### Patch Changes diff --git a/packages/components/list/package.json b/packages/components/list/package.json index ebe05ff07c..02a4329912 100644 --- a/packages/components/list/package.json +++ b/packages/components/list/package.json @@ -1,6 +1,6 @@ { "name": "@contentful/f36-list", - "version": "4.71.2", + "version": "4.74.0", "description": "Forma 36: list React Component", "license": "MIT", "files": [ @@ -20,8 +20,8 @@ "build": "tsup" }, "dependencies": { - "@contentful/f36-core": "^4.71.2", - "@contentful/f36-tokens": "^4.0.4", + "@contentful/f36-core": "^4.74.0", + "@contentful/f36-tokens": "^4.1.0", "emotion": "^10.0.17" }, "peerDependencies": { diff --git a/packages/components/menu/CHANGELOG.md b/packages/components/menu/CHANGELOG.md index a2302f44d3..6d38593bb3 100644 --- a/packages/components/menu/CHANGELOG.md +++ b/packages/components/menu/CHANGELOG.md @@ -1,5 +1,33 @@ # Change Log +## 4.74.0 + +### Patch Changes + +- Updated dependencies []: + - @contentful/f36-core@4.74.0 + - @contentful/f36-popover@4.74.0 + - @contentful/f36-typography@4.74.0 + +## 4.73.0 + +### Patch Changes + +- Updated dependencies []: + - @contentful/f36-core@4.73.0 + - @contentful/f36-popover@4.73.0 + - @contentful/f36-typography@4.73.0 + +## 4.72.0 + +### Patch Changes + +- Updated dependencies [[`0067b57`](https://github.com/contentful/forma-36/commit/0067b57aaadbd05cb878dd5e34d407a80b000281)]: + - @contentful/f36-tokens@4.1.0 + - @contentful/f36-typography@4.72.0 + - @contentful/f36-core@4.72.0 + - @contentful/f36-popover@4.72.0 + ## 4.71.2 ### Patch Changes diff --git a/packages/components/menu/package.json b/packages/components/menu/package.json index b81aa2dc0f..60d6f705e5 100644 --- a/packages/components/menu/package.json +++ b/packages/components/menu/package.json @@ -1,16 +1,16 @@ { "name": "@contentful/f36-menu", - "version": "4.71.2", + "version": "4.74.0", "description": "Forma 36: Menu component", "scripts": { "build": "tsup" }, "dependencies": { - "@contentful/f36-core": "^4.71.2", + "@contentful/f36-core": "^4.74.0", "@contentful/f36-icons": "^4.29.0", - "@contentful/f36-popover": "^4.71.2", - "@contentful/f36-tokens": "^4.0.4", - "@contentful/f36-typography": "^4.71.2", + "@contentful/f36-popover": "^4.74.0", + "@contentful/f36-tokens": "^4.1.0", + "@contentful/f36-typography": "^4.74.0", "@contentful/f36-utils": "^4.24.3", "emotion": "^10.0.17" }, diff --git a/packages/components/modal/CHANGELOG.md b/packages/components/modal/CHANGELOG.md index 6eaff9212b..4e5c141792 100644 --- a/packages/components/modal/CHANGELOG.md +++ b/packages/components/modal/CHANGELOG.md @@ -1,5 +1,33 @@ # Change Log +## 4.74.0 + +### Patch Changes + +- Updated dependencies []: + - @contentful/f36-button@4.74.0 + - @contentful/f36-core@4.74.0 + - @contentful/f36-typography@4.74.0 + +## 4.73.0 + +### Patch Changes + +- Updated dependencies []: + - @contentful/f36-button@4.73.0 + - @contentful/f36-core@4.73.0 + - @contentful/f36-typography@4.73.0 + +## 4.72.0 + +### Patch Changes + +- Updated dependencies [[`0067b57`](https://github.com/contentful/forma-36/commit/0067b57aaadbd05cb878dd5e34d407a80b000281)]: + - @contentful/f36-tokens@4.1.0 + - @contentful/f36-typography@4.72.0 + - @contentful/f36-button@4.72.0 + - @contentful/f36-core@4.72.0 + ## 4.71.2 ### Patch Changes diff --git a/packages/components/modal/package.json b/packages/components/modal/package.json index fed4284aa6..9a84553091 100644 --- a/packages/components/modal/package.json +++ b/packages/components/modal/package.json @@ -1,16 +1,16 @@ { "name": "@contentful/f36-modal", - "version": "4.71.2", + "version": "4.74.0", "description": "Forma 36: Modal component", "scripts": { "build": "tsup" }, "dependencies": { - "@contentful/f36-button": "^4.71.2", - "@contentful/f36-core": "^4.71.2", + "@contentful/f36-button": "^4.74.0", + "@contentful/f36-core": "^4.74.0", "@contentful/f36-icons": "^4.29.0", - "@contentful/f36-tokens": "^4.0.4", - "@contentful/f36-typography": "^4.71.2", + "@contentful/f36-tokens": "^4.1.0", + "@contentful/f36-typography": "^4.74.0", "@types/react-modal": "^3.13.1", "emotion": "^10.0.17", "react-modal": "^3.16.1" diff --git a/packages/components/navbar/CHANGELOG.md b/packages/components/navbar/CHANGELOG.md index 0fd094837f..95253e25f8 100644 --- a/packages/components/navbar/CHANGELOG.md +++ b/packages/components/navbar/CHANGELOG.md @@ -1,5 +1,39 @@ # @contentful/f36-navbar +## 4.74.0 + +### Patch Changes + +- Updated dependencies [[`af9da8c`](https://github.com/contentful/forma-36/commit/af9da8c85f18a61d0dce86dd4370a86fb5a133c8)]: + - @contentful/f36-avatar@4.74.0 + - @contentful/f36-core@4.74.0 + - @contentful/f36-icon@4.74.0 + - @contentful/f36-menu@4.74.0 + - @contentful/f36-skeleton@4.74.0 + +## 4.73.0 + +### Patch Changes + +- Updated dependencies []: + - @contentful/f36-core@4.73.0 + - @contentful/f36-icon@4.73.0 + - @contentful/f36-menu@4.73.0 + - @contentful/f36-skeleton@4.73.0 + - @contentful/f36-avatar@4.73.0 + +## 4.72.0 + +### Patch Changes + +- Updated dependencies [[`0067b57`](https://github.com/contentful/forma-36/commit/0067b57aaadbd05cb878dd5e34d407a80b000281)]: + - @contentful/f36-tokens@4.1.0 + - @contentful/f36-core@4.72.0 + - @contentful/f36-icon@4.72.0 + - @contentful/f36-menu@4.72.0 + - @contentful/f36-skeleton@4.72.0 + - @contentful/f36-avatar@4.72.0 + ## 4.71.2 ### Patch Changes diff --git a/packages/components/navbar/package.json b/packages/components/navbar/package.json index e373bcb27e..1f2f1a2a7d 100644 --- a/packages/components/navbar/package.json +++ b/packages/components/navbar/package.json @@ -1,18 +1,18 @@ { "name": "@contentful/f36-navbar", - "version": "4.71.2", + "version": "4.74.0", "description": "Forma 36: Navbar component", "scripts": { "build": "tsup" }, "dependencies": { - "@contentful/f36-core": "^4.71.2", - "@contentful/f36-menu": "^4.71.2", - "@contentful/f36-avatar": "4.71.2", - "@contentful/f36-tokens": "^4.0.1", + "@contentful/f36-core": "^4.74.0", + "@contentful/f36-menu": "^4.74.0", + "@contentful/f36-avatar": "4.74.0", + "@contentful/f36-tokens": "^4.1.0", "@contentful/f36-utils": "^4.23.2", - "@contentful/f36-skeleton": "^4.71.2", - "@contentful/f36-icon": "^4.71.2", + "@contentful/f36-skeleton": "^4.74.0", + "@contentful/f36-icon": "^4.74.0", "@contentful/f36-icons": "^4.29.0", "emotion": "^10.0.17" }, diff --git a/packages/components/navlist/package.json b/packages/components/navlist/package.json index 79a29bbed7..3c7de9696a 100644 --- a/packages/components/navlist/package.json +++ b/packages/components/navlist/package.json @@ -6,8 +6,8 @@ "build": "tsup" }, "dependencies": { - "@contentful/f36-core": "^4.71.2", - "@contentful/f36-tokens": "^4.0.5", + "@contentful/f36-core": "^4.74.0", + "@contentful/f36-tokens": "^4.1.0", "emotion": "^10.0.17" }, "peerDependencies": { diff --git a/packages/components/note/CHANGELOG.md b/packages/components/note/CHANGELOG.md index 6ee30eece7..10dacae8b5 100644 --- a/packages/components/note/CHANGELOG.md +++ b/packages/components/note/CHANGELOG.md @@ -1,5 +1,36 @@ # Change Log +## 4.74.0 + +### Patch Changes + +- Updated dependencies []: + - @contentful/f36-button@4.74.0 + - @contentful/f36-core@4.74.0 + - @contentful/f36-icon@4.74.0 + - @contentful/f36-typography@4.74.0 + +## 4.73.0 + +### Patch Changes + +- Updated dependencies []: + - @contentful/f36-button@4.73.0 + - @contentful/f36-core@4.73.0 + - @contentful/f36-icon@4.73.0 + - @contentful/f36-typography@4.73.0 + +## 4.72.0 + +### Patch Changes + +- Updated dependencies [[`0067b57`](https://github.com/contentful/forma-36/commit/0067b57aaadbd05cb878dd5e34d407a80b000281)]: + - @contentful/f36-tokens@4.1.0 + - @contentful/f36-typography@4.72.0 + - @contentful/f36-button@4.72.0 + - @contentful/f36-core@4.72.0 + - @contentful/f36-icon@4.72.0 + ## 4.71.2 ### Patch Changes diff --git a/packages/components/note/package.json b/packages/components/note/package.json index bceeaa2e14..04cb8923e8 100644 --- a/packages/components/note/package.json +++ b/packages/components/note/package.json @@ -1,17 +1,17 @@ { "name": "@contentful/f36-note", - "version": "4.71.2", + "version": "4.74.0", "description": "Forma 36: Note component", "scripts": { "build": "tsup" }, "dependencies": { - "@contentful/f36-button": "^4.71.2", - "@contentful/f36-core": "^4.71.2", - "@contentful/f36-icon": "^4.71.2", + "@contentful/f36-button": "^4.74.0", + "@contentful/f36-core": "^4.74.0", + "@contentful/f36-icon": "^4.74.0", "@contentful/f36-icons": "^4.29.0", - "@contentful/f36-tokens": "^4.0.4", - "@contentful/f36-typography": "^4.71.2", + "@contentful/f36-tokens": "^4.1.0", + "@contentful/f36-typography": "^4.74.0", "emotion": "^10.0.17" }, "devDependencies": { diff --git a/packages/components/notification/CHANGELOG.md b/packages/components/notification/CHANGELOG.md index ad583fd9ad..088362a211 100644 --- a/packages/components/notification/CHANGELOG.md +++ b/packages/components/notification/CHANGELOG.md @@ -1,5 +1,36 @@ # Change Log +## 4.74.0 + +### Patch Changes + +- Updated dependencies []: + - @contentful/f36-button@4.74.0 + - @contentful/f36-core@4.74.0 + - @contentful/f36-text-link@4.74.0 + - @contentful/f36-typography@4.74.0 + +## 4.73.0 + +### Patch Changes + +- Updated dependencies []: + - @contentful/f36-button@4.73.0 + - @contentful/f36-core@4.73.0 + - @contentful/f36-text-link@4.73.0 + - @contentful/f36-typography@4.73.0 + +## 4.72.0 + +### Patch Changes + +- Updated dependencies [[`0067b57`](https://github.com/contentful/forma-36/commit/0067b57aaadbd05cb878dd5e34d407a80b000281)]: + - @contentful/f36-tokens@4.1.0 + - @contentful/f36-typography@4.72.0 + - @contentful/f36-button@4.72.0 + - @contentful/f36-core@4.72.0 + - @contentful/f36-text-link@4.72.0 + ## 4.71.2 ### Patch Changes diff --git a/packages/components/notification/package.json b/packages/components/notification/package.json index f2eb12f2e6..128775246f 100644 --- a/packages/components/notification/package.json +++ b/packages/components/notification/package.json @@ -1,17 +1,17 @@ { "name": "@contentful/f36-notification", - "version": "4.71.2", + "version": "4.74.0", "description": "Forma 36: Notification component", "scripts": { "build": "tsup" }, "dependencies": { - "@contentful/f36-button": "^4.71.2", - "@contentful/f36-core": "^4.71.2", + "@contentful/f36-button": "^4.74.0", + "@contentful/f36-core": "^4.74.0", "@contentful/f36-icons": "^4.29.0", - "@contentful/f36-text-link": "^4.71.2", - "@contentful/f36-tokens": "^4.0.4", - "@contentful/f36-typography": "^4.71.2", + "@contentful/f36-text-link": "^4.74.0", + "@contentful/f36-tokens": "^4.1.0", + "@contentful/f36-typography": "^4.74.0", "emotion": "^10.0.17", "react-animate-height": "^3.0.4" }, diff --git a/packages/components/pagination/CHANGELOG.md b/packages/components/pagination/CHANGELOG.md index 09368e3cd5..187d74933a 100644 --- a/packages/components/pagination/CHANGELOG.md +++ b/packages/components/pagination/CHANGELOG.md @@ -1,5 +1,36 @@ # @contentful/f36-pagination +## 4.74.0 + +### Patch Changes + +- Updated dependencies []: + - @contentful/f36-button@4.74.0 + - @contentful/f36-core@4.74.0 + - @contentful/f36-forms@4.74.0 + - @contentful/f36-typography@4.74.0 + +## 4.73.0 + +### Patch Changes + +- Updated dependencies []: + - @contentful/f36-button@4.73.0 + - @contentful/f36-core@4.73.0 + - @contentful/f36-forms@4.73.0 + - @contentful/f36-typography@4.73.0 + +## 4.72.0 + +### Patch Changes + +- Updated dependencies [[`0067b57`](https://github.com/contentful/forma-36/commit/0067b57aaadbd05cb878dd5e34d407a80b000281)]: + - @contentful/f36-tokens@4.1.0 + - @contentful/f36-typography@4.72.0 + - @contentful/f36-button@4.72.0 + - @contentful/f36-core@4.72.0 + - @contentful/f36-forms@4.72.0 + ## 4.71.2 ### Patch Changes diff --git a/packages/components/pagination/package.json b/packages/components/pagination/package.json index 7ffab30de3..9e6463e6a1 100644 --- a/packages/components/pagination/package.json +++ b/packages/components/pagination/package.json @@ -1,17 +1,17 @@ { "name": "@contentful/f36-pagination", - "version": "4.71.2", + "version": "4.74.0", "description": "Forma 36: Pagination component", "scripts": { "build": "tsup" }, "dependencies": { - "@contentful/f36-button": "^4.71.2", - "@contentful/f36-core": "^4.71.2", - "@contentful/f36-forms": "^4.71.2", + "@contentful/f36-button": "^4.74.0", + "@contentful/f36-core": "^4.74.0", + "@contentful/f36-forms": "^4.74.0", "@contentful/f36-icons": "^4.29.0", - "@contentful/f36-tokens": "^4.0.4", - "@contentful/f36-typography": "^4.71.2", + "@contentful/f36-tokens": "^4.1.0", + "@contentful/f36-typography": "^4.74.0", "emotion": "^10.0.17" }, "peerDependencies": { diff --git a/packages/components/pill/CHANGELOG.md b/packages/components/pill/CHANGELOG.md index 1d8dac825b..7b1eda3d52 100644 --- a/packages/components/pill/CHANGELOG.md +++ b/packages/components/pill/CHANGELOG.md @@ -1,5 +1,36 @@ # Change Log +## 4.74.0 + +### Patch Changes + +- Updated dependencies []: + - @contentful/f36-button@4.74.0 + - @contentful/f36-core@4.74.0 + - @contentful/f36-drag-handle@4.74.0 + - @contentful/f36-tooltip@4.74.0 + +## 4.73.0 + +### Patch Changes + +- Updated dependencies []: + - @contentful/f36-button@4.73.0 + - @contentful/f36-core@4.73.0 + - @contentful/f36-drag-handle@4.73.0 + - @contentful/f36-tooltip@4.73.0 + +## 4.72.0 + +### Patch Changes + +- Updated dependencies [[`0067b57`](https://github.com/contentful/forma-36/commit/0067b57aaadbd05cb878dd5e34d407a80b000281)]: + - @contentful/f36-tokens@4.1.0 + - @contentful/f36-button@4.72.0 + - @contentful/f36-core@4.72.0 + - @contentful/f36-drag-handle@4.72.0 + - @contentful/f36-tooltip@4.72.0 + ## 4.71.2 ### Patch Changes diff --git a/packages/components/pill/package.json b/packages/components/pill/package.json index a1c9958c61..19a9cd2f22 100644 --- a/packages/components/pill/package.json +++ b/packages/components/pill/package.json @@ -1,17 +1,17 @@ { "name": "@contentful/f36-pill", - "version": "4.71.2", + "version": "4.74.0", "description": "Forma 36: Pill component", "scripts": { "build": "tsup" }, "dependencies": { - "@contentful/f36-button": "^4.71.2", - "@contentful/f36-core": "^4.71.2", - "@contentful/f36-drag-handle": "^4.71.2", + "@contentful/f36-button": "^4.74.0", + "@contentful/f36-core": "^4.74.0", + "@contentful/f36-drag-handle": "^4.74.0", "@contentful/f36-icons": "^4.29.0", - "@contentful/f36-tokens": "^4.0.4", - "@contentful/f36-tooltip": "^4.71.2", + "@contentful/f36-tokens": "^4.1.0", + "@contentful/f36-tooltip": "^4.74.0", "emotion": "^10.0.17" }, "peerDependencies": { diff --git a/packages/components/popover/CHANGELOG.md b/packages/components/popover/CHANGELOG.md index 78a4690471..3c1da282bc 100644 --- a/packages/components/popover/CHANGELOG.md +++ b/packages/components/popover/CHANGELOG.md @@ -1,5 +1,27 @@ # Change Log +## 4.74.0 + +### Patch Changes + +- Updated dependencies []: + - @contentful/f36-core@4.74.0 + +## 4.73.0 + +### Patch Changes + +- Updated dependencies []: + - @contentful/f36-core@4.73.0 + +## 4.72.0 + +### Patch Changes + +- Updated dependencies [[`0067b57`](https://github.com/contentful/forma-36/commit/0067b57aaadbd05cb878dd5e34d407a80b000281)]: + - @contentful/f36-tokens@4.1.0 + - @contentful/f36-core@4.72.0 + ## 4.71.2 ### Patch Changes diff --git a/packages/components/popover/package.json b/packages/components/popover/package.json index 7e82ea6090..ee97f6ac6d 100644 --- a/packages/components/popover/package.json +++ b/packages/components/popover/package.json @@ -1,13 +1,13 @@ { "name": "@contentful/f36-popover", - "version": "4.71.2", + "version": "4.74.0", "description": "Forma 36: Popover component", "scripts": { "build": "tsup" }, "dependencies": { - "@contentful/f36-core": "^4.71.2", - "@contentful/f36-tokens": "^4.0.4", + "@contentful/f36-core": "^4.74.0", + "@contentful/f36-tokens": "^4.1.0", "@contentful/f36-utils": "^4.24.3", "@popperjs/core": "^2.11.5", "emotion": "^10.0.17", diff --git a/packages/components/progress-stepper/package.json b/packages/components/progress-stepper/package.json index cdd24dbf79..04512522e5 100644 --- a/packages/components/progress-stepper/package.json +++ b/packages/components/progress-stepper/package.json @@ -6,10 +6,10 @@ "build": "tsup" }, "dependencies": { - "@contentful/f36-core": "^4.71.2", + "@contentful/f36-core": "^4.74.0", "@contentful/f36-icons": "^4.29.0", - "@contentful/f36-tokens": "^4.0.0", - "@contentful/f36-typography": "^4.71.2", + "@contentful/f36-tokens": "^4.1.0", + "@contentful/f36-typography": "^4.74.0", "emotion": "^10.0.17" }, "peerDependencies": { diff --git a/packages/components/skeleton/CHANGELOG.md b/packages/components/skeleton/CHANGELOG.md index 456f20c25f..02b7cf74ee 100644 --- a/packages/components/skeleton/CHANGELOG.md +++ b/packages/components/skeleton/CHANGELOG.md @@ -1,5 +1,30 @@ # Change Log +## 4.74.0 + +### Patch Changes + +- Updated dependencies []: + - @contentful/f36-core@4.74.0 + - @contentful/f36-table@4.74.0 + +## 4.73.0 + +### Patch Changes + +- Updated dependencies []: + - @contentful/f36-core@4.73.0 + - @contentful/f36-table@4.73.0 + +## 4.72.0 + +### Patch Changes + +- Updated dependencies [[`0067b57`](https://github.com/contentful/forma-36/commit/0067b57aaadbd05cb878dd5e34d407a80b000281)]: + - @contentful/f36-tokens@4.1.0 + - @contentful/f36-core@4.72.0 + - @contentful/f36-table@4.72.0 + ## 4.71.2 ### Patch Changes diff --git a/packages/components/skeleton/package.json b/packages/components/skeleton/package.json index cc1f236a6e..2b402372ff 100644 --- a/packages/components/skeleton/package.json +++ b/packages/components/skeleton/package.json @@ -1,14 +1,14 @@ { "name": "@contentful/f36-skeleton", - "version": "4.71.2", + "version": "4.74.0", "description": "Forma 36: Skeleton component", "scripts": { "build": "tsup" }, "dependencies": { - "@contentful/f36-core": "^4.71.2", - "@contentful/f36-table": "^4.71.2", - "@contentful/f36-tokens": "^4.0.4", + "@contentful/f36-core": "^4.74.0", + "@contentful/f36-table": "^4.74.0", + "@contentful/f36-tokens": "^4.1.0", "emotion": "^10.0.17" }, "peerDependencies": { diff --git a/packages/components/spinner/CHANGELOG.md b/packages/components/spinner/CHANGELOG.md index ab03fe0189..7a6e09ed86 100644 --- a/packages/components/spinner/CHANGELOG.md +++ b/packages/components/spinner/CHANGELOG.md @@ -1,5 +1,27 @@ # Change Log +## 4.74.0 + +### Patch Changes + +- Updated dependencies []: + - @contentful/f36-core@4.74.0 + +## 4.73.0 + +### Patch Changes + +- Updated dependencies []: + - @contentful/f36-core@4.73.0 + +## 4.72.0 + +### Patch Changes + +- Updated dependencies [[`0067b57`](https://github.com/contentful/forma-36/commit/0067b57aaadbd05cb878dd5e34d407a80b000281)]: + - @contentful/f36-tokens@4.1.0 + - @contentful/f36-core@4.72.0 + ## 4.71.2 ### Patch Changes diff --git a/packages/components/spinner/package.json b/packages/components/spinner/package.json index 239704d301..2fa8a718aa 100644 --- a/packages/components/spinner/package.json +++ b/packages/components/spinner/package.json @@ -1,17 +1,17 @@ { "name": "@contentful/f36-spinner", - "version": "4.71.2", + "version": "4.74.0", "description": "Forma 36: Spinner Component", "scripts": { "build": "tsup" }, "dependencies": { - "@contentful/f36-core": "^4.71.2", - "@contentful/f36-tokens": "^4.0.4", + "@contentful/f36-core": "^4.74.0", + "@contentful/f36-tokens": "^4.1.0", "emotion": "^10.0.17" }, "devDependencies": { - "@contentful/f36-typography": "^4.71.2" + "@contentful/f36-typography": "^4.74.0" }, "peerDependencies": { "react": ">=16.8", diff --git a/packages/components/table/CHANGELOG.md b/packages/components/table/CHANGELOG.md index d3248a9e6e..dbe502440c 100644 --- a/packages/components/table/CHANGELOG.md +++ b/packages/components/table/CHANGELOG.md @@ -1,5 +1,30 @@ # Change Log +## 4.74.0 + +### Patch Changes + +- Updated dependencies []: + - @contentful/f36-core@4.74.0 + - @contentful/f36-typography@4.74.0 + +## 4.73.0 + +### Patch Changes + +- Updated dependencies []: + - @contentful/f36-core@4.73.0 + - @contentful/f36-typography@4.73.0 + +## 4.72.0 + +### Patch Changes + +- Updated dependencies [[`0067b57`](https://github.com/contentful/forma-36/commit/0067b57aaadbd05cb878dd5e34d407a80b000281)]: + - @contentful/f36-tokens@4.1.0 + - @contentful/f36-typography@4.72.0 + - @contentful/f36-core@4.72.0 + ## 4.71.2 ### Patch Changes diff --git a/packages/components/table/package.json b/packages/components/table/package.json index 63781b506c..a0b68cbb26 100644 --- a/packages/components/table/package.json +++ b/packages/components/table/package.json @@ -1,15 +1,15 @@ { "name": "@contentful/f36-table", - "version": "4.71.2", + "version": "4.74.0", "description": "Forma 36: Table component", "scripts": { "build": "tsup" }, "dependencies": { - "@contentful/f36-core": "^4.71.2", + "@contentful/f36-core": "^4.74.0", "@contentful/f36-icons": "^4.29.0", - "@contentful/f36-tokens": "^4.0.4", - "@contentful/f36-typography": "^4.71.2", + "@contentful/f36-tokens": "^4.1.0", + "@contentful/f36-typography": "^4.74.0", "emotion": "^10.0.17" }, "peerDependencies": { diff --git a/packages/components/tabs/CHANGELOG.md b/packages/components/tabs/CHANGELOG.md index 10abb24b63..5acd9723a8 100644 --- a/packages/components/tabs/CHANGELOG.md +++ b/packages/components/tabs/CHANGELOG.md @@ -1,5 +1,27 @@ # Change Log +## 4.74.0 + +### Patch Changes + +- Updated dependencies []: + - @contentful/f36-core@4.74.0 + +## 4.73.0 + +### Patch Changes + +- Updated dependencies []: + - @contentful/f36-core@4.73.0 + +## 4.72.0 + +### Patch Changes + +- Updated dependencies [[`0067b57`](https://github.com/contentful/forma-36/commit/0067b57aaadbd05cb878dd5e34d407a80b000281)]: + - @contentful/f36-tokens@4.1.0 + - @contentful/f36-core@4.72.0 + ## 4.71.2 ### Patch Changes diff --git a/packages/components/tabs/package.json b/packages/components/tabs/package.json index ca4ce7dd9a..91c7027eae 100644 --- a/packages/components/tabs/package.json +++ b/packages/components/tabs/package.json @@ -1,13 +1,13 @@ { "name": "@contentful/f36-tabs", - "version": "4.71.2", + "version": "4.74.0", "description": "Forma 36: Tabs component", "scripts": { "build": "tsup" }, "dependencies": { - "@contentful/f36-core": "^4.71.2", - "@contentful/f36-tokens": "^4.0.4", + "@contentful/f36-core": "^4.74.0", + "@contentful/f36-tokens": "^4.1.0", "@radix-ui/react-tabs": "^1.0.1", "emotion": "^10.0.17" }, diff --git a/packages/components/text-link/CHANGELOG.md b/packages/components/text-link/CHANGELOG.md index 4f1de4270f..dea7eb15f6 100644 --- a/packages/components/text-link/CHANGELOG.md +++ b/packages/components/text-link/CHANGELOG.md @@ -1,5 +1,27 @@ # Change Log +## 4.74.0 + +### Patch Changes + +- Updated dependencies []: + - @contentful/f36-core@4.74.0 + +## 4.73.0 + +### Patch Changes + +- Updated dependencies []: + - @contentful/f36-core@4.73.0 + +## 4.72.0 + +### Patch Changes + +- Updated dependencies [[`0067b57`](https://github.com/contentful/forma-36/commit/0067b57aaadbd05cb878dd5e34d407a80b000281)]: + - @contentful/f36-tokens@4.1.0 + - @contentful/f36-core@4.72.0 + ## 4.71.2 ### Patch Changes diff --git a/packages/components/text-link/package.json b/packages/components/text-link/package.json index 0dc14594f9..bba4b2ee50 100644 --- a/packages/components/text-link/package.json +++ b/packages/components/text-link/package.json @@ -1,13 +1,13 @@ { "name": "@contentful/f36-text-link", - "version": "4.71.2", + "version": "4.74.0", "description": "Forma 36: TextLink component", "scripts": { "build": "tsup" }, "dependencies": { - "@contentful/f36-core": "^4.71.2", - "@contentful/f36-tokens": "^4.0.4", + "@contentful/f36-core": "^4.74.0", + "@contentful/f36-tokens": "^4.1.0", "emotion": "^10.0.17" }, "peerDependencies": { diff --git a/packages/components/tooltip/CHANGELOG.md b/packages/components/tooltip/CHANGELOG.md index 4e5286ecd9..53221a8019 100644 --- a/packages/components/tooltip/CHANGELOG.md +++ b/packages/components/tooltip/CHANGELOG.md @@ -1,5 +1,27 @@ # Change Log +## 4.74.0 + +### Patch Changes + +- Updated dependencies []: + - @contentful/f36-core@4.74.0 + +## 4.73.0 + +### Patch Changes + +- Updated dependencies []: + - @contentful/f36-core@4.73.0 + +## 4.72.0 + +### Patch Changes + +- Updated dependencies [[`0067b57`](https://github.com/contentful/forma-36/commit/0067b57aaadbd05cb878dd5e34d407a80b000281)]: + - @contentful/f36-tokens@4.1.0 + - @contentful/f36-core@4.72.0 + ## 4.71.2 ### Patch Changes diff --git a/packages/components/tooltip/package.json b/packages/components/tooltip/package.json index e35246802f..dd9a8e2f2f 100644 --- a/packages/components/tooltip/package.json +++ b/packages/components/tooltip/package.json @@ -1,13 +1,13 @@ { "name": "@contentful/f36-tooltip", - "version": "4.71.2", + "version": "4.74.0", "description": "Forma 36: Tooltip component", "scripts": { "build": "tsup" }, "dependencies": { - "@contentful/f36-core": "^4.71.2", - "@contentful/f36-tokens": "^4.0.4", + "@contentful/f36-core": "^4.74.0", + "@contentful/f36-tokens": "^4.1.0", "@contentful/f36-utils": "^4.24.3", "@popperjs/core": "^2.11.5", "csstype": "^3.1.1", diff --git a/packages/components/typography/CHANGELOG.md b/packages/components/typography/CHANGELOG.md index f550e5fd66..1abe677d5f 100644 --- a/packages/components/typography/CHANGELOG.md +++ b/packages/components/typography/CHANGELOG.md @@ -1,5 +1,32 @@ # Change Log +## 4.74.0 + +### Patch Changes + +- Updated dependencies []: + - @contentful/f36-core@4.74.0 + +## 4.73.0 + +### Patch Changes + +- Updated dependencies []: + - @contentful/f36-core@4.73.0 + +## 4.72.0 + +### Minor Changes + +- [#2903](https://github.com/contentful/forma-36/pull/2903) [`0067b57`](https://github.com/contentful/forma-36/commit/0067b57aaadbd05cb878dd5e34d407a80b000281) Thanks [@denkristoffer](https://github.com/denkristoffer)! - feat(tokens): smaller font-size-2xl + feat(display-text): smaller line-height to match new font-size-2xl size + +### Patch Changes + +- Updated dependencies [[`0067b57`](https://github.com/contentful/forma-36/commit/0067b57aaadbd05cb878dd5e34d407a80b000281)]: + - @contentful/f36-tokens@4.1.0 + - @contentful/f36-core@4.72.0 + ## 4.71.2 ### Patch Changes diff --git a/packages/components/typography/package.json b/packages/components/typography/package.json index 8b4193507e..5e7a44ab28 100644 --- a/packages/components/typography/package.json +++ b/packages/components/typography/package.json @@ -1,6 +1,6 @@ { "name": "@contentful/f36-typography", - "version": "4.71.2", + "version": "4.74.0", "description": "Forma 36: typography React Component", "license": "MIT", "files": [ @@ -20,8 +20,8 @@ "build": "tsup" }, "dependencies": { - "@contentful/f36-core": "^4.71.2", - "@contentful/f36-tokens": "^4.0.4", + "@contentful/f36-core": "^4.74.0", + "@contentful/f36-tokens": "^4.1.0", "@contentful/f36-utils": "^4.24.3", "emotion": "^10.0.17" }, diff --git a/packages/components/typography/src/DisplayText/DisplayText.tsx b/packages/components/typography/src/DisplayText/DisplayText.tsx index d501fd3c6c..ed9b093869 100644 --- a/packages/components/typography/src/DisplayText/DisplayText.tsx +++ b/packages/components/typography/src/DisplayText/DisplayText.tsx @@ -36,7 +36,7 @@ function _DisplayText< ref: React.Ref, ) { let fontSize: FontSizeTokens = 'fontSize2Xl'; - let lineHeight: LineHeightTokens = 'lineHeight2Xl'; + let lineHeight: LineHeightTokens = 'lineHeightXl'; if (size === 'large') { fontSize = 'fontSize3Xl'; diff --git a/packages/components/typography/stories/DisplayText.stories.tsx b/packages/components/typography/stories/DisplayText.stories.tsx index c93fd05b55..8de90728af 100644 --- a/packages/components/typography/stories/DisplayText.stories.tsx +++ b/packages/components/typography/stories/DisplayText.stories.tsx @@ -37,7 +37,7 @@ export const Overview = (props: DisplayTextInternalProps) => ( - 28 + 24 diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md index f3e53f483e..32ae869538 100644 --- a/packages/core/CHANGELOG.md +++ b/packages/core/CHANGELOG.md @@ -1,5 +1,16 @@ # Change Log +## 4.74.0 + +## 4.73.0 + +## 4.72.0 + +### Patch Changes + +- Updated dependencies [[`0067b57`](https://github.com/contentful/forma-36/commit/0067b57aaadbd05cb878dd5e34d407a80b000281)]: + - @contentful/f36-tokens@4.1.0 + ## 4.71.2 ## 4.71.1 diff --git a/packages/core/package.json b/packages/core/package.json index 276b8cf6fd..44686645f0 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@contentful/f36-core", - "version": "4.71.2", + "version": "4.74.0", "description": "Forma 36 core", "license": "MIT", "files": [ @@ -19,7 +19,7 @@ "build": "tsup" }, "dependencies": { - "@contentful/f36-tokens": "^4.0.4", + "@contentful/f36-tokens": "^4.1.0", "@emotion/core": "^10.1.1", "@emotion/is-prop-valid": "^1.2.0", "csstype": "^3.1.1", diff --git a/packages/forma-36-react-components/CHANGELOG.md b/packages/forma-36-react-components/CHANGELOG.md index 6617ea2925..47da7669bd 100644 --- a/packages/forma-36-react-components/CHANGELOG.md +++ b/packages/forma-36-react-components/CHANGELOG.md @@ -1,5 +1,129 @@ # Change Log +## 4.74.0 + +### Patch Changes + +- Updated dependencies [[`af9da8c`](https://github.com/contentful/forma-36/commit/af9da8c85f18a61d0dce86dd4370a86fb5a133c8)]: + - @contentful/f36-avatar@4.74.0 + - @contentful/f36-navbar@4.74.0 + - @contentful/f36-accordion@4.74.0 + - @contentful/f36-asset@4.74.0 + - @contentful/f36-autocomplete@4.74.0 + - @contentful/f36-badge@4.74.0 + - @contentful/f36-button@4.74.0 + - @contentful/f36-card@4.74.0 + - @contentful/f36-collapse@4.74.0 + - @contentful/f36-copybutton@4.74.0 + - @contentful/f36-core@4.74.0 + - @contentful/f36-datetime@4.74.0 + - @contentful/f36-datepicker@4.74.0 + - @contentful/f36-drag-handle@4.74.0 + - @contentful/f36-entity-list@4.74.0 + - @contentful/f36-empty-state@4.74.0 + - @contentful/f36-forms@4.74.0 + - @contentful/f36-icon@4.74.0 + - @contentful/f36-header@4.74.0 + - @contentful/f36-list@4.74.0 + - @contentful/f36-menu@4.74.0 + - @contentful/f36-modal@4.74.0 + - @contentful/f36-note@4.74.0 + - @contentful/f36-notification@4.74.0 + - @contentful/f36-pagination@4.74.0 + - @contentful/f36-pill@4.74.0 + - @contentful/f36-popover@4.74.0 + - @contentful/f36-skeleton@4.74.0 + - @contentful/f36-spinner@4.74.0 + - @contentful/f36-table@4.74.0 + - @contentful/f36-tabs@4.74.0 + - @contentful/f36-text-link@4.74.0 + - @contentful/f36-tooltip@4.74.0 + - @contentful/f36-typography@4.74.0 + - @contentful/f36-image@4.74.0 + +## 4.73.0 + +### Patch Changes + +- Updated dependencies [[`453ae3d`](https://github.com/contentful/forma-36/commit/453ae3d0e3965934338c78c94a8d8e342461a2ed)]: + - @contentful/f36-header@4.73.0 + - @contentful/f36-accordion@4.73.0 + - @contentful/f36-asset@4.73.0 + - @contentful/f36-autocomplete@4.73.0 + - @contentful/f36-badge@4.73.0 + - @contentful/f36-button@4.73.0 + - @contentful/f36-card@4.73.0 + - @contentful/f36-collapse@4.73.0 + - @contentful/f36-copybutton@4.73.0 + - @contentful/f36-core@4.73.0 + - @contentful/f36-datetime@4.73.0 + - @contentful/f36-datepicker@4.73.0 + - @contentful/f36-drag-handle@4.73.0 + - @contentful/f36-entity-list@4.73.0 + - @contentful/f36-empty-state@4.73.0 + - @contentful/f36-forms@4.73.0 + - @contentful/f36-icon@4.73.0 + - @contentful/f36-list@4.73.0 + - @contentful/f36-menu@4.73.0 + - @contentful/f36-modal@4.73.0 + - @contentful/f36-navbar@4.73.0 + - @contentful/f36-note@4.73.0 + - @contentful/f36-notification@4.73.0 + - @contentful/f36-pagination@4.73.0 + - @contentful/f36-pill@4.73.0 + - @contentful/f36-popover@4.73.0 + - @contentful/f36-skeleton@4.73.0 + - @contentful/f36-spinner@4.73.0 + - @contentful/f36-table@4.73.0 + - @contentful/f36-tabs@4.73.0 + - @contentful/f36-text-link@4.73.0 + - @contentful/f36-tooltip@4.73.0 + - @contentful/f36-typography@4.73.0 + - @contentful/f36-image@4.73.0 + - @contentful/f36-avatar@4.73.0 + +## 4.72.0 + +### Patch Changes + +- Updated dependencies [[`0067b57`](https://github.com/contentful/forma-36/commit/0067b57aaadbd05cb878dd5e34d407a80b000281)]: + - @contentful/f36-tokens@4.1.0 + - @contentful/f36-typography@4.72.0 + - @contentful/f36-accordion@4.72.0 + - @contentful/f36-asset@4.72.0 + - @contentful/f36-autocomplete@4.72.0 + - @contentful/f36-badge@4.72.0 + - @contentful/f36-button@4.72.0 + - @contentful/f36-card@4.72.0 + - @contentful/f36-collapse@4.72.0 + - @contentful/f36-copybutton@4.72.0 + - @contentful/f36-core@4.72.0 + - @contentful/f36-datetime@4.72.0 + - @contentful/f36-datepicker@4.72.0 + - @contentful/f36-drag-handle@4.72.0 + - @contentful/f36-entity-list@4.72.0 + - @contentful/f36-empty-state@4.72.0 + - @contentful/f36-forms@4.72.0 + - @contentful/f36-icon@4.72.0 + - @contentful/f36-header@4.72.0 + - @contentful/f36-list@4.72.0 + - @contentful/f36-menu@4.72.0 + - @contentful/f36-modal@4.72.0 + - @contentful/f36-navbar@4.72.0 + - @contentful/f36-note@4.72.0 + - @contentful/f36-notification@4.72.0 + - @contentful/f36-pagination@4.72.0 + - @contentful/f36-pill@4.72.0 + - @contentful/f36-popover@4.72.0 + - @contentful/f36-skeleton@4.72.0 + - @contentful/f36-spinner@4.72.0 + - @contentful/f36-table@4.72.0 + - @contentful/f36-tabs@4.72.0 + - @contentful/f36-text-link@4.72.0 + - @contentful/f36-tooltip@4.72.0 + - @contentful/f36-image@4.72.0 + - @contentful/f36-avatar@4.72.0 + ## 4.71.2 ### Patch Changes diff --git a/packages/forma-36-react-components/package.json b/packages/forma-36-react-components/package.json index 870ae67e36..56f43d92f0 100644 --- a/packages/forma-36-react-components/package.json +++ b/packages/forma-36-react-components/package.json @@ -1,7 +1,7 @@ { "name": "@contentful/f36-components", "description": "Contentful UI Component Library", - "version": "4.71.2", + "version": "4.74.0", "main": "dist/index.js", "types": "dist/index.d.ts", "module": "dist/index.module.js", @@ -30,43 +30,43 @@ } }, "dependencies": { - "@contentful/f36-accordion": "^4.71.2", - "@contentful/f36-asset": "^4.71.2", - "@contentful/f36-autocomplete": "^4.71.2", - "@contentful/f36-avatar": "4.71.2", - "@contentful/f36-badge": "^4.71.2", - "@contentful/f36-button": "^4.71.2", - "@contentful/f36-card": "^4.71.2", - "@contentful/f36-collapse": "^4.71.2", - "@contentful/f36-copybutton": "^4.71.2", - "@contentful/f36-core": "^4.71.2", - "@contentful/f36-datepicker": "^4.71.2", - "@contentful/f36-datetime": "^4.71.2", - "@contentful/f36-drag-handle": "^4.71.2", - "@contentful/f36-empty-state": "^4.71.2", - "@contentful/f36-entity-list": "^4.71.2", - "@contentful/f36-forms": "^4.71.2", - "@contentful/f36-icon": "^4.71.2", + "@contentful/f36-accordion": "^4.74.0", + "@contentful/f36-asset": "^4.74.0", + "@contentful/f36-autocomplete": "^4.74.0", + "@contentful/f36-avatar": "4.74.0", + "@contentful/f36-badge": "^4.74.0", + "@contentful/f36-button": "^4.74.0", + "@contentful/f36-card": "^4.74.0", + "@contentful/f36-collapse": "^4.74.0", + "@contentful/f36-copybutton": "^4.74.0", + "@contentful/f36-core": "^4.74.0", + "@contentful/f36-datepicker": "^4.74.0", + "@contentful/f36-datetime": "^4.74.0", + "@contentful/f36-drag-handle": "^4.74.0", + "@contentful/f36-empty-state": "^4.74.0", + "@contentful/f36-entity-list": "^4.74.0", + "@contentful/f36-forms": "^4.74.0", + "@contentful/f36-icon": "^4.74.0", "@contentful/f36-icons": "^4.29.0", - "@contentful/f36-image": "4.71.2", - "@contentful/f36-header": "^4.71.2", - "@contentful/f36-list": "^4.71.2", - "@contentful/f36-menu": "^4.71.2", - "@contentful/f36-modal": "^4.71.2", - "@contentful/f36-navbar": "^4.71.2", - "@contentful/f36-note": "^4.71.2", - "@contentful/f36-notification": "^4.71.2", - "@contentful/f36-pagination": "^4.71.2", - "@contentful/f36-pill": "^4.71.2", - "@contentful/f36-popover": "^4.71.2", - "@contentful/f36-skeleton": "^4.71.2", - "@contentful/f36-spinner": "^4.71.2", - "@contentful/f36-table": "^4.71.2", - "@contentful/f36-tabs": "^4.71.2", - "@contentful/f36-text-link": "^4.71.2", - "@contentful/f36-tokens": "^4.0.4", - "@contentful/f36-tooltip": "^4.71.2", - "@contentful/f36-typography": "^4.71.2", + "@contentful/f36-image": "4.74.0", + "@contentful/f36-header": "^4.74.0", + "@contentful/f36-list": "^4.74.0", + "@contentful/f36-menu": "^4.74.0", + "@contentful/f36-modal": "^4.74.0", + "@contentful/f36-navbar": "^4.74.0", + "@contentful/f36-note": "^4.74.0", + "@contentful/f36-notification": "^4.74.0", + "@contentful/f36-pagination": "^4.74.0", + "@contentful/f36-pill": "^4.74.0", + "@contentful/f36-popover": "^4.74.0", + "@contentful/f36-skeleton": "^4.74.0", + "@contentful/f36-spinner": "^4.74.0", + "@contentful/f36-table": "^4.74.0", + "@contentful/f36-tabs": "^4.74.0", + "@contentful/f36-text-link": "^4.74.0", + "@contentful/f36-tokens": "^4.1.0", + "@contentful/f36-tooltip": "^4.74.0", + "@contentful/f36-typography": "^4.74.0", "@contentful/f36-utils": "^4.24.3" }, "devDependencies": { diff --git a/packages/forma-36-tokens/CHANGELOG.md b/packages/forma-36-tokens/CHANGELOG.md index a658547d4a..5f74723a79 100644 --- a/packages/forma-36-tokens/CHANGELOG.md +++ b/packages/forma-36-tokens/CHANGELOG.md @@ -1,5 +1,12 @@ # Change Log +## 4.1.0 + +### Minor Changes + +- [#2903](https://github.com/contentful/forma-36/pull/2903) [`0067b57`](https://github.com/contentful/forma-36/commit/0067b57aaadbd05cb878dd5e34d407a80b000281) Thanks [@denkristoffer](https://github.com/denkristoffer)! - feat(tokens): smaller font-size-2xl + feat(display-text): smaller line-height to match new font-size-2xl size + ## 4.0.5 ### Patch Changes diff --git a/packages/forma-36-tokens/package.json b/packages/forma-36-tokens/package.json index 0634c81993..26b4aa4114 100644 --- a/packages/forma-36-tokens/package.json +++ b/packages/forma-36-tokens/package.json @@ -1,7 +1,7 @@ { "name": "@contentful/f36-tokens", "description": "Forma 36 Tokens", - "version": "4.0.5", + "version": "4.1.0", "main": "dist/index.js", "types": "dist/index.d.ts", "license": "MIT", diff --git a/packages/forma-36-tokens/src/tokens/typography/font-size.js b/packages/forma-36-tokens/src/tokens/typography/font-size.js index ef84a8695c..8b7c1fdef6 100644 --- a/packages/forma-36-tokens/src/tokens/typography/font-size.js +++ b/packages/forma-36-tokens/src/tokens/typography/font-size.js @@ -1,7 +1,7 @@ const fontSize = { 'font-size-4xl': '3rem', 'font-size-3xl': '2.25rem', - 'font-size-2xl': '1.75rem', + 'font-size-2xl': '1.5rem', 'font-size-xl': '1.25rem', 'font-size-xl-high': '1.125rem', 'font-size-l': '1rem', diff --git a/packages/website/content/changelog.mdx b/packages/website/content/changelog.mdx index 16f0e57cf5..b63d1ba923 100644 --- a/packages/website/content/changelog.mdx +++ b/packages/website/content/changelog.mdx @@ -6,6 +6,35 @@ section: 'introduction' The Changelog gives an overview of the changes we've made to Forma 36 +## 11-10-2024 + +**F36 Avatar** `v4.74.0` + +- increase inner white padding for app variant + +## 10-10-2024 + +**F36 Tokens** `v4.1.0` + +- feat(tokens): smaller font-size-2xl +- feat(display-text): smaller line-height to match new font-size-2xl size + +**F36 Typography** `v4.72.0` + +- feat(tokens): smaller font-size-2xl +- feat(display-text): smaller line-height to match new font-size-2xl size + +**F36 Header** `v4.73.0` + +- feat(header): render title as h1 + +## 08-10-2024 + +**F36 Avatar** `v4.71.2` + +- Shrink image to reduce overlapping with the color border +- Round overlay icon for app variant + ## 27-09-2024 `@contentful/f36-components@4.71.1` diff --git a/packages/website/content/tokens/typography.mdx b/packages/website/content/tokens/typography.mdx index 6670f0ffee..b38efb5bb2 100644 --- a/packages/website/content/tokens/typography.mdx +++ b/packages/website/content/tokens/typography.mdx @@ -67,7 +67,7 @@ Font size: **20px** = **1.25rem** - Line Height: **32px** = **2rem** - Weight: * _Display_ is intended to be used in the same cases as Display Text Large. -Font size: **28px** = **1.75rem** - Line Height: **36px** = **2.25rem** - Weight: **700** +Font size: **24px** = **1.5rem** - Line Height: **32px** = **2rem** - Weight: **700** Display Large diff --git a/packages/website/package.json b/packages/website/package.json index 1d5967e954..044fafc360 100644 --- a/packages/website/package.json +++ b/packages/website/package.json @@ -10,19 +10,19 @@ }, "dependencies": { "@codesandbox/sandpack-react": "^1.17.0", - "@contentful/f36-avatar": "4.71.2", - "@contentful/f36-components": "^4.71.2", + "@contentful/f36-avatar": "4.74.0", + "@contentful/f36-components": "^4.74.0", "@contentful/f36-docs-utils": "^4.0.2", - "@contentful/f36-empty-state": "^4.71.2", - "@contentful/f36-header": "^4.71.2", - "@contentful/f36-icon": "^4.71.2", + "@contentful/f36-empty-state": "^4.74.0", + "@contentful/f36-header": "^4.74.0", + "@contentful/f36-icon": "^4.74.0", "@contentful/f36-icons": "^4.29.0", - "@contentful/f36-image": "4.71.2", + "@contentful/f36-image": "4.74.0", "@contentful/f36-layout": "^4.0.0-alpha.0", "@contentful/f36-multiselect": "^4.24.0", "@contentful/f36-navlist": "4.1.0-alpha.1", "@contentful/f36-progress-stepper": "4.0.0-alpha.2", - "@contentful/f36-tokens": "^4.0.5", + "@contentful/f36-tokens": "^4.1.0", "@contentful/f36-utils": "^4.24.3", "@contentful/rich-text-react-renderer": "^15.11.1", "@dnd-kit/core": "^6.0.8",