Skip to content

Commit 81ad84f

Browse files
booc0mtacobooc0mtaco
authored
Merge pull request #1797 from chanzuckerberg/release-v13.7.0
## [13.7.0](v13.6.1...v13.7.0) (2023-11-06) [Storybook](https://61313967cde49b003ae2a860-wtqbmpxmdj.chromatic.com/) ### Features * **Heading:** add preset typography prop and values ([5732144](5732144)) * **Text:** add preset typography prop ([4422e8e](4422e8e)) ### Bug Fixes * **Select:** ensure name prop gets to Listbox ([#1795](#1795)) ([a7eae60](a7eae60))
2 parents c2ecaf7 + 0aefece commit 81ad84f

19 files changed

+1279
-1144
lines changed

‎.omletrc.json

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
{
22
"ignore": ["lib/**", ".storybook/**"],
3-
"include": ["src/components/**/*.tsx"],
4-
"tsconfigPath": "tsconfig.json"
3+
"include": ["src/components/**/*.{tsx,ts}", "src/index.ts"],
4+
"tsconfigPath": "tsconfig.json",
5+
"exports": {
6+
".": "./src/index.ts"
7+
}
58
}

‎CHANGELOG.md

+13
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,19 @@
22

33
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
44

5+
## [13.7.0](https://github.com/chanzuckerberg/edu-design-system/compare/v13.6.1...v13.7.0) (2023-11-06)
6+
7+
8+
### Features
9+
10+
* **Heading:** add preset typography prop and values ([5732144](https://github.com/chanzuckerberg/edu-design-system/commit/57321449504e0bedded8affc93d5f127fcb3807c))
11+
* **Text:** add preset typography prop ([4422e8e](https://github.com/chanzuckerberg/edu-design-system/commit/4422e8eaf0b3460ef78f8342642581e9a6a24401))
12+
13+
14+
### Bug Fixes
15+
16+
* **Select:** ensure name prop gets to Listbox ([#1795](https://github.com/chanzuckerberg/edu-design-system/issues/1795)) ([a7eae60](https://github.com/chanzuckerberg/edu-design-system/commit/a7eae60dbee1a1057e7240bf592a5f9086e949c9))
17+
518
### [13.6.1](https://github.com/chanzuckerberg/edu-design-system/compare/v13.6.0...v13.6.1) (2023-10-23)
619

720

‎package.json

+18-18
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@chanzuckerberg/eds",
3-
"version": "13.6.1",
3+
"version": "13.7.0",
44
"description": "The React-powered design system library for Chan Zuckerberg Initiative education web applications",
55
"author": "CZI <[email protected]>",
66
"homepage": "https://github.com/chanzuckerberg/edu-design-system",
@@ -102,7 +102,7 @@
102102
"react-popper": "^2.3.0",
103103
"react-portal": "^4.2.2",
104104
"react-uid": "^2.3.3",
105-
"style-dictionary": "^3.8.0",
105+
"style-dictionary": "^3.9.0",
106106
"svg4everybody": "^2.1.9"
107107
},
108108
"devDependencies": {
@@ -123,40 +123,40 @@
123123
"@rollup/plugin-node-resolve": "^15.2.3",
124124
"@rollup/plugin-typescript": "^11.1.5",
125125
"@size-limit/file": "^8.2.6",
126-
"@storybook/addon-a11y": "^7.5.1",
127-
"@storybook/addon-docs": "^7.5.1",
128-
"@storybook/addon-essentials": "^7.5.1",
129-
"@storybook/addon-interactions": "^7.5.1",
130-
"@storybook/addon-links": "^7.5.1",
126+
"@storybook/addon-a11y": "^7.5.2",
127+
"@storybook/addon-docs": "^7.5.2",
128+
"@storybook/addon-essentials": "^7.5.2",
129+
"@storybook/addon-interactions": "^7.5.2",
130+
"@storybook/addon-links": "^7.5.2",
131131
"@storybook/addon-styling": "^1.3.7",
132-
"@storybook/react": "^7.5.1",
133-
"@storybook/react-webpack5": "^7.5.1",
132+
"@storybook/react": "^7.5.2",
133+
"@storybook/react-webpack5": "^7.5.2",
134134
"@storybook/testing-library": "^0.2.0",
135135
"@storybook/testing-react": "^2.0.1",
136136
"@testing-library/jest-dom": "^5.17.0",
137137
"@testing-library/react": "^14.0.0",
138138
"@testing-library/user-event": "^14.5.1",
139-
"@types/jest": "^29.5.6",
140-
"@types/node": "^18.18.6",
141-
"@types/react": "^18.2.30",
139+
"@types/jest": "^29.5.7",
140+
"@types/node": "^18.18.8",
141+
"@types/react": "^18.2.34",
142142
"@types/react-beautiful-dnd": "^13.1.6",
143143
"@types/react-dom": "^18.2.14",
144144
"@types/react-portal": "^4.0.5",
145145
"axe-core": "4.8.2",
146146
"chromatic": "^6.24.1",
147147
"codecov": "^3.8.3",
148148
"copyfiles": "^2.4.1",
149-
"eslint": "^8.51.0",
149+
"eslint": "^8.52.0",
150150
"eslint-config-prettier": "^8.10.0",
151-
"eslint-plugin-jest": "^27.4.2",
151+
"eslint-plugin-jest": "^27.6.0",
152152
"eslint-plugin-prettier": "^4.2.1",
153153
"eslint-plugin-storybook": "^0.6.13",
154154
"eslint-plugin-testing-library": "^5.11.1",
155155
"husky": "^8.0.3",
156156
"identity-obj-proxy": "^3.0.0",
157157
"jest": "^29.7.0",
158158
"jest-environment-jsdom": "^29.7.0",
159-
"jest-preset-stylelint": "^6.3.1",
159+
"jest-preset-stylelint": "^6.3.2",
160160
"lint-staged": "^13.3.0",
161161
"pascal-case": "^3.1.2",
162162
"plop": "^3.1.2",
@@ -174,11 +174,11 @@
174174
"size-limit": "^8.2.6",
175175
"snake-case": "^3.0.4",
176176
"standard-version": "^9.5.0",
177-
"storybook": "^7.5.1",
178-
"style-dictionary": "^3.8.0",
177+
"storybook": "^7.5.2",
178+
"style-dictionary": "^3.9.0",
179179
"stylelint": "^15.11.0",
180180
"stylelint-config-recommended": "^10.0.1",
181-
"tailwindcss": "^3.3.3",
181+
"tailwindcss": "^3.3.5",
182182
"ts-jest": "^29.1.1",
183183
"typescript": "^4.9.5"
184184
},

‎src/components/Heading/Heading.module.css

+100-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
# HEADING
33
\*------------------------------------*/
44

5+
/* Deprecated; moving all size classes to prefer prefix */
56
.heading--size-headline-lg {
67
font: var(--eds-theme-typography-headline-lg);
78

@@ -50,6 +51,7 @@
5051

5152
/**
5253
* Heading sizes, correlate to similar numerically named typography token.
54+
* deprecated in favor of only using the typography presets
5355
*/
5456
.heading--size-h1 {
5557
font: var(--eds-theme-typography-headline-lg);
@@ -93,7 +95,7 @@
9395
}
9496

9597
/**
96-
* Color variants
98+
* Color variants - deprecated in favor of using utility classes
9799
*/
98100
.heading--error {
99101
color: var(--eds-theme-color-text-utility-error);
@@ -126,3 +128,100 @@
126128
.heading--white {
127129
color: var(--eds-theme-color-text-neutral-default-inverse);
128130
}
131+
132+
/**
133+
* Map the component preset names to the defined typography tokens
134+
*
135+
* TODO: This should always match the generated tokens so find a
136+
* way to generate this.
137+
*/
138+
.heading--headline-lg {
139+
font: var(--eds-theme-typography-headline-lg);
140+
141+
@media all and (max-width: $eds-bp-md) {
142+
font: var(--eds-typography-preset-001-mobile);
143+
}
144+
}
145+
.heading--headline-lg-bold {
146+
font: var(--eds-theme-typography-headline-lg-bold);
147+
}
148+
.heading--headline-lg-bold-mobile {
149+
font: var(--eds-theme-typography-headline-lg-bold-mobile);
150+
}
151+
.heading--headline-lg-mobile {
152+
font: var(--eds-theme-typography-headline-lg-mobile);
153+
}
154+
.heading--headline-md {
155+
font: var(--eds-theme-typography-headline-md);
156+
157+
@media all and (max-width: $eds-bp-md) {
158+
font: var(--eds-typography-preset-002-mobile);
159+
}
160+
}
161+
.heading--headline-md-bold {
162+
font: var(--eds-theme-typography-headline-md-bold);
163+
}
164+
.heading--headline-md-bold-mobile {
165+
font: var(--eds-theme-typography-headline-md-bold-mobile);
166+
}
167+
.heading--headline-md-mobile {
168+
font: var(--eds-theme-typography-headline-md-mobile);
169+
}
170+
.heading--headline-sm {
171+
font: var(--eds-theme-typography-headline-sm);
172+
173+
@media all and (max-width: $eds-bp-md) {
174+
font: var(--eds-typography-preset-003-mobile);
175+
}
176+
}
177+
.heading--headline-sm-bold {
178+
font: var(--eds-theme-typography-headline-sm-bold);
179+
}
180+
.heading--headline-sm-bold-mobile {
181+
font: var(--eds-theme-typography-headline-sm-bold-mobile);
182+
}
183+
.heading--headline-sm-mobile {
184+
font: var(--eds-theme-typography-headline-sm-mobile);
185+
}
186+
.heading--headline-secondary-lg {
187+
font: var(--eds-theme-typography-headline-secondary-lg);
188+
}
189+
.heading--headline-secondary-lg-bold {
190+
font: var(--eds-theme-typography-headline-secondary-lg-bold);
191+
}
192+
.heading--headline-secondary-md {
193+
font: var(--eds-theme-typography-headline-secondary-md);
194+
}
195+
.heading--headline-secondary-md-bold {
196+
font: var(--eds-theme-typography-headline-secondary-md-bold);
197+
}
198+
.heading--headline-secondary-sm {
199+
font: var(--eds-theme-typography-headline-secondary-sm);
200+
}
201+
.heading--headline-secondary-sm-bold {
202+
font: var(--eds-theme-typography-headline-secondary-sm-bold);
203+
}
204+
.heading--title-lg {
205+
font: var(--eds-theme-typography-title-lg);
206+
}
207+
.heading--title-lg-bold {
208+
font: var(--eds-theme-typography-title-lg-bold);
209+
}
210+
.heading--title-md {
211+
font: var(--eds-theme-typography-title-md);
212+
}
213+
.heading--title-md-bold {
214+
font: var(--eds-theme-typography-title-md-bold);
215+
}
216+
.heading--title-sm {
217+
font: var(--eds-theme-typography-title-sm);
218+
}
219+
.heading--title-sm-bold {
220+
font: var(--eds-theme-typography-title-sm-bold);
221+
}
222+
.heading--title-xs {
223+
font: var(--eds-theme-typography-title-xs);
224+
}
225+
.heading--title-xs-bold {
226+
font: var(--eds-theme-typography-title-xs-bold);
227+
}

‎src/components/Heading/Heading.stories.module.css

-34
This file was deleted.

0 commit comments

Comments
 (0)