Skip to content

Commit

Permalink
Merge branch 'main' into ti-OKTA-721245-layout-component
Browse files Browse the repository at this point in the history
  • Loading branch information
jordankoschei-okta committed Jul 22, 2024
2 parents 7b046a4 + 5a0ed91 commit af78af3
Show file tree
Hide file tree
Showing 88 changed files with 7,667 additions and 197 deletions.
Binary file removed .yarn/cache/glob-npm-7.2.3-2d866d17a5-59452a9202.zip
Binary file not shown.
Binary file removed .yarn/cache/glob-npm-8.1.0-65f64af8b1-9aab1c75eb.zip
Binary file not shown.
Binary file not shown.
77 changes: 77 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,83 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [1.19.0](https://github.com/okta/odyssey/compare/v1.18.0...v1.19.0) (2024-07-15)

### Features

- adds new side navigation component for unified nav design ([#2269](https://github.com/okta/odyssey/issues/2269)) ([e54a470](https://github.com/okta/odyssey/commit/e54a470aaa71eec4fd85f19ac8519425f1d64e8f))

### Bug Fixes

- update glob to v9 ([#2275](https://github.com/okta/odyssey/issues/2275)) ([c4d73ea](https://github.com/okta/odyssey/commit/c4d73eaf2ae972ad4b9afda13428bd96f6b626e0))

## [1.18.0](https://github.com/okta/odyssey/compare/v1.15.9...v1.18.0) (2024-06-26)

### Features

- add backwards compatible empty state export ([#2266](https://github.com/okta/odyssey/issues/2266)) ([0fe3203](https://github.com/okta/odyssey/commit/0fe3203629dc85f7c91c58e3ff078c9a89360407))
- add initial search prop to DataTable ([#2265](https://github.com/okta/odyssey/issues/2265)) ([5829534](https://github.com/okta/odyssey/commit/582953472b9a4e9946a57c852b78cd890a6ab674))
- bumps lerna version ([#2238](https://github.com/okta/odyssey/issues/2238)) ([615f080](https://github.com/okta/odyssey/commit/615f080082ea42ded591a262fb2affe36d51cbf7))
- EmptyState component ([#2175](https://github.com/okta/odyssey/issues/2175)) ([8c86845](https://github.com/okta/odyssey/commit/8c868450b6e1b8c63775afe1f38219507e9bacc7))
- move Pagination to its own component ([#2166](https://github.com/okta/odyssey/issues/2166)) ([61eda40](https://github.com/okta/odyssey/commit/61eda40aaf1a5dc5477799694594ea5625715fe0))
- Test Selectors ([#2209](https://github.com/okta/odyssey/issues/2209)) ([dfa8451](https://github.com/okta/odyssey/commit/dfa8451d0cb6ed63cbd3ac1ce740203b638348f7))

### Bug Fixes

- add changes back, remove required label ([cccce45](https://github.com/okta/odyssey/commit/cccce454c33588369786b2dc8cc6e39bbace4678))
- add clarification in TextField label ([e6f7d80](https://github.com/okta/odyssey/commit/e6f7d8007dcdf0e0738c647342d901252061b705))
- add comment ([9af7d11](https://github.com/okta/odyssey/commit/9af7d11f2964fa1b17be673c4e84a0bbb1a47ab9))
- add errorMessageList to form components ([ad6de75](https://github.com/okta/odyssey/commit/ad6de75175043491b10c966646f95858b3217bea))
- add floating action button variant ([a32110d](https://github.com/okta/odyssey/commit/a32110d5aa71efd7fcbf3f1606eae613a639c721))
- add hint text to Radio and RadioGroup ([6518de5](https://github.com/okta/odyssey/commit/6518de5b38e54ec6aa3146a310c7c02a3b7d8a4e))
- add more tests ([0149621](https://github.com/okta/odyssey/commit/0149621f7f762f0106149d6d9533d8c8596c62e8))
- add optional href prop to button ([f46123b](https://github.com/okta/odyssey/commit/f46123b538947aa0040b29832dafaf6df9da332e))
- add secondary danger button variant ([170e6e0](https://github.com/okta/odyssey/commit/170e6e03476d3a7fdef9bdca9f94a8d7e0d6f00a))
- add secondary danger button variant ([d398e39](https://github.com/okta/odyssey/commit/d398e391e2d80d2f95f54182bf01adb8c78d3c63))
- add test ([37755b4](https://github.com/okta/odyssey/commit/37755b48c1be6a7d82e9f0e6ac377049abcab8a8))
- add test for no options ([d997be1](https://github.com/okta/odyssey/commit/d997be145086c9f3142f8c24e733a7f7abdb9133))
- add tests ([0774e0a](https://github.com/okta/odyssey/commit/0774e0ae7dfc5f8ee2cd355e2186ad29827fa0b4))
- address comments ([c335306](https://github.com/okta/odyssey/commit/c335306a727b7879348cdacfdafda57a878af631))
- alphabetize props ([988bd74](https://github.com/okta/odyssey/commit/988bd74e98794f2f48589e6be3e37f608f87a07a))
- alphabetize props in imports ([ca56f0a](https://github.com/okta/odyssey/commit/ca56f0a3ad5b3a4902bf38111bc6c229ad1533f6))
- await on toBeVisible ([74038da](https://github.com/okta/odyssey/commit/74038daca8211c7ba74971610e49332a0ffee054))
- bump version to 1.17 ([0e32aba](https://github.com/okta/odyssey/commit/0e32aba973ef00d5a872dbd408a84fb54c8a7408))
- button tests ([b427ee5](https://github.com/okta/odyssey/commit/b427ee5cf2901d380112eaae10a813a4f1781f53))
- checkbox test ([69101bb](https://github.com/okta/odyssey/commit/69101bb4fc7f980116f1e1cef2ee736a7126d998))
- expose "filled" variant of search ([af345d6](https://github.com/okta/odyssey/commit/af345d6e3265bd3addf0a3153695a0c03d30ba70))
- fix props issue in storybook ([967fd49](https://github.com/okta/odyssey/commit/967fd494dcf7394b3c182f7d7bd6d95884e39a5c))
- fix storybook error ([a7f3179](https://github.com/okta/odyssey/commit/a7f3179dd78969341744d8d29d903ee706a3ad61))
- fix tests ([a730e69](https://github.com/okta/odyssey/commit/a730e69216735829d0e448dc4a8f39d41fe93a1e))
- loading in autocomplete ([f99e09e](https://github.com/okta/odyssey/commit/f99e09ed70ba941a22875dc41abef35282d9459b))
- make return implicit in label ([e2a26df](https://github.com/okta/odyssey/commit/e2a26df5082bfb5e7573c83a9ab53b364941713b))
- move Drawer from labs to Odyssey OKTA-700393 ([247b30a](https://github.com/okta/odyssey/commit/247b30af6e598119b78d97c971f490c48cd1dfca))
- prevent mixing old and new button props ([7aed65b](https://github.com/okta/odyssey/commit/7aed65be175c12525c9aee5fca18af0251dd2fec))
- re-add support for "callToAction" button usage ([0eb6ec7](https://github.com/okta/odyssey/commit/0eb6ec704ba6a0a9da12dcd6d864a6d1d1421915))
- rename new variant ([28466a4](https://github.com/okta/odyssey/commit/28466a46c8a254f543f595d2abf26115eff7b66b))
- rename tests ([85b59a0](https://github.com/okta/odyssey/commit/85b59a02d8999c1d4cd6d9fc7c86556266c63c63))
- resolve eslint error ([6be8bd0](https://github.com/okta/odyssey/commit/6be8bd0ca6f333949d80cbe59e28fac48528388b))
- resolve type issues in storybook ([1e11cbe](https://github.com/okta/odyssey/commit/1e11cbe40299c62c6a47a419ef0026d932765129))
- revert changes for radio group stories ([b9e3007](https://github.com/okta/odyssey/commit/b9e30071649ff9a0a723b2aa4d546a16973bd43f))
- revert last commit ([beefba3](https://github.com/okta/odyssey/commit/beefba3fe35de567abed72c914048e2662f35b0f))
- revert stories update ([47d5dc4](https://github.com/okta/odyssey/commit/47d5dc4b7f8756648fe20adbb5e267c9352f694a))
- revert type change ([9d9e16b](https://github.com/okta/odyssey/commit/9d9e16b83cc3047b7dd6c5eb7e8027b2dd0898cb))
- show code block in storybook ([b2bd444](https://github.com/okta/odyssey/commit/b2bd444d11af21ef3aa53fde651863c84f763f13))
- show form components with different attribute settings in storybook for visual testing ([f21a9eb](https://github.com/okta/odyssey/commit/f21a9eb028308b6c2c9d97e84d30392ad8ec8e1d))
- storybook tests ([2b3f92d](https://github.com/okta/odyssey/commit/2b3f92dfdceecef3fd425d9040bbfaef2b22249c))
- style in breadcrumbs ([a01ab07](https://github.com/okta/odyssey/commit/a01ab079397ad8d570e44e5573e1e9dd2e41c0b8))
- tests ([a2d7ec9](https://github.com/okta/odyssey/commit/a2d7ec9144456e0abe3d0bd8c249d38dedf82b2d))
- tests ([5a8dd46](https://github.com/okta/odyssey/commit/5a8dd4626ddb6e7bc8ea963b5bfb8c3d9fae2266))
- text update, follow HTML-style prop additions ([a8eb111](https://github.com/okta/odyssey/commit/a8eb1111fa5891901af769e1fdd9af13c7d0d909))
- tooltip ([395047a](https://github.com/okta/odyssey/commit/395047ac00c0ec3656e2e6aa3088cbb176c3e73d))
- tooltip test ([d413a9e](https://github.com/okta/odyssey/commit/d413a9edcce6316bc5bf76e62a0e34325d759fc7))
- update callout storybook docs ([2ce411a](https://github.com/okta/odyssey/commit/2ce411ac3b07a98e2b9b052ea06170d936f832c3))
- update roadmap page ([bf2af54](https://github.com/okta/odyssey/commit/bf2af54bae0109ddca86006d5bc648104ccd1391))
- update story ([b453549](https://github.com/okta/odyssey/commit/b453549866aa997988bba568f479ce66084d377b))
- update story to fix a11y test ([63c0e62](https://github.com/okta/odyssey/commit/63c0e623cdcb4faad64af03c0ee80e9cf3952b08))
- update storybook to show Label not Title ([9378fae](https://github.com/okta/odyssey/commit/9378faeead9e226150d448c19acd99154cace297))
- update tests ([3aa9976](https://github.com/okta/odyssey/commit/3aa9976ac37de4bc5b82833b7d94c1e15604a0a4))
- updated vulnerable packages per Snyk ([#2268](https://github.com/okta/odyssey/issues/2268)) ([1efe177](https://github.com/okta/odyssey/commit/1efe177f79c2a13a8d2c942c472120b30d42410f))

## [1.16.0](https://github.com/okta/odyssey/compare/v1.15.8...odyssey-1.16.0) (2024-06-07)

### Features
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
"npmClient": "yarn",
"packages": ["packages/*"],
"useNx": false,
"version": "1.17.3"
"version": "1.19.0"
}
4 changes: 4 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,10 @@
"braces@npm:^3.0.3": "^3.0.3",
"braces@npm:~3.0.2": "^3.0.3",
"cacache@npm:12.0.4/glob": "^9.0.0",
"glob@npm:^7.1.3": "^9.3.5",
"glob@npm:^7.1.6": "^9.3.5",
"glob@npm:^7.2.0": "^9.3.5",
"glob@npm:^8.0.1": "^9.3.5",
"glob-parent@npm:3.1.0": "^5.1.2",
"ip@npm:^1.1.8": "^1.1.9",
"ip@npm:^2.0.0": "^2.0.1",
Expand Down
10 changes: 10 additions & 0 deletions packages/browserslist-config-odyssey/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,16 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [1.19.0](https://github.com/okta/odyssey/compare/v1.18.0...v1.19.0) (2024-07-15)

**Note:** Version bump only for package @okta/browserslist-config-odyssey

## [1.18.0](https://github.com/okta/odyssey/compare/v1.15.9...v1.18.0) (2024-06-26)

### Bug Fixes

- bump version to 1.17 ([0e32aba](https://github.com/okta/odyssey/commit/0e32aba973ef00d5a872dbd408a84fb54c8a7408))

## [1.15.9](https://github.com/okta/odyssey/compare/v1.15.8...v1.15.9) (2024-03-26)

**Note:** Version bump only for package @okta/browserslist-config-odyssey
Expand Down
2 changes: 1 addition & 1 deletion packages/browserslist-config-odyssey/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@okta/browserslist-config-odyssey",
"version": "1.17.3",
"version": "1.19.0",
"description": "Browserslist config for Odyssey, Okta's design system",
"author": "Okta, Inc.",
"license": "Apache-2.0",
Expand Down
10 changes: 10 additions & 0 deletions packages/odyssey-babel-loader/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,16 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [1.19.0](https://github.com/okta/odyssey/compare/v1.18.0...v1.19.0) (2024-07-15)

**Note:** Version bump only for package @okta/odyssey-babel-loader

## [1.18.0](https://github.com/okta/odyssey/compare/v1.15.9...v1.18.0) (2024-06-26)

### Bug Fixes

- bump version to 1.17 ([0e32aba](https://github.com/okta/odyssey/commit/0e32aba973ef00d5a872dbd408a84fb54c8a7408))

## [1.15.9](https://github.com/okta/odyssey/compare/v1.15.8...v1.15.9) (2024-03-26)

**Note:** Version bump only for package @okta/odyssey-babel-loader
Expand Down
2 changes: 1 addition & 1 deletion packages/odyssey-babel-loader/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@okta/odyssey-babel-loader",
"version": "1.17.3",
"version": "1.19.0",
"description": "Babel webpack loader for Odyssey, Okta's design system",
"author": "Okta, Inc.",
"license": "Apache-2.0",
Expand Down
10 changes: 10 additions & 0 deletions packages/odyssey-babel-preset/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,16 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [1.19.0](https://github.com/okta/odyssey/compare/v1.18.0...v1.19.0) (2024-07-15)

**Note:** Version bump only for package @okta/odyssey-babel-preset

## [1.18.0](https://github.com/okta/odyssey/compare/v1.15.9...v1.18.0) (2024-06-26)

### Bug Fixes

- bump version to 1.17 ([0e32aba](https://github.com/okta/odyssey/commit/0e32aba973ef00d5a872dbd408a84fb54c8a7408))

## [1.15.9](https://github.com/okta/odyssey/compare/v1.15.8...v1.15.9) (2024-03-26)

**Note:** Version bump only for package @okta/odyssey-babel-preset
Expand Down
2 changes: 1 addition & 1 deletion packages/odyssey-babel-preset/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@okta/odyssey-babel-preset",
"version": "1.17.3",
"version": "1.19.0",
"description": "Babel preset for Odyssey, Okta's design system",
"author": "Okta, Inc.",
"license": "Apache-2.0",
Expand Down
10 changes: 10 additions & 0 deletions packages/odyssey-design-tokens/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,16 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [1.19.0](https://github.com/okta/odyssey/compare/v1.18.0...v1.19.0) (2024-07-15)

**Note:** Version bump only for package @okta/odyssey-design-tokens

## [1.18.0](https://github.com/okta/odyssey/compare/v1.15.9...v1.18.0) (2024-06-26)

### Bug Fixes

- bump version to 1.17 ([0e32aba](https://github.com/okta/odyssey/commit/0e32aba973ef00d5a872dbd408a84fb54c8a7408))

## [1.15.9](https://github.com/okta/odyssey/compare/v1.15.8...v1.15.9) (2024-03-26)

**Note:** Version bump only for package @okta/odyssey-design-tokens
Expand Down
2 changes: 1 addition & 1 deletion packages/odyssey-design-tokens/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@okta/odyssey-design-tokens",
"version": "1.17.3",
"version": "1.19.0",
"description": "Design tokens for Odyssey, Okta's design system",
"author": "Okta, Inc.",
"license": "Apache-2.0",
Expand Down
35 changes: 35 additions & 0 deletions packages/odyssey-react-mui/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,41 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [1.19.0](https://github.com/okta/odyssey/compare/v1.18.0...v1.19.0) (2024-07-15)

### Features

- adds new side navigation component for unified nav design ([#2269](https://github.com/okta/odyssey/issues/2269)) ([e54a470](https://github.com/okta/odyssey/commit/e54a470aaa71eec4fd85f19ac8519425f1d64e8f))

## [1.18.0](https://github.com/okta/odyssey/compare/v1.15.9...v1.18.0) (2024-06-26)

### Features

- add backwards compatible empty state export ([#2266](https://github.com/okta/odyssey/issues/2266)) ([0fe3203](https://github.com/okta/odyssey/commit/0fe3203629dc85f7c91c58e3ff078c9a89360407))
- add initial search prop to DataTable ([#2265](https://github.com/okta/odyssey/issues/2265)) ([5829534](https://github.com/okta/odyssey/commit/582953472b9a4e9946a57c852b78cd890a6ab674))
- EmptyState component ([#2175](https://github.com/okta/odyssey/issues/2175)) ([8c86845](https://github.com/okta/odyssey/commit/8c868450b6e1b8c63775afe1f38219507e9bacc7))
- move Pagination to its own component ([#2166](https://github.com/okta/odyssey/issues/2166)) ([61eda40](https://github.com/okta/odyssey/commit/61eda40aaf1a5dc5477799694594ea5625715fe0))
- Test Selectors ([#2209](https://github.com/okta/odyssey/issues/2209)) ([dfa8451](https://github.com/okta/odyssey/commit/dfa8451d0cb6ed63cbd3ac1ce740203b638348f7))

### Bug Fixes

- add changes back, remove required label ([cccce45](https://github.com/okta/odyssey/commit/cccce454c33588369786b2dc8cc6e39bbace4678))
- add comment ([9af7d11](https://github.com/okta/odyssey/commit/9af7d11f2964fa1b17be673c4e84a0bbb1a47ab9))
- add floating action button variant ([a32110d](https://github.com/okta/odyssey/commit/a32110d5aa71efd7fcbf3f1606eae613a639c721))
- add hint text to Radio and RadioGroup ([6518de5](https://github.com/okta/odyssey/commit/6518de5b38e54ec6aa3146a310c7c02a3b7d8a4e))
- add optional href prop to button ([f46123b](https://github.com/okta/odyssey/commit/f46123b538947aa0040b29832dafaf6df9da332e))
- add secondary danger button variant ([170e6e0](https://github.com/okta/odyssey/commit/170e6e03476d3a7fdef9bdca9f94a8d7e0d6f00a))
- alphabetize props ([988bd74](https://github.com/okta/odyssey/commit/988bd74e98794f2f48589e6be3e37f608f87a07a))
- alphabetize props in imports ([ca56f0a](https://github.com/okta/odyssey/commit/ca56f0a3ad5b3a4902bf38111bc6c229ad1533f6))
- bump version to 1.17 ([0e32aba](https://github.com/okta/odyssey/commit/0e32aba973ef00d5a872dbd408a84fb54c8a7408))
- make return implicit in label ([e2a26df](https://github.com/okta/odyssey/commit/e2a26df5082bfb5e7573c83a9ab53b364941713b))
- move Drawer from labs to Odyssey OKTA-700393 ([247b30a](https://github.com/okta/odyssey/commit/247b30af6e598119b78d97c971f490c48cd1dfca))
- prevent mixing old and new button props ([7aed65b](https://github.com/okta/odyssey/commit/7aed65be175c12525c9aee5fca18af0251dd2fec))
- re-add support for "callToAction" button usage ([0eb6ec7](https://github.com/okta/odyssey/commit/0eb6ec704ba6a0a9da12dcd6d864a6d1d1421915))
- rename new variant ([28466a4](https://github.com/okta/odyssey/commit/28466a46c8a254f543f595d2abf26115eff7b66b))
- resolve eslint error ([6be8bd0](https://github.com/okta/odyssey/commit/6be8bd0ca6f333949d80cbe59e28fac48528388b))
- revert type change ([9d9e16b](https://github.com/okta/odyssey/commit/9d9e16b83cc3047b7dd6c5eb7e8027b2dd0898cb))

## [1.15.9](https://github.com/okta/odyssey/compare/v1.15.8...v1.15.9) (2024-03-26)

**Note:** Version bump only for package @okta/odyssey-react-mui
Expand Down
4 changes: 3 additions & 1 deletion packages/odyssey-react-mui/i18n.config.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,7 @@
"resourceFilePath": "packages/odyssey-react-mui/src/properties",
"translationsFilePath": "packages/odyssey-react-mui/src/properties/translations",
"commitPrefix": "chore(odyssey-react-mui): ",
"reviewers": ["okta/eng-globalizationcore", "okta/design-system"]
"reviewers": ["okta/eng-globalizationcore", "okta/design-system"],
"slackChannel": "odyssey",
"guardian": "guardian-odyssey"
}
2 changes: 1 addition & 1 deletion packages/odyssey-react-mui/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@okta/odyssey-react-mui",
"version": "1.17.3",
"version": "1.19.0",
"description": "React MUI components for Odyssey, Okta's design system",
"author": "Okta, Inc.",
"license": "Apache-2.0",
Expand Down
2 changes: 2 additions & 0 deletions packages/odyssey-react-mui/src/Autocomplete.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -471,6 +471,7 @@ const Autocomplete = <
// AutoComplete is wrapped in a div within MUI which does not get the disabled attr. So this aria-disabled gets set in the div
aria-disabled={isDisabled}
clearText={t("clear.text")}
closeText={t("close.text")}
disableCloseOnSelect={hasMultipleChoices}
disabled={isDisabled}
freeSolo={isCustomValueAllowed}
Expand All @@ -484,6 +485,7 @@ const Autocomplete = <
onChange={onChange}
onInputChange={onInputChange}
onFocus={onFocus}
openText={t("open.text")}
options={options}
readOnly={isReadOnly}
renderInput={renderInput}
Expand Down
57 changes: 32 additions & 25 deletions packages/odyssey-react-mui/src/Card.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ import {
useOdysseyDesignTokens,
} from "./OdysseyDesignTokensContext";
import { Heading5, Paragraph, Support } from "./Typography";
import { Box } from "./Box";

export const CARD_IMAGE_HEIGHT = "64px";

Expand Down Expand Up @@ -63,7 +64,7 @@ const ImageContainer = styled("div", {
}>(({ odysseyDesignTokens, hasMenuButtonChildren }) => ({
display: "flex",
alignItems: "flex-start",
maxHeight: `${CARD_IMAGE_HEIGHT}`,
maxHeight: CARD_IMAGE_HEIGHT,
marginBlockEnd: odysseyDesignTokens.Spacing5,
paddingRight: hasMenuButtonChildren ? odysseyDesignTokens.Spacing5 : 0,
}));
Expand All @@ -76,6 +77,10 @@ const MenuButtonContainer = styled("div", {
top: odysseyDesignTokens.Spacing3,
}));

const CardContentContainer = styled("div")(() => ({
display: "flex",
}));

const buttonProviderValue = { isFullWidth: true };

const Card = ({
Expand All @@ -91,30 +96,32 @@ const Card = ({

const cardContent = useMemo(
() => (
<>
{image && (
<ImageContainer
odysseyDesignTokens={odysseyDesignTokens}
hasMenuButtonChildren={Boolean(menuButtonChildren)}
>
{image}
</ImageContainer>
)}

{overline && <Support component="div">{overline}</Support>}
{title && <Heading5 component="div">{title}</Heading5>}
{description && (
<Paragraph color="textSecondary">{description}</Paragraph>
)}

{button && (
<MuiCardActions>
<ButtonContext.Provider value={buttonProviderValue}>
{button}
</ButtonContext.Provider>
</MuiCardActions>
)}
</>
<CardContentContainer>
<Box>
{image && (
<ImageContainer
odysseyDesignTokens={odysseyDesignTokens}
hasMenuButtonChildren={Boolean(menuButtonChildren)}
>
{image}
</ImageContainer>
)}

{overline && <Support component="div">{overline}</Support>}
{title && <Heading5 component="div">{title}</Heading5>}
{description && (
<Paragraph color="textSecondary">{description}</Paragraph>
)}

{button && (
<MuiCardActions>
<ButtonContext.Provider value={buttonProviderValue}>
{button}
</ButtonContext.Provider>
</MuiCardActions>
)}
</Box>
</CardContentContainer>
),
[
button,
Expand Down
Loading

0 comments on commit af78af3

Please sign in to comment.