newspack-components 4.2.0 → 4.4.0-alpha.1

package/dist/esm/web-preview/index.js

@@ -1,10 +1,18 @@
+import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
+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";
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e)); }
+function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 /**
  * WordPress dependencies.
  */
 import { Component, createRef, Fragment, createPortal } from '@wordpress/element';
 import { __ } from '@wordpress/i18n';
-import { closeSmall, desktop, mobile, tablet } from '@wordpress/icons';
-import { Button, ButtonGroup } from '@wordpress/components';
+import { close, desktop, mobile, tablet, check } from '@wordpress/icons';
+import { Button, DropdownMenu, MenuItem } from '@wordpress/components';
 
 /**
  * Internal dependencies.
@@ -16,168 +24,231 @@ import './style.scss';
  * External dependencies.
  */
 import classnames from 'classnames';
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-const PORTAL_PARENT_ID = 'newspack-components-web-preview-wrapper';
+import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
+var PORTAL_PARENT_ID = 'newspack-components-web-preview-wrapper';
 
 /**
  * Web Preview. A component to preview a website in an iframe, with device sizing options.
  */
-class WebPreview extends Component {
-  state = {
-    device: 'desktop',
-    loaded: false,
-    isPreviewVisible: false
-  };
-  constructor(props) {
-    super(props);
-    this.iframeRef = createRef();
+var WebPreview = /*#__PURE__*/function (_Component) {
+  function WebPreview(props) {
+    var _this;
+    _classCallCheck(this, WebPreview);
+    _this = _callSuper(this, WebPreview, [props]);
+    _defineProperty(_this, "state", {
+      device: 'desktop',
+      loaded: false,
+      isPreviewVisible: false
+    });
+    /**
+     * Handle keyboard events
+     */
+    _defineProperty(_this, "handleKeyDown", function (event) {
+      if (event.key === 'Escape' && _this.state.isPreviewVisible) {
+        _this.closePreview();
+      }
+    });
+    /**
+     * Close the preview modal
+     */
+    _defineProperty(_this, "closePreview", function () {
+      var _this$props$onClose = _this.props.onClose,
+        onClose = _this$props$onClose === void 0 ? function () {} : _this$props$onClose;
+      onClose();
+      _this.setState({
+        isPreviewVisible: false,
+        loaded: false
+      });
+    });
+    /**
+     * Create JSX for the modal
+     */
+    _defineProperty(_this, "getWebPreviewModal", function () {
+      var _this$props = _this.props,
+        _this$props$beforeLoa = _this$props.beforeLoad,
+        beforeLoad = _this$props$beforeLoa === void 0 ? function () {} : _this$props$beforeLoa,
+        url = _this$props.url,
+        title = _this$props.title;
+      var _this$state = _this.state,
+        device = _this$state.device,
+        loaded = _this$state.loaded,
+        isPreviewVisible = _this$state.isPreviewVisible;
+      if (!_this.modalDOMElement || !isPreviewVisible) {
+        return null;
+      }
+      var classes = classnames('newspack-web-preview', device, loaded && 'is-loaded');
+      var icon = mobile;
+      if (device === 'desktop') {
+        icon = desktop;
+      } else if (device === 'tablet') {
+        icon = tablet;
+      }
+      beforeLoad();
+      return createPortal(/*#__PURE__*/_jsx("div", {
+        className: classes,
+        children: /*#__PURE__*/_jsxs("div", {
+          className: "newspack-web-preview__interior",
+          children: [/*#__PURE__*/_jsxs("div", {
+            className: "newspack-web-preview__toolbar",
+            children: [title && /*#__PURE__*/_jsx("div", {
+              className: "newspack-web-preview__toolbar-left",
+              children: /*#__PURE__*/_jsx("h3", {
+                children: title
+              })
+            }), /*#__PURE__*/_jsxs("div", {
+              className: "newspack-web-preview__toolbar-right",
+              children: [/*#__PURE__*/_jsx(DropdownMenu, {
+                icon: icon,
+                label: __('Preview Size', 'newspack-plugin'),
+                children: function children(_ref) {
+                  var onDropdownClose = _ref.onClose;
+                  return /*#__PURE__*/_jsxs(_Fragment, {
+                    children: [/*#__PURE__*/_jsx(MenuItem, {
+                      icon: device === 'desktop' ? check : null,
+                      role: "menuitemradio",
+                      isSelected: device === 'desktop',
+                      onClick: function onClick() {
+                        _this.setState({
+                          device: 'desktop'
+                        });
+                        onDropdownClose();
+                      },
+                      children: __('Desktop', 'newspack-plugin')
+                    }), /*#__PURE__*/_jsx(MenuItem, {
+                      icon: device === 'tablet' ? check : null,
+                      role: "menuitemradio",
+                      isSelected: device === 'tablet',
+                      onClick: function onClick() {
+                        _this.setState({
+                          device: 'tablet'
+                        });
+                        onDropdownClose();
+                      },
+                      children: __('Tablet', 'newspack-plugin')
+                    }), /*#__PURE__*/_jsx(MenuItem, {
+                      icon: device === 'phone' ? check : null,
+                      role: "menuitemradio",
+                      isSelected: device === 'phone',
+                      onClick: function onClick() {
+                        _this.setState({
+                          device: 'phone'
+                        });
+                        onDropdownClose();
+                      },
+                      children: __('Phone', 'newspack-plugin')
+                    })]
+                  });
+                }
+              }), /*#__PURE__*/_jsx(Button, {
+                onClick: _this.closePreview,
+                icon: close,
+                label: __('Close Preview', 'newspack-plugin')
+              })]
+            })]
+          }), /*#__PURE__*/_jsxs("div", {
+            className: "newspack-web-preview__content",
+            children: [!loaded && /*#__PURE__*/_jsxs("div", {
+              className: "newspack-web-preview__is-waiting",
+              children: [/*#__PURE__*/_jsx(Waiting, {
+                isLeft: true
+              }), __('Loading…', 'newspack-plugin')]
+            }), /*#__PURE__*/_jsx("iframe", {
+              ref: _this.iframeRef,
+              title: "web-preview",
+              src: url,
+              onLoad: function onLoad() {
+                _this.setState({
+                  loaded: true
+                });
+                _this.props.onLoad(_this.iframeRef.current);
+              }
+            })]
+          })]
+        })
+      }), _this.modalDOMElement);
+    });
+    _defineProperty(_this, "showPreview", function () {
+      _this.setState({
+        isPreviewVisible: true
+      });
+    });
+    _this.iframeRef = createRef();
+    return _this;
   }
 
   /**
    * If a div with id PORTAL_PARENT_ID exists, assign it to class field.
    * If not, create it and append to the body.
    */
-  componentDidMount() {
-    const existingDOMElement = document.getElementById(PORTAL_PARENT_ID);
-    this.modalDOMElement = existingDOMElement || document.createElement('div');
-    if (!existingDOMElement) {
-      this.modalDOMElement.id = PORTAL_PARENT_ID;
-      document.body.appendChild(this.modalDOMElement);
+  _inherits(WebPreview, _Component);
+  return _createClass(WebPreview, [{
+    key: "componentDidMount",
+    value: function componentDidMount() {
+      var existingDOMElement = document.getElementById(PORTAL_PARENT_ID);
+      this.modalDOMElement = existingDOMElement || document.createElement('div');
+      if (!existingDOMElement) {
+        this.modalDOMElement.id = PORTAL_PARENT_ID;
+        document.body.appendChild(this.modalDOMElement);
+      }
     }
-  }
 
-  /**
-   * Add or remove applicable body classes
-   */
-  componentDidUpdate() {
-    if (this.state.isPreviewVisible === true) {
-      document.body.classList.add('newspack-web-preview--open');
-    } else {
-      document.body.classList.remove('newspack-web-preview--open');
+    /**
+     * Add or remove applicable body classes and keyboard event listeners
+     */
+  }, {
+    key: "componentDidUpdate",
+    value: function componentDidUpdate(prevProps, prevState) {
+      if (this.state.isPreviewVisible === true) {
+        document.body.classList.add('newspack-web-preview--open');
+        if (prevState.isPreviewVisible === false) {
+          // Add event listener when modal opens
+          document.addEventListener('keydown', this.handleKeyDown);
+        }
+      } else {
+        document.body.classList.remove('newspack-web-preview--open');
+        if (prevState.isPreviewVisible === true) {
+          // Remove event listener when modal closes
+          document.removeEventListener('keydown', this.handleKeyDown);
+        }
+      }
     }
-  }
 
-  /**
-   * Create JSX for the modal
-   */
-  getWebPreviewModal = () => {
-    const {
-      beforeLoad = () => {},
-      onClose = () => {},
-      url
-    } = this.props;
-    const {
-      device,
-      loaded,
-      isPreviewVisible
-    } = this.state;
-    if (!this.modalDOMElement || !isPreviewVisible) {
-      return null;
+    /**
+     * Clean up event listeners on unmount
+     */
+  }, {
+    key: "componentWillUnmount",
+    value: function componentWillUnmount() {
+      document.removeEventListener('keydown', this.handleKeyDown);
+      document.body.classList.remove('newspack-web-preview--open');
     }
-    const classes = classnames('newspack-web-preview', device, loaded && 'is-loaded');
-    beforeLoad();
-    return createPortal(/*#__PURE__*/_jsx("div", {
-      className: classes,
-      children: /*#__PURE__*/_jsxs("div", {
-        className: "newspack-web-preview__interior",
-        children: [/*#__PURE__*/_jsxs("div", {
-          className: "newspack-web-preview__toolbar",
-          children: [/*#__PURE__*/_jsx("div", {
-            className: "newspack-web-preview__toolbar-left",
-            children: /*#__PURE__*/_jsxs(ButtonGroup, {
-              children: [/*#__PURE__*/_jsx(Button, {
-                onClick: () => this.setState({
-                  device: 'desktop'
-                }),
-                variant: 'desktop' === device && 'primary',
-                icon: desktop,
-                label: __('Preview Desktop Size', 'newspack-plugin')
-              }), /*#__PURE__*/_jsx(Button, {
-                onClick: () => this.setState({
-                  device: 'tablet'
-                }),
-                variant: 'tablet' === device && 'primary',
-                icon: tablet,
-                label: __('Preview Tablet Size', 'newspack-plugin')
-              }), /*#__PURE__*/_jsx(Button, {
-                onClick: () => this.setState({
-                  device: 'phone'
-                }),
-                variant: 'phone' === device && 'primary',
-                icon: mobile,
-                label: __('Preview Phone Size', 'newspack-plugin')
-              })]
-            })
-          }), /*#__PURE__*/_jsx("div", {
-            className: "newspack-web-preview__toolbar-right",
-            children: /*#__PURE__*/_jsx(Button, {
-              onClick: () => {
-                onClose();
-                this.setState({
-                  isPreviewVisible: false,
-                  loaded: false
-                });
-              },
-              icon: closeSmall,
-              label: __('Close Preview', 'newspack-plugin')
-            })
-          })]
-        }), /*#__PURE__*/_jsxs("div", {
-          className: "newspack-web-preview__content",
-          children: [!loaded && /*#__PURE__*/_jsxs("div", {
-            className: "newspack-web-preview__is-waiting",
-            children: [/*#__PURE__*/_jsx(Waiting, {
-              isLeft: true
-            }), __('Loading…', 'newspack-plugin')]
-          }), /*#__PURE__*/_jsx("iframe", {
-            ref: this.iframeRef,
-            title: "web-preview",
-            src: url,
-            onLoad: () => {
-              this.setState({
-                loaded: true
-              });
-              this.props.onLoad(this.iframeRef.current);
-            }
-          })]
-        })]
-      })
-    }), this.modalDOMElement);
-  };
-  showPreview = () => {
-    this.setState({
-      isPreviewVisible: true
-    });
-  };
-
-  /**
-   * Render.
-   */
-  render() {
-    const {
-      label,
-      variant,
-      /**
-       * Inversion of control - let the caller render
-       * the button that will trigger the modal
-       */
-      renderButton
-    } = this.props;
-    return /*#__PURE__*/_jsxs(Fragment, {
-      children: [renderButton ? renderButton({
-        showPreview: this.showPreview
-      }) : /*#__PURE__*/_jsx(Button, {
-        variant: variant,
-        onClick: this.showPreview,
-        tabIndex: "0",
-        children: label
-      }), this.getWebPreviewModal()]
-    });
-  }
-}
+  }, {
+    key: "render",
+    value:
+    /**
+     * Render.
+     */
+    function render() {
+      var _this$props2 = this.props,
+        label = _this$props2.label,
+        variant = _this$props2.variant,
+        renderButton = _this$props2.renderButton;
+      return /*#__PURE__*/_jsxs(Fragment, {
+        children: [renderButton ? renderButton({
+          showPreview: this.showPreview
+        }) : /*#__PURE__*/_jsx(Button, {
+          variant: variant,
+          onClick: this.showPreview,
+          tabIndex: "0",
+          children: label
+        }), this.getWebPreviewModal()]
+      });
+    }
+  }]);
+}(Component);
 WebPreview.defaultProps = {
   url: '//newspack.com',
   label: __('Preview', 'newspack-plugin'),
-  onLoad: () => {}
+  onLoad: function onLoad() {}
 };
 export default WebPreview;

package/dist/esm/web-preview/style.scss

@@ -13,8 +13,10 @@
 	--wp-admin-theme-color-darker-10--rgb: #{colors.$primary-700--rgb};
 	--wp-admin-theme-color-darker-20: #{colors.$primary-800};
 	--wp-admin-theme-color-darker-20--rgb: #{colors.$primary-800--rgb};
+	--wp-admin-theme-color-lighter-10: #{colors.$primary-000};
+	--wp-admin-theme-color-lighter-10--rgb: #{colors.$primary-000--rgb};
 
-	background: #{colors.$neutral-700};
+	background: color-mix(in srgb, colors.$neutral-1000, transparent 65%);
 	box-sizing: border-box;
 	height: 100%;
 	left: 0;
@@ -27,11 +29,11 @@
 	z-index: 99999;
 
 	&.phone iframe {
-		max-width: 380px;
+		max-width: 360px;
 	}
 
 	&.tablet iframe {
-		max-width: 768px;
+		max-width: 780px;
 	}
 
 	&.is-loaded iframe {
@@ -46,7 +48,7 @@
 		animation: appear-animation 125ms ease-in-out;
 		animation-fill-mode: forwards;
 		background: white;
-		border-radius: 2px;
+		border-radius: 8px;
 		overflow: hidden;
 		height: 100%;
 		width: 100%;
@@ -54,19 +56,18 @@
 
 	&__content {
 		background: wp-colors.$gray-100;
-		height: calc(100% - 49px);
+		height: calc(100% - 72px);
 		-webkit-overflow-scrolling: touch;
 		overflow-x: hidden;
 		width: 100%;
 
 		iframe {
-			background: #fff;
+			background: white;
 			display: block;
 			height: 100%;
 			margin: 0 auto;
 			max-width: 100%;
 			opacity: 0;
-			outline: 1px solid wp-colors.$gray-300;
 			padding: 0;
 			pointer-events: all;
 			transition: max-width 125ms ease-in-out, opacity 250ms ease-in-out;
@@ -85,62 +86,28 @@
 	}
 
 	&__toolbar {
+		align-items: center;
 		border-bottom: 1px solid wp-colors.$gray-300;
 		display: flex;
-		padding: 6px;
+		gap: 16px;
+		justify-content: space-between;
+		min-height: 71px;
+		padding: 12px 24px;
 
 		&-left {
-			flex: 0 0 auto;
+			display: flex;
 
-			.newspack-button-group {
-				display: flex;
+			h3 {
 				margin: 0;
 			}
-
-			.newspack-button {
-				display: none;
-				padding: 0 !important;
-
-				&.is-selected {
-					background: var(--wp-admin-theme-color);
-					color: white;
-
-					&:active,
-					&:focus,
-					&:hover {
-						box-shadow: none !important;
-						color: white;
-						outline: none;
-					}
-
-					&:focus {
-						box-shadow: inset 0 0 0 1px var(--wp-admin-theme-color), inset 0 0 0 3px white !important;
-					}
-				}
-
-				@media screen and ( min-width: 528px ) {
-					&.is-phone,
-					&.is-tablet {
-						display: flex;
-					}
-				}
-
-				@media screen and ( min-width: 816px ) {
-					&.is-desktop {
-						display: flex;
-					}
-				}
-			}
 		}
 
 		&-right {
-			display: flex;
-			flex: 1;
-			justify-content: flex-end;
-		}
-
-		.newspack-button {
-			border-radius: 0 !important;
+			display: grid;
+			gap: 8px;
+			grid-template-columns: repeat(2, 1fr);
+			justify-self: end;
+			margin-left: auto;
 		}
 	}
 }