[@mantine/core] Title: Fix inline prop being ignored (mantinedev#2182)

* [@mantine/core] Title: Fixed `inline` prop * [@mantine/core] Title: Fixed small error
nmay231 · Aug 28, 2022 · b46a5dd · b46a5dd
1 parent 4755e98
commit b46a5dd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/mantine-core/src/Title/Title.styles.ts b/src/mantine-core/src/Title/Title.styles.ts
@@ -7,6 +7,7 @@ export interface TitleStylesParams {
   element: HeadingElement;
   size: TitleSize;
   weight: React.CSSProperties['fontWeight'];
+  inline: boolean;
 }
 
 function getFontSize(size: TitleSize, element: HeadingElement, theme: MantineTheme) {
@@ -19,19 +20,19 @@ function getFontSize(size: TitleSize, element: HeadingElement, theme: MantineThe
 
 function getLineHeight(size: TitleSize, element: HeadingElement, theme: MantineTheme) {
   if (typeof size !== 'undefined' && size in theme.headings.sizes) {
-    return theme.headings.sizes[element].lineHeight;
+    return theme.headings.sizes[size].lineHeight;
   }
 
   return theme.headings.sizes[element].lineHeight;
 }
 
-export default createStyles((theme, { element, weight, size }: TitleStylesParams) => ({
+export default createStyles((theme, { element, weight, size, inline }: TitleStylesParams) => ({
   root: {
     ...theme.fn.fontStyles(),
     fontFamily: theme.headings.fontFamily,
     fontWeight: weight || theme.headings.sizes[element].fontWeight || theme.headings.fontWeight,
     fontSize: getFontSize(size, element, theme),
-    lineHeight: getLineHeight(size, element, theme),
+    lineHeight: inline ? 1 : getLineHeight(size, element, theme),
     margin: 0,
   },
 }));
diff --git a/src/mantine-core/src/Title/Title.tsx b/src/mantine-core/src/Title/Title.tsx
@@ -22,11 +22,11 @@ const defaultProps: Partial<TitleProps> = {
 };
 
 export const Title = forwardRef<HTMLHeadingElement, TitleProps>((props, ref) => {
-  const { className, order, children, unstyled, size, weight, ...others } =
+  const { className, order, children, unstyled, size, weight, inline, ...others } =
     useComponentDefaultProps('Title', defaultProps, props);
 
   const { classes, cx } = useStyles(
-    { element: `h${order}`, weight, size },
+    { element: `h${order}`, weight, size, inline },
     { name: 'Title', unstyled }
   );