@manamerge/mana-atomic-ui 1.0.45 → 1.0.47

package/dist/index.d.ts

@@ -1,5 +1,4 @@
 import React, { ReactNode, FunctionComponent, SVGProps, AnchorHTMLAttributes, ElementType } from 'react';
-import { PaletteColor } from 'themes/manamerge/miscellaneous/colorpalette';
 
 interface ButtonTypes {
     disabled?: boolean;
@@ -19,12 +18,11 @@ interface TextTypes {
     htmlFor?: string;
     margin?: string;
     color?: string;
-    fontSize?: string;
     lineHeight?: string;
     fontWeight?: string | number;
     tag?: keyof JSX.IntrinsicElements;
-    vColor?: PaletteColor;
-    vFontSize?: "sm" | "md" | "lg" | "xl" | "xxl" | "xxxl" | "xxxxl";
+    vColor?: string;
+    vFontSize?: "xs" | "sm" | "md" | "lg" | "xl" | "xxl" | "xxxxl";
     onClick?: React.MouseEventHandler<HTMLElement>;
 }
 declare const Text: React.FC<TextTypes>;
@@ -32,7 +30,7 @@ declare const Text: React.FC<TextTypes>;
 interface HeadingTypes {
     variant?: string;
     children: ReactNode;
-    as?: "h1" | "h2" | "h3" | "h4" | "h5" | "h6";
+    as: "h1" | "h2" | "h3" | "h4" | "h5" | "h6";
 }
 declare const Heading: React.FC<HeadingTypes>;
 

package/dist/index.js

@@ -143,16 +143,15 @@ const TextContainer = styled.p `
     var _b, _c;
     var { variant = "regular", theme } = _a, props = __rest(_a, ["variant", "theme"]);
     const textStyles = ((_b = theme === null || theme === void 0 ? void 0 : theme.text) === null || _b === void 0 ? void 0 : _b[variant]) || {};
-    console.log("----", theme);
     return css `
             margin: ${(props === null || props === void 0 ? void 0 : props.margin) || (textStyles === null || textStyles === void 0 ? void 0 : textStyles.margin)};
-            font-size: ${((_c = theme === null || theme === void 0 ? void 0 : theme.fontsizes) === null || _c === void 0 ? void 0 : _c[props === null || props === void 0 ? void 0 : props.vFontSize]) ||
+            font-size: ${((_c = theme.fontsizes) === null || _c === void 0 ? void 0 : _c[props === null || props === void 0 ? void 0 : props.vFontSize]) ||
         (textStyles === null || textStyles === void 0 ? void 0 : textStyles.vFontSize)};
             line-height: ${(props === null || props === void 0 ? void 0 : props.lineHeight) || (textStyles === null || textStyles === void 0 ? void 0 : textStyles.lineHeight)};
             font-weight: ${(props === null || props === void 0 ? void 0 : props.fontWeight) ||
         (textStyles === null || textStyles === void 0 ? void 0 : textStyles.fontWeight) ||
         "regular"};
-            font-family: ${(textStyles === null || textStyles === void 0 ? void 0 : textStyles.fontFamily) || "inherit"};
+            font-family: ${textStyles === null || textStyles === void 0 ? void 0 : textStyles.fontFamily};
             font-style: ${(textStyles === null || textStyles === void 0 ? void 0 : textStyles.fontStyle) || "normal"};
             color: ${(props === null || props === void 0 ? void 0 : props.vColor) || (textStyles === null || textStyles === void 0 ? void 0 : textStyles.vColor) || "inherit"};
         `;
@@ -178,16 +177,18 @@ const TextContainerLabel = styled.label `
 `;
 
 const Text = (_a) => {
-    var { variant, children, htmlFor, margin, vColor, vFontSize, fontSize, lineHeight, fontWeight, tag, onClick } = _a, props = __rest(_a, ["variant", "children", "htmlFor", "margin", "vColor", "vFontSize", "fontSize", "lineHeight", "fontWeight", "tag", "onClick"]);
+    var { variant, children, htmlFor, margin, vColor, vFontSize, lineHeight, fontWeight, tag, onClick } = _a, props = __rest(_a, ["variant", "children", "htmlFor", "margin", "vColor", "vFontSize", "lineHeight", "fontWeight", "tag", "onClick"]);
     // Determine which component to use
     const Wrapper = htmlFor
         ? TextContainerLabel
         : TextContainer;
-    return (jsx(Wrapper, Object.assign({ as: tag, className: classNames("Text-", variant), variant: "Text-" + variant, htmlFor: htmlFor, vColor: vColor, vFontSize: vFontSize, style: { margin, fontSize, lineHeight, fontWeight }, onClick: onClick }, props, { children: children })));
+    return (jsx(Wrapper, Object.assign({ as: tag, className: classNames("Text-", variant), variant: "Text-" + variant, htmlFor: htmlFor, vColor: vColor, vFontSize: vFontSize, 
+        // ? WIP - erase in line styles card nº 159
+        style: { margin, lineHeight, fontWeight }, onClick: onClick }, props, { children: children })));
 };
 
 const HeadingContainer = styled.h1 `
-    ${({ variant, theme }) => {
+    ${({ variant = "h1", theme }) => {
     const { media, heading } = theme;
     const { tinyMobileUp, largeMobileUp, superLargeDesktopUp } = media;
     const headingStyles = (heading === null || heading === void 0 ? void 0 : heading[variant]) || {};