newspack-components 4.6.3 → 4.7.0-alpha.2

package/dist/esm/button/index.test.js

@@ -0,0 +1,273 @@
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+function _regenerator() { /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/babel/babel/blob/main/packages/babel-helpers/LICENSE */ var e, t, r = "function" == typeof Symbol ? Symbol : {}, n = r.iterator || "@@iterator", o = r.toStringTag || "@@toStringTag"; function i(r, n, o, i) { var c = n && n.prototype instanceof Generator ? n : Generator, u = Object.create(c.prototype); return _regeneratorDefine2(u, "_invoke", function (r, n, o) { var i, c, u, f = 0, p = o || [], y = !1, G = { p: 0, n: 0, v: e, a: d, f: d.bind(e, 4), d: function d(t, r) { return i = t, c = 0, u = e, G.n = r, a; } }; function d(r, n) { for (c = r, u = n, t = 0; !y && f && !o && t < p.length; t++) { var o, i = p[t], d = G.p, l = i[2]; r > 3 ? (o = l === n) && (u = i[(c = i[4]) ? 5 : (c = 3, 3)], i[4] = i[5] = e) : i[0] <= d && ((o = r < 2 && d < i[1]) ? (c = 0, G.v = n, G.n = i[1]) : d < l && (o = r < 3 || i[0] > n || n > l) && (i[4] = r, i[5] = n, G.n = l, c = 0)); } if (o || r > 1) return a; throw y = !0, n; } return function (o, p, l) { if (f > 1) throw TypeError("Generator is already running"); for (y && 1 === p && d(p, l), c = p, u = l; (t = c < 2 ? e : u) || !y;) { i || (c ? c < 3 ? (c > 1 && (G.n = -1), d(c, u)) : G.n = u : G.v = u); try { if (f = 2, i) { if (c || (o = "next"), t = i[o]) { if (!(t = t.call(i, u))) throw TypeError("iterator result is not an object"); if (!t.done) return t; u = t.value, c < 2 && (c = 0); } else 1 === c && (t = i["return"]) && t.call(i), c < 2 && (u = TypeError("The iterator does not provide a '" + o + "' method"), c = 1); i = e; } else if ((t = (y = G.n < 0) ? u : r.call(n, G)) !== a) break; } catch (t) { i = e, c = 1, u = t; } finally { f = 1; } } return { value: t, done: y }; }; }(r, o, i), !0), u; } var a = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} t = Object.getPrototypeOf; var c = [][n] ? t(t([][n]())) : (_regeneratorDefine2(t = {}, n, function () { return this; }), t), u = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(c); function f(e) { return Object.setPrototypeOf ? Object.setPrototypeOf(e, GeneratorFunctionPrototype) : (e.__proto__ = GeneratorFunctionPrototype, _regeneratorDefine2(e, o, "GeneratorFunction")), e.prototype = Object.create(u), e; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, _regeneratorDefine2(u, "constructor", GeneratorFunctionPrototype), _regeneratorDefine2(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = "GeneratorFunction", _regeneratorDefine2(GeneratorFunctionPrototype, o, "GeneratorFunction"), _regeneratorDefine2(u), _regeneratorDefine2(u, o, "Generator"), _regeneratorDefine2(u, n, function () { return this; }), _regeneratorDefine2(u, "toString", function () { return "[object Generator]"; }), (_regenerator = function _regenerator() { return { w: i, m: f }; })(); }
+function _regeneratorDefine2(e, r, n, t) { var i = Object.defineProperty; try { i({}, "", {}); } catch (e) { i = 0; } _regeneratorDefine2 = function _regeneratorDefine(e, r, n, t) { function o(r, n) { _regeneratorDefine2(e, r, function (e) { return this._invoke(r, n, e); }); } r ? i ? i(e, r, { value: n, enumerable: !t, configurable: !t, writable: !t }) : e[r] = n : (o("next", 0), o("throw", 1), o("return", 2)); }, _regeneratorDefine2(e, r, n, t); }
+/**
+ * External dependencies.
+ */
+import { act, render, screen } from '@testing-library/react';
+import { MemoryRouter, useHistory } from 'react-router-dom';
+
+/**
+ * Internal dependencies.
+ */
+import Button from './';
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+var HistoryGrabber = function HistoryGrabber(_ref) {
+  var historyRef = _ref.historyRef;
+  historyRef.current = useHistory();
+  return null;
+};
+var clickButton = /*#__PURE__*/function () {
+  var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2() {
+    return _regenerator().w(function (_context2) {
+      while (1) switch (_context2.n) {
+        case 0:
+          _context2.n = 1;
+          return act(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee() {
+            return _regenerator().w(function (_context) {
+              while (1) switch (_context.n) {
+                case 0:
+                  screen.getByRole('button', {
+                    name: 'Save'
+                  }).click();
+                case 1:
+                  return _context.a(2);
+              }
+            }, _callee);
+          })));
+        case 1:
+          return _context2.a(2);
+      }
+    }, _callee2);
+  }));
+  return function clickButton() {
+    return _ref2.apply(this, arguments);
+  };
+}();
+describe('Button href with onClick', function () {
+  it('awaits the onClick, then pushes the route', /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3() {
+    var historyRef, onClick;
+    return _regenerator().w(function (_context3) {
+      while (1) switch (_context3.n) {
+        case 0:
+          historyRef = {
+            current: null
+          };
+          onClick = jest.fn().mockResolvedValue(undefined);
+          render(/*#__PURE__*/_jsxs(MemoryRouter, {
+            children: [/*#__PURE__*/_jsx(HistoryGrabber, {
+              historyRef: historyRef
+            }), /*#__PURE__*/_jsx(Button, {
+              href: "#/next",
+              onClick: onClick,
+              children: "Save"
+            })]
+          }));
+          _context3.n = 1;
+          return clickButton();
+        case 1:
+          expect(onClick).toHaveBeenCalled();
+          // The leading '#' is stripped so the router sees a route, not a fragment.
+          expect(historyRef.current.location.pathname).toBe('/next');
+        case 2:
+          return _context3.a(2);
+      }
+    }, _callee3);
+  })));
+});
+
+// `useHistory` returns undefined outside a wizard, leaving no route table for the
+// href to name.
+describe('Button href with onClick outside a router', function () {
+  // jsdom's real location logs "Not implemented: navigation" rather than
+  // navigating, so swap in a plain object to assert against and put the
+  // original back afterwards.
+  var withStubbedLocation = /*#__PURE__*/function () {
+    var _ref5 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee4(fn) {
+      var original;
+      return _regenerator().w(function (_context4) {
+        while (1) switch (_context4.p = _context4.n) {
+          case 0:
+            original = window.location;
+            delete window.location;
+            window.location = {
+              href: ''
+            };
+            _context4.p = 1;
+            _context4.n = 2;
+            return fn();
+          case 2:
+            return _context4.a(2, _context4.v);
+          case 3:
+            _context4.p = 3;
+            window.location = original;
+            return _context4.f(3);
+          case 4:
+            return _context4.a(2);
+        }
+      }, _callee4, null, [[1,, 3, 4]]);
+    }));
+    return function withStubbedLocation(_x) {
+      return _ref5.apply(this, arguments);
+    };
+  }();
+  it('awaits the onClick, then navigates to the href', /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee6() {
+    var onClick;
+    return _regenerator().w(function (_context6) {
+      while (1) switch (_context6.n) {
+        case 0:
+          onClick = jest.fn().mockResolvedValue(undefined);
+          _context6.n = 1;
+          return withStubbedLocation(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee5() {
+            return _regenerator().w(function (_context5) {
+              while (1) switch (_context5.n) {
+                case 0:
+                  render(/*#__PURE__*/_jsx(Button, {
+                    href: "/wp-admin/admin.php?page=next",
+                    onClick: onClick,
+                    children: "Save"
+                  }));
+                  _context5.n = 1;
+                  return clickButton();
+                case 1:
+                  expect(onClick).toHaveBeenCalled();
+                  expect(window.location.href).toBe('/wp-admin/admin.php?page=next');
+                case 2:
+                  return _context5.a(2);
+              }
+            }, _callee5);
+          })));
+        case 1:
+          return _context6.a(2);
+      }
+    }, _callee6);
+  })));
+  it('hands the click event to a combined href and onClick handler', /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee8() {
+    var onClick;
+    return _regenerator().w(function (_context8) {
+      while (1) switch (_context8.n) {
+        case 0:
+          onClick = jest.fn();
+          _context8.n = 1;
+          return withStubbedLocation(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee7() {
+            return _regenerator().w(function (_context7) {
+              while (1) switch (_context7.n) {
+                case 0:
+                  render(/*#__PURE__*/_jsx(Button, {
+                    href: "/wp-admin/admin.php?page=next",
+                    onClick: onClick,
+                    children: "Save"
+                  }));
+                  _context7.n = 1;
+                  return clickButton();
+                case 1:
+                  expect(onClick).toHaveBeenCalledWith(expect.objectContaining({
+                    type: 'click'
+                  }));
+                case 2:
+                  return _context7.a(2);
+              }
+            }, _callee7);
+          })));
+        case 1:
+          return _context8.a(2);
+      }
+    }, _callee8);
+  })));
+  it('runs an onClick with no href without touching navigation', /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee0() {
+    var onClick;
+    return _regenerator().w(function (_context0) {
+      while (1) switch (_context0.n) {
+        case 0:
+          onClick = jest.fn();
+          _context0.n = 1;
+          return withStubbedLocation(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee9() {
+            return _regenerator().w(function (_context9) {
+              while (1) switch (_context9.n) {
+                case 0:
+                  render(/*#__PURE__*/_jsx(Button, {
+                    onClick: onClick,
+                    children: "Save"
+                  }));
+                  _context9.n = 1;
+                  return clickButton();
+                case 1:
+                  expect(onClick).toHaveBeenCalled();
+                  expect(window.location.href).toBe('');
+                case 2:
+                  return _context9.a(2);
+              }
+            }, _callee9);
+          })));
+        case 1:
+          return _context0.a(2);
+      }
+    }, _callee0);
+  })));
+  it('drops a javascript: href and still runs the onClick', /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee10() {
+    var warn, onClick;
+    return _regenerator().w(function (_context10) {
+      while (1) switch (_context10.n) {
+        case 0:
+          warn = jest.spyOn(console, 'warn').mockImplementation(function () {});
+          onClick = jest.fn().mockResolvedValue(undefined);
+          _context10.n = 1;
+          return withStubbedLocation(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee1() {
+            return _regenerator().w(function (_context1) {
+              while (1) switch (_context1.n) {
+                case 0:
+                  // eslint-disable-next-line no-script-url
+                  render(/*#__PURE__*/_jsx(Button, {
+                    href: "javascript:alert(1)",
+                    onClick: onClick,
+                    children: "Save"
+                  }));
+                  _context1.n = 1;
+                  return clickButton();
+                case 1:
+                  expect(onClick).toHaveBeenCalled();
+                  expect(window.location.href).toBe('');
+                case 2:
+                  return _context1.a(2);
+              }
+            }, _callee1);
+          })));
+        case 1:
+          expect(warn).toHaveBeenCalledWith(expect.stringContaining('javascript:'));
+          warn.mockRestore();
+        case 2:
+          return _context10.a(2);
+      }
+    }, _callee10);
+  })));
+});
+describe('Button with a javascript: href alone', function () {
+  var link = function link() {
+    return screen.getByText('Save').closest('a');
+  };
+  it('renders no link', function () {
+    var warn = jest.spyOn(console, 'warn').mockImplementation(function () {});
+    render(/*#__PURE__*/_jsx(Button, {
+      href: "JavaScript:alert(1)",
+      children: "Save"
+    }));
+    expect(link()).toBeNull();
+    warn.mockRestore();
+  });
+  it('sees through interleaved control characters', function () {
+    var warn = jest.spyOn(console, 'warn').mockImplementation(function () {});
+    render(/*#__PURE__*/_jsx(Button, {
+      href: 'java\nscript:alert(1)',
+      children: "Save"
+    }));
+    expect(link()).toBeNull();
+    warn.mockRestore();
+  });
+  it('leaves an ordinary href alone', function () {
+    render(/*#__PURE__*/_jsx(Button, {
+      href: "/wp-admin/admin.php?page=next",
+      children: "Save"
+    }));
+    expect(link()).toHaveAttribute('href', '/wp-admin/admin.php?page=next');
+  });
+});

package/dist/esm/card/core-card.js

@@ -1,6 +1,6 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
-var _excluded = ["actions", "actionType", "as", "buttonsCard", "className", "footer", "header", "headerAction", "headerStyle", "childrenStyle", "footerStyle", "disabled", "icon", "iconElement", "iconBackgroundColor", "isActive", "isDraggable", "isFirstTarget", "isLastTarget", "isNarrow", "isSmall", "dragIndex", "onDragCallback", "onToggle", "onHeaderClick", "noBorder", "noMargin", "children", "hasGreyHeader", "hasHeaderBorder"];
+var _excluded = ["actions", "actionType", "as", "buttonsCard", "className", "footer", "header", "headerAction", "headerStyle", "childrenStyle", "footerStyle", "disabled", "icon", "iconElement", "iconBackgroundColor", "isActive", "isDraggable", "isFirstTarget", "isLastTarget", "isNarrow", "isSelectable", "isSmall", "isVertical", "size", "dragIndex", "onDragCallback", "onToggle", "onHeaderClick", "noBorder", "noMargin", "children", "hasGreyHeader", "hasHeaderBorder"];
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 /**
@@ -46,7 +46,10 @@ var CoreCard = function CoreCard(_ref) {
     isFirstTarget = _ref.isFirstTarget,
     isLastTarget = _ref.isLastTarget,
     isNarrow = _ref.isNarrow,
+    isSelectable = _ref.isSelectable,
     isSmall = _ref.isSmall,
+    isVertical = _ref.isVertical,
+    size = _ref.size,
     dragIndex = _ref.dragIndex,
     _ref$onDragCallback = _ref.onDragCallback,
     onDragCallback = _ref$onDragCallback === void 0 ? function () {} : _ref$onDragCallback,
@@ -61,8 +64,9 @@ var CoreCard = function CoreCard(_ref) {
     _ref$hasHeaderBorder = _ref.hasHeaderBorder,
     hasHeaderBorder = _ref$hasHeaderBorder === void 0 ? true : _ref$hasHeaderBorder,
     otherProps = _objectWithoutProperties(_ref, _excluded);
-  var classes = classNames('newspack-card--core', className, (buttonsCard || as === 'a') && 'newspack-card--core__buttons-card', (actions === null || actions === void 0 ? void 0 : actions.length) > 0 && 'newspack-card--core__header--has-actions', isDraggable && 'newspack-card--core__is-draggable', isNarrow && 'newspack-card--core__is-narrow', isSmall && 'newspack-card--core__is-small', (icon || iconElement) && 'newspack-card--core__has-icon', iconBackgroundColor && 'newspack-card--core__has-icon-background-color', isActive && 'newspack-card--core__is-active', disabled && 'newspack-card--core__is-disabled', children && 'newspack-card--core__has-children', noMargin && 'newspack-card--core__no-margin', hasGreyHeader && 'newspack-card--core__has-grey-header');
-  var sizeProps = isSmall ? 'small' : otherProps.size;
+  var bodySize = isSmall ? undefined : size;
+  var classes = classNames('newspack-card--core', className, (buttonsCard || as === 'a') && 'newspack-card--core__buttons-card', (actions === null || actions === void 0 ? void 0 : actions.length) > 0 && 'newspack-card--core__header--has-actions', isDraggable && 'newspack-card--core__is-draggable', isNarrow && 'newspack-card--core__is-narrow', isSmall && 'newspack-card--core__is-small', isSelectable && 'newspack-card--core__is-selectable', bodySize === 'large' && 'newspack-card--core__is-large', isVertical && 'newspack-card--core__is-vertical', (icon || iconElement) && 'newspack-card--core__has-icon', iconBackgroundColor && 'newspack-card--core__has-icon-background-color', isActive && 'newspack-card--core__is-active', disabled && 'newspack-card--core__is-disabled', children && 'newspack-card--core__has-children', noMargin && 'newspack-card--core__no-margin', hasGreyHeader && 'newspack-card--core__has-grey-header');
+  var sizeProps = isSmall ? 'small' : size;
   if (buttonsCard || as === 'a') {
     if (!isSmall) {
       sizeProps = 'large';
@@ -81,7 +85,8 @@ var CoreCard = function CoreCard(_ref) {
   var headerIsButton = !!onHeaderClick && !hasInteractiveHeaderChildren;
   return /*#__PURE__*/_jsxs(CardWrapper, _objectSpread(_objectSpread({
     as: as,
-    className: classes
+    className: classes,
+    size: bodySize
   }, otherProps), {}, {
     children: [(header || icon || iconElement) && /*#__PURE__*/_jsxs(CardHeader, {
       as: headerIsButton ? 'button' : undefined,

package/dist/esm/card/core-card.test.js

@@ -62,4 +62,33 @@ describe('CoreCard', function () {
       container = _render5.container;
     expect(getHeader(container).tagName).not.toBe('BUTTON');
   });
+  it('gives the body large padding when size is large', function () {
+    var _render6 = render(/*#__PURE__*/_jsx(CoreCard, {
+        size: "large"
+      })),
+      container = _render6.container;
+    expect(container.querySelector('.newspack-card--core__is-large')).not.toBeNull();
+  });
+  it('lets isSmall win over a large size', function () {
+    var _render7 = render(/*#__PURE__*/_jsx(CoreCard, {
+        size: "large",
+        isSmall: true
+      })),
+      container = _render7.container;
+    expect(container.querySelector('.newspack-card--core__is-large')).toBeNull();
+    expect(container.querySelector('.newspack-card--core__is-small')).not.toBeNull();
+  });
+  it('marks the card vertical only when isVertical is passed', function () {
+    var _render8 = render(/*#__PURE__*/_jsx(CoreCard, {
+        header: "Settings"
+      })),
+      plain = _render8.container;
+    expect(plain.querySelector('.newspack-card--core__is-vertical')).toBeNull();
+    var _render9 = render(/*#__PURE__*/_jsx(CoreCard, {
+        header: "Settings",
+        isVertical: true
+      })),
+      vertical = _render9.container;
+    expect(vertical.querySelector('.newspack-card--core__is-vertical')).not.toBeNull();
+  });
 });

package/dist/esm/card/index.js

@@ -5,7 +5,7 @@ import _createClass from "@babel/runtime/helpers/createClass";
 import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
 import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
 import _inherits from "@babel/runtime/helpers/inherits";
-var _excluded = ["buttonsCard", "className", "headerActions", "isNarrow", "isMedium", "isSmall", "isWhite", "noBorder", "__experimentalCoreCard", "__experimentalCoreProps"];
+var _excluded = ["buttonsCard", "className", "headerActions", "isNarrow", "isMedium", "isSmall", "isWhite", "noBorder", "size", "__experimentalCoreCard", "__experimentalCoreProps"];
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e)); }
@@ -52,6 +52,7 @@ var Card = /*#__PURE__*/function (_Component) {
         isSmall = _this$props.isSmall,
         isWhite = _this$props.isWhite,
         noBorder = _this$props.noBorder,
+        size = _this$props.size,
         __experimentalCoreCard = _this$props.__experimentalCoreCard,
         _this$props$__experim = _this$props.__experimentalCoreProps,
         __experimentalCoreProps = _this$props$__experim === void 0 ? {
@@ -77,7 +78,8 @@ var Card = /*#__PURE__*/function (_Component) {
           isNarrow: isNarrow,
           isSmall: isSmall,
           isWhite: isWhite,
-          noBorder: noBorder
+          noBorder: noBorder,
+          size: size
         }, otherProps), __experimentalCoreProps);
         return /*#__PURE__*/_jsx(CoreCard, _objectSpread({}, props));
       }

package/dist/esm/card/style-core.scss

@@ -59,6 +59,19 @@
 			}
 		}
 	}
+	&__is-vertical {
+		.newspack-card--core__header {
+			align-items: flex-start;
+			flex-direction: column;
+			height: 100%;
+			justify-content: flex-start;
+		}
+		.newspack-card--core__header-content {
+			display: flex;
+			flex-direction: column;
+			gap: wp-vars.$grid-unit-10;
+		}
+	}
 	&__no-margin .components-card__body {
 		padding: 0 !important;
 	}
@@ -202,6 +215,48 @@
 			}
 		}
 	}
+	&__is-selectable {
+		appearance: none;
+		border: 0;
+		color: inherit;
+		cursor: pointer;
+		font: inherit;
+		margin: 0;
+		padding: 0;
+		text-align: inherit;
+
+		&:hover {
+			box-shadow: var(--wp-admin-theme-color) 0 0 0 1px;
+
+			.newspack-card--core__header,
+			.newspack-card--core__header h1,
+			.newspack-card--core__header h2,
+			.newspack-card--core__header h3,
+			.newspack-card--core__header h4,
+			.newspack-card--core__header h5,
+			.newspack-card--core__header h6 {
+				color: var(--wp-admin-theme-color);
+			}
+		}
+
+		&:focus-visible {
+			box-shadow: inset 0 0 0 2px var(--wp-admin-theme-color);
+			outline: 2px solid transparent;
+		}
+
+		@media ( prefers-contrast: more ) {
+			&.newspack-card--core__is-active {
+				box-shadow: var(--wp-admin-theme-color) 0 0 0 2px;
+			}
+		}
+
+		@media ( forced-colors: active ) {
+			&.newspack-card--core__is-active {
+				outline: 3px solid CanvasText;
+				outline-offset: -3px;
+			}
+		}
+	}
 	&__is-active:not(.newspack-card--core__is-draggable) {
 		border-color: var(--wp-admin-theme-color);
 		box-shadow: var(--wp-admin-theme-color) 0 0 0 1px;
@@ -298,6 +353,10 @@
 			.newspack-card--core__is-small & {
 				padding: 16px;
 			}
+
+			.newspack-card--core__is-large & {
+				padding: wp-vars.$grid-unit-60;
+			}
 			.newspack-card--core__no-margin & {
 				padding: 0;
 			}

package/dist/esm/card-feature/index.js

@@ -6,7 +6,7 @@ import classnames from 'classnames';
 /**
  * WordPress dependencies
  */
-import { __ } from '@wordpress/i18n';
+import { __, _x, sprintf } from '@wordpress/i18n';
 import { isValidElement } from '@wordpress/element';
 import { DropdownMenu, __experimentalHStack as HStack } from '@wordpress/components'; // eslint-disable-line @wordpress/no-unsafe-wp-apis
 import { moreVertical } from '@wordpress/icons';
@@ -64,6 +64,9 @@ var CardFeature = function CardFeature(_ref) {
   }
   var isConfigureState = enabled && !requirements;
   var buttonLabel = isConfigureState ? configureLabel !== null && configureLabel !== void 0 ? configureLabel : __('Configure', 'newspack-plugin') : enableLabel !== null && enableLabel !== void 0 ? enableLabel : __('Enable', 'newspack-plugin');
+  var buttonAccessibleLabel = sprintf(
+  // translators: %1$s: the button's visible action label, e.g. "Enable". %2$s: the feature's name. The visible label must stay first (WCAG 2.5.3).
+  _x('%1$s %2$s', 'accessible button name: visible action label, then feature name', 'newspack-plugin'), buttonLabel, title);
   var showMoreControls = enabled && !!(moreControls !== null && moreControls !== void 0 && moreControls.length) && (!requirements || requirementsActionable);
   var handleButtonClick = function handleButtonClick() {
     if (isConfigureState) {
@@ -122,10 +125,13 @@ var CardFeature = function CardFeature(_ref) {
               isBusy: busy,
               onClick: handleButtonClick,
               size: "compact",
+              "aria-label": buttonAccessibleLabel,
               children: buttonLabel
             }), showMoreControls && /*#__PURE__*/_jsx(DropdownMenu, {
               icon: moreVertical,
-              label: __('More', 'newspack-plugin'),
+              label: sprintf(
+              // translators: %s: the feature's name.
+              __('More options for %s', 'newspack-plugin'), title),
               controls: moreControls,
               toggleProps: {
                 size: 'compact'

package/dist/esm/card-feature/index.test.js

@@ -0,0 +1,96 @@
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+/**
+ * External dependencies.
+ */
+import { render, screen } from '@testing-library/react';
+
+/**
+ * WordPress dependencies.
+ */
+import { _x } from '@wordpress/i18n';
+
+/**
+ * Internal dependencies.
+ */
+import CardFeature from './index';
+
+// The spy lives in the factory: @wordpress/components calls _x while it loads,
+// before a module-scope const would be initialized.
+import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
+jest.mock('@wordpress/i18n', function () {
+  var actual = jest.requireActual('@wordpress/i18n');
+  return _objectSpread(_objectSpread({}, actual), {}, {
+    _x: jest.fn(function (text) {
+      return text;
+    })
+  });
+});
+describe('CardFeature', function () {
+  beforeEach(function () {
+    _x.mockClear();
+  });
+  it('names the feature in the primary button, keeping the visible label first', function () {
+    render(/*#__PURE__*/_jsx(CardFeature, {
+      title: "Metered Countdown"
+    }));
+    var button = screen.getByRole('button', {
+      name: 'Enable Metered Countdown'
+    });
+    expect(button).toHaveTextContent('Enable');
+    expect(button.getAttribute('aria-label').startsWith(button.textContent)).toBe(true);
+  });
+  it('carries a custom label into the accessible name', function () {
+    render(/*#__PURE__*/_jsx(CardFeature, {
+      title: "Subscription retention",
+      enableLabel: "Change"
+    }));
+    expect(screen.getByRole('button', {
+      name: 'Change Subscription retention'
+    })).toHaveTextContent('Change');
+  });
+  it('names the feature in the configure state too', function () {
+    render(/*#__PURE__*/_jsx(CardFeature, {
+      title: "Content Gifting",
+      enabled: true
+    }));
+    expect(screen.getByRole('button', {
+      name: 'Configure Content Gifting'
+    })).toBeInTheDocument();
+  });
+  it('names the feature in the More menu', function () {
+    render(/*#__PURE__*/_jsx(CardFeature, {
+      title: "Content Gifting",
+      enabled: true,
+      moreControls: [{
+        title: 'Disable',
+        onClick: function onClick() {}
+      }]
+    }));
+    expect(screen.getByRole('button', {
+      name: 'More options for Content Gifting'
+    })).toBeInTheDocument();
+  });
+  it('gives the accessible-name order its own catalogue entry', function () {
+    render(/*#__PURE__*/_jsx(CardFeature, {
+      title: "Metered Countdown"
+    }));
+    expect(_x).toHaveBeenCalledWith('%1$s %2$s', 'accessible button name: visible action label, then feature name', 'newspack-plugin');
+  });
+  it('distinguishes two cards that share a button label', function () {
+    render(/*#__PURE__*/_jsxs(_Fragment, {
+      children: [/*#__PURE__*/_jsx(CardFeature, {
+        title: "Metered Countdown"
+      }), /*#__PURE__*/_jsx(CardFeature, {
+        title: "Content Gifting"
+      })]
+    }));
+    expect(screen.getByRole('button', {
+      name: 'Enable Metered Countdown'
+    })).toBeInTheDocument();
+    expect(screen.getByRole('button', {
+      name: 'Enable Content Gifting'
+    })).toBeInTheDocument();
+  });
+});

package/dist/esm/color-picker/index.js

@@ -28,7 +28,7 @@ var InteractiveDiv = utils.InteractiveDiv;
  *
  * @param {Object}             props             - Component props.
  * @param {JSX.Element|string} props.label       - Label for the color picker.
- * @param {JSX.Element|string} props.help        - Help text for the color picker.
+ * @param {JSX.Element|string} [props.help]      - Help text for the color picker.
  * @param {string}             [props.color]     - Default color.
  * @param {Function}           props.onChange    - Function to call when the color changes.
  * @param {string}             [props.className] - Additional class name.

package/dist/esm/confirm-dialog/index.js

@@ -72,21 +72,26 @@ function ConfirmDialog(_ref, ref) {
   }, [onConfirm, pendingNavigation]);
   var handleOnCancel = useCallback(function () {
     setShowDialog(false);
+    var hadPendingNavigation = !!pendingNavigation.current;
     pendingNavigation.current = null;
     // A POP may have moved the URL to the target before it was blocked; put
     // it back so the address bar matches the page the user chose to stay on.
-    bypassBlock.current = true;
-    try {
-      history.replace(history.location);
-    } finally {
-      bypassBlock.current = false;
+    // Only when this instance blocked it: v5 keeps one prompt slot, so an
+    // unprompted replace is caught by whichever dialog did install a blocker.
+    if (hadPendingNavigation && history) {
+      bypassBlock.current = true;
+      try {
+        history.replace(history.location);
+      } finally {
+        bypassBlock.current = false;
+      }
     }
     onCancel();
   }, [onCancel, history]);
 
   // Block navigation when there are unsaved changes.
   useEffect(function () {
-    if (!when) {
+    if (!when || !history) {
       return;
     }
     var unblock = history.block(function (location, action) {
@@ -117,10 +122,22 @@ function ConfirmDialog(_ref, ref) {
     return unblock;
   }, [when, history]);
 
-  // Show the dialog imperatively without blocking navigation.
+  // During render: a commit later the dialog would still hold focus while the
+  // caller unmounted. The blocker above raises it without touching `isOpen`.
+  var _useState3 = useState(isOpen),
+    _useState4 = _slicedToArray(_useState3, 2),
+    wasOpen = _useState4[0],
+    setWasOpen = _useState4[1];
+  if (wasOpen !== isOpen) {
+    setWasOpen(isOpen);
+    setShowDialog(isOpen);
+  }
+
+  // A withdrawn prompt releases what the blocker held, as confirm and cancel do.
+  // After the commit, so a discarded render cannot drop a live one.
   useEffect(function () {
-    if (isOpen) {
-      setShowDialog(true);
+    if (!isOpen) {
+      pendingNavigation.current = null;
     }
   }, [isOpen]);
   if (!showDialog) {