@databiosphere/findable-ui 42.0.0 → 42.1.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.release-please-manifest.json +1 -1
- package/CHANGELOG.md +21 -0
- package/lib/components/DataDictionary/components/Description/description.styles.js +2 -7
- package/lib/components/Filter/components/Filters/filters.js +1 -1
- package/lib/components/Filter/components/Filters/filters.styles.d.ts +2 -5
- package/lib/components/Support/components/SupportRequest/components/SupportRequestForm/supportRequestForm.js +2 -2
- package/lib/components/Support/components/SupportRequest/components/SupportRequestForm/supportRequestForm.styles.d.ts +0 -4
- package/lib/components/Support/components/SupportRequest/components/SupportRequestForm/supportRequestForm.styles.js +0 -5
- package/lib/components/Table/components/PaginationSummary/paginationSummary.js +3 -0
- package/lib/styles/common/mixins/typography.d.ts +8 -0
- package/lib/styles/common/mixins/typography.js +11 -0
- package/lib/theme/common/components.js +4 -4
- package/lib/theme/common/typography.js +8 -3
- package/package.json +1 -1
- package/src/components/DataDictionary/components/Description/description.styles.ts +2 -7
- package/src/components/Filter/components/Filters/filters.styles.ts +1 -1
- package/src/components/Filter/components/Filters/filters.tsx +1 -0
- package/src/components/Support/components/SupportRequest/components/SupportRequestForm/supportRequestForm.styles.ts +0 -6
- package/src/components/Support/components/SupportRequest/components/SupportRequestForm/supportRequestForm.tsx +7 -2
- package/src/components/Table/components/PaginationSummary/paginationSummary.tsx +3 -3
- package/src/styles/common/mixins/typography.ts +15 -0
- package/src/theme/common/components.ts +5 -5
- package/src/theme/common/typography.ts +8 -3
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,26 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## [42.1.0](https://github.com/DataBiosphere/findable-ui/compare/v42.0.1...v42.1.0) (2025-08-13)
|
|
4
|
+
|
|
5
|
+
|
|
6
|
+
### Features
|
|
7
|
+
|
|
8
|
+
* create typography to css helper function ([#625](https://github.com/DataBiosphere/findable-ui/issues/625)) ([#626](https://github.com/DataBiosphere/findable-ui/issues/626)) ([2a78f7a](https://github.com/DataBiosphere/findable-ui/commit/2a78f7aa256617f9f1f058b2979849e865a668a0))
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
### Bug Fixes
|
|
12
|
+
|
|
13
|
+
* fix category group filter label line height ([#627](https://github.com/DataBiosphere/findable-ui/issues/627)) ([#628](https://github.com/DataBiosphere/findable-ui/issues/628)) ([3bb93ce](https://github.com/DataBiosphere/findable-ui/commit/3bb93ce6f8cd4ad316d08809626638b45e238b56))
|
|
14
|
+
* fix pagination summary spacing ([#623](https://github.com/DataBiosphere/findable-ui/issues/623)) ([#624](https://github.com/DataBiosphere/findable-ui/issues/624)) ([b1bfd1f](https://github.com/DataBiosphere/findable-ui/commit/b1bfd1f6c4f1a7d53524ec8d584a97b9cd1dbe83))
|
|
15
|
+
* revert typography theme styles ([#630](https://github.com/DataBiosphere/findable-ui/issues/630)) ([#631](https://github.com/DataBiosphere/findable-ui/issues/631)) ([e9f037b](https://github.com/DataBiosphere/findable-ui/commit/e9f037b8e5c759533f7cb491e7b080c5496f6474))
|
|
16
|
+
|
|
17
|
+
## [42.0.1](https://github.com/DataBiosphere/findable-ui/compare/v42.0.0...v42.0.1) (2025-08-12)
|
|
18
|
+
|
|
19
|
+
|
|
20
|
+
### Bug Fixes
|
|
21
|
+
|
|
22
|
+
* update any typography header fonts using css vars with breakpoint overrides ([#620](https://github.com/DataBiosphere/findable-ui/issues/620)) ([#621](https://github.com/DataBiosphere/findable-ui/issues/621)) ([468fb09](https://github.com/DataBiosphere/findable-ui/commit/468fb09cb367a98c20fd70949cc857ce17db2dd4))
|
|
23
|
+
|
|
3
24
|
## [42.0.0](https://github.com/DataBiosphere/findable-ui/compare/v41.2.0...v42.0.0) (2025-08-12)
|
|
4
25
|
|
|
5
26
|
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import styled from "@emotion/styled";
|
|
2
2
|
import { FONT } from "../../../../styles/common/constants/font";
|
|
3
3
|
import { PALETTE } from "../../../../styles/common/constants/palette";
|
|
4
|
-
import { bpDownSm
|
|
4
|
+
import { bpDownSm } from "../../../../styles/common/mixins/breakpoints";
|
|
5
5
|
import { FluidPaper } from "../../../common/Paper/components/FluidPaper/fluidPaper";
|
|
6
6
|
import { MarkdownRenderer } from "../../../MarkdownRenderer/markdownRenderer";
|
|
7
7
|
export const StyledFluidPaper = styled(FluidPaper) `
|
|
@@ -32,11 +32,6 @@ export const StyledMarkdownRenderer = styled(MarkdownRenderer) `
|
|
|
32
32
|
font: ${FONT.HEADING_SMALL};
|
|
33
33
|
font-size: 18px;
|
|
34
34
|
line-height: 26px;
|
|
35
|
-
|
|
36
|
-
${bpUpSm} {
|
|
37
|
-
font-size: 18px;
|
|
38
|
-
line-height: 26px;
|
|
39
|
-
}
|
|
40
35
|
}
|
|
41
36
|
|
|
42
37
|
hr {
|
|
@@ -46,6 +41,6 @@ export const StyledMarkdownRenderer = styled(MarkdownRenderer) `
|
|
|
46
41
|
}
|
|
47
42
|
|
|
48
43
|
p {
|
|
49
|
-
font:
|
|
44
|
+
font: ${FONT.BODY_400_2_LINES};
|
|
50
45
|
}
|
|
51
46
|
`;
|
|
@@ -53,7 +53,7 @@ export const Filters = ({ categoryFilters, className, disabled = false, onFilter
|
|
|
53
53
|
}, [windowHeight]);
|
|
54
54
|
return (React.createElement(FilterList, { className: className, "data-testid": TEST_IDS.FILTERS, disabled: disabled, height: height, ref: filterListRef, surfaceType: surfaceType }, categoryFilters.map(({ categoryViews, label }, i) => (React.createElement(Fragment, { key: i },
|
|
55
55
|
i !== 0 && React.createElement(Divider, null),
|
|
56
|
-
label && (React.createElement(StyledTypography, { color: TYPOGRAPHY_PROPS.COLOR.INK_LIGHT, variant: TYPOGRAPHY_PROPS.VARIANT.UPPERCASE_500 }, label)),
|
|
56
|
+
label && (React.createElement(StyledTypography, { color: TYPOGRAPHY_PROPS.COLOR.INK_LIGHT, component: "div", variant: TYPOGRAPHY_PROPS.VARIANT.UPPERCASE_500 }, label)),
|
|
57
57
|
categoryViews.map((categoryView) => (React.createElement(Filter, { key: categoryView.key, categorySection: label, categoryView: categoryView, closeAncestor: onClose, onFilter: onFilter, surfaceType: surfaceType, trackFilterOpened: trackFilterOpened, tags: renderFilterTags(categoryView, onFilter) }))))))));
|
|
58
58
|
};
|
|
59
59
|
/**
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { Typography } from "@mui/material";
|
|
1
2
|
import { FiltersProps } from "./filters";
|
|
2
3
|
interface Props {
|
|
3
4
|
height: number;
|
|
@@ -6,9 +7,5 @@ export declare const Filters: import("@emotion/styled").StyledComponent<{
|
|
|
6
7
|
theme?: import("@emotion/react").Theme;
|
|
7
8
|
as?: React.ElementType;
|
|
8
9
|
} & Props & Pick<FiltersProps, "disabled" | "surfaceType">, import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLDivElement>, HTMLDivElement>, {}>;
|
|
9
|
-
export declare const StyledTypography:
|
|
10
|
-
ref?: ((instance: HTMLSpanElement | null) => void | import("react").DO_NOT_USE_OR_YOU_WILL_BE_FIRED_CALLBACK_REF_RETURN_VALUES[keyof import("react").DO_NOT_USE_OR_YOU_WILL_BE_FIRED_CALLBACK_REF_RETURN_VALUES]) | import("react").RefObject<HTMLSpanElement> | null | undefined;
|
|
11
|
-
}, "p" | "style" | "order" | "bottom" | "height" | "left" | "right" | "top" | "width" | "className" | "classes" | "children" | "sx" | "color" | "border" | "boxShadow" | "fontWeight" | "zIndex" | "alignContent" | "alignItems" | "alignSelf" | "boxSizing" | "columnGap" | "display" | "flexBasis" | "flexDirection" | "flexGrow" | "flexShrink" | "flexWrap" | "fontFamily" | "fontSize" | "fontStyle" | "gridAutoColumns" | "gridAutoFlow" | "gridAutoRows" | "gridTemplateAreas" | "gridTemplateColumns" | "gridTemplateRows" | "justifyContent" | "justifyItems" | "justifySelf" | "letterSpacing" | "lineHeight" | "marginBlockEnd" | "marginBlockStart" | "marginBottom" | "marginInlineEnd" | "marginInlineStart" | "marginLeft" | "marginRight" | "marginTop" | "maxHeight" | "maxWidth" | "minHeight" | "minWidth" | "paddingBlockEnd" | "paddingBlockStart" | "paddingBottom" | "paddingInlineEnd" | "paddingInlineStart" | "paddingLeft" | "paddingRight" | "paddingTop" | "position" | "rowGap" | "textAlign" | "textOverflow" | "textTransform" | "visibility" | "whiteSpace" | "borderBottom" | "borderColor" | "borderLeft" | "borderRadius" | "borderRight" | "borderTop" | "flex" | "gap" | "gridArea" | "gridColumn" | "gridRow" | "margin" | "marginBlock" | "marginInline" | "overflow" | "padding" | "paddingBlock" | "paddingInline" | "bgcolor" | "m" | "mt" | "mr" | "mb" | "ml" | "mx" | "marginX" | "my" | "marginY" | "pt" | "pr" | "pb" | "pl" | "px" | "paddingX" | "py" | "paddingY" | "typography" | "displayPrint" | "align" | "variant" | "gutterBottom" | "noWrap" | "paragraph" | "variantMapping"> & {
|
|
12
|
-
theme?: import("@emotion/react").Theme;
|
|
13
|
-
}, {}, {}>;
|
|
10
|
+
export declare const StyledTypography: typeof Typography;
|
|
14
11
|
export {};
|
|
@@ -11,7 +11,7 @@ import Dropzone from "../Dropzone/dropzone";
|
|
|
11
11
|
import { DEFAULT_FORM_STATE, DRAGGING_STYLE, MAX_ATTACHMENT_SIZE, OPTIONS, VALIDATION_SCHEMA, } from "./common/constants";
|
|
12
12
|
import { FORM_CONTROL_LABEL, FORM_CONTROL_NAME, } from "./common/entities";
|
|
13
13
|
import { createSupportRequest, uploadAttachment } from "./common/utils";
|
|
14
|
-
import { Section
|
|
14
|
+
import { Section } from "./supportRequestForm.styles";
|
|
15
15
|
export const SupportRequestForm = ({ setFormSubmitted, supportRequest, }) => {
|
|
16
16
|
const [formState, setFormState] = useState(DEFAULT_FORM_STATE);
|
|
17
17
|
const [errorFields, setErrorFields] = useState();
|
|
@@ -132,7 +132,7 @@ export const SupportRequestForm = ({ setFormSubmitted, supportRequest, }) => {
|
|
|
132
132
|
return (React.createElement(Dropzone, { activeStyle: DRAGGING_STYLE, disabled: Boolean(formState[FORM_CONTROL_NAME.ATTACHMENT_TOKEN]), maxSize: MAX_ATTACHMENT_SIZE, multiple: false, onDropAccepted: onAttachmentDropped, onDropRejected: onAttachmentRejected }, ({ isDragActive, open }) => (React.createElement(GridPaper, null,
|
|
133
133
|
React.createElement(Section, null,
|
|
134
134
|
React.createElement(SectionContent, null,
|
|
135
|
-
React.createElement(
|
|
135
|
+
React.createElement(Typography, { component: "h3", variant: TYPOGRAPHY_PROPS.VARIANT.HEADING_SMALL }, "Contact Us"),
|
|
136
136
|
React.createElement(Typography, { color: TYPOGRAPHY_PROPS.COLOR.INK_LIGHT, variant: TYPOGRAPHY_PROPS.VARIANT.BODY_400 }, "We\u2019re here to help and answer any questions you might have. We look forward to hearing from you!"))),
|
|
137
137
|
React.createElement(Section, null,
|
|
138
138
|
React.createElement(Input, { error: isFieldError(formState, errorFields, FORM_CONTROL_NAME.NAME), isFilled: Boolean(formState[FORM_CONTROL_NAME.NAME]), label: FORM_CONTROL_LABEL.NAME, name: FORM_CONTROL_NAME.NAME, onBlur: onBlur, onChange: onInputChange }),
|
|
@@ -1,7 +1,3 @@
|
|
|
1
|
-
export declare const Title: import("@emotion/styled").StyledComponent<{
|
|
2
|
-
theme?: import("@emotion/react").Theme;
|
|
3
|
-
as?: React.ElementType;
|
|
4
|
-
}, import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLHeadingElement>, HTMLHeadingElement>, {}>;
|
|
5
1
|
export declare const Section: import("@emotion/styled").StyledComponent<{
|
|
6
2
|
theme?: import("@emotion/react").Theme;
|
|
7
3
|
as?: React.ElementType;
|
|
@@ -1,10 +1,5 @@
|
|
|
1
1
|
import styled from "@emotion/styled";
|
|
2
|
-
import { FONT } from "../../../../../../styles/common/constants/font";
|
|
3
2
|
import { GridPaperSection } from "../../../../../common/Section/section.styles";
|
|
4
|
-
export const Title = styled.h3 `
|
|
5
|
-
font: ${FONT.HEADING_SMALL};
|
|
6
|
-
margin: 0;
|
|
7
|
-
`;
|
|
8
3
|
export const Section = styled(GridPaperSection) `
|
|
9
4
|
min-width: 0;
|
|
10
5
|
`;
|
|
@@ -6,10 +6,13 @@ export const PaginationSummary = ({ firstResult, lastResult, totalResult, }) =>
|
|
|
6
6
|
return (React.createElement(Fade, { in: totalResult > 0, unmountOnExit: true },
|
|
7
7
|
React.createElement("div", { "data-testid": TEST_IDS.TABLE_PAGINATION_RESULTS },
|
|
8
8
|
React.createElement(Typography, { variant: TYPOGRAPHY_PROPS.VARIANT.BODY_400 }, "Results"),
|
|
9
|
+
" ",
|
|
9
10
|
React.createElement(Typography, { variant: TYPOGRAPHY_PROPS.VARIANT.BODY_SMALL_500 },
|
|
10
11
|
firstResult,
|
|
11
12
|
" - ",
|
|
12
13
|
lastResult),
|
|
14
|
+
" ",
|
|
13
15
|
React.createElement(Typography, { variant: TYPOGRAPHY_PROPS.VARIANT.BODY_400 }, "of"),
|
|
16
|
+
" ",
|
|
14
17
|
React.createElement(Typography, { variant: TYPOGRAPHY_PROPS.VARIANT.BODY_SMALL_500 }, totalResult))));
|
|
15
18
|
};
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import { SerializedStyles } from "@emotion/react";
|
|
2
|
+
import { ThemeProps } from "../../../theme/types";
|
|
3
|
+
/**
|
|
4
|
+
* Returns typography style for the given variant.
|
|
5
|
+
* @param variant - Typography variant key from the theme configuration.
|
|
6
|
+
* @returns Typography styles.
|
|
7
|
+
*/
|
|
8
|
+
export declare function typographyToCSS(variant: keyof ThemeProps["theme"]["typography"]): (props: ThemeProps) => SerializedStyles;
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import { css } from "@emotion/react";
|
|
2
|
+
/**
|
|
3
|
+
* Returns typography style for the given variant.
|
|
4
|
+
* @param variant - Typography variant key from the theme configuration.
|
|
5
|
+
* @returns Typography styles.
|
|
6
|
+
*/
|
|
7
|
+
export function typographyToCSS(variant) {
|
|
8
|
+
return (props) => {
|
|
9
|
+
return css(props.theme.typography[variant]);
|
|
10
|
+
};
|
|
11
|
+
}
|
|
@@ -267,9 +267,9 @@ const MuiButton = {
|
|
|
267
267
|
props: {
|
|
268
268
|
variant: "backNav", // associated with "nav" variant.
|
|
269
269
|
},
|
|
270
|
-
style: {
|
|
270
|
+
style: ({ theme }) => ({
|
|
271
|
+
...theme.typography["heading-small"],
|
|
271
272
|
color: PALETTE.INK_MAIN,
|
|
272
|
-
font: FONT.HEADING_SMALL,
|
|
273
273
|
minWidth: 0,
|
|
274
274
|
textTransform: "capitalize",
|
|
275
275
|
whiteSpace: "nowrap",
|
|
@@ -277,7 +277,7 @@ const MuiButton = {
|
|
|
277
277
|
"&:hover": {
|
|
278
278
|
backgroundColor: PALETTE.SMOKE_LIGHT,
|
|
279
279
|
},
|
|
280
|
-
},
|
|
280
|
+
}),
|
|
281
281
|
},
|
|
282
282
|
{
|
|
283
283
|
props: {
|
|
@@ -549,9 +549,9 @@ const MuiDialogContent = {
|
|
|
549
549
|
const MuiDialogTitle = {
|
|
550
550
|
styleOverrides: {
|
|
551
551
|
root: ({ theme }) => ({
|
|
552
|
+
...theme.typography.heading,
|
|
552
553
|
alignItems: "center",
|
|
553
554
|
display: "grid",
|
|
554
|
-
font: FONT.HEADING,
|
|
555
555
|
gridAutoFlow: "column",
|
|
556
556
|
padding: 20,
|
|
557
557
|
[bpUpSm({ theme })]: {},
|
|
@@ -57,9 +57,11 @@ const heading = (theme) => ({
|
|
|
57
57
|
fontFamily: "Inter",
|
|
58
58
|
fontSize: "20px",
|
|
59
59
|
fontWeight: 500,
|
|
60
|
+
letterSpacing: "-0.2px",
|
|
60
61
|
lineHeight: "28px",
|
|
61
62
|
[bpUpSm({ theme })]: {
|
|
62
63
|
fontSize: "24px",
|
|
64
|
+
letterSpacing: "-0.4px",
|
|
63
65
|
lineHeight: "32px",
|
|
64
66
|
},
|
|
65
67
|
});
|
|
@@ -67,9 +69,11 @@ const headingLarge = (theme) => ({
|
|
|
67
69
|
fontFamily: "Inter",
|
|
68
70
|
fontSize: "24px",
|
|
69
71
|
fontWeight: 500,
|
|
72
|
+
letterSpacing: "-0.4px",
|
|
70
73
|
lineHeight: "32px",
|
|
71
74
|
[bpUpSm({ theme })]: {
|
|
72
|
-
fontSize: "
|
|
75
|
+
fontSize: "30px",
|
|
76
|
+
letterSpacing: "-0.8px",
|
|
73
77
|
lineHeight: "40px",
|
|
74
78
|
},
|
|
75
79
|
});
|
|
@@ -80,6 +84,7 @@ const headingSmall = (theme) => ({
|
|
|
80
84
|
lineHeight: "26px",
|
|
81
85
|
[bpUpSm({ theme })]: {
|
|
82
86
|
fontSize: "20px",
|
|
87
|
+
letterSpacing: "-0.2px",
|
|
83
88
|
lineHeight: "28px",
|
|
84
89
|
},
|
|
85
90
|
});
|
|
@@ -91,8 +96,8 @@ const headingXLarge = (theme) => ({
|
|
|
91
96
|
lineHeight: "40px",
|
|
92
97
|
[bpUpSm({ theme })]: {
|
|
93
98
|
fontSize: "40px",
|
|
94
|
-
letterSpacing: "-
|
|
95
|
-
lineHeight: "
|
|
99
|
+
letterSpacing: "-1.4px",
|
|
100
|
+
lineHeight: "56px",
|
|
96
101
|
},
|
|
97
102
|
});
|
|
98
103
|
const headingXSmall = {
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import styled from "@emotion/styled";
|
|
2
2
|
import { FONT } from "../../../../styles/common/constants/font";
|
|
3
3
|
import { PALETTE } from "../../../../styles/common/constants/palette";
|
|
4
|
-
import { bpDownSm
|
|
4
|
+
import { bpDownSm } from "../../../../styles/common/mixins/breakpoints";
|
|
5
5
|
import { FluidPaper } from "../../../common/Paper/components/FluidPaper/fluidPaper";
|
|
6
6
|
import { MarkdownRenderer } from "../../../MarkdownRenderer/markdownRenderer";
|
|
7
7
|
|
|
@@ -34,11 +34,6 @@ export const StyledMarkdownRenderer = styled(MarkdownRenderer)`
|
|
|
34
34
|
font: ${FONT.HEADING_SMALL};
|
|
35
35
|
font-size: 18px;
|
|
36
36
|
line-height: 26px;
|
|
37
|
-
|
|
38
|
-
${bpUpSm} {
|
|
39
|
-
font-size: 18px;
|
|
40
|
-
line-height: 26px;
|
|
41
|
-
}
|
|
42
37
|
}
|
|
43
38
|
|
|
44
39
|
hr {
|
|
@@ -48,6 +43,6 @@ export const StyledMarkdownRenderer = styled(MarkdownRenderer)`
|
|
|
48
43
|
}
|
|
49
44
|
|
|
50
45
|
p {
|
|
51
|
-
font:
|
|
46
|
+
font: ${FONT.BODY_400_2_LINES};
|
|
52
47
|
}
|
|
53
48
|
`;
|
|
@@ -1,12 +1,6 @@
|
|
|
1
1
|
import styled from "@emotion/styled";
|
|
2
|
-
import { FONT } from "../../../../../../styles/common/constants/font";
|
|
3
2
|
import { GridPaperSection } from "../../../../../common/Section/section.styles";
|
|
4
3
|
|
|
5
|
-
export const Title = styled.h3`
|
|
6
|
-
font: ${FONT.HEADING_SMALL};
|
|
7
|
-
margin: 0;
|
|
8
|
-
`;
|
|
9
|
-
|
|
10
4
|
export const Section = styled(GridPaperSection)`
|
|
11
5
|
min-width: 0;
|
|
12
6
|
`;
|
|
@@ -34,7 +34,7 @@ import {
|
|
|
34
34
|
RequestValue,
|
|
35
35
|
} from "./common/entities";
|
|
36
36
|
import { createSupportRequest, uploadAttachment } from "./common/utils";
|
|
37
|
-
import { Section
|
|
37
|
+
import { Section } from "./supportRequestForm.styles";
|
|
38
38
|
|
|
39
39
|
export interface SupportRequestFormProps {
|
|
40
40
|
setFormSubmitted: Dispatch<SetStateAction<boolean>>;
|
|
@@ -183,7 +183,12 @@ export const SupportRequestForm = ({
|
|
|
183
183
|
<GridPaper>
|
|
184
184
|
<Section>
|
|
185
185
|
<SectionContent>
|
|
186
|
-
<
|
|
186
|
+
<Typography
|
|
187
|
+
component="h3"
|
|
188
|
+
variant={TYPOGRAPHY_PROPS.VARIANT.HEADING_SMALL}
|
|
189
|
+
>
|
|
190
|
+
Contact Us
|
|
191
|
+
</Typography>
|
|
187
192
|
<Typography
|
|
188
193
|
color={TYPOGRAPHY_PROPS.COLOR.INK_LIGHT}
|
|
189
194
|
variant={TYPOGRAPHY_PROPS.VARIANT.BODY_400}
|
|
@@ -19,11 +19,11 @@ export const PaginationSummary = ({
|
|
|
19
19
|
<div data-testid={TEST_IDS.TABLE_PAGINATION_RESULTS}>
|
|
20
20
|
<Typography variant={TYPOGRAPHY_PROPS.VARIANT.BODY_400}>
|
|
21
21
|
Results
|
|
22
|
-
</Typography>
|
|
22
|
+
</Typography>{" "}
|
|
23
23
|
<Typography variant={TYPOGRAPHY_PROPS.VARIANT.BODY_SMALL_500}>
|
|
24
24
|
{firstResult} - {lastResult}
|
|
25
|
-
</Typography>
|
|
26
|
-
<Typography variant={TYPOGRAPHY_PROPS.VARIANT.BODY_400}>of</Typography>
|
|
25
|
+
</Typography>{" "}
|
|
26
|
+
<Typography variant={TYPOGRAPHY_PROPS.VARIANT.BODY_400}>of</Typography>{" "}
|
|
27
27
|
<Typography variant={TYPOGRAPHY_PROPS.VARIANT.BODY_SMALL_500}>
|
|
28
28
|
{totalResult}
|
|
29
29
|
</Typography>
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import { css, SerializedStyles } from "@emotion/react";
|
|
2
|
+
import { ThemeProps } from "../../../theme/types";
|
|
3
|
+
|
|
4
|
+
/**
|
|
5
|
+
* Returns typography style for the given variant.
|
|
6
|
+
* @param variant - Typography variant key from the theme configuration.
|
|
7
|
+
* @returns Typography styles.
|
|
8
|
+
*/
|
|
9
|
+
export function typographyToCSS(
|
|
10
|
+
variant: keyof ThemeProps["theme"]["typography"]
|
|
11
|
+
) {
|
|
12
|
+
return (props: ThemeProps): SerializedStyles => {
|
|
13
|
+
return css(props.theme.typography[variant]);
|
|
14
|
+
};
|
|
15
|
+
}
|
|
@@ -109,7 +109,7 @@ const MuiBreadcrumbs: Components["MuiBreadcrumbs"] = {
|
|
|
109
109
|
},
|
|
110
110
|
};
|
|
111
111
|
|
|
112
|
-
const MuiButton: Components["MuiButton"] = {
|
|
112
|
+
const MuiButton: Components<Theme>["MuiButton"] = {
|
|
113
113
|
defaultProps: {
|
|
114
114
|
disableRipple: true,
|
|
115
115
|
disableTouchRipple: true,
|
|
@@ -276,9 +276,9 @@ const MuiButton: Components["MuiButton"] = {
|
|
|
276
276
|
props: {
|
|
277
277
|
variant: "backNav", // associated with "nav" variant.
|
|
278
278
|
},
|
|
279
|
-
style: {
|
|
279
|
+
style: ({ theme }) => ({
|
|
280
|
+
...theme.typography["heading-small"],
|
|
280
281
|
color: PALETTE.INK_MAIN,
|
|
281
|
-
font: FONT.HEADING_SMALL,
|
|
282
282
|
minWidth: 0,
|
|
283
283
|
textTransform: "capitalize",
|
|
284
284
|
whiteSpace: "nowrap",
|
|
@@ -286,7 +286,7 @@ const MuiButton: Components["MuiButton"] = {
|
|
|
286
286
|
"&:hover": {
|
|
287
287
|
backgroundColor: PALETTE.SMOKE_LIGHT,
|
|
288
288
|
},
|
|
289
|
-
},
|
|
289
|
+
}),
|
|
290
290
|
},
|
|
291
291
|
{
|
|
292
292
|
props: {
|
|
@@ -568,9 +568,9 @@ const MuiDialogContent: Components["MuiDialogContent"] = {
|
|
|
568
568
|
const MuiDialogTitle: Components<Theme>["MuiDialogTitle"] = {
|
|
569
569
|
styleOverrides: {
|
|
570
570
|
root: ({ theme }) => ({
|
|
571
|
+
...theme.typography.heading,
|
|
571
572
|
alignItems: "center",
|
|
572
573
|
display: "grid",
|
|
573
|
-
font: FONT.HEADING,
|
|
574
574
|
gridAutoFlow: "column",
|
|
575
575
|
padding: 20,
|
|
576
576
|
[bpUpSm({ theme })]: {},
|
|
@@ -72,9 +72,11 @@ const heading = (theme: Theme): TypographyStyle => ({
|
|
|
72
72
|
fontFamily: "Inter",
|
|
73
73
|
fontSize: "20px",
|
|
74
74
|
fontWeight: 500,
|
|
75
|
+
letterSpacing: "-0.2px",
|
|
75
76
|
lineHeight: "28px",
|
|
76
77
|
[bpUpSm({ theme })]: {
|
|
77
78
|
fontSize: "24px",
|
|
79
|
+
letterSpacing: "-0.4px",
|
|
78
80
|
lineHeight: "32px",
|
|
79
81
|
},
|
|
80
82
|
});
|
|
@@ -83,9 +85,11 @@ const headingLarge = (theme: Theme): TypographyStyle => ({
|
|
|
83
85
|
fontFamily: "Inter",
|
|
84
86
|
fontSize: "24px",
|
|
85
87
|
fontWeight: 500,
|
|
88
|
+
letterSpacing: "-0.4px",
|
|
86
89
|
lineHeight: "32px",
|
|
87
90
|
[bpUpSm({ theme })]: {
|
|
88
|
-
fontSize: "
|
|
91
|
+
fontSize: "30px",
|
|
92
|
+
letterSpacing: "-0.8px",
|
|
89
93
|
lineHeight: "40px",
|
|
90
94
|
},
|
|
91
95
|
});
|
|
@@ -97,6 +101,7 @@ const headingSmall = (theme: Theme): TypographyStyle => ({
|
|
|
97
101
|
lineHeight: "26px",
|
|
98
102
|
[bpUpSm({ theme })]: {
|
|
99
103
|
fontSize: "20px",
|
|
104
|
+
letterSpacing: "-0.2px",
|
|
100
105
|
lineHeight: "28px",
|
|
101
106
|
},
|
|
102
107
|
});
|
|
@@ -109,8 +114,8 @@ const headingXLarge = (theme: Theme): TypographyStyle => ({
|
|
|
109
114
|
lineHeight: "40px",
|
|
110
115
|
[bpUpSm({ theme })]: {
|
|
111
116
|
fontSize: "40px",
|
|
112
|
-
letterSpacing: "-
|
|
113
|
-
lineHeight: "
|
|
117
|
+
letterSpacing: "-1.4px",
|
|
118
|
+
lineHeight: "56px",
|
|
114
119
|
},
|
|
115
120
|
});
|
|
116
121
|
|