carbon-react 144.22.1 → 146.0.0

package/lib/components/drawer/drawer.style.js

@@ -169,9 +169,6 @@ const StyledDrawerContent = exports.StyledDrawerContent = _styledComponents.defa
     }
   }
 `;
-const oldFocusStyling = `
-  outline: solid 3px var(--colorsSemanticFocus500);
-`;
 const StyledSidebarToggleButton = exports.StyledSidebarToggleButton = _styledComponents.default.button.attrs({
   type: "button"
 })`
@@ -195,13 +192,9 @@ const StyledSidebarToggleButton = exports.StyledSidebarToggleButton = _styledCom
     animation: ${buttonClose} ${animationDuration} ease-in-out;
     border-radius: var(--borderRadius050);
 
-    ${({
-  theme
-}) => `
-      &:focus {
-        ${!theme.focusRedesignOptOut ? (0, _addFocusStyling.default)() : /* istanbul ignore next */oldFocusStyling}
-      }
-    `}
+    &:focus {
+      ${(0, _addFocusStyling.default)()}
+    }
 
     &:hover {
       cursor: pointer;

package/lib/components/flat-table/flat-table-row/flat-table-row.style.js

@@ -21,13 +21,6 @@ const horizontalBorderSizes = {
   medium: "2px",
   large: "4px"
 };
-const oldFocusStyling = `
-  border: 2px solid var(--colorsSemanticFocus500);
-`;
-const firstColumnOldFocusStyling = `
-  outline: 2px solid var(--colorsSemanticFocus500);
-  outline-offset: -1px;
-`;
 const newFocusStyling = theme => {
   return `
     ${(0, _addFocusStyling.default)(true)}
@@ -48,11 +41,7 @@ themeOptOut && /* istanbul ignore next */
       border-right: 2px solid var(--colorsSemanticFocus500);
     }
   `;
-const stickyColumnFocusStyling = theme => {
-  /* istanbul ignore else */
-  if (!theme.focusRedesignOptOut) return ``;
-  /* istanbul ignore next */
-  return `
+const stickyColumnFocusStyling = theme => `
       width: calc(100% + 1px);
       z-index: ${theme.zIndex.overlay};
       :before {
@@ -69,7 +58,6 @@ const stickyColumnFocusStyling = theme => {
       }
     }
   `;
-};
 const borderColor = colorTheme => {
   switch (colorTheme) {
     case "light":
@@ -212,7 +200,7 @@ const StyledFlatTableRow = _styledComponents.default.tr`
             right: 0px;
             top: 0;
             bottom: 0px;
-            ${!theme.focusRedesignOptOut ? newFocusStyling(theme) : /* istanbul ignore next */oldFocusStyling}
+            ${newFocusStyling(theme)}
             pointer-events: none;
           }
 
@@ -231,37 +219,12 @@ const StyledFlatTableRow = _styledComponents.default.tr`
 
           /* Styling for safari. Position relative does not work on tr elements on Safari  */
           ${(0, _browserTypeCheck.isSafari)(navigator) && (0, _styledComponents.css)`
-            ${theme.focusRedesignOptOut && /* istanbul ignore next */
-  (0, _styledComponents.css)`
-              outline: 2px solid var(--colorsSemanticFocus500);
-              outline-offset: -2px;
-              position: static;
-
-              :after {
-                content: none;
-                border: none;
-              }
-            `}
-            ${!theme.focusRedesignOptOut && /* istanbul ignore next */
-  (0, _styledComponents.css)`
-              position: -webkit-sticky;
-              :after {
-                border: none;
-                content: "";
-                height: ${rowHeight}px;
-                ${newFocusStyling(theme)}
-              }
-            `}
-          `}
-
-          ${theme.focusRedesignOptOut && /* istanbul ignore next */
-  (0, _styledComponents.css)`
-            td:first-of-type:not(:nth-child(${lhsRowHeaderIndex + 2}))::before {
-              border-left: 3px solid var(--colorsSemanticFocus500);
-            }
-
-            td:last-of-type:not(:nth-child(${rhsRowHeaderIndex})) {
-              border-right: 2px solid var(--colorsSemanticFocus500);
+            position: -webkit-sticky;
+            :after {
+              border: none;
+              content: "";
+              height: ${rowHeight}px;
+              ${newFocusStyling(theme)}
             }
           `}
 
@@ -297,7 +260,7 @@ const StyledFlatTableRow = _styledComponents.default.tr`
           cursor: pointer;
 
           :focus {
-            ${!theme.focusRedesignOptOut ? newFocusStyling(theme) : /* istanbul ignore next */firstColumnOldFocusStyling}
+            ${newFocusStyling(theme)}
           }
 
           :hover {

package/lib/components/flat-table/flat-table.style.js

@@ -22,9 +22,6 @@ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e;
 const HEADER_OVERLAY_INCREMENT = 3;
 const STICKY_FOOTER_OVERLAY_INCREMENT = 1;
 const ROW_HEADER_OVERLAY_INCREMENT = 5;
-const oldFocusStyling = `
-  outline: 2px solid var(--colorsSemanticFocus500);
-`;
 const StyledTableContainer = exports.StyledTableContainer = _styledComponents.default.div`
   ${({
   width,
@@ -134,22 +131,15 @@ const StyledFlatTableWrapper = exports.StyledFlatTableWrapper = (0, _styledCompo
 
   ${({
   isInSidebar,
-  theme,
   isFocused
 }) => (0, _styledComponents.css)`
     box-sizing: border-box;
 
-    /* istanbul ignore next */
-    ${theme.focusRedesignOptOut && isFocused && /* istanbul ignore next */
-(0, _styledComponents.css)`
-      ${oldFocusStyling}
-    `}
-
-    ${!theme.focusRedesignOptOut && isFocused && (0, _styledComponents.css)`
+    ${isFocused && (0, _styledComponents.css)`
       ${(0, _addFocusStyling.default)()}
     `}
 
-      ${isInSidebar ? "min-width: fit-content;" : ""}
+    ${isInSidebar ? "min-width: fit-content;" : ""}
   `}
 
   ${({

package/lib/components/flat-table/sort/sort.style.js

@@ -9,9 +9,6 @@ var _icon = _interopRequireDefault(require("../../icon"));
 var _addFocusStyling = _interopRequireDefault(require("../../../style/utils/add-focus-styling"));
 var _base = _interopRequireDefault(require("../../../style/themes/base"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-const oldFocusStyling = `
-  outline: solid 1px var(--colorsSemanticFocus500);
-`;
 const StyledSort = exports.StyledSort = _styledComponents.default.div`
   display: inline-flex;
   align-items: center;
@@ -26,9 +23,7 @@ const StyledSort = exports.StyledSort = _styledComponents.default.div`
   }
 
   :focus {
-    ${({
-  theme
-}) => `${!theme.focusRedesignOptOut ? (0, _addFocusStyling.default)() : /* istanbul ignore next */oldFocusStyling}`}
+    ${(0, _addFocusStyling.default)()}
     border-radius: var(--borderRadius025);
   }
 `;

package/lib/components/heading/heading.style.js

@@ -28,7 +28,6 @@ const StyledHeaderContent = exports.StyledHeaderContent = _styledComponents.defa
   display: inline-flex;
   align-items: flex-end;
 `;
-const oldFocusStyling = "outline: 3px solid var(--colorsSemanticFocus500);";
 const StyledHeader = exports.StyledHeader = _styledComponents.default.div`
   ${({
   divider,
@@ -65,9 +64,7 @@ const StyledHeadingBackButton = exports.StyledHeadingBackButton = (0, _styledCom
 
     &:focus {
       background-color: transparent;
-      ${({
-  theme
-}) => !theme.focusRedesignOptOut ? (0, _addFocusStyling.default)() : oldFocusStyling}
+      ${(0, _addFocusStyling.default)()}
     }
 
     &:hover {

package/lib/components/help/help.style.js

@@ -12,9 +12,6 @@ var _addFocusStyling = _interopRequireDefault(require("../../style/utils/add-foc
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
-const oldFocusStyling = `
-  outline: solid 2px var(--colorsSemanticFocus500);
-`;
 const StyledHelp = _styledComponents.default.div`
   background: none;
   cursor: default;
@@ -46,9 +43,7 @@ const StyledHelp = _styledComponents.default.div`
 
   &:focus ${_icon.default} {
     border-radius: var(--borderRadius050);
-    ${({
-  theme
-}) => `${!theme.focusRedesignOptOut ? (0, _addFocusStyling.default)() : /* istanbul ignore next */oldFocusStyling}`}
+    ${(0, _addFocusStyling.default)()}
   }
 
   ${_styledSystem.margin}

package/lib/components/icon/icon.style.js

@@ -41,7 +41,6 @@ function adjustIconBgSize(fontSize, bgSize) {
   /* istanbul ignore next */
   return bgSize ? _iconConfig.default.backgroundSize[bgSize] : undefined;
 }
-const oldFocusStyling = "outline: 2px solid var(--colorsSemanticFocus500);";
 const StyledIcon = _styledComponents.default.span`
   ${({
   theme,
@@ -141,7 +140,7 @@ const StyledIcon = _styledComponents.default.span`
 
       ${hasTooltip && `
         :focus {
-          ${!theme.focusRedesignOptOut ? (0, _addFocusStyling.default)() : oldFocusStyling}
+        ${(0, _addFocusStyling.default)()}
         }
       `}
 

package/lib/components/icon-button/icon-button.style.js

@@ -12,11 +12,6 @@ var _addFocusStyling = _interopRequireDefault(require("../../style/utils/add-foc
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
-const oldFocusStyling = `
-  background-color: transparent;
-  outline: solid 3px var(--colorsSemanticFocus500);
-  z-index: 1;
-`;
 const StyledIconButton = _styledComponents.default.button.attrs({
   type: "button"
 })`
@@ -31,9 +26,7 @@ const StyledIconButton = _styledComponents.default.button.attrs({
     border-radius: var(--borderRadius050);
 
     &:focus {
-      ${({
-  theme
-}) => `${!theme.focusRedesignOptOut ? (0, _addFocusStyling.default)() : /* istanbul ignore next */oldFocusStyling}`}
+      ${(0, _addFocusStyling.default)()}
     }
 
     &:hover {

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

@@ -177,7 +177,7 @@ const StyledLink = exports.StyledLink = _styledComponents.default.span`
         `}
       }
 
-      ${!isSkipLink && !disabled && !theme.focusRedesignOptOut && hasFocus && (0, _styledComponents.css)`
+      ${!isSkipLink && !disabled && hasFocus && (0, _styledComponents.css)`
         > a,
         > button {
           outline: none;

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

@@ -11,10 +11,6 @@ var _base = _interopRequireDefault(require("../../style/themes/base"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
-const oldFocusStyling = `
-  outline: solid 2px var(--colorsSemanticFocus500);
-  outline-offset: -1px;
-`;
 const StyledLinkPreview = exports.StyledLinkPreview = _styledComponents.default.a`
   display: flex;
   margin: 8px;
@@ -31,9 +27,7 @@ const StyledLinkPreview = exports.StyledLinkPreview = _styledComponents.default.
 
     ${as !== "div" && (0, _styledComponents.css)`
       :focus {
-        ${({
-  theme
-}) => `${!theme.focusRedesignOptOut ? (0, _addFocusStyling.default)() : /* istanbul ignore next */oldFocusStyling}`}
+        ${(0, _addFocusStyling.default)()}
       }
 
       :hover {

package/lib/components/loader/loader-square.style.js

@@ -19,7 +19,7 @@ const loaderAnimation = (0, _styledComponents.keyframes)`
     transform: scale(1);
   }
 `;
-const getDimensions = (size, roundedCornersOptOut) => {
+const getDimensions = size => {
   let width;
   let marginRight;
   switch (size) {
@@ -39,7 +39,6 @@ const getDimensions = (size, roundedCornersOptOut) => {
     width: ${width};
     height: ${width};
     margin-right: ${marginRight};
-    ${!roundedCornersOptOut && "border-radius: var(--borderRadiusCircle);"}
   `;
 };
 const StyledLoaderSquare = _styledComponents.default.div`
@@ -47,13 +46,13 @@ const StyledLoaderSquare = _styledComponents.default.div`
   size,
   isInsideButton,
   isActive,
-  theme,
   backgroundColor
 }) => (0, _styledComponents.css)`
     animation: ${loaderAnimation} 1s infinite ease-in-out both;
     background-color: ${backgroundColor};
     display: inline-block;
-    ${getDimensions(size, theme.roundedCornersOptOut)}
+    ${getDimensions(size)}
+    border-radius: var(--borderRadiusCircle);
 
     ${isInsideButton && (0, _styledComponents.css)`
       background-color: ${isActive ? "var(--colorsUtilityYang100)" : "var(--colorsSemanticNeutral500)"};

package/lib/components/menu/menu-full-screen/menu-full-screen.style.js

@@ -17,10 +17,6 @@ var _link = require("../../link/link.style");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
-const oldFocusStyling = `
-outline: solid 3px var(--colorsSemanticFocus500);
-box-shadow: none;
-`;
 const StyledMenuFullscreen = exports.StyledMenuFullscreen = _styledComponents.default.div`
   position: fixed;
   top: 0;
@@ -77,8 +73,7 @@ const StyledMenuModal = exports.StyledMenuModal = _styledComponents.default.div`
   }
 
   ${({
-  menuType,
-  theme
+  menuType
 }) => (0, _styledComponents.css)`
     background-color: ${_menu.default[menuType].background};
 
@@ -98,7 +93,7 @@ const StyledMenuModal = exports.StyledMenuModal = _styledComponents.default.div`
             border-bottom-right-radius: var(--borderRadius050);
             border-top-right-radius: var(--borderRadius050);
 
-            ${!theme.focusRedesignOptOut ? (0, _addFocusStyling.default)() : /* istanbul ignore next */oldFocusStyling}
+            ${(0, _addFocusStyling.default)()}
           }
         }
       }

package/lib/components/menu/menu-item/menu-item.style.js

@@ -83,9 +83,6 @@ const parsePadding = props => {
       };
   }
 };
-const oldFocusStyling = `
-  box-shadow: inset 0 0 0 var(--borderWidth300) var(--colorsSemanticFocus500);
-`;
 const StyledMenuItemWrapper = _styledComponents.default.a.attrs({
   as: _link.default
 })`
@@ -124,10 +121,7 @@ const StyledMenuItemWrapper = _styledComponents.default.a.attrs({
 
     a:focus,
     button:focus {
-      ${({
-  theme
-}) => `${!theme.focusRedesignOptOut ? (0, _addFocusStyling.default)(true) : /* istanbul ignore next */oldFocusStyling}
-      `}
+      ${(0, _addFocusStyling.default)(true)}
     }
 
     :has([data-element="input"]) ${_link2.StyledContent} {

package/lib/components/multi-action-button/multi-action-button.style.js

@@ -42,10 +42,7 @@ const StyledMultiActionButton = exports.StyledMultiActionButton = _styledCompone
 
     &:focus {
       background-color: var(--colorsActionMajor700);
-      border: 3px solid
-        ${({
-  theme
-}) => !theme.focusRedesignOptOut ? "var(--colorsActionMajor700)" : /* istanbul ignore next */"var(--colorsSemanticFocus500)"};
+      border: 3px solid var(--colorsActionMajor700);
       outline: none;
       margin: 0 -1px;
 
@@ -67,12 +64,6 @@ const StyledMultiActionButton = exports.StyledMultiActionButton = _styledCompone
         }
 
         &:focus {
-          ${({
-  theme
-}) => /* istanbul ignore next */
-theme.focusRedesignOptOut && (0, _styledComponents.css)`
-              border-color: var(--colorsSemanticFocus500);
-            `}
           margin: 0 -1px;
         }
       `}

package/lib/components/pill/pill.style.js

@@ -67,9 +67,7 @@ const StyledPill = _styledComponents.default.span`
       align-items: center;
       justify-content: center;
       border: 2px solid ${pillColor};
-      ${!theme.roundedCornersOptOut && (0, _styledComponents.css)`
-        border-radius: var(--borderRadius025);
-      `}
+      border-radius: var(--borderRadius025);
       height: auto;
 
       ${!wrapText && (0, _styledComponents.css)`
@@ -96,10 +94,6 @@ const StyledPill = _styledComponents.default.span`
         line-height: 16px;
         font-size: 12px;
         padding: 0 8px;
-
-        ${theme.roundedCornersOptOut && (0, _styledComponents.css)`
-          border-radius: 12px;
-        `}
       `}
 
       ${size === "M" && (0, _styledComponents.css)`
@@ -107,10 +101,6 @@ const StyledPill = _styledComponents.default.span`
         line-height: 20px;
         font-size: 14px;
         padding: 0 8px;
-
-        ${theme.roundedCornersOptOut && (0, _styledComponents.css)`
-          border-radius: 12px;
-        `}
       `}
 
       ${size === "L" && (0, _styledComponents.css)`
@@ -118,10 +108,6 @@ const StyledPill = _styledComponents.default.span`
         line-height: 24px;
         font-size: 14px;
         padding: 0 8px;
-
-        ${theme.roundedCornersOptOut && (0, _styledComponents.css)`
-          border-radius: 13px;
-        `}
       `}
 
       ${size === "XL" && (0, _styledComponents.css)`
@@ -129,18 +115,12 @@ const StyledPill = _styledComponents.default.span`
         line-height: 28px;
         font-size: 16px;
         padding: 0 12px;
-
-        ${theme.roundedCornersOptOut && (0, _styledComponents.css)`
-          border-radius: 15px;
-        `}
       `}
 
       ${isDeletable && (0, _styledComponents.css)`
         ${_iconButton.default} {
           -webkit-appearance: none;
-          ${!theme.roundedCornersOptOut && (0, _styledComponents.css)`
-            border-radius: var(--borderRadius000);
-          `}
+          border-radius: var(--borderRadius000);
           border: none;
           bottom: 0;
           font-size: 100%;
@@ -152,18 +132,9 @@ const StyledPill = _styledComponents.default.span`
           line-height: 16px;
 
           &:focus {
-            ${theme.focusRedesignOptOut && /* istanbul ignore next */
-  (0, _styledComponents.css)`
-              outline: none;
-              box-shadow: 0 0 0 3px var(--colorsSemanticFocus500);
-            `}
-
             background-color: ${buttonFocusColor};
-            ${!theme.roundedCornersOptOut && (0, _styledComponents.css)`
-              border-radius: var(--borderRadius000) var(--borderRadius025)
-                var(--borderRadius025) var(--borderRadius000);
-            `}
-
+            border-radius: var(--borderRadius000) var(--borderRadius025)
+              var(--borderRadius025) var(--borderRadius000);
             ::-moz-focus-inner {
               border: 0;
             }
@@ -207,10 +178,6 @@ const StyledPill = _styledComponents.default.span`
                 font-size: 16px;
               }
             }
-
-            ${theme.roundedCornersOptOut && (0, _styledComponents.css)`
-              border-radius: 0 10px 10px 0;
-            `}
           }
         `}
 
@@ -221,10 +188,6 @@ const StyledPill = _styledComponents.default.span`
             width: 24px;
             padding: 0;
             line-height: 15px;
-
-            ${theme.roundedCornersOptOut && (0, _styledComponents.css)`
-              border-radius: 0 10px 10px 0;
-            `}
           }
         `}
 
@@ -235,10 +198,6 @@ const StyledPill = _styledComponents.default.span`
             width: 28px;
             padding: 0;
             line-height: 16px;
-
-            ${theme.roundedCornersOptOut && (0, _styledComponents.css)`
-              border-radius: 0 11px 11px 0;
-            `}
           }
         `}
 
@@ -249,10 +208,6 @@ const StyledPill = _styledComponents.default.span`
             width: 32px;
             padding: 0;
             line-height: 18px;
-
-            ${theme.roundedCornersOptOut && (0, _styledComponents.css)`
-              border-radius: 0 12px 12px 0;
-            `}
           }
         `}
       `}

package/lib/components/portrait/portrait.component.js

@@ -14,7 +14,6 @@ var _tags = _interopRequireDefault(require("../../__internal__/utils/helpers/tag
 var _portrait = require("./portrait.config");
 var _portrait2 = require("./portrait.style");
 var _utils = require("../../style/utils");
-var _newValidation = _interopRequireDefault(require("../carbon-provider/__internal__/new-validation.context"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
@@ -27,7 +26,7 @@ const Portrait = ({
   gravatar = "",
   iconType = "individual",
   initials,
-  shape,
+  shape = "circle",
   size = "M",
   src,
   onClick,
@@ -42,10 +41,6 @@ const Portrait = ({
   ...rest
 }) => {
   const [externalError, setExternalError] = (0, _react.useState)(false);
-  const {
-    roundedCornersOptOut
-  } = (0, _react.useContext)(_newValidation.default);
-  const defaultShape = roundedCornersOptOut ? "square" : "circle";
   !!(src && gravatar) ? process.env.NODE_ENV !== "production" ? (0, _invariant.default)(false, "The `src` prop cannot be used in conjunction with the `gravatar` prop." + " Please use one or the other.") : (0, _invariant.default)(false) : void 0;
   const logGravatarDeprecationWarning = () => {
     deprecatedGravatarWarnTriggered = true;
@@ -108,7 +103,7 @@ const Portrait = ({
       }, tagProps, {
         darkBackground: darkBackground,
         size: size,
-        shape: shape || defaultShape
+        shape: shape
       }), portrait));
     }
     return /*#__PURE__*/_react.default.createElement(_portrait2.StyledPortraitContainer, _extends({}, (0, _utils.filterStyledSystemMarginProps)(rest), {
@@ -116,7 +111,7 @@ const Portrait = ({
     }, tagProps, {
       darkBackground: darkBackground,
       size: size,
-      shape: shape || defaultShape
+      shape: shape
     }), portrait);
   };
   return renderComponent();

package/lib/components/progress-tracker/progress-tracker.style.js

@@ -56,8 +56,7 @@ const StyledProgressTracker = exports.StyledProgressTracker = _styledComponents.
 const StyledProgressBar = exports.StyledProgressBar = _styledComponents.default.span`
   ${({
   progress,
-  error,
-  theme
+  error
 }) => (0, _styledComponents.css)`
     display: flex;
     position: relative;
@@ -66,7 +65,7 @@ const StyledProgressBar = exports.StyledProgressBar = _styledComponents.default.
   progress,
   error
 })};
-    border-radius: ${theme.roundedCornersOptOut ? "25px" : "var(--borderRadius400)"};
+    border-radius: var(--borderRadius400);
     overflow-x: hidden;
     width: 100%
     min-height: fit-content;
@@ -117,8 +116,7 @@ const InnerBar = exports.InnerBar = _styledComponents.default.span`
   ${({
   progress,
   size,
-  error,
-  theme
+  error
 }) => (0, _styledComponents.css)`
     position: relative;
     left: 0;
@@ -126,7 +124,7 @@ const InnerBar = exports.InnerBar = _styledComponents.default.span`
   progress,
   error
 })};
-    border-radius: ${theme.roundedCornersOptOut ? "25px" : "var(--borderRadius400)"};
+    border-radius: var(--borderRadius400);
     width: ${progress}%;
     min-width: 2px;
     height: ${getHeight(size)};

package/lib/components/simple-color-picker/simple-color/simple-color.style.js

@@ -23,10 +23,6 @@ const StyledSimpleColor = exports.StyledSimpleColor = _styledComponents.default.
     cursor: pointer;
   }
 `;
-const oldFocusStyling = `
-  box-shadow: inset 0px 0px 0px var(--borderWidth200) var(--colorsUtilityYang100);
-  border: 2px solid var(--colorsSemanticFocus500);
-`;
 const StyledColorSampleBox = exports.StyledColorSampleBox = _styledComponents.default.div`
   height: 100%;
   width: 100%;
@@ -34,10 +30,6 @@ const StyledColorSampleBox = exports.StyledColorSampleBox = _styledComponents.de
   display: flex;
   align-items: center;
   justify-content: center;
-  ${({
-  theme
-}) => /* istanbul ignore next */
-theme.focusRedesignOptOut && "border: 2px solid transparent;"}
 
   ${({
   color
@@ -70,18 +62,7 @@ const StyledSimpleColorInput = exports.StyledSimpleColorInput = (0, _styledCompo
   }
 
   &:focus + ${StyledColorSampleBox} {
-    ${({
-  theme
-}) => (0, _styledComponents.css)`
-      ${theme.focusRedesignOptOut && /* istanbul ignore next */
-`
-        ${oldFocusStyling}
-      `}
-
-      ${!theme.focusRedesignOptOut && `
-        ${(0, _addFocusStyling.default)(true)}
-      `}
-    `}
+    ${(0, _addFocusStyling.default)(true)}
   }
 `;
 const getIconColor = color => {