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

PageTemplate and Layout component #2219

Merged
merged 21 commits into from
Jul 22, 2024
Merged

PageTemplate and Layout component #2219

Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
fac7853
feat: start layout component
trevoring-okta Apr 24, 2024
0a1cd83
feat: more work on layout component
trevoring-okta Apr 25, 2024
2f7ca88
feat: documentation and syntax updates
trevoring-okta Apr 27, 2024
baded28
fix: update to storybook and component
trevoring-okta Apr 30, 2024
cba53dc
feat: add more to Storybook
trevoring-okta May 2, 2024
2a8f9a2
fix: remove unncessary MUI ScopedCssBaseline
trevoring-okta May 2, 2024
5c3c1b5
feat: add full-width story
trevoring-okta May 3, 2024
3da76c1
feat(odyssey-react-mui): create surface component
bryancunningham-okta May 6, 2024
762febb
feat(odyssey-react-mui): create stories for Grid
bryancunningham-okta May 6, 2024
ed431aa
feat(odyssey-react-mui): remove surface styling from Grid
bryancunningham-okta May 6, 2024
24d9734
fix: small nit fixes
trevoring-okta May 8, 2024
5341d2b
feat(odyssey-react-mui): panes => regions
bryancunningham-okta May 22, 2024
28662cb
fix(odyssey-react-mui): rename components and add disclaimer
bryancunningham-okta Jun 26, 2024
9192e28
fix: standardize vertical layout distance
jordankoschei-okta Jul 15, 2024
4337437
refactor: update css
jordankoschei-okta Jul 16, 2024
db40151
refactor: alphabetize the imports
jordankoschei-okta Jul 16, 2024
5ee9de1
feat: add rudimentary responsiveness to Layout
jordankoschei-okta Jul 16, 2024
286a346
refactor: improve nested selectors
jordankoschei-okta Jul 17, 2024
7b046a4
refactor: update based on code review
jordankoschei-okta Jul 22, 2024
af78af3
Merge branch 'main' into ti-OKTA-721245-layout-component
jordankoschei-okta Jul 22, 2024
f7b20d1
fix: update redundant type export
jordankoschei-okta Jul 22, 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
15 changes: 3 additions & 12 deletions packages/odyssey-react-mui/src/labs/Layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import {
DesignTokens,
useOdysseyDesignTokens,
} from "../OdysseyDesignTokensContext";
import { Box } from "../Box";

type SupportedRegionRatios =
| [1]
Expand Down Expand Up @@ -45,16 +46,6 @@ interface LayoutContentProps {
regions: string;
}

const LayoutContainer = styled("div", {
shouldForwardProp: (prop) => prop != "odysseyDesignTokens",
})<Pick<LayoutContentProps, "odysseyDesignTokens">>(
({ odysseyDesignTokens }) => ({
"& + &": {
marginBlockStart: odysseyDesignTokens.Spacing4,
},
}),
);

const LayoutContent = styled("div", {
shouldForwardProp: (prop) =>
!["odysseyDesignTokens", "regions"].includes(prop),
Expand All @@ -76,14 +67,14 @@ const Layout = ({ regions, children }: LayoutProps) => {
.join(" ");

return (
<LayoutContainer odysseyDesignTokens={odysseyDesignTokens}>
<Box>
jordankoschei-okta marked this conversation as resolved.
Show resolved Hide resolved
<LayoutContent
odysseyDesignTokens={odysseyDesignTokens}
regions={mappedRegions}
>
{Children.toArray(children).map((child) => child)}
</LayoutContent>
</LayoutContainer>
</Box>
);
};

Expand Down
Loading