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

Wrap Typography #1886

Merged
merged 10 commits into from
Jul 21, 2023
+555 −73
Merged

Wrap Typography #1886

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
806b9e4
feat: wrap Typography
jordankoschei-okta Jul 17, 2023
a73be08
feat: add ARIA props to Typography
jordankoschei-okta Jul 18, 2023
2f81f22
refactor: switch Typography to internal and add color
jordankoschei-okta Jul 18, 2023
4ace733
fix: update types
jordankoschei-okta Jul 20, 2023
de4912e
refactor: abstract component list into type
jordankoschei-okta Jul 20, 2023
6dd4a55
refactor: encapsulate component
jordankoschei-okta Jul 20, 2023
0c7de35
refactor: update aliases
jordankoschei-okta Jul 21, 2023
5017d68
fix: modify vestigial Typogrpahy components
jordankoschei-okta Jul 21, 2023
bf5ce00
Merge branch 'develop' into jk/OKTA-626132
jordankoschei-okta Jul 21, 2023
a878618
Merge branch 'develop' into jk/OKTA-626132
jordankoschei-okta Jul 21, 2023
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
2 changes: 1 addition & 1 deletion packages/odyssey-react-mui/src/Checkbox.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import {
Checkbox as MuiCheckbox,
CheckboxProps as MuiCheckboxProps,
FormControlLabel,
Typography,
} from "@mui/material";
import { Typography } from "./Typography";
import { memo, useCallback, useMemo, useState } from "react";
import { useTranslation } from "react-i18next";

Expand Down
2 changes: 1 addition & 1 deletion packages/odyssey-react-mui/src/Field.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ import { memo, ReactElement, useMemo } from "react";
import {
FormControl as MuiFormControl,
FormLabel as MuiFormLabel,
Typography,
} from "@mui/material";
import { FieldError } from "./FieldError";
import { FieldHint } from "./FieldHint";
import { FieldLabel } from "./FieldLabel";
import { Typography } from "./Typography";
import { useUniqueId } from "./useUniqueId";
import { useTranslation } from "react-i18next";

Expand Down
6 changes: 2 additions & 4 deletions packages/odyssey-react-mui/src/FieldLabel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import { memo, useMemo } from "react";

import { useTranslation } from "react-i18next";
import { ScreenReaderText } from "./ScreenReaderText";
import { Typography } from "@mui/material";
import { Subordinate } from "./Typography";

export type FieldLabelProps = {
hasVisibleLabel: boolean;
Expand All @@ -39,9 +39,7 @@ const FieldLabel = ({
<MuiInputLabel htmlFor={inputId} id={id}>
<span>{text}</span>
{isOptional && (
<Typography variant="subtitle1">
{t("fieldlabel.optional.text")}
</Typography>
<Subordinate>{t("fieldlabel.optional.text")}</Subordinate>
)}
</MuiInputLabel>
),
Expand Down
13 changes: 4 additions & 9 deletions packages/odyssey-react-mui/src/Fieldset.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@

import { memo, ReactElement } from "react";

import { Box, Typography } from "@mui/material";
import { Box } from "@mui/material";
import { Infobox } from "./Infobox";
import { Legend, Subordinate } from "./Typography";
import { useUniqueId } from "./useUniqueId";

export type FieldsetProps = {
Expand Down Expand Up @@ -71,14 +72,8 @@ const Fieldset = ({
},
}}
>
<Typography variant="legend" component="legend">
{legend}
</Typography>
{description && (
<Typography component="p" variant="subtitle2">
{description}
</Typography>
)}
<Legend>{legend}</Legend>
{description && <Subordinate component="p">{description}</Subordinate>}
{alert}
{children}
</Box>
Expand Down
15 changes: 4 additions & 11 deletions packages/odyssey-react-mui/src/Form.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,10 @@

import { memo, ReactElement } from "react";

import { Box, Typography } from "@mui/material";
import { Box } from "@mui/material";
import { Button } from "./Button";
import { Infobox } from "./Infobox";
import { Heading4, Support } from "./Typography";
import { useUniqueId } from "./useUniqueId";

export const formEncodingTypeValues = [
Expand Down Expand Up @@ -123,16 +124,8 @@ const Form = ({
marginBlockEnd: (theme) => theme.spacing(4),
}}
>
{title && (
<Typography variant="h4" component="h1">
{title}
</Typography>
)}
{description && (
<Typography component="p" variant="subtitle2">
{description}
</Typography>
)}
{title && <Heading4 component="h1">{title}</Heading4>}
{description && <Support>{description}</Support>}
{alert}
</Box>
<Box component="div">{children}</Box>
Expand Down
Loading