Skip to content

Commit 340ee76

Browse files
smithgajjar09smithgajjar09
authored
Merge branch 'main' into cass-pink-theme
2 parents 1ba2dec + f7daa86 commit 340ee76

File tree

37 files changed

+310
-226
lines changed

37 files changed

+310
-226
lines changed

‎.vscode/stories.code-snippets

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,20 @@
99
"import * as $1Stories from './$1.stories';",
1010
"",
1111
"export const parameters = {",
12-
"subtitle: `Template component`,",
13-
"design: {",
14-
"type: 'figma',",
15-
"url: 'https: //www.figma.com/file/XXX',",
16-
" },",
17-
"status: 'current',",
18-
"source: {",
19-
"repo: '$2',",
20-
"// this is easy to find by right clicking on the file in VSCode and clicking 'Copy Remote File Url From...' and the selecting 'main' or amending the url path below like so: https://github.com/Codecademy/gamut/blob/main/packages/${2}/src/file/location",
21-
"githubLink:",
22-
"'https: //github.com/Codecademy/gamut/blob/main/packages/gamut/src/Logo',",
23-
" },",
12+
" subtitle: `Template component`,",
13+
" design: {",
14+
" type: 'figma',",
15+
" url: 'https: //www.figma.com/file/XXX',",
16+
" },",
17+
" status: 'current',",
18+
" source: {",
19+
" repo: '$2',",
20+
" // this is easy to find by right clicking on the file in VSCode and clicking 'Copy Remote File Url From...' and the selecting 'main' or amending the url path below like so: https://github.com/Codecademy/gamut/blob/main/packages/${2}/src/file/location",
21+
" githubLink:",
22+
" 'https: //github.com/Codecademy/gamut/blob/main/packages/gamut/src/Logo',",
23+
" },",
2424
"};",
25+
"",
2526
"<Meta of={$1Stories}/>",
2627
"",
2728
"<ComponentHeader {...parameters} />",
@@ -85,20 +86,22 @@
8586
" id: '$1',",
8687
" title: '$1/About',",
8788
" subtitle: '$2',",
88-
" }",
89+
" status: 'current'",
90+
"}",
8991
"",
9092
"<Meta title='$1/About' />",
9193
"",
9294
"<AboutHeader {...parameters} />",
9395
"",
94-
"Foundations make up the smallest scale design values that comprise a design system. Sometimes referred to elsewhere as "tokens", they are the abstract units that comprise and stitch together our atoms, molecules, and organisms.",
96+
"Provide a general overview of what this collection of components should do or be used for.",
9597
"",
9698
"<TableOfContents",
9799
" links={[",
98100
" {",
99101
" id: '$1/Category',",
100102
" subtitle: 'Short description',",
101103
" title: 'Category',",
104+
" status: 'current'",
102105
" }",
103106
" ]}",
104107
"/>"

‎packages/gamut-icons/CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,14 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
### [9.38.2](https://github.com/Codecademy/gamut/compare/@codecademy/[email protected]...@codecademy/[email protected]) (2025-02-11)
7+
8+
**Note:** Version bump only for package @codecademy/gamut-icons
9+
10+
### [9.38.1](https://github.com/Codecademy/gamut/compare/@codecademy/[email protected]...@codecademy/[email protected]) (2025-02-10)
11+
12+
**Note:** Version bump only for package @codecademy/gamut-icons
13+
614
## [9.38.0](https://github.com/Codecademy/gamut/compare/@codecademy/[email protected]...@codecademy/[email protected]) (2025-02-05)
715

816
### Features

‎packages/gamut-icons/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"name": "@codecademy/gamut-icons",
33
"description": "Icon library for codecademy.com",
4-
"version": "9.38.0",
4+
"version": "9.38.2",
55
"author": "Codecademy <[email protected]>",
66
"dependencies": {
7-
"@codecademy/gamut-styles": "17.4.1",
7+
"@codecademy/gamut-styles": "17.5.0",
88
"@codecademy/variance": "0.22.1"
99
},
1010
"files": [

‎packages/gamut-icons/src/useIconId.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
import { useId } from '@reach/auto-id';
2-
import { useMemo } from 'react';
1+
import { useId, useMemo } from 'react';
32

43
export function useIconId(id: string) {
54
const generatedId = useId();

‎packages/gamut-illustrations/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
### [0.53.2](https://github.com/Codecademy/gamut/compare/@codecademy/[email protected]...@codecademy/[email protected]) (2025-02-10)
7+
8+
**Note:** Version bump only for package @codecademy/gamut-illustrations
9+
610
### [0.53.1](https://github.com/Codecademy/gamut/compare/@codecademy/[email protected]...@codecademy/[email protected]) (2025-02-05)
711

812
**Note:** Version bump only for package @codecademy/gamut-illustrations

‎packages/gamut-illustrations/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
22
"name": "@codecademy/gamut-illustrations",
33
"description": "Illustrations library for Codecademy",
4-
"version": "0.53.1",
4+
"version": "0.53.2",
55
"author": "Codecademy Engineering <[email protected]>",
66
"bugs": "https://github.com/Codecademy/gamut/issues",
77
"dependencies": {
8-
"@codecademy/gamut-styles": "17.4.1",
8+
"@codecademy/gamut-styles": "17.5.0",
99
"classnames": "^2.2.5"
1010
},
1111
"files": [

‎packages/gamut-kit/CHANGELOG.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,18 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
### [0.6.475](https://github.com/Codecademy/gamut/compare/@codecademy/[email protected]...@codecademy/[email protected]) (2025-02-11)
7+
8+
**Note:** Version bump only for package @codecademy/gamut-kit
9+
10+
### [0.6.474](https://github.com/Codecademy/gamut/compare/@codecademy/[email protected]...@codecademy/[email protected]) (2025-02-11)
11+
12+
**Note:** Version bump only for package @codecademy/gamut-kit
13+
14+
### [0.6.473](https://github.com/Codecademy/gamut/compare/@codecademy/[email protected]...@codecademy/[email protected]) (2025-02-10)
15+
16+
**Note:** Version bump only for package @codecademy/gamut-kit
17+
618
### [0.6.472](https://github.com/Codecademy/gamut/compare/@codecademy/[email protected]...@codecademy/[email protected]) (2025-02-05)
719

820
**Note:** Version bump only for package @codecademy/gamut-kit

‎packages/gamut-kit/package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{
22
"name": "@codecademy/gamut-kit",
33
"description": "Styleguide & Component library for Codecademy",
4-
"version": "0.6.472",
4+
"version": "0.6.475",
55
"author": "Codecademy Engineering <[email protected]>",
66
"dependencies": {
7-
"@codecademy/gamut": "59.0.3",
8-
"@codecademy/gamut-icons": "9.38.0",
9-
"@codecademy/gamut-illustrations": "0.53.1",
10-
"@codecademy/gamut-patterns": "0.10.3",
11-
"@codecademy/gamut-styles": "17.4.1",
12-
"@codecademy/gamut-tests": "5.2.3",
7+
"@codecademy/gamut": "59.0.6",
8+
"@codecademy/gamut-icons": "9.38.2",
9+
"@codecademy/gamut-illustrations": "0.53.2",
10+
"@codecademy/gamut-patterns": "0.10.5",
11+
"@codecademy/gamut-styles": "17.5.0",
12+
"@codecademy/gamut-tests": "5.2.4",
1313
"@codecademy/variance": "0.22.1",
1414
"component-test-setup": "^0.3.1"
1515
},

‎packages/gamut-patterns/CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,14 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
### [0.10.5](https://github.com/Codecademy/gamut/compare/@codecademy/[email protected]...@codecademy/[email protected]) (2025-02-11)
7+
8+
**Note:** Version bump only for package @codecademy/gamut-patterns
9+
10+
### [0.10.4](https://github.com/Codecademy/gamut/compare/@codecademy/[email protected]...@codecademy/[email protected]) (2025-02-10)
11+
12+
**Note:** Version bump only for package @codecademy/gamut-patterns
13+
614
### [0.10.3](https://github.com/Codecademy/gamut/compare/@codecademy/[email protected]...@codecademy/[email protected]) (2025-02-05)
715

816
**Note:** Version bump only for package @codecademy/gamut-patterns

‎packages/gamut-patterns/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
22
"name": "@codecademy/gamut-patterns",
33
"description": "Pattern library for Codecademy",
4-
"version": "0.10.3",
4+
"version": "0.10.5",
55
"author": "Codecademy Engineering <[email protected]>",
66
"bugs": "https://github.com/Codecademy/gamut/issues",
77
"dependencies": {
8-
"@codecademy/gamut-styles": "17.4.1",
8+
"@codecademy/gamut-styles": "17.5.0",
99
"@codecademy/variance": "0.22.1",
1010
"classnames": "^2.2.5"
1111
},

‎packages/gamut-patterns/src/usePatternId.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
import { useId } from '@reach/auto-id';
2-
import { useMemo } from 'react';
1+
import { useId, useMemo } from 'react';
32

43
export function usePatternId(id: string) {
54
const generatedId = useId();

‎packages/gamut-styles/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [17.5.0](https://github.com/Codecademy/gamut/compare/@codecademy/[email protected]...@codecademy/[email protected]) (2025-02-10)
7+
8+
### Features
9+
10+
- **Colors:** Add new orange weight to colors ([c52cc0e](https://github.com/Codecademy/gamut/commit/c52cc0e774fc64e2b4cbf412e41ca5c4c36792b5))
11+
612
### [17.4.1](https://github.com/Codecademy/gamut/compare/@codecademy/[email protected]...@codecademy/[email protected]) (2025-02-05)
713

814
**Note:** Version bump only for package @codecademy/gamut-styles

‎packages/gamut-styles/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@codecademy/gamut-styles",
33
"description": "Styleguide & Component library for codecademy.com",
4-
"version": "17.4.1",
4+
"version": "17.5.0",
55
"author": "Jake Hiller <[email protected]>",
66
"dependencies": {
77
"@codecademy/variance": "0.22.1",

‎packages/gamut-styles/src/themes/__tests__/__snapshots__/theme.test.ts.snap

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ exports[`themes admin - theme shape 1`] = `
4242
"navy-800": "#10162F",
4343
"navy-900": "#0A0D1C",
4444
"orange": "#FF8C00",
45+
"orange-100": "#FFE8CC",
4546
"orange-500": "#FF8C00",
4647
"paleBlue": "#F5FCFF",
4748
"paleGreen": "#F5FFE3",
@@ -215,6 +216,7 @@ exports[`themes admin - theme shape 1`] = `
215216
"--color-navy-800": "#10162F",
216217
"--color-navy-900": "#0A0D1C",
217218
"--color-orange": "#FF8C00",
219+
"--color-orange-100": "#FFE8CC",
218220
"--color-orange-500": "#FF8C00",
219221
"--color-paleBlue": "#F5FCFF",
220222
"--color-paleGreen": "#F5FFE3",
@@ -339,6 +341,7 @@ exports[`themes admin - theme shape 1`] = `
339341
"navy-800": "var(--color-navy-800)",
340342
"navy-900": "var(--color-navy-900)",
341343
"orange": "var(--color-orange)",
344+
"orange-100": "var(--color-orange-100)",
342345
"orange-500": "var(--color-orange-500)",
343346
"paleBlue": "var(--color-paleBlue)",
344347
"paleGreen": "var(--color-paleGreen)",
@@ -542,6 +545,7 @@ exports[`themes core - theme shape 1`] = `
542545
"navy-800": "#10162F",
543546
"navy-900": "#0A0D1C",
544547
"orange": "#FF8C00",
548+
"orange-100": "#FFE8CC",
545549
"orange-500": "#FF8C00",
546550
"paleBlue": "#F5FCFF",
547551
"paleGreen": "#F5FFE3",
@@ -715,6 +719,7 @@ exports[`themes core - theme shape 1`] = `
715719
"--color-navy-800": "#10162F",
716720
"--color-navy-900": "#0A0D1C",
717721
"--color-orange": "#FF8C00",
722+
"--color-orange-100": "#FFE8CC",
718723
"--color-orange-500": "#FF8C00",
719724
"--color-paleBlue": "#F5FCFF",
720725
"--color-paleGreen": "#F5FFE3",
@@ -839,6 +844,7 @@ exports[`themes core - theme shape 1`] = `
839844
"navy-800": "var(--color-navy-800)",
840845
"navy-900": "var(--color-navy-900)",
841846
"orange": "var(--color-orange)",
847+
"orange-100": "var(--color-orange-100)",
842848
"orange-500": "var(--color-orange-500)",
843849
"paleBlue": "var(--color-paleBlue)",
844850
"paleGreen": "var(--color-paleGreen)",
@@ -1046,6 +1052,7 @@ exports[`themes platform - theme shape 1`] = `
10461052
"navy-800": "#10162F",
10471053
"navy-900": "#0A0D1C",
10481054
"orange": "#FF8C00",
1055+
"orange-100": "#FFE8CC",
10491056
"orange-500": "#FF8C00",
10501057
"orange-800": "#D14900",
10511058
"paleBlue": "#F5FCFF",
@@ -1304,6 +1311,7 @@ exports[`themes platform - theme shape 1`] = `
13041311
"--color-navy-800": "#10162F",
13051312
"--color-navy-900": "#0A0D1C",
13061313
"--color-orange": "#FF8C00",
1314+
"--color-orange-100": "#FFE8CC",
13071315
"--color-orange-500": "#FF8C00",
13081316
"--color-orange-800": "#D14900",
13091317
"--color-paleBlue": "#F5FCFF",
@@ -1463,6 +1471,7 @@ exports[`themes platform - theme shape 1`] = `
14631471
"navy-800": "var(--color-navy-800)",
14641472
"navy-900": "var(--color-navy-900)",
14651473
"orange": "var(--color-orange)",
1474+
"orange-100": "var(--color-orange-100)",
14661475
"orange-500": "var(--color-orange-500)",
14671476
"orange-800": "var(--color-orange-800)",
14681477
"paleBlue": "var(--color-paleBlue)",

‎packages/gamut-styles/src/variables/colors.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ export const coreSwatches = {
6666
'600': '#BE1809',
6767
},
6868
orange: {
69+
'100': '#FFE8CC',
6970
'500': '#FF8C00',
7071
},
7172
hyper: {

‎packages/gamut-tests/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
### [5.2.4](https://github.com/Codecademy/gamut/compare/@codecademy/[email protected]...@codecademy/[email protected]) (2025-02-10)
7+
8+
**Note:** Version bump only for package @codecademy/gamut-tests
9+
610
### [5.2.3](https://github.com/Codecademy/gamut/compare/@codecademy/[email protected]...@codecademy/[email protected]) (2025-02-05)
711

812
**Note:** Version bump only for package @codecademy/gamut-tests

‎packages/gamut-tests/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"name": "@codecademy/gamut-tests",
33
"description": "Shared component test setup for Gamut applications",
4-
"version": "5.2.3",
4+
"version": "5.2.4",
55
"author": "Codecademy Engineering <[email protected]>",
66
"dependencies": {
7-
"@codecademy/gamut-styles": "17.4.1",
7+
"@codecademy/gamut-styles": "17.5.0",
88
"component-test-setup": "*",
99
"lodash": "^4.17.5"
1010
},

‎packages/gamut/CHANGELOG.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,18 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
### [59.0.6](https://github.com/Codecademy/gamut/compare/@codecademy/[email protected]...@codecademy/[email protected]) (2025-02-11)
7+
8+
**Note:** Version bump only for package @codecademy/gamut
9+
10+
### [59.0.5](https://github.com/Codecademy/gamut/compare/@codecademy/[email protected]...@codecademy/[email protected]) (2025-02-11)
11+
12+
**Note:** Version bump only for package @codecademy/gamut
13+
14+
### [59.0.4](https://github.com/Codecademy/gamut/compare/@codecademy/[email protected]...@codecademy/[email protected]) (2025-02-10)
15+
16+
**Note:** Version bump only for package @codecademy/gamut
17+
618
### [59.0.3](https://github.com/Codecademy/gamut/compare/@codecademy/[email protected]...@codecademy/[email protected]) (2025-02-05)
719

820
**Note:** Version bump only for package @codecademy/gamut

‎packages/gamut/package.json

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
11
{
22
"name": "@codecademy/gamut",
33
"description": "Styleguide & Component library for Codecademy",
4-
"version": "59.0.3",
4+
"version": "59.0.6",
55
"author": "Codecademy Engineering <[email protected]>",
66
"dependencies": {
7-
"@codecademy/gamut-icons": "9.38.0",
8-
"@codecademy/gamut-illustrations": "0.53.1",
9-
"@codecademy/gamut-patterns": "0.10.3",
10-
"@codecademy/gamut-styles": "17.4.1",
7+
"@codecademy/gamut-icons": "9.38.2",
8+
"@codecademy/gamut-illustrations": "0.53.2",
9+
"@codecademy/gamut-patterns": "0.10.5",
10+
"@codecademy/gamut-styles": "17.5.0",
1111
"@codecademy/variance": "0.22.1",
12-
"@reach/auto-id": "^0.16.0",
13-
"@reach/tabs": "^0.16.4",
12+
"@reach/tabs": "^0.18.0",
1413
"@types/marked": "^4.0.8",
1514
"classnames": "^2.2.5",
16-
"framer-motion": "^6.5.1",
15+
"framer-motion": "^11.18.0",
1716
"html-to-react": "^1.6.0",
1817
"invariant": "^2.2.4",
1918
"lodash": "^4.17.5",

‎packages/gamut/src/Alert/Alert.tsx

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
import { MiniChevronDownIcon, MiniDeleteIcon } from '@codecademy/gamut-icons';
22
import { breakpoints, useCurrentMode } from '@codecademy/gamut-styles';
3-
import { useId } from '@reach/auto-id';
4-
import { isValidElement, useMemo, useState } from 'react';
5-
import * as React from 'react';
3+
import { Children, isValidElement, useId, useMemo, useState } from 'react';
64
import TruncateMarkup from 'react-truncate-markup';
75
import { useMeasure } from 'react-use';
86

@@ -121,7 +119,7 @@ export const Alert: React.FC<AlertProps> = ({
121119
>
122120
{/** Truncate markup expects a single child element */}
123121
<Box {...alertContentProps}>
124-
{React.Children.map(children, (child) =>
122+
{Children.map(children, (child) =>
125123
isValidElement(child) || typeof child === 'string' ? (
126124
child
127125
) : (

‎packages/gamut/src/Button/IconButton.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
import { useId } from '@reach/auto-id';
2-
import { ComponentProps, forwardRef } from 'react';
1+
import { ComponentProps, forwardRef, useId } from 'react';
32

43
import { ButtonBaseElements } from '../ButtonBase/ButtonBase';
54
import { ToolTip, ToolTipProps } from '../Tip/ToolTip';

0 commit comments

Comments
 (0)