newspack-components 2.0.3 → 2.1.0

package/dist/cjs/tabbed-navigation/style.scss

@@ -6,12 +6,23 @@
 @import '../../../shared/scss/colors';
 
 .newspack-tabbed-navigation {
+	background: white;
+	width: 100%;
+
+	@media only screen and ( min-width: 600px ) {
+		position: sticky;
+		top: 46px;
+		z-index: 3;
+	}
+
+	@media only screen and ( min-width: 783px ) {
+		top: 32px;
+	}
+
 	ul {
 		box-shadow: 0 -1px 0 inset $gray-300;
 		display: flex;
 		flex-wrap: wrap;
-		font-size: 14px;
-		line-height: 24px;
 		margin: 0;
 	}
 
@@ -22,43 +33,54 @@
 		@media screen and ( min-width: 600px ) {
 			width: auto;
 		}
-	}
 
-	a {
-		border-bottom: 4px solid transparent;
-		color: $gray-900;
-		display: block;
-		font-weight: bold;
-		padding: 12px 16px 8px;
-		text-decoration: none;
-
-		&:active,
-		&:focus,
-		&:hover {
-			color: $primary-500;
-			outline: none;
-		}
+		a {
+			align-items: center;
+			color: $gray-900;
+			display: flex;
+			font-weight: bold;
+			height: 48px;
+			padding: 12px 15px;
+			text-decoration: none;
 
-		&:focus {
-			box-shadow: none;
-		}
+			@media screen and ( min-width: 600px ) {
+				border-bottom: 4px solid transparent;
+				padding-bottom: 8px;
+			}
 
-		&:focus-visible {
-			outline: 3px solid;
-			outline-offset: -3px;
-		}
+			&:active,
+			&:focus,
+			&:hover {
+				color: var( --wp-admin-theme-color );
+				outline: none;
+			}
 
-		&.selected {
-			border-bottom-width: 0;
-			border-left: 4px solid $primary-500;
-			padding-bottom: 12px;
+			&:focus {
+				box-shadow: none;
+			}
 
-			@media screen and ( min-width: 600px ) {
-				border-bottom-width: 4px;
-				border-color: $primary-500;
-				border-left-width: 0;
-				padding-bottom: 8px;
-				padding-left: 16px;
+			&:focus-visible {
+				outline: 2px solid;
+				outline-offset: -2px;
+			}
+
+			&.selected {
+				box-shadow: inset 0 0 0 2px white, inset 0 0 0 4px var( --wp-admin-theme-color );
+
+				@media screen and ( min-width: 600px ) {
+					border-color: var( --wp-admin-theme-color );
+					box-shadow: none;
+				}
+			}
+
+			&.disabled {
+				cursor: not-allowed;
+				opacity: 0.3;
+				pointer-events: none;
+
+				&:hover {
+					color: inherit;
+				}
 			}
 		}
 	}

package/dist/cjs/text-control/index.js

@@ -52,14 +52,11 @@ class TextControl extends _element.Component {
     const {
       className,
       required,
-      isSmall,
       isWide,
       withMargin = true,
       ...otherProps
     } = this.props;
     const classes = (0, _classnames.default)('newspack-text-control', {
-      'newspack-text-control--small': isSmall
-    }, {
       'newspack-text-control--wide': isWide
     }, {
       'newspack-text-control--with-margin': withMargin

package/dist/cjs/text-control/style.scss

@@ -2,13 +2,7 @@
  * Text Control
  */
 
-@import '../../../shared/scss/colors';
-@import '~@wordpress/base-styles/colors';
-
 .newspack-text-control {
-	color: $gray-700;
-	font-size: 14px;
-	line-height: 24px;
 	&--with-margin {
 		margin: 32px 0;
 	}
@@ -26,80 +20,6 @@
 		> * {
 			margin: 0;
 		}
-
-		& + & {
-			margin-bottom: 32px;
-			margin-top: -16px;
-		}
-
-		+ .newspack-select-control,
-		+ .newspack-textarea-control {
-			margin-bottom: 32px;
-			margin-top: -16px;
-		}
-	}
-
-	label {
-		color: $gray-900;
-		font-size: 14px;
-		font-weight: bold;
-		line-height: 24px;
-		margin: 0;
-
-		&[data-required-text] {
-			&::after {
-				content: attr( data-required-text );
-				padding-left: 0.25em;
-				font-weight: normal;
-				color: $gray-700;
-			}
-		}
-	}
-
-	input[type='date'],
-	input[type='datetime-local'],
-	input[type='datetime'],
-	input[type='email'],
-	input[type='month'],
-	input[type='number'],
-	input[type='password'],
-	input[type='search'],
-	input[type='tel'],
-	input[type='text'],
-	input[type='time'],
-	input[type='url'],
-	input[type='week'] {
-		background: white;
-		border: 1px solid $gray-300;
-		border-radius: 3px;
-		box-shadow: none;
-		color: inherit;
-		font-size: 16px;
-		line-height: inherit;
-		margin: 0;
-		min-height: 48px;
-		padding: 11px 8px;
-		transition: border-color 125ms ease-in-out, box-shadow 125ms ease-in-out;
-		width: 100%;
-
-		@media screen and ( min-width: 768px ) {
-			font-size: 14px;
-		}
-
-		&::placeholder {
-			opacity: 0.5;
-		}
-		&:focus {
-			border-color: $primary-500;
-			box-shadow: inset 0 0 0 2px $primary-500;
-		}
-
-		&:disabled,
-		&.disabled {
-			background: $gray-100;
-			color: $gray-600;
-			cursor: not-allowed;
-		}
 	}
 
 	// Code
@@ -109,50 +29,4 @@
 			font-family: Consolas, monaco, monospace;
 		}
 	}
-
-	// Small
-
-	&--small {
-		input[type='date'],
-		input[type='datetime-local'],
-		input[type='datetime'],
-		input[type='email'],
-		input[type='month'],
-		input[type='number'],
-		input[type='password'],
-		input[type='search'],
-		input[type='tel'],
-		input[type='text'],
-		input[type='time'],
-		input[type='url'],
-		input[type='week'] {
-			min-height: 36px;
-			padding-bottom: 5px;
-			padding-top: 5px;
-		}
-	}
-
-	// Multiple Text Controls
-
-	& + & {
-		margin-bottom: 32px;
-		margin-top: -16px;
-	}
-
-	// Multiple Controls
-
-	+ .newspack-select-control,
-	+ .newspack-textarea-control {
-		margin-bottom: 32px;
-		margin-top: -16px;
-	}
-
-	// Reset
-
-	.components-base-control__field,
-	.components-base-control__label,
-	.components-base-control__help {
-		display: block;
-		margin: 0;
-	}
 }

package/dist/cjs/waiting/index.js

@@ -5,14 +5,12 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.icon = exports.default = void 0;
+exports.default = void 0;
 
 var _element = require("@wordpress/element");
 
 var _components = require("@wordpress/components");
 
-var _icons = require("@wordpress/icons");
-
 require("./style.scss");
 
 var _classnames = _interopRequireDefault(require("classnames"));
@@ -34,19 +32,6 @@ var _jsxRuntime = require("@emotion/react/jsx-runtime");
 /**
  * External dependencies.
  */
-const icon = (0, _jsxRuntime.jsx)(_components.SVG, {
-  xmlns: "http://www.w3.org/2000/svg",
-  width: "24",
-  height: "24",
-  viewBox: "0 0 24 24",
-  children: (0, _jsxRuntime.jsx)(_components.Path, {
-    clipRule: "evenodd",
-    d: "M12 4h-.033a7.975 7.975 0 00-5.636 2.322L5.138 5.129l-.353 3.889 3.889-.354-1.282-1.281A6.48 6.48 0 0112 5.5a6.48 6.48 0 014.63 1.904 6.469 6.469 0 011.848 3.747l1.487-.195a7.969 7.969 0 00-2.275-4.613A7.975 7.975 0 0012.033 4H12zm-6.478 8.85l-1.487.194a7.969 7.969 0 002.275 4.613A7.975 7.975 0 0012 20a7.975 7.975 0 005.669-2.322l1.193 1.193.353-3.889-3.889.354 1.282 1.281A6.48 6.48 0 0112 18.5a6.48 6.48 0 01-4.63-1.904 6.469 6.469 0 01-1.848-3.747z",
-    fillRule: "evenodd"
-  })
-});
-exports.icon = icon;
-
 class Waiting extends _element.Component {
   /**
    * Render
@@ -57,17 +42,16 @@ class Waiting extends _element.Component {
       isRight,
       isLeft,
       isCenter,
-      size
+      ...otherProps
     } = this.props;
-    const classes = (0, _classnames.default)('newspack-is-waiting', className, {
-      'newspack-is-waiting__is-right': isRight,
-      'newspack-is-waiting__is-left': isLeft,
-      'newspack-is-waiting__is-center': isCenter
+    const classes = (0, _classnames.default)('newspack-waiting', className, {
+      'is-right': isRight,
+      'is-left': isLeft,
+      'is-center': isCenter
     });
-    return (0, _jsxRuntime.jsx)(_icons.Icon, {
-      icon: icon,
-      size: size,
-      className: classes
+    return (0, _jsxRuntime.jsx)(_components.Spinner, {
+      className: classes,
+      ...otherProps
     });
   }
 

package/dist/cjs/waiting/style.scss

@@ -2,37 +2,26 @@
  * Waiting
  */
 
-.newspack-is-waiting {
-	animation: newspack-is-waiting__animation 1s infinite linear;
-	display: block;
-	fill: currentColor;
-	flex: 0 0 24px;
+.newspack-waiting.components-spinner {
+	flex: 0 0 auto;
+	margin: 0;
 
-	&.newspack-is-waiting__is-left {
-		margin-right: 4px;
+	&.is-left {
+		margin-right: 8px;
 	}
 
-	&.newspack-is-waiting__is-right {
-		margin-right: 4px;
+	&.is-right {
+		margin-right: 8px;
 		order: -1;
 
 		@media screen and ( min-width: 744px ) {
-			margin-left: 4px;
+			margin-left: 8px;
 			margin-right: 0;
 			order: 1;
 		}
 	}
 
-	&.newspack-is-waiting__is-center {
+	&.is-center {
 		margin: auto;
 	}
 }
-
-@keyframes newspack-is-waiting__animation {
-	from {
-		transform: rotate( 360deg );
-	}
-	to {
-		transform: rotate( 0deg );
-	}
-}

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

@@ -15,6 +15,8 @@ var _i18n = require("@wordpress/i18n");
 
 var _icons = require("@wordpress/icons");
 
+var _components = require("@wordpress/components");
+
 var _ = require("../");
 
 require("./style.scss");
@@ -56,7 +58,7 @@ class WebPreview extends _element.Component {
         return null;
       }
 
-      const classes = (0, _classnames.default)('newspack-web-preview__container', device, loaded && 'newspack-web-preview__is-loaded');
+      const classes = (0, _classnames.default)('newspack-web-preview', device, loaded && 'is-loaded');
       beforeLoad();
       return (0, _element.createPortal)((0, _jsxRuntime.jsx)("div", {
         className: classes,
@@ -66,36 +68,33 @@ class WebPreview extends _element.Component {
             className: "newspack-web-preview__toolbar",
             children: [(0, _jsxRuntime.jsx)("div", {
               className: "newspack-web-preview__toolbar-left",
-              children: (0, _jsxRuntime.jsxs)(_.ButtonGroup, {
-                children: [(0, _jsxRuntime.jsx)(_.Button, {
+              children: (0, _jsxRuntime.jsxs)(_components.ButtonGroup, {
+                children: [(0, _jsxRuntime.jsx)(_components.Button, {
                   onClick: () => this.setState({
                     device: 'desktop'
                   }),
-                  isSmall: true,
-                  className: (0, _classnames.default)('is-desktop', 'desktop' === device && 'is-selected'),
+                  variant: 'desktop' === device && 'primary',
                   icon: _icons.desktop,
-                  label: __('Preview desktop size', 'newspack')
-                }), (0, _jsxRuntime.jsx)(_.Button, {
+                  label: __('Preview Desktop Size', 'newspack')
+                }), (0, _jsxRuntime.jsx)(_components.Button, {
                   onClick: () => this.setState({
                     device: 'tablet'
                   }),
-                  isSmall: true,
-                  className: (0, _classnames.default)('is-tablet', 'tablet' === device && 'is-selected'),
+                  variant: 'tablet' === device && 'primary',
                   icon: _icons.tablet,
-                  label: __('Preview tablet size', 'newspack')
-                }), (0, _jsxRuntime.jsx)(_.Button, {
+                  label: __('Preview Tablet Size', 'newspack')
+                }), (0, _jsxRuntime.jsx)(_components.Button, {
                   onClick: () => this.setState({
                     device: 'phone'
                   }),
-                  isSmall: true,
-                  className: (0, _classnames.default)('is-phone', 'phone' === device && 'is-selected'),
+                  variant: 'phone' === device && 'primary',
                   icon: _icons.mobile,
-                  label: __('Preview phone size', 'newspack')
+                  label: __('Preview Phone Size', 'newspack')
                 })]
               })
             }), (0, _jsxRuntime.jsx)("div", {
               className: "newspack-web-preview__toolbar-right",
-              children: (0, _jsxRuntime.jsx)(_.Button, {
+              children: (0, _jsxRuntime.jsx)(_components.Button, {
                 onClick: () => {
                   onClose();
                   this.setState({
@@ -103,9 +102,8 @@ class WebPreview extends _element.Component {
                     loaded: false
                   });
                 },
-                isSmall: true,
                 icon: _icons.closeSmall,
-                label: __('Close preview', 'newspack')
+                label: __('Close Preview', 'newspack')
               })
             })]
           }), (0, _jsxRuntime.jsxs)("div", {
@@ -175,12 +173,7 @@ class WebPreview extends _element.Component {
   render() {
     const {
       label,
-      isPrimary,
-      isSecondary,
-      isTertiary,
-      isQuaternary,
-      isLink,
-      isSmall,
+      variant,
 
       /**
        * Inversion of control - let the caller render
@@ -191,13 +184,8 @@ class WebPreview extends _element.Component {
     return (0, _jsxRuntime.jsxs)(_element.Fragment, {
       children: [renderButton ? renderButton({
         showPreview: this.showPreview
-      }) : (0, _jsxRuntime.jsx)(_.Button, {
-        isPrimary: isPrimary,
-        isSecondary: isSecondary,
-        isTertiary: isTertiary,
-        isQuaternary: isQuaternary,
-        isLink: isLink,
-        isSmall: isSmall,
+      }) : (0, _jsxRuntime.jsx)(_components.Button, {
+        variant: variant,
         onClick: this.showPreview,
         tabIndex: "0",
         children: label

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

@@ -6,41 +6,47 @@
 @import '~@wordpress/base-styles/colors';
 
 .newspack-web-preview {
-	&--open {
-		overflow: hidden;
+	// Color
+	--wp-admin-theme-color: #{$primary-500};
+	--wp-admin-theme-color--rgb: #{$primary-500--rgb};
+	--wp-admin-theme-color-darker-10: #{$primary-600};
+	--wp-admin-theme-color-darker-10--rgb: #{$primary-600--rgb};
+	--wp-admin-theme-color-darker-20: #{$primary-700};
+	--wp-admin-theme-color-darker-20--rgb: #{$primary-700--rgb};
+
+	background: rgba( black, 0.7 );
+	box-sizing: border-box;
+	height: 100%;
+	left: 0;
+	margin: 0;
+	max-width: 100%;
+	padding: 32px;
+	position: fixed;
+	top: 0;
+	width: 100%;
+	z-index: 99999;
+
+	&.phone iframe {
+		max-width: 380px;
 	}
 
-	&__container {
-		background: rgba( black, 0.7 );
-		box-sizing: border-box;
-		height: 100%;
-		left: 0;
-		margin: 0;
-		max-width: 100%;
-		padding: 32px;
-		position: fixed;
-		top: 0;
-		width: 100%;
-		z-index: 99999;
-
-		&.phone iframe {
-			max-width: 380px;
-		}
+	&.tablet iframe {
+		max-width: 768px;
+	}
 
-		&.tablet iframe {
-			max-width: 768px;
-		}
+	&.is-loaded iframe {
+		opacity: 1;
+	}
 
-		&.newspack-web-preview__is-loaded iframe {
-			opacity: 1;
-		}
+	&--open {
+		overflow: hidden;
 	}
 
 	&__interior {
 		animation: appear-animation 125ms ease-in-out;
 		animation-fill-mode: forwards;
 		background: white;
-		border-radius: 3px;
+		border-radius: 2px;
 		overflow: hidden;
 		height: 100%;
 		width: 100%;
@@ -48,7 +54,7 @@
 
 	&__content {
 		background: $gray-100;
-		height: calc( 100% - 37px );
+		height: calc( 100% - 49px );
 		-webkit-overflow-scrolling: touch;
 		overflow-x: hidden;
 		width: 100%;
@@ -81,6 +87,7 @@
 	&__toolbar {
 		border-bottom: 1px solid $gray-300;
 		display: flex;
+		padding: 6px;
 
 		&-left {
 			flex: 0 0 auto;

package/dist/cjs/with-wizard/index.js

@@ -223,8 +223,10 @@ function withWizard(WrappedComponent, requiredPlugins) {
                     children: (0, _jsxRuntime.jsx)(_.NewspackIcon, {
                       size: 36
                     })
-                  }), (0, _jsxRuntime.jsx)("h1", {
-                    children: requiredPlugins.length > 1 ? __('Required plugins', 'newspack') : __('Required plugin', 'newspack')
+                  }), (0, _jsxRuntime.jsx)("div", {
+                    children: (0, _jsxRuntime.jsx)("h2", {
+                      children: requiredPlugins.length > 1 ? __('Required plugins', 'newspack') : __('Required plugin', 'newspack')
+                    })
                   })]
                 })
               })