@dnanpm/styleguide 2.0.1 → 2.2.0

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

@@ -1,5 +1,6 @@
 import React from 'react';
-export interface Props {
+import type { Props as AccordionItemProps } from './AccordionItem';
+interface Props extends Omit<AccordionItemProps, 'title' | 'id' | 'children' | 'onClick' | 'onKeyDown'> {
     /**
      * Content of Accordion
      *
@@ -12,39 +13,8 @@ export interface Props {
      * @default false
      */
     autoCollapsible?: boolean;
-    /**
-     * 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;
-    /**
-     * 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: ({ autoCollapsible, highlightSelected, hasCloseButton, ...props }: Props) => JSX.Element;
+declare const Accordion: ({ autoCollapsible, highlightSelected, hasCloseButton, ...props }: Props) => JSX.Element | null;
 /** @component */
 export default Accordion;

package/build/es/components/Accordion/Accordion.js

@@ -1,8 +1,10 @@
+import { __rest } from 'tslib';
 import React, { useState } from 'react';
 import AccordionItem from './AccordionItem.js';
 
 /** @visibleName Accordion */
-const Accordion = ({ autoCollapsible = false, highlightSelected = true, hasCloseButton = false, ...props }) => {
+const Accordion = (_a) => {
+    var { autoCollapsible = false, highlightSelected = true, hasCloseButton = false } = _a, props = __rest(_a, ["autoCollapsible", "highlightSelected", "hasCloseButton"]);
     const initialItemList = {};
     const getAccordionItemId = (index, title) => `${title.replace(/\s+/g, '')}-${index}`;
     if (props.isExpanded) {
@@ -14,29 +16,31 @@ const Accordion = ({ autoCollapsible = false, highlightSelected = true, hasClose
     }
     const [itemList, setItemList] = useState(initialItemList);
     const toggleExpanded = (currentItemId) => {
-        const currentItemState = itemList[currentItemId];
-        setItemList({
-            ...(autoCollapsible ? {} : itemList),
-            [currentItemId]: !currentItemState,
-        });
+        if (currentItemId) {
+            const currentItemState = itemList[currentItemId];
+            setItemList(Object.assign(Object.assign({}, (autoCollapsible ? {} : itemList)), { [currentItemId]: !currentItemState }));
+        }
     };
     const handleClick = (e) => {
-        toggleExpanded(e.currentTarget.parentElement.id);
+        var _a, _b;
+        toggleExpanded((_b = (_a = e.currentTarget) === null || _a === void 0 ? void 0 : _a.parentElement) === null || _b === void 0 ? void 0 : _b.id);
     };
     const handleKeyDown = (e) => {
+        var _a, _b;
         if (e.key === 'Enter' || e.key === ' ') {
             e.preventDefault();
-            toggleExpanded(e.currentTarget.parentElement.id);
+            toggleExpanded((_b = (_a = e.currentTarget) === null || _a === void 0 ? void 0 : _a.parentElement) === null || _b === void 0 ? void 0 : _b.id);
         }
     };
     const accordionItems = React.Children.map(props.children, (child, index) => {
         if (React.isValidElement(child) && child.type === AccordionItem) {
             const id = getAccordionItemId(index, child.props.title);
-            return (React.createElement(AccordionItem, 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));
+            return (React.createElement(AccordionItem, { id: id, key: id, title: child.props.title, isExpanded: itemList[id], highlightSelected: highlightSelected, hasCloseButton: hasCloseButton, openLabel: props.openLabel, closeLabel: props.closeLabel, onClick: handleClick, onKeyDown: handleKeyDown, className: child.props.className }, child.props.children));
         }
+        return null;
     });
     if (!accordionItems) {
-        return React.createElement(React.Fragment, null);
+        return null;
     }
     return React.createElement("div", { className: props.className }, accordionItems);
 };

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

@@ -1,6 +1,5 @@
 import React from 'react';
-import { Props as AccordionProps } from './Accordion';
-interface Props extends Omit<AccordionProps, 'children' | 'autoCollapsible'> {
+export interface Props {
     /**
      * Accordion item title
      */
@@ -13,6 +12,33 @@ interface Props extends Omit<AccordionProps, 'children' | 'autoCollapsible'> {
      * Content of Accordion Item
      */
     children?: React.ReactNode;
+    /**
+     * Allows to expand or collapse the component
+     *
+     * @default false
+     */
+    isExpanded?: boolean;
+    /**
+     * 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;
+    /**
+     * 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;
     /**
      * On component title and close button mouse click callback
      * Use `e.currentTarget.parentElement` to get AccordionItem element
@@ -23,6 +49,10 @@ interface Props extends Omit<AccordionProps, 'children' | 'autoCollapsible'> {
      * Use `e.currentTarget.parentElement` to get AccordionItem element
      */
     onKeyDown?: (e: React.KeyboardEvent<HTMLElement>) => void;
+    /**
+     * Allows to pass a custom className
+     */
+    className?: string;
 }
 /** @visibleName Accordion Item */
 declare const AccordionItem: ({ hasCloseButton, highlightSelected, ...props }: Props) => JSX.Element;

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

@@ -1,68 +1,74 @@
+import { __rest } from 'tslib';
 import React from 'react';
 import styled__default, { css } from 'styled-components';
 import useResizeObserver from '../../hooks/useElementDimensions.js';
+import theme from '../../themes/theme.js';
 import { getDividedSize, getMultipliedSize } from '../../utils/styledUtils.js';
 import Icon from '../Icon/Icon.js';
+import hlChevronDown from '../Icons/hlChevronDown.js';
+import hlChevronUp from '../Icons/hlChevronUp.js';
+import hlX from '../Icons/hlX.js';
 
 const AccordionItemContainer = styled__default.div `
-    margin: ${p => `0 ${getDividedSize(p.theme.base.baseHeight, 2.5)}}`};
+    margin: 0 ${getDividedSize(theme.base.baseHeight, 2.5)};
     border-bottom: 1px solid
-        ${p => (p.isExpanded && p.highlightSelected ? p.theme.color.hotPink : p.theme.color.gray15)};
+        ${p => (p.isExpanded && p.highlightSelected ? theme.color.hotPink : theme.color.gray15)};
 `;
 const AccordionItemTitle = styled__default.div `
-    font-size: ${p => p.theme.fontSize.default};
-    font-weight: ${p => p.theme.fontWeight.bold};
+    font-size: ${theme.fontSize.default};
+    font-weight: ${theme.fontWeight.bold};
     display: flex;
     justify-content: space-between;
     flex-direction: row;
     cursor: pointer;
-    padding: ${p => getMultipliedSize(p.theme.base.baseHeight, 1.6)}
-        ${p => getMultipliedSize(p.theme.base.baseHeight, 2)};
-    color: ${p => p.isExpanded && p.highlightSelected ? p.theme.color.hotPink : p.theme.color.text};
+    padding: ${getMultipliedSize(theme.base.baseHeight, 1.6)}
+        ${getMultipliedSize(theme.base.baseHeight, 2)};
+    color: ${p => (p.isExpanded && p.highlightSelected ? theme.color.hotPink : theme.color.text)};
     transition: color 0.2s;
     ${p => p.highlightSelected &&
     css `
             &:hover,
             &:active {
-                color: ${p.theme.color.hotPink};
+                color: ${theme.color.hotPink};
                 text-decoration: none;
             }
         `}
 `;
 const AccordionItemContentWrapper = styled__default.div `
     overflow: hidden;
-    color: ${p => p.theme.color.slateGray};
+    color: ${theme.color.slateGray};
     transition: all 0.2s ease;
     height: ${p => (p.isExpanded ? p.maxHeight / 16 + 1.25 : 0)}rem;
-    padding: 0 ${p => getMultipliedSize(p.theme.base.baseHeight, 2)};
+    padding: 0 ${getMultipliedSize(theme.base.baseHeight, 2)};
     visibility: ${p => (p.isExpanded ? 'visible' : 'hidden')};
 `;
 const AccordionItemContent = styled__default.div `
-    padding-bottom: ${p => getMultipliedSize(p.theme.base.baseHeight, 1.6)};
+    padding-bottom: ${getMultipliedSize(theme.base.baseHeight, 1.6)};
 `;
 const AccordionItemCloseButton = styled__default.div `
     display: flex;
     justify-content: flex-end;
-    line-height: ${p => p.theme.lineHeight.default};
-    margin-bottom: ${p => getMultipliedSize(p.theme.base.baseHeight, 1.6)};
-    padding: 0 ${p => getMultipliedSize(p.theme.base.baseHeight, 2)};
-    gap: ${p => getMultipliedSize(p.theme.base.baseHeight, 1)};
-    color: ${p => p.theme.color.text};
+    line-height: ${theme.lineHeight.default};
+    margin-bottom: ${getMultipliedSize(theme.base.baseHeight, 1.6)};
+    padding: 0 ${getMultipliedSize(theme.base.baseHeight, 2)};
+    gap: ${getMultipliedSize(theme.base.baseHeight, 1)};
+    color: ${theme.color.text};
     cursor: pointer;
 `;
 /** @visibleName Accordion Item */
-const AccordionItem = ({ hasCloseButton = false, highlightSelected = true, ...props }) => {
+const AccordionItem = (_a) => {
+    var { hasCloseButton = false, highlightSelected = true } = _a, props = __rest(_a, ["hasCloseButton", "highlightSelected"]);
     // Get height when element dimensions change
     const { height: contentHeight, ref: contentRef } = useResizeObserver();
     return (React.createElement(AccordionItemContainer, { id: props.id, "aria-expanded": Boolean(props.isExpanded), className: props.className, isExpanded: Boolean(props.isExpanded), highlightSelected: highlightSelected },
         React.createElement(AccordionItemTitle, { tabIndex: 0, onClick: props.onClick, onKeyDown: props.onKeyDown, isExpanded: Boolean(props.isExpanded), highlightSelected: highlightSelected, role: "button" },
             props.title,
-            Boolean(props.isExpanded) ? (React.createElement(Icon, { name: "hlChevronUp", size: "1.5rem", right: true, "aria-label": props.closeLabel })) : (React.createElement(Icon, { name: "hlChevronDown", size: "1.5rem", right: true, "aria-label": props.openLabel }))),
+            props.isExpanded ? (React.createElement(Icon, { icon: hlChevronUp, position: "right", "aria-label": props.closeLabel })) : (React.createElement(Icon, { icon: hlChevronDown, position: "right", "aria-label": props.openLabel }))),
         React.createElement(AccordionItemContentWrapper, { maxHeight: contentHeight, isExpanded: props.isExpanded },
             React.createElement(AccordionItemContent, { ref: contentRef }, props.children)),
         hasCloseButton && props.isExpanded && (React.createElement(AccordionItemCloseButton, { tabIndex: 0, onClick: props.onClick, onKeyDown: props.onKeyDown, "aria-label": props.closeLabel, role: "button" },
             React.createElement("span", null, props.closeLabel),
-            React.createElement(Icon, { name: "hlX", size: "1.5rem" })))));
+            React.createElement(Icon, { icon: hlX })))));
 };
 
 export default AccordionItem;

package/build/es/components/AmountSelector/AmountSelector.js

@@ -1,3 +1,4 @@
+import { __rest } from 'tslib';
 import React from 'react';
 import styled from '../../themes/styled.js';
 import theme from '../../themes/theme.js';
@@ -8,9 +9,12 @@ import ButtonSecondary from '../Buttons/ButtonSecondary.js';
 import '../Buttons/ButtonTertiary.js';
 import '../Buttons/ButtonRoundStyles.js';
 import '../Buttons/CloseButton.js';
-import '../Buttons/ButtonIconStyles.js';
 import Icon from '../Icon/Icon.js';
+import '../Buttons/ButtonIconStyles.js';
 import '../Buttons/ButtonIconPrimaryStyles.js';
+import hlMinus from '../Icons/hlMinus.js';
+import hlPlus from '../Icons/hlPlus.js';
+import hlTrash from '../Icons/hlTrash.js';
 
 const Container = styled.div `
     display: flex;
@@ -18,6 +22,8 @@ const Container = styled.div `
 
     input {
         width: ${getMultipliedSize(theme.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;
@@ -31,9 +37,13 @@ const Container = styled.div `
 `;
 const StyledButtonSecondary = styled(ButtonSecondary) `
     min-width: ${getMultipliedSize(theme.base.baseWidth, 4)};
+    width: ${getMultipliedSize(theme.base.baseWidth, 4)};
+    height: ${getMultipliedSize(theme.base.baseHeight, 4)};
+    padding: ${getMultipliedSize(theme.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 }) => {
+const AmountSelector = (_a) => {
+    var { onChange, value = 1, step = 1, min = 1, max, disabled = false, readonly = true, 'data-testid': dataTestId } = _a, props = __rest(_a, ["onChange", "value", "step", "min", "max", "disabled", "readonly", 'data-testid']);
     const isMinReached = (val) => val < min;
     const isMaxReached = (val) => Boolean(max && val > max);
     const isInRange = (val) => !isMinReached(val) && !isMaxReached(val);
@@ -66,10 +76,10 @@ const AmountSelector = ({ onChange, value = 1, step = 1, min = 1, max, disabled
     return (React.createElement(Container, { disabled: disabled, "data-testid": dataTestId, className: props.className },
         React.createElement(StyledButtonSecondary, { disabled: disabled, onClick: decrease, type: "button", "data-testid": dataTestId &&
                 `${dataTestId}${props.removable && isMinReached(value - step) ? '-remove' : '-decrease'}` },
-            React.createElement(Icon, { color: theme.color.black, name: props.removable && isMinReached(value - step) ? 'hlTrash' : 'hlMinus' })),
+            React.createElement(Icon, { icon: props.removable && isMinReached(value - step) ? hlTrash : hlMinus, color: theme.color.black })),
         React.createElement("input", { id: props.id, name: props.name, type: "number", onChange: handleChange, value: value, readOnly: readonly || disabled, disabled: disabled }),
         React.createElement(StyledButtonSecondary, { disabled: disabled, onClick: increase, "data-testid": dataTestId ? `${dataTestId}-increase` : undefined, type: "button" },
-            React.createElement(Icon, { color: theme.color.black, name: "hlPlus" }))));
+            React.createElement(Icon, { icon: hlPlus, color: theme.color.black }))));
 };
 
 export default AmountSelector;

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

@@ -1,9 +1,10 @@
+import type theme from '../../themes/theme';
 export interface ButtonProps {
     fullWidth?: boolean;
     small?: boolean;
     loading?: boolean | string;
     darkBg?: boolean;
-    theme?: any;
+    theme?: typeof theme;
 }
 declare const ButtonBasicStyle: import("styled-components").StyledComponent<"button", {
     base: {

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

@@ -29,7 +29,7 @@ const ButtonBasicStyle = styled.button `
     &:focus {
         outline: none;
         color: ${props => props && props.darkBg ? props.theme.color.white : props.theme.color.black};
-        span {
+        span:not(span.dnasg-icon) {
             border-bottom: ${props => `${props.theme.button.border} solid`};
         }
     }
@@ -37,7 +37,7 @@ const ButtonBasicStyle = styled.button `
         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;
         }
     }
@@ -45,7 +45,7 @@ const ButtonBasicStyle = styled.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;
         }
     }
@@ -58,7 +58,7 @@ const ButtonBasicStyle = styled.button `
         pointer-events: none;
     }
 
-    span {
+    span:not(span.dnasg-icon) {
         border-bottom: 0;
         font-size: ${props => props && props.small ? props.theme.fontSize.s : props.theme.fontSize.default};
     }

package/build/es/components/Buttons/ButtonDefault.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-import ButtonProps from './ButtonBasicProps';
+import type ButtonProps from './ButtonBasicProps';
 /** @visibleName Buttons */
 export declare const Button: (props: ButtonProps) => JSX.Element;
 /** @component */

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

@@ -1,7 +1,8 @@
 import React from 'react';
 import styled from '../../themes/styled.js';
-import { PixelLoader } from '../PixelLoader/PixelLoader.js';
+import PixelLoader from '../PixelLoader/PixelLoader.js';
 import ButtonBasicStyle from './ButtonBasicStyles.js';
+import theme from '../../themes/theme.js';
 
 const noop = () => { }; // tslint:disable-line
 const StyledPixelLoader = styled(PixelLoader) `
@@ -16,7 +17,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.createElement("span", { "data-testid": dataTestId && `${dataTestId}-text`, "data-no-close": dataNoClose }, children)),
-        loading && React.createElement(StyledPixelLoader, null)));
+        loading && (React.createElement(StyledPixelLoader, { color: darkBg ? theme.color.white : theme.color.black }))));
 };
 
 export default Button;

package/build/es/components/Buttons/ButtonIcon.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-import ButtonIconProps from './ButtonIconProps';
+import type ButtonIconProps from './ButtonIconProps';
 /** @visibleName Icon Button */
 declare const ButtonIcon: (props: ButtonIconProps) => JSX.Element;
 /** @component */

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

@@ -1,17 +1,24 @@
 import React from 'react';
-import ButtonIconStyles from './ButtonIconStyles.js';
 import Icon from '../Icon/Icon.js';
+import ButtonIconStyles from './ButtonIconStyles.js';
 
 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.createElement(Icon, { name: icon, size: small ? '1.25rem' : '1.5rem', "data-testid": dataTestId && `${dataTestId}-icon`, "data-no-close": dataNoClose }));
+        }
+        return (React.createElement(Icon, { icon: icon, size: small ? '1.25rem' : '1.5rem', "data-testid": dataTestId && `${dataTestId}-icon`, "data-no-close": dataNoClose }));
+    };
     return (React.createElement(ButtonIconStyles, { 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.createElement(React.Fragment, null,
-        React.createElement(Icon, { name: icon, size: "100%", "data-testid": dataTestId && `${dataTestId}-icon`, "data-no-close": dataNoClose }),
+        renderIcon(),
         React.createElement("span", { "data-testid": dataTestId && `${dataTestId}-text`, "data-no-close": dataNoClose }, children)))));
 };
 

package/build/es/components/Buttons/ButtonIconPrimary.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-import ButtonIconProps from './ButtonIconProps';
+import type ButtonIconProps from './ButtonIconProps';
 /** @visibleName  Icon Button Primary */
 declare const ButtonIconPrimary: (props: ButtonIconProps) => JSX.Element;
 /** @component */

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

@@ -1,17 +1,24 @@
 import React from 'react';
-import ButtonIconPrimaryStyles from './ButtonIconPrimaryStyles.js';
 import Icon from '../Icon/Icon.js';
+import ButtonIconPrimaryStyles from './ButtonIconPrimaryStyles.js';
 
 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.createElement(Icon, { name: icon, size: small ? '1.25rem' : '1.5rem', "data-testid": dataTestId && `${dataTestId}-icon`, "data-no-close": dataNoClose }));
+        }
+        return (React.createElement(Icon, { icon: icon, size: small ? '1.25rem' : '1.5rem', "data-testid": dataTestId && `${dataTestId}-icon`, "data-no-close": dataNoClose }));
+    };
     return (React.createElement(ButtonIconPrimaryStyles, { 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.createElement(React.Fragment, null,
-        React.createElement(Icon, { name: icon, size: "100%", "data-testid": dataTestId && `${dataTestId}-icon`, "data-no-close": dataNoClose }),
+        renderIcon(),
         React.createElement("span", { "data-testid": dataTestId && `${dataTestId}-text`, "data-no-close": dataNoClose }, children)))));
 };
 

package/build/es/components/Buttons/ButtonIconStyles.js

@@ -1,6 +1,6 @@
 import styled from '../../themes/styled.js';
-import ButtonBasicStyle from './ButtonBasicStyles.js';
 import { media } from '../../utils/styledUtils.js';
+import ButtonBasicStyle from './ButtonBasicStyles.js';
 
 const ButtonIconStyles = styled(ButtonBasicStyle) `
     border: none;
@@ -19,11 +19,7 @@ const ButtonIconStyles = styled(ButtonBasicStyle) `
     &:disabled {
         background: none;
     }
-    svg {
-        height: ${p => (p.small ? '1.25em' : '1.5em')};
-        width: ${p => (p.small ? '1.25em' : '1.5em')};
-    }
-    span {
+    span.dnasg-icon + span {
         margin-left: 0.5rem;
         display: ${({ showTextMobile }) => (showTextMobile ? 'block' : 'none')};
         ${media.sm `

package/build/es/components/Buttons/ButtonPrimary.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-import ButtonProps from './ButtonBasicProps';
+import type ButtonProps from './ButtonBasicProps';
 /** @visibleName Button primary */
 declare const ButtonPrimary: (props: ButtonProps) => JSX.Element;
 /** @component */

package/build/es/components/Buttons/ButtonPrimary.js

@@ -1,7 +1,8 @@
 import React from 'react';
 import styled from '../../themes/styled.js';
-import { PixelLoader } from '../PixelLoader/PixelLoader.js';
+import PixelLoader from '../PixelLoader/PixelLoader.js';
 import ButtonPrimaryStyles from './ButtonPrimaryStyles.js';
+import theme from '../../themes/theme.js';
 
 const noop = () => { }; // tslint:disable-line
 const StyledPixelLoader = styled(PixelLoader) `
@@ -16,7 +17,7 @@ const ButtonPrimary = (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.createElement("span", { "data-testid": dataTestId && `${dataTestId}-text`, "data-no-close": dataNoClose }, children)),
-        loading && React.createElement(StyledPixelLoader, null)));
+        loading && React.createElement(StyledPixelLoader, { color: theme.color.white })));
 };
 
 export default ButtonPrimary;

package/build/es/components/Buttons/ButtonRoundStyles.js

@@ -1,11 +1,12 @@
 import styled__default from 'styled-components';
+import theme from '../../themes/theme.js';
 
 const ButtonRoundStyles = styled__default.button `
     display: inline-flex;
     align-items: center;
     justify-content: center;
-    background-color: ${props => props.theme.color.hotPink};
-    color: ${props => props.theme.color.white};
+    background-color: ${theme.color.hotPink};
+    color: ${theme.color.white};
     outline: none;
     cursor: pointer;
     text-align: center;
@@ -13,15 +14,15 @@ const ButtonRoundStyles = styled__default.button `
     border-radius: 50%;
     width: 2rem;
     height: 2rem;
-    border-color: ${props => props.theme.color.hotPink};
+    border-color: ${theme.color.hotPink};
     border-style: solid;
     &:focus {
         outline: none;
-        color: ${props => props.theme.color.white};
+        color: ${theme.color.white};
     }
     &:hover,
     &:active {
-        color: ${props => props.theme.color.white};
+        color: ${theme.color.white};
     }
 `;
 

package/build/es/components/Buttons/ButtonSecondary.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-import ButtonProps from './ButtonBasicProps';
+import type ButtonProps from './ButtonBasicProps';
 /** @visibleName Button secondary */
 declare const ButtonSecondary: (props: ButtonProps) => JSX.Element;
 /** @component */

package/build/es/components/Buttons/ButtonSecondary.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import styled from '../../themes/styled.js';
 import theme from '../../themes/theme.js';
-import { PixelLoader } from '../PixelLoader/PixelLoader.js';
+import PixelLoader from '../PixelLoader/PixelLoader.js';
 import ButtonSecondaryStyles from './ButtonSecondaryStyles.js';
 
 const noop = () => { }; // tslint:disable-line

package/build/es/components/Buttons/ButtonTertiary.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-import ButtonProps from './ButtonBasicProps';
+import type ButtonProps from './ButtonBasicProps';
 /** @visibleName Button tertiary */
 declare const ButtonTertiary: (props: ButtonProps) => JSX.Element;
 /** @component */

package/build/es/components/Buttons/ButtonTertiary.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import styled from '../../themes/styled.js';
 import theme from '../../themes/theme.js';
-import { PixelLoader } from '../PixelLoader/PixelLoader.js';
+import PixelLoader from '../PixelLoader/PixelLoader.js';
 import ButtonTertiaryStyles from './ButtonTertiaryStyles.js';
 
 const noop = () => { }; // tslint:disable-line

package/build/es/components/Card/Card.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-import { CardProps } from './CardProps';
+import type { CardProps } from './CardProps';
 declare const Card: ({ title, children, className, "data-testid": dataTestId }: CardProps) => JSX.Element;
 /** @component */
 export default Card;

package/build/es/components/Card/Card.js

@@ -55,10 +55,8 @@ const CardWrapper = styled.div `
         box-shadow: none;
     `};
 `;
-const Card = ({ title, children, className, 'data-testid': dataTestId }) => {
-    return (React.createElement(CardContainer, { "data-testid": dataTestId, className: className },
-        title && React.createElement(CardTitle, null, title),
-        React.createElement(CardWrapper, null, children)));
-};
+const Card = ({ title, children, className, 'data-testid': dataTestId }) => (React.createElement(CardContainer, { "data-testid": dataTestId, className: className },
+    title && React.createElement(CardTitle, null, title),
+    React.createElement(CardWrapper, null, children)));
 
 export default Card;

package/build/es/components/Card/CardRow.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-import { CardRowProps } from './CardProps';
-declare const CardRow: ({ title, value, children, noBorder, dashedBorder, eCareRow, ...props }: CardRowProps) => JSX.Element;
+import type { CardRowProps } from './CardProps';
+declare const CardRow: ({ title, value, children, noBorder, dashedBorder, eCareRow, }: CardRowProps) => JSX.Element;
 /** @component */
 export default CardRow;

package/build/es/components/Card/CardRow.js

@@ -40,12 +40,12 @@ const CTAButtonWrapper = styled.div `
     justify-self: right;
     align-self: center;
 `;
-const CardRow = ({ title = '', value = '', children, noBorder = false, dashedBorder = false, eCareRow = false, ...props }) => {
+const CardRow = ({ title = '', value = '', children, noBorder = false, dashedBorder = false, eCareRow = false, }) => {
     if (!eCareRow) {
-        return (React.createElement(CardElement, Object.assign({ noBorder: noBorder, dashedBorder: dashedBorder }, props),
+        return (React.createElement(CardElement, { noBorder: noBorder, dashedBorder: dashedBorder },
             React.createElement(CardContent, null, children)));
     }
-    return (React.createElement(CardElement, Object.assign({ noBorder: noBorder, dashedBorder: dashedBorder }, props),
+    return (React.createElement(CardElement, { noBorder: noBorder, dashedBorder: dashedBorder },
         React.createElement(CardContent, null,
             title && React.createElement("h5", null, title),
             value && React.createElement("p", null, value)),