@dnanpm/styleguide 1.9.0 → 2.1.0

package/build/cjs/components/Accordion/Accordion.d.ts

@@ -1,38 +1,50 @@
 import React from 'react';
-interface AccordionProps {
+export interface Props {
     /**
-     * Allows to pass a custom className
-     */
-    className?: string;
-    /**
-     * The actual content
+     * Content of Accordion
+     *
      * @type AccordionItem
      */
     children: React.ReactNode;
-    /** Allow multiple accordion items to be open
-     * @default true
-     */
-    allowMultiOpen?: boolean;
     /**
-     * Display close button in the item content
+     * Allows only one AccordionItem to be opened when set to true
+     *
      * @default false
      */
-    hasCloseButton?: boolean;
+    autoCollapsible?: boolean;
     /**
-     * Title has color when item is open, hovered or focused
+     * Allows to remove item title highlight when it is in expanded state
+     * Removes also highlight of CSS :hover and :active states
+     *
      * @default true
      */
     highlightSelected?: boolean;
     /**
-     * Label to show for the close button in the content
+     * Allows to expand or collapse the component
+     *
+     * @default false
+     */
+    isExpanded?: boolean;
+    /**
+     * Display close button in the item content
+     *
+     * @default false
+     */
+    hasCloseButton?: boolean;
+    /**
+     * Label to show for the open icon for accessibility
      */
     openLabel?: string;
     /**
      * Label to show for the close button in the content
      */
     closeLabel?: string;
+    /**
+     * Allows to pass a custom className
+     */
+    className?: string;
 }
 /** @visibleName Accordion */
-declare const Accordion: ({ className, children, allowMultiOpen, highlightSelected, hasCloseButton, openLabel, closeLabel, }: AccordionProps) => JSX.Element;
+declare const Accordion: ({ autoCollapsible, highlightSelected, hasCloseButton, ...props }: Props) => JSX.Element;
 /** @component */
 export default Accordion;

package/build/cjs/components/Accordion/Accordion.js

@@ -10,26 +10,43 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 
 /** @visibleName Accordion */
-const Accordion = ({ className, children, allowMultiOpen = true, highlightSelected = true, hasCloseButton = false, openLabel, closeLabel, }) => {
-    const [activeItem, setActiveItem] = React.useState(null);
-    const handleItemOpen = (index) => {
-        if (allowMultiOpen) {
-            return;
+const Accordion = ({ autoCollapsible = false, highlightSelected = true, hasCloseButton = false, ...props }) => {
+    const initialItemList = {};
+    const getAccordionItemId = (index, title) => `${title.replace(/\s+/g, '')}-${index}`;
+    if (props.isExpanded) {
+        React__default['default'].Children.map(props.children, (child, index) => {
+            if (React__default['default'].isValidElement(child) && child.type === AccordionItem['default']) {
+                initialItemList[getAccordionItemId(index, child.props.title)] = Boolean(props.isExpanded);
+            }
+        });
+    }
+    const [itemList, setItemList] = React.useState(initialItemList);
+    const toggleExpanded = (currentItemId) => {
+        const currentItemState = itemList[currentItemId];
+        setItemList({
+            ...(autoCollapsible ? {} : itemList),
+            [currentItemId]: !currentItemState,
+        });
+    };
+    const handleClick = (e) => {
+        toggleExpanded(e.currentTarget.parentElement.id);
+    };
+    const handleKeyDown = (e) => {
+        if (e.key === 'Enter' || e.key === ' ') {
+            e.preventDefault();
+            toggleExpanded(e.currentTarget.parentElement.id);
         }
-        setActiveItem(index);
     };
-    /** filter out immediate children that are not AccordionItems */
-    const accordionItems = React__default['default'].Children.map(children, (child, index) => {
+    const accordionItems = React__default['default'].Children.map(props.children, (child, index) => {
         if (React__default['default'].isValidElement(child) && child.type === AccordionItem['default']) {
-            return (React__default['default'].createElement(AccordionItem['default'], Object.assign({ closeFromParent: !allowMultiOpen && activeItem !== index, key: index + child.props.title, hasCloseButton: hasCloseButton, highlightSelected: highlightSelected, openLabel: openLabel, closeLabel: closeLabel, 
-                // tslint:disable-next-line: jsx-no-lambda
-                onOpen: () => handleItemOpen(index) }, child.props), child.props.children));
+            const id = getAccordionItemId(index, child.props.title);
+            return (React__default['default'].createElement(AccordionItem['default'], Object.assign({ id: id, key: id, title: child.props.title, isExpanded: itemList[id], hasCloseButton: hasCloseButton, highlightSelected: highlightSelected, openLabel: props.openLabel, closeLabel: props.closeLabel, onClick: handleClick, onKeyDown: handleKeyDown }, child.props), child.props.children));
         }
     });
     if (!accordionItems) {
         return React__default['default'].createElement(React__default['default'].Fragment, null);
     }
-    return React__default['default'].createElement("div", { className: className }, accordionItems);
+    return React__default['default'].createElement("div", { className: props.className }, accordionItems);
 };
 
 exports.default = Accordion;

package/build/cjs/components/Accordion/AccordionItem.d.ts

@@ -1,45 +1,30 @@
 import React from 'react';
-export interface AccordionItemProps {
-    /**
-     * Allows to pass a custom className
-     */
-    className?: string;
-    /**
-     * The actual content
-     */
-    children?: React.ReactNode;
+import { Props as AccordionProps } from './Accordion';
+interface Props extends Omit<AccordionProps, 'children' | 'autoCollapsible'> {
     /**
      * Accordion item title
      */
     title: string;
     /**
-     * Display close button in the item content
-     * @default false
+     * Unique ID for the component
      */
-    hasCloseButton?: boolean;
+    id?: string;
     /**
-     * Title has color when item is open, hovered or focused
-     * @default true
+     * Content of Accordion Item
      */
-    highlightSelected?: boolean;
-    /**
-     * Label to show for the open icon for accessibility
-     */
-    openLabel?: string;
-    /**
-     * Label to show for the close button in the content
-     */
-    closeLabel?: string;
+    children?: React.ReactNode;
     /**
-     * Accordion item is closed from a parent accordion
-     * @default false
+     * On component title and close button mouse click callback
+     * Use `e.currentTarget.parentElement` to get AccordionItem element
      */
-    closeFromParent?: boolean;
+    onClick?: (e: React.MouseEvent<HTMLElement>) => void;
     /**
-     * callback to parent accordion when item is expanded
+     * On component title and close button keyboard key down callback
+     * Use `e.currentTarget.parentElement` to get AccordionItem element
      */
-    onOpen?: () => void;
+    onKeyDown?: (e: React.KeyboardEvent<HTMLElement>) => void;
 }
-declare const AccordionItem: ({ title, children, hasCloseButton, highlightSelected, openLabel, closeLabel, closeFromParent, onOpen, ...props }: AccordionItemProps) => JSX.Element;
+/** @visibleName Accordion Item */
+declare const AccordionItem: ({ hasCloseButton, highlightSelected, ...props }: Props) => JSX.Element;
 /** @component */
 export default AccordionItem;

package/build/cjs/components/Accordion/AccordionItem.js

@@ -7,94 +7,74 @@ var styled = require('styled-components');
 var useElementDimensions = require('../../hooks/useElementDimensions.js');
 var styledUtils = require('../../utils/styledUtils.js');
 var Icon = require('../Icon/Icon.js');
+var hlChevronDown = require('../Icons/hlChevronDown.js');
+var hlChevronUp = require('../Icons/hlChevronUp.js');
+var hlX = require('../Icons/hlX.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var styled__default = /*#__PURE__*/_interopDefaultLegacy(styled);
 
-/* eslint-disable react-hooks/exhaustive-deps */
+const AccordionItemContainer = styled__default['default'].div `
+    margin: ${p => `0 ${styledUtils.getDividedSize(p.theme.base.baseHeight, 2.5)}}`};
+    border-bottom: 1px solid
+        ${p => (p.isExpanded && p.highlightSelected ? p.theme.color.hotPink : p.theme.color.gray15)};
+`;
 const AccordionItemTitle = styled__default['default'].div `
-    font-size: ${p => p.theme.fontSize.defaultFontSize};
+    font-size: ${p => p.theme.fontSize.default};
     font-weight: ${p => p.theme.fontWeight.bold};
     display: flex;
     justify-content: space-between;
     flex-direction: row;
     cursor: pointer;
+    padding: ${p => styledUtils.getMultipliedSize(p.theme.base.baseHeight, 1.6)}
+        ${p => styledUtils.getMultipliedSize(p.theme.base.baseHeight, 2)};
     color: ${p => p.isExpanded && p.highlightSelected ? p.theme.color.hotPink : p.theme.color.text};
-    padding: ${p => `${styledUtils.getMultipliedSize(p.theme.base.baseHeight, 1.6)} ${styledUtils.getMultipliedSize(p.theme.base.baseHeight, 2)}`};
     transition: color 0.2s;
     ${p => p.highlightSelected &&
     styled.css `
             &:hover,
-            &:active,
-            &:focus {
+            &:active {
                 color: ${p.theme.color.hotPink};
                 text-decoration: none;
             }
         `}
 `;
-const AccordionItemContainer = styled__default['default'].div `
-    margin: ${p => `0 ${styledUtils.getDividedSize(p.theme.base.baseHeight, 2.5)}}`};
-    border-bottom: 1px solid
-        ${p => (p.isExpanded && p.highlightSelected ? p.theme.color.hotPink : p.theme.color.gray15)};
-`;
-const AccordionItemContent = styled__default['default'].div `
+const AccordionItemContentWrapper = styled__default['default'].div `
     overflow: hidden;
     color: ${p => p.theme.color.slateGray};
     transition: all 0.2s ease;
     height: ${p => (p.isExpanded ? p.maxHeight / 16 + 1.25 : 0)}rem;
+    padding: 0 ${p => styledUtils.getMultipliedSize(p.theme.base.baseHeight, 2)};
     visibility: ${p => (p.isExpanded ? 'visible' : 'hidden')};
 `;
-const AccordionItemContentInner = styled__default['default'].div `
-    padding: ${p => `0 ${styledUtils.getMultipliedSize(p.theme.base.baseHeight, 2)} ${styledUtils.getMultipliedSize(p.theme.base.baseHeight, 2)}`};
+const AccordionItemContent = styled__default['default'].div `
+    padding-bottom: ${p => styledUtils.getMultipliedSize(p.theme.base.baseHeight, 1.6)};
 `;
-const CloseAccordionItemWrapper = styled__default['default'].div `
+const AccordionItemCloseButton = styled__default['default'].div `
     display: flex;
-    flex: 1;
     justify-content: flex-end;
-`;
-const CloseAccordionItem = styled__default['default'].div `
-    display: flex;
+    line-height: ${p => p.theme.lineHeight.default};
+    margin-bottom: ${p => styledUtils.getMultipliedSize(p.theme.base.baseHeight, 1.6)};
+    padding: 0 ${p => styledUtils.getMultipliedSize(p.theme.base.baseHeight, 2)};
     gap: ${p => styledUtils.getMultipliedSize(p.theme.base.baseHeight, 1)};
     color: ${p => p.theme.color.text};
     cursor: pointer;
 `;
-const AccordionItem = ({ title, children, hasCloseButton = false, highlightSelected = true, openLabel, closeLabel, closeFromParent = false, onOpen, ...props }) => {
-    const [isExpanded, setExpanded] = React.useState(false);
-    const toggleExpanded = () => {
-        setExpanded(!isExpanded);
-    };
-    // get height when element dimensions change
+/** @visibleName Accordion Item */
+const AccordionItem = ({ hasCloseButton = false, highlightSelected = true, ...props }) => {
+    // Get height when element dimensions change
     const { height: contentHeight, ref: contentRef } = useElementDimensions['default']();
-    React.useEffect(() => {
-        if (closeFromParent) {
-            setExpanded(false);
-        }
-    }, [closeFromParent]);
-    React.useEffect(() => {
-        if (isExpanded && onOpen) {
-            onOpen();
-        }
-    }, [isExpanded]);
-    const handleKeyDown = (e) => {
-        const key = e.key;
-        if (key === 'Enter' || key === ' ') {
-            e.preventDefault();
-            setExpanded(!isExpanded);
-        }
-    };
-    return (React__default['default'].createElement(AccordionItemContainer, { "aria-expanded": isExpanded, className: props.className, isExpanded: isExpanded, highlightSelected: highlightSelected },
-        React__default['default'].createElement(AccordionItemTitle, { tabIndex: 0, onKeyDown: handleKeyDown, isExpanded: isExpanded, highlightSelected: highlightSelected, onClick: toggleExpanded, role: "button" },
-            React__default['default'].createElement("span", null, title),
-            isExpanded ? (React__default['default'].createElement(Icon['default'], { name: "hlChevronUp", size: "1.5rem", right: true, "aria-label": closeLabel })) : (React__default['default'].createElement(Icon['default'], { name: "hlChevronDown", size: "1.5rem", right: true, "aria-label": openLabel }))),
-        React__default['default'].createElement(AccordionItemContent, { maxHeight: contentHeight, isExpanded: isExpanded },
-            React__default['default'].createElement(AccordionItemContentInner, { ref: contentRef },
-                children,
-                hasCloseButton && (React__default['default'].createElement(CloseAccordionItemWrapper, null,
-                    React__default['default'].createElement(CloseAccordionItem, { onClick: toggleExpanded, "aria-label": closeLabel, tabIndex: 0, onKeyDown: handleKeyDown, role: "button" },
-                        React__default['default'].createElement("span", null, closeLabel),
-                        React__default['default'].createElement(Icon['default'], { name: "hlX", size: "1.5rem" }))))))));
+    return (React__default['default'].createElement(AccordionItemContainer, { id: props.id, "aria-expanded": Boolean(props.isExpanded), className: props.className, isExpanded: Boolean(props.isExpanded), highlightSelected: highlightSelected },
+        React__default['default'].createElement(AccordionItemTitle, { tabIndex: 0, onClick: props.onClick, onKeyDown: props.onKeyDown, isExpanded: Boolean(props.isExpanded), highlightSelected: highlightSelected, role: "button" },
+            props.title,
+            Boolean(props.isExpanded) ? (React__default['default'].createElement(Icon['default'], { icon: hlChevronUp['default'], position: "right", "aria-label": props.closeLabel })) : (React__default['default'].createElement(Icon['default'], { icon: hlChevronDown['default'], position: "right", "aria-label": props.openLabel }))),
+        React__default['default'].createElement(AccordionItemContentWrapper, { maxHeight: contentHeight, isExpanded: props.isExpanded },
+            React__default['default'].createElement(AccordionItemContent, { ref: contentRef }, props.children)),
+        hasCloseButton && props.isExpanded && (React__default['default'].createElement(AccordionItemCloseButton, { tabIndex: 0, onClick: props.onClick, onKeyDown: props.onKeyDown, "aria-label": props.closeLabel, role: "button" },
+            React__default['default'].createElement("span", null, props.closeLabel),
+            React__default['default'].createElement(Icon['default'], { icon: hlX['default'] })))));
 };
 
 exports.default = AccordionItem;

package/build/cjs/components/AmountSelector/AmountSelector.js

@@ -6,16 +6,18 @@ var React = require('react');
 var styled = require('../../themes/styled.js');
 var theme = require('../../themes/theme.js');
 var styledUtils = require('../../utils/styledUtils.js');
-require('../Buttons/ButtonBasicStyles.js');
-require('../PixelLoader/PixelLoaderStyles.js');
-require('../Buttons/ButtonPrimaryStyles.js');
+require('../Buttons/ButtonDefault.js');
+require('../Buttons/ButtonPrimary.js');
 var ButtonSecondary = require('../Buttons/ButtonSecondary.js');
-require('../Buttons/ButtonTertiaryStyles.js');
+require('../Buttons/ButtonTertiary.js');
 require('../Buttons/ButtonRoundStyles.js');
 require('../Buttons/CloseButton.js');
-require('../Buttons/ButtonIconStyles.js');
 var Icon = require('../Icon/Icon.js');
+require('../Buttons/ButtonIconStyles.js');
 require('../Buttons/ButtonIconPrimaryStyles.js');
+var hlMinus = require('../Icons/hlMinus.js');
+var hlPlus = require('../Icons/hlPlus.js');
+var hlTrash = require('../Icons/hlTrash.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -27,6 +29,8 @@ const Container = styled['default'].div `
 
     input {
         width: ${styledUtils.getMultipliedSize(theme['default'].base.baseWidth, 4)};
+        font-family: ${props => props.theme.fontFamily.default};
+        font-size: ${props => props.theme.fontSize.default};
         border: 0 none;
         text-align: center;
         outline: none;
@@ -40,6 +44,9 @@ const Container = styled['default'].div `
 `;
 const StyledButtonSecondary = styled['default'](ButtonSecondary['default']) `
     min-width: ${styledUtils.getMultipliedSize(theme['default'].base.baseWidth, 4)};
+    width: ${styledUtils.getMultipliedSize(theme['default'].base.baseWidth, 4)};
+    height: ${styledUtils.getMultipliedSize(theme['default'].base.baseHeight, 4)};
+    padding: ${styledUtils.getMultipliedSize(theme['default'].base.baseWidth, 0.6)};
 `;
 /** @visibleName Amount Selector */
 const AmountSelector = ({ onChange, value = 1, step = 1, min = 1, max, disabled = false, readonly = true, 'data-testid': dataTestId, ...props }) => {
@@ -73,12 +80,12 @@ const AmountSelector = ({ onChange, value = 1, step = 1, min = 1, max, disabled
         }
     };
     return (React__default['default'].createElement(Container, { disabled: disabled, "data-testid": dataTestId, className: props.className },
-        React__default['default'].createElement(StyledButtonSecondary, { disabled: disabled, onClick: decrease, "data-testid": dataTestId &&
+        React__default['default'].createElement(StyledButtonSecondary, { disabled: disabled, onClick: decrease, type: "button", "data-testid": dataTestId &&
                 `${dataTestId}${props.removable && isMinReached(value - step) ? '-remove' : '-decrease'}` },
-            React__default['default'].createElement(Icon['default'], { color: theme['default'].color.black, name: props.removable && isMinReached(value - step) ? 'hlTrash' : 'hlMinus' })),
+            React__default['default'].createElement(Icon['default'], { icon: props.removable && isMinReached(value - step) ? hlTrash['default'] : hlMinus['default'], color: theme['default'].color.black })),
         React__default['default'].createElement("input", { id: props.id, name: props.name, type: "number", onChange: handleChange, value: value, readOnly: readonly || disabled, disabled: disabled }),
-        React__default['default'].createElement(StyledButtonSecondary, { disabled: disabled, onClick: increase, "data-testid": dataTestId ? `${dataTestId}-increase` : undefined },
-            React__default['default'].createElement(Icon['default'], { color: theme['default'].color.black, name: "hlPlus" }))));
+        React__default['default'].createElement(StyledButtonSecondary, { disabled: disabled, onClick: increase, "data-testid": dataTestId ? `${dataTestId}-increase` : undefined, type: "button" },
+            React__default['default'].createElement(Icon['default'], { icon: hlPlus['default'], color: theme['default'].color.black }))));
 };
 
 exports.default = AmountSelector;

package/build/cjs/components/Buttons/ButtonBasicStyles.d.ts

@@ -18,12 +18,7 @@ declare const ButtonBasicStyle: import("styled-components").StyledComponent<"but
     };
     breakpoints: import("../../themes/themeComponents/breakpoints").ViewBreakpoints;
     button: {
-        buttonBorderWidth: string;
-        buttonPadding: string;
-        smallButtonPadding: string;
-        buttonLineHeight: string;
-        buttonWidth: string;
-        buttonSmallWidth: string;
+        border: string;
     };
     color: {
         black: string;
@@ -54,22 +49,27 @@ declare const ButtonBasicStyle: import("styled-components").StyledComponent<"but
         gray5: string;
     };
     fontFamily: {
-        baseFontFamily: string;
+        default: string;
+        heading: string;
+        numerals: string;
     };
     fontSize: {
-        defaultFontSize: string;
-        smallFontSize: string;
-        extraSmallFontSize: string;
-        xsFontSize: string;
-        xxsFontSize: string;
-        h1FontSize: string;
-        h2FontSize: string;
-        h2MobileFontSize: string;
-        h3FontSize: string;
-        h4FontSize: string;
-        h5FontSize: string;
-        heroBannerTitleFontSize: string;
-        heroBannerTitleMobileFontSize: string;
+        default: string;
+        xl: string;
+        l: string;
+        s: string;
+        xs: string;
+        h1XL: string;
+        h1L: string;
+        h1M: string;
+        h1S: string;
+        h2M: string;
+        h2S: string;
+        h3: string;
+        h4: string;
+        h5: string;
+        h1: string;
+        h2: string;
     };
     fontWeight: {
         book: number;
@@ -85,16 +85,23 @@ declare const ButtonBasicStyle: import("styled-components").StyledComponent<"but
         gutter: string;
     };
     lineHeight: {
-        defaultLineHeight: string;
-        paragraphLineHeight: string;
-        heroBannerLineHeight: string;
-        heroBannerMobileLineHeight: string;
-        h1LineHeight: string;
-        h2LineHeight: string;
-        h2MobileLineHeight: string;
-        h3LineHeight: string;
-        h4LineHeight: string;
-        h5LineHeight: string;
+        default: string;
+        xl: string;
+        s: string;
+        xs: string;
+        xxs: string;
+        auto: string;
+        h1XL: string;
+        h1L: string;
+        h1M: string;
+        h1S: string;
+        h2M: string;
+        h2S: string;
+        h3: string;
+        h4: string;
+        h5: string;
+        h1: string;
+        h2: string;
     };
     media: Record<string | number, (l: TemplateStringsArray, ...p: any[]) => string>;
 }, ButtonProps, never>;

package/build/cjs/components/Buttons/ButtonBasicStyles.js

@@ -3,30 +3,28 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var styled = require('../../themes/styled.js');
+var styledUtils = require('../../utils/styledUtils.js');
 
 const ButtonBasicStyle = styled['default'].button `
     position: relative;
-    padding: ${props => props && props.small
-    ? props.theme.button.smallButtonPadding
-    : props.theme.button.buttonPadding};
+    padding: ${props => `${styledUtils.getMultipliedSize(props.theme.base.baseWidth, 0.8)}
+        ${styledUtils.getMultipliedSize(props.theme.base.baseWidth, 1)}`};
     text-decoration: none;
     display: inline-block;
     border-style: solid;
-    border-width: ${props => props.theme.button.buttonBorderWidth};
+    border-width: ${props => props.theme.button.border};
     border-color: ${props => props && props.darkBg ? props.theme.color.white : props.theme.color.black};
     box-sizing: border-box;
     background-color: transparent;
     color: ${props => (props && props.darkBg ? props.theme.color.white : props.theme.color.black)};
-    font-family: ${props => props.theme.fontFamily.baseFontFamily};
+    font-family: ${props => props.theme.fontFamily.default};
     font-weight: ${props => props.theme.fontWeight.bold};
-    line-height: ${props => props.theme.button.buttonLineHeight};
-    font-size: ${props => props.theme.fontSize.defaultFontSize};
+    font-size: ${props => props && props.small ? props.theme.fontSize.s : props.theme.fontSize.default};
+    line-height: ${props => props && props.small ? props.theme.lineHeight.s : props.theme.lineHeight.default};
     outline: none;
     text-align: center;
     vertical-align: middle;
-    min-width: ${props => props && props.small
-    ? props.theme.button.buttonSmallWidth
-    : props.theme.button.buttonWidth};
+    min-width: ${props => styledUtils.getMultipliedSize(props.theme.base.baseWidth, props && props.small ? 10.5 : 12.5)};
     width: ${props => (props && props.fullWidth ? '100%' : 'auto')};
     cursor: pointer;
     max-width: 100%;
@@ -35,15 +33,15 @@ const ButtonBasicStyle = styled['default'].button `
     &:focus {
         outline: none;
         color: ${props => props && props.darkBg ? props.theme.color.white : props.theme.color.black};
-        span {
-            border-bottom: ${props => `${props.theme.button.buttonBorderWidth} solid`};
+        span:not(span.dnasg-icon) {
+            border-bottom: ${props => `${props.theme.button.border} solid`};
         }
     }
     &:hover {
         background: ${props => props && props.darkBg ? props.theme.color.white : props.theme.color.black};
         color: ${props => props && props.darkBg ? props.theme.color.black : props.theme.color.white};
         text-decoration: none;
-        span {
+        span:not(span.dnasg-icon) {
             border-bottom: 0;
         }
     }
@@ -51,7 +49,7 @@ const ButtonBasicStyle = styled['default'].button `
         opacity: 0.7;
         background: transparent;
         color: ${props => props && props.darkBg ? props.theme.color.white : props.theme.color.black};
-        span {
+        span:not(span.dnasg-icon) {
             border-bottom: 0;
         }
     }
@@ -64,11 +62,9 @@ const ButtonBasicStyle = styled['default'].button `
         pointer-events: none;
     }
 
-    span {
+    span:not(span.dnasg-icon) {
         border-bottom: 0;
-        font-size: ${props => props && props.small
-    ? props.theme.fontSize.smallFontSize
-    : props.theme.fontSize.defaultFontSize};
+        font-size: ${props => props && props.small ? props.theme.fontSize.s : props.theme.fontSize.default};
     }
 `;
 

package/build/cjs/components/Buttons/ButtonDefault.js

@@ -3,14 +3,18 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var React = require('react');
-var ButtonBasicStyles = require('./ButtonBasicStyles.js');
+var styled = require('../../themes/styled.js');
 var PixelLoader = require('../PixelLoader/PixelLoader.js');
+var ButtonBasicStyles = require('./ButtonBasicStyles.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 
 const noop = () => { }; // tslint:disable-line
+const StyledPixelLoader = styled['default'](PixelLoader.PixelLoader) `
+    display: inline-flex;
+`;
 /** @visibleName Buttons */
 const Button = (props) => {
     const { children, className, fullWidth, small, loading = false, darkBg, onClick, onMouseDown, disabled = false, 'data-testid': dataTestId, 'data-no-close': dataNoClose, 'data-track-value': dataTrackValue, type, } = props;
@@ -20,7 +24,7 @@ const Button = (props) => {
         // https://github.com/styled-components/styled-components/pull/2093
         loading: loading ? loading.toString() : undefined, darkBg: darkBg, disabled: disabled, onClick: !disabled || !loading ? onClick : noop, onMouseDown: (!disabled || !loading) && onMouseDown ? onMouseDown : noop, className: className, "data-testid": dataTestId, "data-no-close": dataNoClose, "data-track-value": dataTrackValue, type: type },
         !loading && (React__default['default'].createElement("span", { "data-testid": dataTestId && `${dataTestId}-text`, "data-no-close": dataNoClose }, children)),
-        loading && React__default['default'].createElement(PixelLoader.PixelLoader, null)));
+        loading && React__default['default'].createElement(StyledPixelLoader, null)));
 };
 
 exports.Button = Button;

package/build/cjs/components/Buttons/ButtonIcon.js

@@ -3,8 +3,8 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var React = require('react');
-var ButtonIconStyles = require('./ButtonIconStyles.js');
 var Icon = require('../Icon/Icon.js');
+var ButtonIconStyles = require('./ButtonIconStyles.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -14,12 +14,19 @@ const noop = () => { }; // tslint:disable-line
 /** @visibleName Icon Button */
 const ButtonIcon = (props) => {
     const { children, fullWidth, small, loading = false, darkBg, onClick, onMouseDown, disabled = false, className, icon, showTextMobile = true, 'data-testid': dataTestId, 'data-no-close': dataNoClose, 'data-track-value': dataTrackValue, type, } = props;
+    // TODO: Remove once https://jira.dna.fi/browse/STYLE-334 is done
+    const renderIcon = () => {
+        if (typeof icon === 'string') {
+            return (React__default['default'].createElement(Icon['default'], { name: icon, size: small ? '1.25rem' : '1.5rem', "data-testid": dataTestId && `${dataTestId}-icon`, "data-no-close": dataNoClose }));
+        }
+        return (React__default['default'].createElement(Icon['default'], { icon: icon, size: small ? '1.25rem' : '1.5rem', "data-testid": dataTestId && `${dataTestId}-icon`, "data-no-close": dataNoClose }));
+    };
     return (React__default['default'].createElement(ButtonIconStyles['default'], { fullWidth: fullWidth, small: small, 
         // There is an issue related to styled-components: react warning: Received `true` for a non-boolean attribute 'loading'.
         // If you want to write it to the DOM, pass a string instead: loading="true"
         // https://github.com/styled-components/styled-components/pull/2093
         darkBg: darkBg, disabled: disabled, onClick: !disabled || !loading ? onClick : noop, onMouseDown: (!disabled || !loading) && onMouseDown ? onMouseDown : noop, className: className, showTextMobile: showTextMobile, "data-testid": dataTestId, "data-no-close": dataNoClose, "data-track-value": dataTrackValue, type: type }, !loading && (React__default['default'].createElement(React__default['default'].Fragment, null,
-        React__default['default'].createElement(Icon['default'], { name: icon, size: "100%", "data-testid": dataTestId && `${dataTestId}-icon`, "data-no-close": dataNoClose }),
+        renderIcon(),
         React__default['default'].createElement("span", { "data-testid": dataTestId && `${dataTestId}-text`, "data-no-close": dataNoClose }, children)))));
 };
 

package/build/cjs/components/Buttons/ButtonIconPrimary.js

@@ -3,8 +3,8 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var React = require('react');
-var ButtonIconPrimaryStyles = require('./ButtonIconPrimaryStyles.js');
 var Icon = require('../Icon/Icon.js');
+var ButtonIconPrimaryStyles = require('./ButtonIconPrimaryStyles.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -14,12 +14,19 @@ const noop = () => { }; // tslint:disable-line
 /** @visibleName  Icon Button Primary */
 const ButtonIconPrimary = (props) => {
     const { children, fullWidth, small, loading = false, darkBg, onClick, onMouseDown, disabled = false, className, icon, showTextMobile = true, 'data-testid': dataTestId, 'data-no-close': dataNoClose, 'data-track-value': dataTrackValue, type, } = props;
+    // TODO: Remove once https://jira.dna.fi/browse/STYLE-334 is done
+    const renderIcon = () => {
+        if (typeof icon === 'string') {
+            return (React__default['default'].createElement(Icon['default'], { name: icon, size: small ? '1.25rem' : '1.5rem', "data-testid": dataTestId && `${dataTestId}-icon`, "data-no-close": dataNoClose }));
+        }
+        return (React__default['default'].createElement(Icon['default'], { icon: icon, size: small ? '1.25rem' : '1.5rem', "data-testid": dataTestId && `${dataTestId}-icon`, "data-no-close": dataNoClose }));
+    };
     return (React__default['default'].createElement(ButtonIconPrimaryStyles['default'], { fullWidth: fullWidth, small: small, 
         // There is an issue related to styled-components: react warning: Received `true` for a non-boolean attribute 'loading'.
         // If you want to write it to the DOM, pass a string instead: loading="true"
         // https://github.com/styled-components/styled-components/pull/2093
         darkBg: darkBg, disabled: disabled, onClick: !disabled || !loading ? onClick : noop, onMouseDown: (!disabled || !loading) && onMouseDown ? onMouseDown : noop, className: className, showTextMobile: showTextMobile, "data-testid": dataTestId, "data-no-close": dataNoClose, "data-track-value": dataTrackValue, type: type }, !loading && (React__default['default'].createElement(React__default['default'].Fragment, null,
-        React__default['default'].createElement(Icon['default'], { name: icon, size: "100%", "data-testid": dataTestId && `${dataTestId}-icon`, "data-no-close": dataNoClose }),
+        renderIcon(),
         React__default['default'].createElement("span", { "data-testid": dataTestId && `${dataTestId}-text`, "data-no-close": dataNoClose }, children)))));
 };