carbon-react 114.14.0 → 114.14.1

package/esm/components/link/link.component.js

@@ -1,8 +1,9 @@
 function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
-import React, { useMemo } from "react";
+import React, { useContext, useMemo } from "react";
 import PropTypes from "prop-types";
 import Icon from "../icon";
+import MenuContext from "../menu/menu.context";
 import Event from "../../__internal__/utils/helpers/events";
 import { StyledLink, StyledContent } from "./link.style";
 import tagComponent from "../../__internal__/utils/helpers/tags/tags";
@@ -29,6 +30,9 @@ const Link = /*#__PURE__*/React.forwardRef(({
   ...rest
 }, ref) => {
   const l = useLocale();
+  const {
+    inMenu
+  } = useContext(MenuContext);
 
   const handleOnKeyDown = ev => {
     if (onKeyDown) {
@@ -99,7 +103,8 @@ const Link = /*#__PURE__*/React.forwardRef(({
     iconAlign: iconAlign,
     hasContent: Boolean(children),
     variant: variant,
-    isDarkBackground: isDarkBackground
+    isDarkBackground: isDarkBackground,
+    isMenuItem: inMenu
   }, tagComponent("link", rest), isSkipLink && {
     "data-element": "skip-link"
   }), createLinkBasedOnType());

package/esm/components/link/link.style.d.ts

@@ -13,6 +13,7 @@ export interface StyledLinkProps {
 }
 interface PrivateStyledLinkProps {
     hasContent: boolean;
+    isMenuItem?: boolean;
 }
 declare const StyledLink: import("styled-components").StyledComponent<"span", any, StyledLinkProps & PrivateStyledLinkProps, never>;
 declare const StyledContent: import("styled-components").StyledComponent<"span", any, {}, never>;

package/esm/components/link/link.style.js

@@ -45,7 +45,8 @@ const StyledLink = styled.span`
   hasContent,
   disabled,
   variant,
-  isDarkBackground
+  isDarkBackground,
+  isMenuItem
 }) => {
   const colorMapKey = isDarkBackground ? "dark" : "light";
   const {
@@ -54,8 +55,6 @@ const StyledLink = styled.span`
     disabledColor
   } = colorMap[colorMapKey](variant);
   return css`
-      display: inline-block;
-
       ${isSkipLink && css`
         a {
           position: absolute;
@@ -126,7 +125,7 @@ const StyledLink = styled.span`
       a,
       button {
         text-decoration: underline;
-        display: inline-block;
+        ${isMenuItem && "display: inline-block;"}
 
         ${StyledIcon} {
           display: inline-block;

package/lib/components/link/link.component.js

@@ -11,6 +11,8 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _icon = _interopRequireDefault(require("../icon"));
 
+var _menu = _interopRequireDefault(require("../menu/menu.context"));
+
 var _events = _interopRequireDefault(require("../../__internal__/utils/helpers/events"));
 
 var _link = require("./link.style");
@@ -49,6 +51,9 @@ const Link = /*#__PURE__*/_react.default.forwardRef(({
   ...rest
 }, ref) => {
   const l = (0, _useLocale.default)();
+  const {
+    inMenu
+  } = (0, _react.useContext)(_menu.default);
 
   const handleOnKeyDown = ev => {
     if (onKeyDown) {
@@ -119,7 +124,8 @@ const Link = /*#__PURE__*/_react.default.forwardRef(({
     iconAlign: iconAlign,
     hasContent: Boolean(children),
     variant: variant,
-    isDarkBackground: isDarkBackground
+    isDarkBackground: isDarkBackground,
+    isMenuItem: inMenu
   }, (0, _tags.default)("link", rest), isSkipLink && {
     "data-element": "skip-link"
   }), createLinkBasedOnType());

package/lib/components/link/link.style.d.ts

@@ -13,6 +13,7 @@ export interface StyledLinkProps {
 }
 interface PrivateStyledLinkProps {
     hasContent: boolean;
+    isMenuItem?: boolean;
 }
 declare const StyledLink: import("styled-components").StyledComponent<"span", any, StyledLinkProps & PrivateStyledLinkProps, never>;
 declare const StyledContent: import("styled-components").StyledComponent<"span", any, {}, never>;

package/lib/components/link/link.style.js

@@ -61,7 +61,8 @@ const StyledLink = _styledComponents.default.span`
   hasContent,
   disabled,
   variant,
-  isDarkBackground
+  isDarkBackground,
+  isMenuItem
 }) => {
   const colorMapKey = isDarkBackground ? "dark" : "light";
   const {
@@ -70,8 +71,6 @@ const StyledLink = _styledComponents.default.span`
     disabledColor
   } = colorMap[colorMapKey](variant);
   return (0, _styledComponents.css)`
-      display: inline-block;
-
       ${isSkipLink && (0, _styledComponents.css)`
         a {
           position: absolute;
@@ -142,7 +141,7 @@ const StyledLink = _styledComponents.default.span`
       a,
       button {
         text-decoration: underline;
-        display: inline-block;
+        ${isMenuItem && "display: inline-block;"}
 
         ${_icon.default} {
           display: inline-block;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "carbon-react",
-  "version": "114.14.0",
+  "version": "114.14.1",
   "description": "A library of reusable React components for easily building user interfaces.",
   "files": [
     "lib",