@automattic/vip-design-system 2.3.1 → 2.4.1

package/build/system/Nav/Nav.js

@@ -24,7 +24,7 @@ var NavBase = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
     "aria-label": label,
     ref: ref,
     className: (0, _classnames["default"])(VIP_NAV, className),
-    sx: (0, _styles.navStyles)(variant),
+    sx: (0, _styles.navStyles)(variant, orientation),
     orientation: orientation,
     children: (0, _jsxRuntime.jsx)(NavigationMenu.List, {
       className: (0, _classnames["default"])(VIP_NAV + "-list"),

package/build/system/Nav/Nav.stories.js

@@ -68,22 +68,34 @@ var Tab = exports.Tab = {
         },
         label: "Nav Tab",
         children: [(0, _jsxRuntime.jsx)(_NavItem.NavItem.Tab, {
-          active: true,
           as: _CustomLink.CustomLink,
-          href: "https://random-website.com/",
+          href: "#!",
           children: "PHP"
         }), (0, _jsxRuntime.jsx)(_NavItem.NavItem.Tab, {
           as: _CustomLink.CustomLink,
-          href: "https://wordpress.com",
+          href: "#2!",
           children: "WordPress"
         }), (0, _jsxRuntime.jsx)(_NavItem.NavItem.Tab, {
+          active: true,
           as: _CustomLink.CustomLink,
-          href: "https://newrelic.com/",
+          href: "#3!",
           children: "New Relic"
+        }), (0, _jsxRuntime.jsx)(_NavItem.NavItem.Tab, {
+          as: _CustomLink.CustomLink,
+          href: "#4!",
+          children: "Datadog"
+        }), (0, _jsxRuntime.jsx)(_NavItem.NavItem.Tab, {
+          as: _CustomLink.CustomLink,
+          href: "#4!",
+          children: "OnePlus"
+        }), (0, _jsxRuntime.jsx)(_NavItem.NavItem.Tab, {
+          as: _CustomLink.CustomLink,
+          href: "#5!",
+          children: "Rollbar"
         }), (0, _jsxRuntime.jsx)(_NavItem.NavItem.Tab, {
           disabled: true,
           as: _CustomLink.CustomLink,
-          href: "https://google.com/",
+          href: "#6!",
           children: "Not accessible"
         })]
       })]
@@ -131,6 +143,7 @@ var Menu = exports.Menu = {
           children: "Domains & TLS"
         }), (0, _jsxRuntime.jsxs)(_NavItem.NavItem.MenuGroup, {
           active: true,
+          activeChildren: true,
           label: "Logs",
           renderIcon: function renderIcon(size) {
             return (0, _jsxRuntime.jsx)(_bi.BiHistory, {

package/build/system/Nav/NavItemGroup.d.ts

@@ -3,6 +3,7 @@ import { NavItemRenderIconProp } from './Nav';
 import { NavItemBaseProps } from './NavItem';
 export interface NavItemGroupProps extends NavItemBaseProps {
     renderIcon?: NavItemRenderIconProp;
+    activeChildren?: boolean;
     label: string;
 }
 export declare const IconContainer: ({ children }: {

package/build/system/Nav/NavItemGroup.js

@@ -23,6 +23,7 @@ var NavItemGroupBase = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref)
     orientation = _ref.orientation,
     className = _ref.className,
     active = _ref.active,
+    activeChildren = _ref.activeChildren,
     renderIcon = _ref.renderIcon,
     children = _ref.children,
     sx = _ref.sx;
@@ -47,6 +48,7 @@ var NavItemGroupBase = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref)
           "aria-haspopup": true,
           "data-active": active || undefined,
           "data-open": isExpanded || undefined,
+          "data-active-children": activeChildren || undefined,
           sx: _extends({}, (0, _styles.navItemLinkVariantStyles)(variant), _menugroup.navItemGroupTriggerStyles),
           children: [renderIcon ? (0, _jsxRuntime.jsx)(IconContainer, {
             children: renderIcon(_NavItem.NAV_ITEM_ICON_SIZE)

package/build/system/Nav/NavItemGroup.test.d.ts

@@ -0,0 +1,2 @@
+/** @jsxImportSource theme-ui */
+export {};

package/build/system/Nav/NavItemGroup.test.js

@@ -0,0 +1,73 @@
+"use strict";
+
+var _react = require("@testing-library/react");
+var _jestAxe = require("jest-axe");
+var _themeUi = require("theme-ui");
+var _Nav = require("./Nav");
+var _NavItem = require("./NavItem");
+var _ = require("../");
+var _CustomLink = require("../utils/stories/CustomLink");
+var _jsxRuntime = require("theme-ui/jsx-runtime");
+function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == typeof h && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator["return"] && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(typeof e + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, "catch": function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; } /** @jsxImportSource theme-ui */ /* eslint-disable @typescript-eslint/ban-ts-comment */ // @ts-nocheck
+var renderWithTheme = function renderWithTheme(children) {
+  return (0, _react.render)((0, _jsxRuntime.jsx)(_themeUi.ThemeUIProvider, {
+    theme: _.theme,
+    children: children
+  }));
+};
+var renderComponent = function renderComponent() {
+  return renderWithTheme((0, _jsxRuntime.jsx)(_Nav.Nav.Menu, {
+    label: "Nav Menu",
+    children: (0, _jsxRuntime.jsxs)(_NavItem.NavItem.MenuGroup, {
+      active: true,
+      activeChildren: true,
+      label: "Logs",
+      children: [(0, _jsxRuntime.jsx)(_NavItem.NavItem.Menu, {
+        active: true,
+        as: _CustomLink.CustomLink,
+        href: "https://google.com/",
+        children: "Audit"
+      }), (0, _jsxRuntime.jsx)(_NavItem.NavItem.Menu, {
+        as: _CustomLink.CustomLink,
+        href: "https://wpvip.com/",
+        children: "Runtime"
+      }), (0, _jsxRuntime.jsx)(_NavItem.NavItem.Menu, {
+        as: _CustomLink.CustomLink,
+        href: "https://dashboard.wpvip.com/",
+        children: "Slow Query"
+      })]
+    })
+  }));
+};
+describe('<NavItemGroup />', function () {
+  it('renders the NavItemGroup component a data-active-children', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _renderComponent, container, button;
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          _renderComponent = renderComponent(), container = _renderComponent.container; // Should find the button label
+          button = _react.screen.getByRole('button', {
+            label: /Logs/
+          });
+          expect(button).toBeInTheDocument();
+
+          // Expect to have another attribute
+          expect(button).toHaveAttribute('data-active', 'true');
+          expect(button).toHaveAttribute('data-active-children', 'true');
+
+          // Check for accessibility issues
+          _context.t0 = expect;
+          _context.next = 8;
+          return (0, _jestAxe.axe)(container);
+        case 8:
+          _context.t1 = _context.sent;
+          (0, _context.t0)(_context.t1).toHaveNoViolations();
+        case 10:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  })));
+});

package/build/system/Nav/styles/variants/menu.d.ts

@@ -4,13 +4,14 @@ type MixedStyleProp = {
     [key: string]: string | number | MixedStyleProp | ThemeUIStyleObject;
 };
 export declare const menuItemStyles: (orientation: NavProps['orientation']) => ThemeUIStyleObject;
+export declare const tabItemStyles: (orientation: NavProps['orientation']) => ThemeUIStyleObject;
 export declare const menuInverseItemStyles: (orientation: NavProps['orientation']) => ThemeUIStyleObject;
 export declare const menuItemLinkStyles: MixedStyleProp;
 export declare const menuInverseItemLinkStyles: {
     backgroundColor: string;
     color: string;
     "&:visited": {};
-    "&[data-active]": {};
-    "&:focus:not(&[data-active]), &:hover:not(&[data-active])": {};
+    "&[data-active]:not(&[data-active-children=\"true\"][data-state=\"open\"])": {};
+    "&:focus:not(&[data-active]:not(&[data-active-children=\"true\"][data-state=\"open\"])), &:hover:not(&[data-active]:not(&[data-active-children=\"true\"][data-state=\"open\"]))": {};
 };
 export {};

package/build/system/Nav/styles/variants/menu.js

@@ -1,7 +1,7 @@
 "use strict";
 
 exports.__esModule = true;
-exports.menuItemStyles = exports.menuItemLinkStyles = exports.menuInverseItemStyles = exports.menuInverseItemLinkStyles = void 0;
+exports.tabItemStyles = exports.menuItemStyles = exports.menuItemLinkStyles = exports.menuInverseItemStyles = exports.menuInverseItemLinkStyles = void 0;
 var _primary = require("./primary");
 var _menuItemLinkStyles, _extends2;
 function _extends() { _extends = Object.assign ? Object.assign.bind() : 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); }
@@ -16,6 +16,13 @@ var menuItemStyles = exports.menuItemStyles = function menuItemStyles(orientatio
   });
 };
 
+// Tab Item Style <li>
+var tabItemStyles = exports.tabItemStyles = function tabItemStyles(orientation) {
+  return _extends({}, (0, _primary.defaultNavItemStyles)(orientation), {
+    mr: 0
+  });
+};
+
 // Menu Inverse Item Style <li>
 var menuInverseItemStyles = exports.menuInverseItemStyles = function menuInverseItemStyles(orientation) {
   return _extends({}, menuItemStyles(orientation), {
@@ -29,9 +36,9 @@ var menuInverseItemStyles = exports.menuInverseItemStyles = function menuInverse
 // Menu Item Link <a>
 
 var visitedLink = '&:visited';
-var activeAfter = '&[data-active]::before';
-var active = '&[data-active]';
-var focusNotActiveHoverNotActive = '&:focus:not(&[data-active]), &:hover:not(&[data-active])';
+var active = '&[data-active]:not(&[data-active-children="true"][data-state="open"])';
+var activeBefore = active + "::before";
+var focusNotActiveHoverNotActive = "&:focus:not(" + active + "), &:hover:not(" + active + ")";
 var notHover = ':not(&:hover)';
 var svgIcon = 'svg';
 var menuItemLinkStyles = exports.menuItemLinkStyles = (_menuItemLinkStyles = {
@@ -59,7 +66,7 @@ var menuItemLinkStyles = exports.menuItemLinkStyles = (_menuItemLinkStyles = {
   width: '100%'
 }, _menuItemLinkStyles[visitedLink] = {
   color: 'text'
-}, _menuItemLinkStyles[activeAfter] = {
+}, _menuItemLinkStyles[activeBefore] = {
   position: 'absolute',
   content: "''",
   overflow: 'hidden',

package/build/system/Nav/styles/variants/tabs.d.ts

@@ -1,3 +1,4 @@
 import { ThemeUIStyleObject } from 'theme-ui';
-export declare const tabRootStyles: ThemeUIStyleObject;
+import { NavProps } from '../../Nav';
+export declare const tabRootStyles: (orientation: NavProps['orientation']) => ThemeUIStyleObject;
 export declare const tabItemLinkStyles: ThemeUIStyleObject;

package/build/system/Nav/styles/variants/tabs.js

@@ -5,27 +5,61 @@ exports.tabRootStyles = exports.tabItemLinkStyles = void 0;
 var _primary = require("./primary");
 function _extends() { _extends = Object.assign ? Object.assign.bind() : 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); }
 // Tab Root Styles <nav>
-
-var tabRootStyles = exports.tabRootStyles = {
-  width: '100%',
-  borderColor: 'borders.2'
+var getTabPropsByOrientation = function getTabPropsByOrientation(orientation) {
+  if (orientation === 'vertical') {
+    return {
+      '> div:first-of-type': {
+        height: '100%',
+        overflowY: 'auto'
+      },
+      ul: {
+        minHeight: 'max-content'
+      }
+    };
+  }
+  return {
+    '> div:first-of-type': {
+      width: '100%',
+      overflowX: 'auto'
+    },
+    ul: {
+      minWidth: 'max-content'
+    }
+  };
+};
+var tabRootStyles = exports.tabRootStyles = function tabRootStyles(orientation) {
+  return _extends({
+    width: '100%',
+    borderColor: 'borders.2',
+    gap: 2
+  }, getTabPropsByOrientation(orientation));
 };
 
 // Tab Link <a>
 var tabItemLinkStyles = exports.tabItemLinkStyles = _extends({}, _primary.defaultItemLinkStyles, {
-  px: 0,
-  mr: 2,
+  px: 2,
+  height: '100%',
+  backgroundColor: 'red',
   color: 'heading',
   '&[data-active]': {
     color: 'link',
     fontWeight: 'normal',
-    boxShadow: 'inset 0 -1px 0 0, 0 1px 0 0'
+    position: 'relative',
+    '&::after': {
+      position: 'absolute',
+      bottom: 0,
+      display: 'block',
+      width: '100%',
+      content: '""',
+      height: '0.125rem',
+      backgroundColor: 'link'
+    }
   },
   '&[aria-disabled="true"]': {
     color: 'muted'
   },
   ':hover': {
     fontWeight: 'regular',
-    color: 'heading'
+    color: 'link'
   }
 });

package/build/system/Nav/styles.d.ts

@@ -3,6 +3,5 @@ import { NavProps, NavVariant } from './Nav';
 export declare const navItemLinkVariantStyles: (variant: NavVariant) => ThemeUIStyleObject;
 export declare const navItemLinkStyles: (variant: NavVariant) => ThemeUIStyleObject;
 export declare const navItemStyles: (orientation: NavProps['orientation'], variant?: NavVariant) => ThemeUIStyleObject;
-export declare const navRootStyles: (variant: NavVariant) => ThemeUIStyleObject;
-export declare const navStyles: (variant: NavVariant) => ThemeUIStyleObject;
+export declare const navStyles: (variant: NavVariant, orientation: NavProps['orientation']) => ThemeUIStyleObject;
 export declare const navMenuListStyles: (orientation: NavProps['orientation']) => ThemeUIStyleObject;

package/build/system/Nav/styles.js

@@ -1,7 +1,7 @@
 "use strict";
 
 exports.__esModule = true;
-exports.navStyles = exports.navRootStyles = exports.navMenuListStyles = exports.navItemStyles = exports.navItemLinkVariantStyles = exports.navItemLinkStyles = void 0;
+exports.navStyles = exports.navMenuListStyles = exports.navItemStyles = exports.navItemLinkVariantStyles = exports.navItemLinkStyles = void 0;
 var _breadcrumbs = require("./styles/variants/breadcrumbs");
 var _menu = require("./styles/variants/menu");
 var _primary = require("./styles/variants/primary");
@@ -57,6 +57,10 @@ var navItemStyles = exports.navItemStyles = function navItemStyles(orientation,
       {
         return (0, _menu.menuItemStyles)(orientation);
       }
+    case 'tabs':
+      {
+        return (0, _menu.tabItemStyles)(orientation);
+      }
     case 'menu-inverse':
       {
         return (0, _menu.menuInverseItemStyles)(orientation);
@@ -71,28 +75,12 @@ var navItemStyles = exports.navItemStyles = function navItemStyles(orientation,
       }
   }
 };
-var navRootStyles = exports.navRootStyles = function navRootStyles(variant) {
-  switch (variant) {
-    case 'tabs':
-      {
-        return _tabs.tabRootStyles;
-      }
-    case 'toolbar':
-      {
-        return _toolbar.toolbarRootStyles;
-      }
-    default:
-      {
-        return _primary.defaultNavRootStyles;
-      }
-  }
-};
-var navStyles = exports.navStyles = function navStyles(variant) {
+var navStyles = exports.navStyles = function navStyles(variant, orientation) {
   var navStyle = {};
   switch (variant) {
     case 'tabs':
       {
-        navStyle = _tabs.tabRootStyles;
+        navStyle = (0, _tabs.tabRootStyles)(orientation);
       }
       break;
     case 'toolbar':

package/build/system/Tabs/Tabs.stories.jsx

@@ -38,6 +38,7 @@ export const Default = () => (
 		</TabsContent>
 	</Tabs>
 );
+
 export const SetActiveTab = () => {
 	const [ activeTab, setActiveTab ] = React.useState( 'all' );
 

package/build/system/Tabs/TabsTrigger.js

@@ -24,7 +24,16 @@ const styles = {
 	'&[data-state="active"]': {
 		color: 'link',
 		fontWeight: 'regular',
-		boxShadow: 'inset 0 -1px 0 0, 0 1px 0 0',
+		position: 'relative',
+		'&::after': {
+			position: 'absolute',
+			bottom: 0,
+			display: 'block',
+			width: '100%',
+			content: '""',
+			height: '0.125rem',
+			backgroundColor: 'link',
+		},
 	},
 	'&:disabled': {
 		color: 'muted',

package/build/system/theme/index.d.ts

@@ -326,6 +326,7 @@ declare namespace _default {
                 '&:hover': {
                     textDecorationLine: string;
                     textDecorationThickness: string;
+                    textUnderlineOffset: string;
                 };
             };
             export namespace svg {

package/build/system/theme/index.js

@@ -414,8 +414,10 @@ export default {
 			'&:active': {
 				color: 'links.active',
 			},
+
 			textDecorationThickness: '0.125rem',
-			textUnderlineOffset: '0.125rem',
+			textUnderlineOffset: '0.250rem',
+
 			'&:hover, &:focus': {
 				color: 'links.hover',
 				textDecorationLine: 'underline',
@@ -534,7 +536,8 @@ export default {
 			a: {
 				'&:hover': {
 					textDecorationLine: 'underline',
-					textDecorationThickness: '2px',
+					textDecorationThickness: '0.125rem',
+					textUnderlineOffset: '0.250rem',
 				},
 			},
 			svg: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@automattic/vip-design-system",
-  "version": "2.3.1",
+  "version": "2.4.1",
   "main": "build/system/index.js",
   "scripts": {
     "build-storybook": "storybook build",

package/src/system/Nav/Nav.stories.tsx

@@ -115,16 +115,25 @@ export const Tab: Story = {
 				<strong>Variant: Tab</strong>
 			</p>
 			<Nav.Tab sx={ { mb: 4 } } label="Nav Tab">
-				<NavItem.Tab active as={ CustomLink } href="https://random-website.com/">
+				<NavItem.Tab as={ CustomLink } href="#!">
 					PHP
 				</NavItem.Tab>
-				<NavItem.Tab as={ CustomLink } href="https://wordpress.com">
+				<NavItem.Tab as={ CustomLink } href="#2!">
 					WordPress
 				</NavItem.Tab>
-				<NavItem.Tab as={ CustomLink } href="https://newrelic.com/">
+				<NavItem.Tab active as={ CustomLink } href="#3!">
 					New Relic
 				</NavItem.Tab>
-				<NavItem.Tab disabled as={ CustomLink } href="https://google.com/">
+				<NavItem.Tab as={ CustomLink } href="#4!">
+					Datadog
+				</NavItem.Tab>
+				<NavItem.Tab as={ CustomLink } href="#4!">
+					OnePlus
+				</NavItem.Tab>
+				<NavItem.Tab as={ CustomLink } href="#5!">
+					Rollbar
+				</NavItem.Tab>
+				<NavItem.Tab disabled as={ CustomLink } href="#6!">
 					Not accessible
 				</NavItem.Tab>
 			</Nav.Tab>
@@ -163,7 +172,12 @@ export const Menu: Story = {
 					Domains & TLS
 				</NavItem.Menu>
 
-				<NavItem.MenuGroup active label="Logs" renderIcon={ size => <BiHistory size={ size } /> }>
+				<NavItem.MenuGroup
+					active
+					activeChildren
+					label="Logs"
+					renderIcon={ size => <BiHistory size={ size } /> }
+				>
 					<NavItem.Menu active as={ CustomLink } href="https://google.com/">
 						Audit
 					</NavItem.Menu>

package/src/system/Nav/Nav.tsx

@@ -24,7 +24,7 @@ const NavBase = forwardRef< HTMLElement, NavProps >(
 			aria-label={ label }
 			ref={ ref }
 			className={ classNames( VIP_NAV, className ) }
-			sx={ navStyles( variant ) }
+			sx={ navStyles( variant, orientation ) }
 			orientation={ orientation }
 		>
 			<NavigationMenu.List

package/src/system/Nav/NavItemGroup.test.tsx

@@ -0,0 +1,50 @@
+/** @jsxImportSource theme-ui */
+/* eslint-disable @typescript-eslint/ban-ts-comment */
+// @ts-nocheck
+
+import { render, screen } from '@testing-library/react';
+import { axe } from 'jest-axe';
+import { ThemeUIProvider } from 'theme-ui';
+
+import { Nav } from './Nav';
+import { NavItem } from './NavItem';
+import { theme } from '../';
+import { CustomLink } from '../utils/stories/CustomLink';
+
+const renderWithTheme = children =>
+	render( <ThemeUIProvider theme={ theme }>{ children }</ThemeUIProvider> );
+
+const renderComponent = () =>
+	renderWithTheme(
+		<Nav.Menu label="Nav Menu">
+			<NavItem.MenuGroup active activeChildren label="Logs">
+				<NavItem.Menu active as={ CustomLink } href="https://google.com/">
+					Audit
+				</NavItem.Menu>
+				<NavItem.Menu as={ CustomLink } href="https://wpvip.com/">
+					Runtime
+				</NavItem.Menu>
+				<NavItem.Menu as={ CustomLink } href="https://dashboard.wpvip.com/">
+					Slow Query
+				</NavItem.Menu>
+			</NavItem.MenuGroup>
+		</Nav.Menu>
+	);
+
+describe( '<NavItemGroup />', () => {
+	it( 'renders the NavItemGroup component a data-active-children', async () => {
+		const { container } = renderComponent();
+
+		// Should find the button label
+		const button = screen.getByRole( 'button', { label: /Logs/ } );
+
+		expect( button ).toBeInTheDocument();
+
+		// Expect to have another attribute
+		expect( button ).toHaveAttribute( 'data-active', 'true' );
+		expect( button ).toHaveAttribute( 'data-active-children', 'true' );
+
+		// Check for accessibility issues
+		expect( await axe( container ) ).toHaveNoViolations();
+	} );
+} );

package/src/system/Nav/NavItemGroup.tsx

@@ -17,6 +17,7 @@ import {
 
 export interface NavItemGroupProps extends NavItemBaseProps {
 	renderIcon?: NavItemRenderIconProp;
+	activeChildren?: boolean;
 	label: string;
 }
 
@@ -28,6 +29,7 @@ const NavItemGroupBase = forwardRef< HTMLLIElement, NavItemGroupProps >(
 			orientation,
 			className,
 			active,
+			activeChildren,
 			renderIcon,
 			children,
 			sx,
@@ -54,6 +56,7 @@ const NavItemGroupBase = forwardRef< HTMLLIElement, NavItemGroupProps >(
 							aria-haspopup={ true }
 							data-active={ active || undefined }
 							data-open={ isExpanded || undefined }
+							data-active-children={ activeChildren || undefined }
 							sx={ {
 								...navItemLinkVariantStyles( variant ),
 								...navItemGroupTriggerStyles,

package/src/system/Nav/styles/variants/menu.ts

@@ -17,6 +17,12 @@ export const menuItemStyles = ( orientation: NavProps[ 'orientation' ] ): ThemeU
 	justifyContent: 'space-between',
 } );
 
+// Tab Item Style <li>
+export const tabItemStyles = ( orientation: NavProps[ 'orientation' ] ): ThemeUIStyleObject => ( {
+	...defaultNavItemStyles( orientation ),
+	mr: 0,
+} );
+
 // Menu Inverse Item Style <li>
 export const menuInverseItemStyles = (
 	orientation: NavProps[ 'orientation' ]
@@ -31,9 +37,9 @@ export const menuInverseItemStyles = (
 // Menu Item Link <a>
 
 const visitedLink = '&:visited';
-const activeAfter = '&[data-active]::before';
-const active = '&[data-active]';
-const focusNotActiveHoverNotActive = '&:focus:not(&[data-active]), &:hover:not(&[data-active])';
+const active = '&[data-active]:not(&[data-active-children="true"][data-state="open"])';
+const activeBefore = `${ active }::before`;
+const focusNotActiveHoverNotActive = `&:focus:not(${ active }), &:hover:not(${ active })`;
 const notHover = ':not(&:hover)';
 const svgIcon = 'svg';
 
@@ -63,7 +69,7 @@ export const menuItemLinkStyles: MixedStyleProp = {
 	[ visitedLink ]: {
 		color: 'text',
 	},
-	[ activeAfter ]: {
+	[ activeBefore ]: {
 		position: 'absolute',
 		content: "''",
 		overflow: 'hidden',

package/src/system/Nav/styles/variants/tabs.ts

@@ -1,27 +1,64 @@
 import { ThemeUIStyleObject } from 'theme-ui';
 
 import { defaultItemLinkStyles } from './primary';
+import { NavProps } from '../../Nav';
 
 // Tab Root Styles <nav>
+const getTabPropsByOrientation = ( orientation: NavProps[ 'orientation' ] ): ThemeUIStyleObject => {
+	if ( orientation === 'vertical' ) {
+		return {
+			'> div:first-of-type': {
+				height: '100%',
+				overflowY: 'auto',
+			},
+			ul: {
+				minHeight: 'max-content',
+			},
+		};
+	}
+	return {
+		'> div:first-of-type': {
+			width: '100%',
+			overflowX: 'auto',
+		},
+		ul: {
+			minWidth: 'max-content',
+		},
+	};
+};
 
-export const tabRootStyles: ThemeUIStyleObject = {
+export const tabRootStyles = ( orientation: NavProps[ 'orientation' ] ): ThemeUIStyleObject => ( {
 	width: '100%',
 	borderColor: 'borders.2',
-};
+	gap: 2,
+
+	// Responsive in case the content is bigger than the viewport
+	...getTabPropsByOrientation( orientation ),
+} );
 
 // Tab Link <a>
 export const tabItemLinkStyles: ThemeUIStyleObject = {
 	...defaultItemLinkStyles,
-	px: 0,
-	mr: 2,
+	px: 2,
+	height: '100%',
+	backgroundColor: 'red',
 	color: 'heading',
 	'&[data-active]': {
 		color: 'link',
 		fontWeight: 'normal',
-		boxShadow: 'inset 0 -1px 0 0, 0 1px 0 0',
+		position: 'relative',
+		'&::after': {
+			position: 'absolute',
+			bottom: 0,
+			display: 'block',
+			width: '100%',
+			content: '""',
+			height: '0.125rem',
+			backgroundColor: 'link',
+		},
 	},
 	'&[aria-disabled="true"]': {
 		color: 'muted',
 	},
-	':hover': { fontWeight: 'regular', color: 'heading' },
+	':hover': { fontWeight: 'regular', color: 'link' },
 };

package/src/system/Nav/styles.ts

@@ -8,6 +8,7 @@ import {
 	menuInverseItemStyles,
 	menuItemLinkStyles,
 	menuItemStyles,
+	tabItemStyles,
 } from './styles/variants/menu';
 import {
 	defaultNavItemStyles,
@@ -68,6 +69,9 @@ export const navItemStyles = (
 		case 'menu': {
 			return menuItemStyles( orientation );
 		}
+		case 'tabs': {
+			return tabItemStyles( orientation );
+		}
 		case 'menu-inverse': {
 			return menuInverseItemStyles( orientation );
 		}
@@ -82,29 +86,16 @@ export const navItemStyles = (
 	}
 };
 
-export const navRootStyles = ( variant: NavVariant ): ThemeUIStyleObject => {
-	switch ( variant ) {
-		case 'tabs': {
-			return tabRootStyles;
-		}
-
-		case 'toolbar': {
-			return toolbarRootStyles;
-		}
-
-		default: {
-			return defaultNavRootStyles;
-		}
-	}
-};
-
-export const navStyles = ( variant: NavVariant ): ThemeUIStyleObject => {
+export const navStyles = (
+	variant: NavVariant,
+	orientation: NavProps[ 'orientation' ]
+): ThemeUIStyleObject => {
 	let navStyle: ThemeUIStyleObject = {};
 
 	switch ( variant ) {
 		case 'tabs':
 			{
-				navStyle = tabRootStyles;
+				navStyle = tabRootStyles( orientation );
 			}
 
 			break;

package/src/system/Tabs/Tabs.stories.jsx

@@ -38,6 +38,7 @@ export const Default = () => (
 		</TabsContent>
 	</Tabs>
 );
+
 export const SetActiveTab = () => {
 	const [ activeTab, setActiveTab ] = React.useState( 'all' );
 

package/src/system/Tabs/TabsTrigger.js

@@ -24,7 +24,16 @@ const styles = {
 	'&[data-state="active"]': {
 		color: 'link',
 		fontWeight: 'regular',
-		boxShadow: 'inset 0 -1px 0 0, 0 1px 0 0',
+		position: 'relative',
+		'&::after': {
+			position: 'absolute',
+			bottom: 0,
+			display: 'block',
+			width: '100%',
+			content: '""',
+			height: '0.125rem',
+			backgroundColor: 'link',
+		},
 	},
 	'&:disabled': {
 		color: 'muted',

package/src/system/theme/index.js

@@ -414,8 +414,10 @@ export default {
 			'&:active': {
 				color: 'links.active',
 			},
+
 			textDecorationThickness: '0.125rem',
-			textUnderlineOffset: '0.125rem',
+			textUnderlineOffset: '0.250rem',
+
 			'&:hover, &:focus': {
 				color: 'links.hover',
 				textDecorationLine: 'underline',
@@ -534,7 +536,8 @@ export default {
 			a: {
 				'&:hover': {
 					textDecorationLine: 'underline',
-					textDecorationThickness: '2px',
+					textDecorationThickness: '0.125rem',
+					textUnderlineOffset: '0.250rem',
 				},
 			},
 			svg: {