@nulogy/components 7.1.0 → 7.2.0

package/dist/main.js

@@ -16443,15 +16443,23 @@
     border: "none"
   };
 
+  function getColorFromProps(props) {
+    return themeGet("colors." + props.color, props.color)(props);
+  }
+
+  function getColor(props) {
+    return getColorFromProps(props) || props.theme.colors.blue;
+  }
+
   var getHoverColor = function getHoverColor(props) {
-    return props.hover ? props.color : curriedDarken("0.1", themeGet("colors." + props.color, props.color)(props));
+    return props.hover ? getColor(props) : curriedDarken("0.1", getColor(props));
   };
 
   var Link = styled__default['default'].a.withConfig({
     shouldForwardProp: function shouldForwardProp(prop, defaultValidatorFn) {
       return !["underline", "hover"].includes(prop) && defaultValidatorFn(prop);
     }
-  })(color, space, typography, function (_a) {
+  })(function (_a) {
     var underline = _a.underline,
         as = _a.as,
         props = __rest(_a, ["underline", "as"]);
@@ -16459,17 +16467,16 @@
     return Object.assign(Object.assign({}, resetButtonStyles), {
       padding: as === "button" ? "0" : undefined,
       textDecoration: underline ? "underline" : "none",
+      fontSize: props.theme.fontSizes.medium,
+      color: getColor(props),
       "&:hover": {
         cursor: "pointer",
         color: getHoverColor(props)
       }
     });
-  });
+  }, addStyledProps);
   Link.defaultProps = {
-    className: undefined,
-    underline: true,
-    fontSize: "medium",
-    color: "blue"
+    underline: true
   };
 
   var ListItem = styled__default['default'].li.withConfig({
@@ -45112,9 +45119,7 @@
       fontSize: theme.fontSizes.large,
       fontWeight: theme.fontWeights.medium,
       lineHeight: theme.lineHeights.heading3,
-      marginBottom: theme.space.x1,
-      padding: theme.space.x1 + " " + theme.space.x3,
-      paddingLeft: getPaddingLeft(0)
+      padding: theme.space.x1 + " " + theme.space.x3
     };
   };
 
@@ -45144,7 +45149,7 @@
         opacity: ".5"
       }
     });
-  });
+  }, addStyledProps);
   var TopLevelText = styled__default['default'](Text).withConfig({
     displayName: "MobileMenu__TopLevelText",
     componentId: "sc-18t6zrc-2"
@@ -45153,27 +45158,10 @@
     return Object.assign(Object.assign({}, getSharedStyles(theme)), {
       color: theme.colors.blackBlue
     });
-  });
-  var ChildIndentingLi = styled__default['default'].li.withConfig({
-    displayName: "MobileMenu__ChildIndentingLi",
-    componentId: "sc-18t6zrc-3"
-  })(function (_ref4) {
-    var _ref5;
-
-    var layer = _ref4.layer,
-        theme = _ref4.theme;
-    return _ref5 = {
-      marginBottom: theme.space.x1
-    }, _ref5["> " + DropdownButton + ", > " + DropdownLink] = {
-      // eslint-disable-next-line no-mixed-operators
-      paddingLeft: 24 * layer + 20 + "px"
-    }, _ref5["> " + DropdownText] = {
-      paddingLeft: getPaddingLeft(layer)
-    }, _ref5;
-  });
+  }, addStyledProps);
   var SubMenuItemsList = styled__default['default'].ul.withConfig({
     displayName: "MobileMenu__SubMenuItemsList",
-    componentId: "sc-18t6zrc-4"
+    componentId: "sc-18t6zrc-3"
   })({
     listStyle: "none",
     paddingLeft: "0",
@@ -45183,23 +45171,25 @@
   var renderMenuLink = function renderMenuLink(menuItem, linkOnClick, themeColorObject, layer) {
     var _a;
 
-    var MenuLink = layer === 0 ? TopLevelLink : DropdownLink;
-    return /*#__PURE__*/React__default['default'].createElement(ChildIndentingLi, {
-      layer: layer,
-      key: (_a = menuItem.key) !== null && _a !== void 0 ? _a : menuItem.name
-    }, /*#__PURE__*/React__default['default'].createElement(MenuLink, {
+    var sharedLinkProps = {
       onClick: linkOnClick,
       href: menuItem.href,
       as: menuItem.as,
-      to: menuItem.to
-    }, menuItem.name));
+      to: menuItem.to,
+      // eslint-disable-next-line no-mixed-operators
+      pl: layer === 0 ? getPaddingLeft(layer) : 24 * layer + 20 + "px",
+      mb: "x1"
+    };
+    var MenuLink = layer === 0 ? TopLevelLink : DropdownLink;
+    return /*#__PURE__*/React__default['default'].createElement("li", {
+      key: (_a = menuItem.key) !== null && _a !== void 0 ? _a : menuItem.name
+    }, /*#__PURE__*/React__default['default'].createElement(MenuLink, Object.assign({}, sharedLinkProps), menuItem.name));
   };
 
   var renderCustom = function renderCustom(menuItem, linkOnClick, themeColorObject, layer) {
     var _a;
 
-    return /*#__PURE__*/React__default['default'].createElement(ChildIndentingLi, {
-      layer: layer,
+    return /*#__PURE__*/React__default['default'].createElement("li", {
       key: (_a = menuItem.key) !== null && _a !== void 0 ? _a : menuItem.name
     }, menuItem.render({
       size: "small",
@@ -45228,10 +45218,12 @@
     var _a;
 
     var MenuText = layer === 0 ? TopLevelText : DropdownText;
-    return /*#__PURE__*/React__default['default'].createElement(ChildIndentingLi, {
-      layer: layer,
+    return /*#__PURE__*/React__default['default'].createElement("li", {
       key: (_a = menuItem.key) !== null && _a !== void 0 ? _a : menuItem.name
-    }, /*#__PURE__*/React__default['default'].createElement(MenuText, null, menuItem.name));
+    }, /*#__PURE__*/React__default['default'].createElement(MenuText, {
+      pl: getPaddingLeft(layer),
+      mb: "x1"
+    }, menuItem.name));
   };
 
   var getRenderFunction = function getRenderFunction(menuItem) {
@@ -45259,20 +45251,19 @@
 
   var getSubMenuHeading = function getSubMenuHeading(layer, name) {
     return layer === 0 ? /*#__PURE__*/React__default['default'].createElement(TopLevelText, {
-      as: "h3"
+      as: "h3",
+      mb: "x1"
     }, name) : /*#__PURE__*/React__default['default'].createElement(DropdownText, {
       mb: "x1",
-      style: {
-        paddingLeft: getPaddingLeft(layer)
-      }
+      pl: getPaddingLeft(layer)
     }, name);
   };
 
-  var SubMenu = function SubMenu(_ref6) {
-    var menuItem = _ref6.menuItem,
-        linkOnClick = _ref6.linkOnClick,
-        themeColorObject = _ref6.themeColorObject,
-        layer = _ref6.layer;
+  var SubMenu = function SubMenu(_ref4) {
+    var menuItem = _ref4.menuItem,
+        linkOnClick = _ref4.linkOnClick,
+        themeColorObject = _ref4.themeColorObject,
+        layer = _ref4.layer;
 
     var defaultRender = function defaultRender() {
       return getSubMenuHeading(layer, menuItem.name);
@@ -45287,27 +45278,27 @@
 
   var Menu$1 = styled__default['default'].ul.withConfig({
     displayName: "MobileMenu__Menu",
-    componentId: "sc-18t6zrc-5"
-  })(function (_ref7) {
-    var _ref8;
+    componentId: "sc-18t6zrc-4"
+  })(function (_ref5) {
+    var _ref6;
 
-    var theme = _ref7.theme;
-    return _ref8 = {
+    var theme = _ref5.theme;
+    return _ref6 = {
       listStyle: "none",
       margin: "0",
       padding: theme.space.x1 + " 0",
       zIndex: theme.zIndices.content,
       width: "100%",
       color: theme.colors.white
-    }, _ref8["" + Heading3] = {
+    }, _ref6["" + Heading3] = {
       padding: theme.space.x1 + " 0 " + theme.space.x1 + " " + theme.space.x3
-    }, _ref8;
+    }, _ref6;
   });
   var Nav = styled__default['default'].nav.withConfig({
     displayName: "MobileMenu__Nav",
-    componentId: "sc-18t6zrc-6"
-  })(function (_ref9) {
-    var backgroundColor = _ref9.backgroundColor;
+    componentId: "sc-18t6zrc-5"
+  })(function (_ref7) {
+    var backgroundColor = _ref7.backgroundColor;
     return {
       backgroundColor: backgroundColor
     };
@@ -45345,7 +45336,7 @@
 
   var MobileMenu = styled__default['default'](BaseMobileMenu).withConfig({
     displayName: "MobileMenu",
-    componentId: "sc-18t6zrc-7"
+    componentId: "sc-18t6zrc-6"
   })(display);
 
   var borderStyle = "1px solid #e4e7eb";

package/dist/main.module.js

@@ -16417,15 +16417,23 @@ var resetButtonStyles = {
   border: "none"
 };
 
+function getColorFromProps(props) {
+  return themeGet("colors." + props.color, props.color)(props);
+}
+
+function getColor(props) {
+  return getColorFromProps(props) || props.theme.colors.blue;
+}
+
 var getHoverColor = function getHoverColor(props) {
-  return props.hover ? props.color : curriedDarken("0.1", themeGet("colors." + props.color, props.color)(props));
+  return props.hover ? getColor(props) : curriedDarken("0.1", getColor(props));
 };
 
 var Link = styled.a.withConfig({
   shouldForwardProp: function shouldForwardProp(prop, defaultValidatorFn) {
     return !["underline", "hover"].includes(prop) && defaultValidatorFn(prop);
   }
-})(color, space, typography, function (_a) {
+})(function (_a) {
   var underline = _a.underline,
       as = _a.as,
       props = __rest(_a, ["underline", "as"]);
@@ -16433,17 +16441,16 @@ var Link = styled.a.withConfig({
   return Object.assign(Object.assign({}, resetButtonStyles), {
     padding: as === "button" ? "0" : undefined,
     textDecoration: underline ? "underline" : "none",
+    fontSize: props.theme.fontSizes.medium,
+    color: getColor(props),
     "&:hover": {
       cursor: "pointer",
       color: getHoverColor(props)
     }
   });
-});
+}, addStyledProps);
 Link.defaultProps = {
-  className: undefined,
-  underline: true,
-  fontSize: "medium",
-  color: "blue"
+  underline: true
 };
 
 var ListItem = styled.li.withConfig({
@@ -45086,9 +45093,7 @@ var getSharedStyles = function getSharedStyles(theme) {
     fontSize: theme.fontSizes.large,
     fontWeight: theme.fontWeights.medium,
     lineHeight: theme.lineHeights.heading3,
-    marginBottom: theme.space.x1,
-    padding: theme.space.x1 + " " + theme.space.x3,
-    paddingLeft: getPaddingLeft(0)
+    padding: theme.space.x1 + " " + theme.space.x3
   };
 };
 
@@ -45118,7 +45123,7 @@ var TopLevelLink = styled(Link).withConfig({
       opacity: ".5"
     }
   });
-});
+}, addStyledProps);
 var TopLevelText = styled(Text).withConfig({
   displayName: "MobileMenu__TopLevelText",
   componentId: "sc-18t6zrc-2"
@@ -45127,27 +45132,10 @@ var TopLevelText = styled(Text).withConfig({
   return Object.assign(Object.assign({}, getSharedStyles(theme)), {
     color: theme.colors.blackBlue
   });
-});
-var ChildIndentingLi = styled.li.withConfig({
-  displayName: "MobileMenu__ChildIndentingLi",
-  componentId: "sc-18t6zrc-3"
-})(function (_ref4) {
-  var _ref5;
-
-  var layer = _ref4.layer,
-      theme = _ref4.theme;
-  return _ref5 = {
-    marginBottom: theme.space.x1
-  }, _ref5["> " + DropdownButton + ", > " + DropdownLink] = {
-    // eslint-disable-next-line no-mixed-operators
-    paddingLeft: 24 * layer + 20 + "px"
-  }, _ref5["> " + DropdownText] = {
-    paddingLeft: getPaddingLeft(layer)
-  }, _ref5;
-});
+}, addStyledProps);
 var SubMenuItemsList = styled.ul.withConfig({
   displayName: "MobileMenu__SubMenuItemsList",
-  componentId: "sc-18t6zrc-4"
+  componentId: "sc-18t6zrc-3"
 })({
   listStyle: "none",
   paddingLeft: "0",
@@ -45157,23 +45145,25 @@ var SubMenuItemsList = styled.ul.withConfig({
 var renderMenuLink = function renderMenuLink(menuItem, linkOnClick, themeColorObject, layer) {
   var _a;
 
-  var MenuLink = layer === 0 ? TopLevelLink : DropdownLink;
-  return /*#__PURE__*/React__default.createElement(ChildIndentingLi, {
-    layer: layer,
-    key: (_a = menuItem.key) !== null && _a !== void 0 ? _a : menuItem.name
-  }, /*#__PURE__*/React__default.createElement(MenuLink, {
+  var sharedLinkProps = {
     onClick: linkOnClick,
     href: menuItem.href,
     as: menuItem.as,
-    to: menuItem.to
-  }, menuItem.name));
+    to: menuItem.to,
+    // eslint-disable-next-line no-mixed-operators
+    pl: layer === 0 ? getPaddingLeft(layer) : 24 * layer + 20 + "px",
+    mb: "x1"
+  };
+  var MenuLink = layer === 0 ? TopLevelLink : DropdownLink;
+  return /*#__PURE__*/React__default.createElement("li", {
+    key: (_a = menuItem.key) !== null && _a !== void 0 ? _a : menuItem.name
+  }, /*#__PURE__*/React__default.createElement(MenuLink, Object.assign({}, sharedLinkProps), menuItem.name));
 };
 
 var renderCustom = function renderCustom(menuItem, linkOnClick, themeColorObject, layer) {
   var _a;
 
-  return /*#__PURE__*/React__default.createElement(ChildIndentingLi, {
-    layer: layer,
+  return /*#__PURE__*/React__default.createElement("li", {
     key: (_a = menuItem.key) !== null && _a !== void 0 ? _a : menuItem.name
   }, menuItem.render({
     size: "small",
@@ -45202,10 +45192,12 @@ var renderText = function renderText(menuItem, linkOnClick, themeColorObject, la
   var _a;
 
   var MenuText = layer === 0 ? TopLevelText : DropdownText;
-  return /*#__PURE__*/React__default.createElement(ChildIndentingLi, {
-    layer: layer,
+  return /*#__PURE__*/React__default.createElement("li", {
     key: (_a = menuItem.key) !== null && _a !== void 0 ? _a : menuItem.name
-  }, /*#__PURE__*/React__default.createElement(MenuText, null, menuItem.name));
+  }, /*#__PURE__*/React__default.createElement(MenuText, {
+    pl: getPaddingLeft(layer),
+    mb: "x1"
+  }, menuItem.name));
 };
 
 var getRenderFunction = function getRenderFunction(menuItem) {
@@ -45233,20 +45225,19 @@ var renderTopLayerMenuItems = function renderTopLayerMenuItems(menuData, linkOnC
 
 var getSubMenuHeading = function getSubMenuHeading(layer, name) {
   return layer === 0 ? /*#__PURE__*/React__default.createElement(TopLevelText, {
-    as: "h3"
+    as: "h3",
+    mb: "x1"
   }, name) : /*#__PURE__*/React__default.createElement(DropdownText, {
     mb: "x1",
-    style: {
-      paddingLeft: getPaddingLeft(layer)
-    }
+    pl: getPaddingLeft(layer)
   }, name);
 };
 
-var SubMenu = function SubMenu(_ref6) {
-  var menuItem = _ref6.menuItem,
-      linkOnClick = _ref6.linkOnClick,
-      themeColorObject = _ref6.themeColorObject,
-      layer = _ref6.layer;
+var SubMenu = function SubMenu(_ref4) {
+  var menuItem = _ref4.menuItem,
+      linkOnClick = _ref4.linkOnClick,
+      themeColorObject = _ref4.themeColorObject,
+      layer = _ref4.layer;
 
   var defaultRender = function defaultRender() {
     return getSubMenuHeading(layer, menuItem.name);
@@ -45261,27 +45252,27 @@ var SubMenu = function SubMenu(_ref6) {
 
 var Menu$1 = styled.ul.withConfig({
   displayName: "MobileMenu__Menu",
-  componentId: "sc-18t6zrc-5"
-})(function (_ref7) {
-  var _ref8;
+  componentId: "sc-18t6zrc-4"
+})(function (_ref5) {
+  var _ref6;
 
-  var theme = _ref7.theme;
-  return _ref8 = {
+  var theme = _ref5.theme;
+  return _ref6 = {
     listStyle: "none",
     margin: "0",
     padding: theme.space.x1 + " 0",
     zIndex: theme.zIndices.content,
     width: "100%",
     color: theme.colors.white
-  }, _ref8["" + Heading3] = {
+  }, _ref6["" + Heading3] = {
     padding: theme.space.x1 + " 0 " + theme.space.x1 + " " + theme.space.x3
-  }, _ref8;
+  }, _ref6;
 });
 var Nav = styled.nav.withConfig({
   displayName: "MobileMenu__Nav",
-  componentId: "sc-18t6zrc-6"
-})(function (_ref9) {
-  var backgroundColor = _ref9.backgroundColor;
+  componentId: "sc-18t6zrc-5"
+})(function (_ref7) {
+  var backgroundColor = _ref7.backgroundColor;
   return {
     backgroundColor: backgroundColor
   };
@@ -45319,7 +45310,7 @@ var BaseMobileMenu = function BaseMobileMenu(_a) {
 
 var MobileMenu = styled(BaseMobileMenu).withConfig({
   displayName: "MobileMenu",
-  componentId: "sc-18t6zrc-7"
+  componentId: "sc-18t6zrc-6"
 })(display);
 
 var borderStyle = "1px solid #e4e7eb";

package/dist/src/Alert/CloseButton.d.ts

@@ -3,5 +3,5 @@ declare type CloseButtonProps = {
     onClick: any;
     "aria-label": string;
 };
-declare const CloseButton: ({ onClick, "aria-label": ariaLabel, }: CloseButtonProps) => JSX.Element;
+declare const CloseButton: ({ onClick, "aria-label": ariaLabel }: CloseButtonProps) => JSX.Element;
 export default CloseButton;

package/dist/src/BrandedNavBar/NulogyLogoContainer.d.ts

@@ -3,5 +3,5 @@ declare type NulogyLogoContainerProps = {
     subText?: string;
     height?: string;
 };
-export declare const NulogyLogoContainer: ({ subText, height, }: NulogyLogoContainerProps) => JSX.Element;
+export declare const NulogyLogoContainer: ({ subText, height }: NulogyLogoContainerProps) => JSX.Element;
 export {};

package/dist/src/Link/Link.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="react" />
-import { ColorProps, SpaceProps, LayoutProps, TypographyProps } from "styled-system";
 import { DefaultNDSThemeType } from "../theme.type";
-export declare type LinkProps = React.ComponentPropsWithRef<"a"> & ColorProps & SpaceProps & LayoutProps & TypographyProps & {
+import { StyledProps } from "../StyledProps";
+export declare type LinkProps = React.ComponentPropsWithRef<"a"> & StyledProps & {
     className?: string;
     underline?: boolean;
     hover?: string;

package/dist/src/NDSProvider/NDSProvider.d.ts

@@ -6,5 +6,5 @@ declare type NDSProviderProps = {
     disableGlobalStyles?: boolean;
     children?: any;
 };
-declare const NDSProvider: ({ theme, children, disableGlobalStyles, locale, }: NDSProviderProps) => JSX.Element;
+declare const NDSProvider: ({ theme, children, disableGlobalStyles, locale }: NDSProviderProps) => JSX.Element;
 export default NDSProvider;

package/dist/src/Pagination/PreviousButton.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="react" />
 import PropTypes from "prop-types";
 declare const PreviousButton: {
-    ({ disabled, onClick, label, "aria-label": ariaLabel, }: any): JSX.Element;
+    ({ disabled, onClick, label, "aria-label": ariaLabel }: any): JSX.Element;
     propTypes: {
         disabled: PropTypes.Requireable<boolean>;
         onClick: PropTypes.Requireable<(...args: any[]) => any>;

package/dist/src/Select/customReactSelectStyles.d.ts

@@ -1,9 +1,9 @@
-export declare const showIndicatorSeparator: ({ isMulti, hasValue, hasDefaultOptions, }: {
+export declare const showIndicatorSeparator: ({ isMulti, hasValue, hasDefaultOptions }: {
     isMulti: any;
     hasValue: any;
     hasDefaultOptions: any;
 }) => any;
-declare const customStyles: ({ theme, error, maxHeight, windowed, hasDefaultOptions, }: {
+declare const customStyles: ({ theme, error, maxHeight, windowed, hasDefaultOptions }: {
     theme: any;
     error: any;
     maxHeight: any;

package/dist/src/Table/SortingColumnHeader.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="react" />
 import PropTypes from "prop-types";
 declare const SortingColumnHeader: {
-    ({ onChange, label, ascending, active, ariaLabel, }: {
+    ({ onChange, label, ascending, active, ariaLabel }: {
         onChange: any;
         label: any;
         ascending: any;

package/dist/src/Table/Table.d.ts

@@ -8,7 +8,7 @@ export declare type TableCellInfoType = CellInfoType;
 declare const Table: {
     ({ hasSelectableRows, rowsPerPage, hasExpandableRows, selectedRows, onRowSelectionChange, onRowExpansionChange, onPageChange, selectAllAriaLabel, deselectAllAriaLabel, paginationCss, paginationProps, ...props }: TableProps): JSX.Element;
     SortingHeader: {
-        ({ onChange, label, ascending, active, ariaLabel, }: {
+        ({ onChange, label, ascending, active, ariaLabel }: {
             onChange: any;
             label: any;
             ascending: any;

package/dist/src/TimePicker/TimePicker.d.ts

@@ -22,7 +22,7 @@ declare type TimePickerProps = SpaceProps & {
     onClick?: (...args: any[]) => any;
 };
 export declare const convertTo24HourTimeArray: (timeInput: any) => any;
-export declare const getBestMatchTime: ({ time, timeFormat, minTime, maxTime, locale, }: {
+export declare const getBestMatchTime: ({ time, timeFormat, minTime, maxTime, locale }: {
     time: any;
     timeFormat: any;
     minTime: any;

package/dist/src/index.d.ts

@@ -5,13 +5,13 @@ export { Box, AnimatedBox } from "./Box";
 export { Flex } from "./Flex";
 export { Icon, InlineIcon } from "./Icon";
 export { Text, Heading1, Heading2, Heading3, Heading4 } from "./Type";
-export { Button, PrimaryButton, DangerButton, QuietButton, IconicButton, ControlIcon, } from "./Button";
+export { Button, PrimaryButton, DangerButton, QuietButton, IconicButton, ControlIcon } from "./Button";
 export { ButtonGroup } from "./ButtonGroup";
 export { Link } from "./Link";
 export { InlineValidation } from "./Validation";
 export { Alert } from "./Alert";
 export { Branding } from "./Branding";
-export { DropdownMenu, DropdownLink, DropdownButton, DropdownItem, DropdownText, } from "./DropdownMenu";
+export { DropdownMenu, DropdownLink, DropdownButton, DropdownItem, DropdownText } from "./DropdownMenu";
 export { HelpText, RequirementText, FieldLabel } from "./FieldLabel";
 export { Input } from "./Input";
 export { NavBar } from "./NavBar";
@@ -28,7 +28,7 @@ export { Modal } from "./Modal";
 export { Tab, Tabs } from "./Tabs";
 export { Switch, Switcher } from "./Switcher";
 export { Table } from "./Table";
-export type { TableProps, TableColumnType, TableRowType, TableCellInfoType, } from "./Table";
+export type { TableProps, TableColumnType, TableRowType, TableCellInfoType } from "./Table";
 export { StatusIndicator } from "./StatusIndicator";
 export { Pagination } from "./Pagination";
 export { DatePicker } from "./DatePicker";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nulogy/components",
-  "version": "7.1.0",
+  "version": "7.2.0",
   "description": "Component library for the Nulogy Design System - http://nulogy.design",
   "private": false,
   "publishConfig": {