Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Backport 1.20 #2300

Merged
merged 9 commits into from
Jul 31, 2024
Merged

Backport 1.20 #2300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c8d1330
fix: english leak for "Close" in Autocomplete (#2291)
stephanieyoshimoto-okta Jul 18, 2024
0d1aa97
feat: pageTemplate and Layout component (#2219)
trevoring-okta Jul 22, 2024
a9b65fc
fix: data Table legacy improvements (#2294)
jordankoschei-okta Jul 24, 2024
468fb4b
chore(odyssey-react-mui): fix Layout story margin
bryancunningham-okta Jul 24, 2024
17b16d7
chore(odyssey-react-mui): bump to 1.20.0. not done in main by error
bryancunningham-okta Jul 24, 2024
56d6106
chore: back to 1.19.0
bryancunningham-okta Jul 25, 2024
20b9873
chore: bump back to 1.20.0 and generate changelog
bryancunningham-okta Jul 25, 2024
de087ab
Merge branch 'main' into bc_backport_1.20
bryancunningham-okta Jul 25, 2024
3c7db00
Merge remote-tracking branch 'origin/main' into bc_backport_1.20
bryancunningham-okta Jul 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,17 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [1.20.0](https://github.com/okta/odyssey/compare/v1.19.0...v1.20.0) (2024-07-25)

### Features

- pageTemplate and Layout component ([#2219](https://github.com/okta/odyssey/issues/2219)) ([a04eb1d](https://github.com/okta/odyssey/commit/a04eb1df24702ef23b436d0df58e0571974b0454))

### Bug Fixes

- data Table legacy improvements ([#2294](https://github.com/okta/odyssey/issues/2294)) ([3146cd1](https://github.com/okta/odyssey/commit/3146cd1edeb145aa727682659eaba422533ba0f1))
- english leak for "Close" in Autocomplete ([#2291](https://github.com/okta/odyssey/issues/2291)) ([0959c71](https://github.com/okta/odyssey/commit/0959c71f7c2dc6ddc1cde3281534f19222f4df6d))

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

### Features
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
"npmClient": "yarn",
"packages": ["packages/*"],
"useNx": false,
"version": "1.19.0"
"version": "1.20.0"
}
4 changes: 4 additions & 0 deletions packages/browserslist-config-odyssey/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [1.20.0](https://github.com/okta/odyssey/compare/v1.19.0...v1.20.0) (2024-07-25)

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

## [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
Expand Down
2 changes: 1 addition & 1 deletion packages/browserslist-config-odyssey/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@okta/browserslist-config-odyssey",
"version": "1.19.0",
"version": "1.20.0",
"description": "Browserslist config for Odyssey, Okta's design system",
"author": "Okta, Inc.",
"license": "Apache-2.0",
Expand Down
4 changes: 4 additions & 0 deletions packages/odyssey-babel-loader/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [1.20.0](https://github.com/okta/odyssey/compare/v1.19.0...v1.20.0) (2024-07-25)

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

## [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
Expand Down
2 changes: 1 addition & 1 deletion packages/odyssey-babel-loader/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@okta/odyssey-babel-loader",
"version": "1.19.0",
"version": "1.20.0",
"description": "Babel webpack loader for Odyssey, Okta's design system",
"author": "Okta, Inc.",
"license": "Apache-2.0",
Expand Down
4 changes: 4 additions & 0 deletions packages/odyssey-babel-preset/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [1.20.0](https://github.com/okta/odyssey/compare/v1.19.0...v1.20.0) (2024-07-25)

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

## [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
Expand Down
2 changes: 1 addition & 1 deletion packages/odyssey-babel-preset/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@okta/odyssey-babel-preset",
"version": "1.19.0",
"version": "1.20.0",
"description": "Babel preset for Odyssey, Okta's design system",
"author": "Okta, Inc.",
"license": "Apache-2.0",
Expand Down
4 changes: 4 additions & 0 deletions packages/odyssey-design-tokens/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [1.20.0](https://github.com/okta/odyssey/compare/v1.19.0...v1.20.0) (2024-07-25)

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

## [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
Expand Down
2 changes: 1 addition & 1 deletion packages/odyssey-design-tokens/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@okta/odyssey-design-tokens",
"version": "1.19.0",
"version": "1.20.0",
"description": "Design tokens for Odyssey, Okta's design system",
"author": "Okta, Inc.",
"license": "Apache-2.0",
Expand Down
11 changes: 11 additions & 0 deletions packages/odyssey-react-mui/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,17 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [1.20.0](https://github.com/okta/odyssey/compare/v1.19.0...v1.20.0) (2024-07-25)

### Features

- pageTemplate and Layout component ([#2219](https://github.com/okta/odyssey/issues/2219)) ([a04eb1d](https://github.com/okta/odyssey/commit/a04eb1df24702ef23b436d0df58e0571974b0454))

### Bug Fixes

- data Table legacy improvements ([#2294](https://github.com/okta/odyssey/issues/2294)) ([3146cd1](https://github.com/okta/odyssey/commit/3146cd1edeb145aa727682659eaba422533ba0f1))
- english leak for "Close" in Autocomplete ([#2291](https://github.com/okta/odyssey/issues/2291)) ([0959c71](https://github.com/okta/odyssey/commit/0959c71f7c2dc6ddc1cde3281534f19222f4df6d))

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

### Features
Expand Down
2 changes: 1 addition & 1 deletion packages/odyssey-react-mui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@okta/odyssey-react-mui",
"version": "1.19.0",
"version": "1.20.0",
"description": "React MUI components for Odyssey, Okta's design system",
"author": "Okta, Inc.",
"license": "Apache-2.0",
Expand Down
11 changes: 11 additions & 0 deletions packages/odyssey-storybook/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,17 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [1.20.0](https://github.com/okta/odyssey/compare/v1.19.0...v1.20.0) (2024-07-25)

### Features

- pageTemplate and Layout component ([#2219](https://github.com/okta/odyssey/issues/2219)) ([a04eb1d](https://github.com/okta/odyssey/commit/a04eb1df24702ef23b436d0df58e0571974b0454))

### Bug Fixes

- data Table legacy improvements ([#2294](https://github.com/okta/odyssey/issues/2294)) ([3146cd1](https://github.com/okta/odyssey/commit/3146cd1edeb145aa727682659eaba422533ba0f1))
- english leak for "Close" in Autocomplete ([#2291](https://github.com/okta/odyssey/issues/2291)) ([0959c71](https://github.com/okta/odyssey/commit/0959c71f7c2dc6ddc1cde3281534f19222f4df6d))

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

### Features
Expand Down
2 changes: 1 addition & 1 deletion packages/odyssey-storybook/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@okta/odyssey-storybook",
"version": "1.19.0",
"version": "1.20.0",
"description": "Documentation for Odyssey, Okta's design system",
"author": "Okta, Inc.",
"license": "Apache-2.0",
Expand Down
169 changes: 99 additions & 70 deletions packages/odyssey-storybook/src/components/odyssey-labs/Layout/Layout.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,12 @@ const RegionDisclaimer = () => {
);
};

const MarginContainer = styled.div({
"& + &": {
marginBlockStart: "16px",
},
});

const storybookMeta: Meta<LayoutProps> = {
title: "Labs Components/Layout",
component: Layout,
Expand Down Expand Up @@ -250,76 +256,99 @@ export const KitchenSink: StoryObj<LayoutProps> = {
render: function () {
return (
<>
<Layout regions={[1]}>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
</Layout>
<Layout regions={[1, 1]}>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
</Layout>
<Layout regions={[2, 1]}>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
</Layout>
<Layout regions={[1, 2]}>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
</Layout>
<Layout regions={[3, 1]}>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
</Layout>
<Layout regions={[1, 3]}>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
</Layout>
<Layout regions={[1, 1, 1]}>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
</Layout>
<Layout regions={[1, 1, 1, 1]}>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
</Layout>
<MarginContainer>
<Layout regions={[1]}>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
</Layout>
</MarginContainer>

<MarginContainer>
<Layout regions={[1, 1]}>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
</Layout>
</MarginContainer>

<MarginContainer>
<Layout regions={[2, 1]}>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
</Layout>
</MarginContainer>

<MarginContainer>
<Layout regions={[1, 2]}>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
</Layout>
</MarginContainer>

<MarginContainer>
<Layout regions={[3, 1]}>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
</Layout>
</MarginContainer>

<MarginContainer>
<Layout regions={[1, 3]}>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
</Layout>
</MarginContainer>

<MarginContainer>
<Layout regions={[1, 1, 1]}>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
</Layout>
</MarginContainer>

<MarginContainer>
<Layout regions={[1, 1, 1, 1]}>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
</Layout>
</MarginContainer>
</>
);
},
Expand Down
4 changes: 4 additions & 0 deletions packages/odyssey-svgr/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [1.20.0](https://github.com/okta/odyssey/compare/v1.19.0...v1.20.0) (2024-07-25)

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

## [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-svgr
Expand Down
2 changes: 1 addition & 1 deletion packages/odyssey-svgr/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@okta/odyssey-svgr",
"version": "1.19.0",
"version": "1.20.0",
"description": "Configuration files for svgr icon conversion",
"author": "Okta, Inc.",
"license": "Apache-2.0",
Expand Down
Loading