Merge remote-tracking branch 'origin/master' into add/use-webpack-con…

…fig-js-package-in-jetpack

projects/js-packages/components/changelog/add-jetpack-spinner

@@ -0,0 +1,4 @@
+Significance: minor
+Type: added
+
+Add Spinner in RNA components.

projects/js-packages/components/components/spinner/README.md

@@ -19,6 +19,7 @@ export default class extends React.Component {
 
 The following props can be passed to the Spinner component:
 
-| PROPERTY | TYPE     | REQUIRED | DEFAULT | DESCRIPTION                                     |
-| -------- | -------- | -------- | ------- | ----------------------------------------------- |
-| **size** | _number_ | no       | `20`    | The width and height of the spinner, in pixels. |
+| PROPERTY  | TYPE     | REQUIRED | DEFAULT   | DESCRIPTION                                     |
+| --------- | -------- | -------- | --------- | ----------------------------------------------- |
+| **size**  | _number_ | no       | `20`      | The width and height of the spinner, in pixels. |
+| **color** | _strong_ | no       | `#000000` | The color of the spinner, in hex.               |

projects/js-packages/components/components/spinner/index.jsx

@@ -12,29 +12,40 @@ import './style.scss';
 const Spinner = props => {
 	const className = props.className + ' jp-components-spinner';
 
-	const style = {
+	const styleOuter = {
 		width: props.size,
 		height: props.size,
 		fontSize: props.size, // allows border-width to be specified in em units
+		borderTopColor: props.color,
+	};
+
+	const styleInner = {
+		borderTopColor: props.color,
+		borderRightColor: props.color,
 	};
 
 	return (
 		<div className={ className }>
-			<div className="jp-components-spinner__outer" style={ style }>
-				<div className="jp-components-spinner__inner" />
+			<div className="jp-components-spinner__outer" style={ styleOuter }>
+				<div className="jp-components-spinner__inner" style={ styleInner } />
 			</div>
 		</div>
 	);
 };
 
 Spinner.propTypes = {
+	/** The spinner color. */
+	color: PropTypes.string,
+	/** CSS class names. */
 	className: PropTypes.string,
+	/** The spinner size. */
 	size: PropTypes.number,
 };
 
 Spinner.defaultProps = {
-	size: 20,
+	color: '#FFFFFF',
 	className: '',
+	size: 20,
 };
 
 export default Spinner;

projects/js-packages/components/components/spinner/stories/index.jsx

@@ -0,0 +1,27 @@
+/* eslint-disable react/react-in-jsx-scope */
+/**
+ * External dependencies
+ */
+import React from 'react';
+
+/**
+ * Internal dependencies
+ */
+import Spinner from '../index.jsx';
+
+export default {
+	title: 'Playground/Spinner',
+	component: Spinner,
+	argTypes: {
+		color: { control: 'color' },
+	},
+	parameters: {
+		backgrounds: {
+			default: 'dark',
+		},
+	},
+};
+
+const Template = args => <Spinner { ...args } />;
+
+export const _default = Template.bind( {} );

projects/js-packages/components/components/spinner/test/component.jsx

@@ -0,0 +1,33 @@
+/**
+ * External dependencies
+ */
+import React from 'react';
+import { expect } from 'chai';
+import { shallow } from 'enzyme';
+import ShallowRenderer from 'react-test-renderer/shallow';
+
+/**
+ * Internal dependencies
+ */
+import Spinner from '../index';
+
+describe( 'Spinner', () => {
+	const testProps = {
+		className: 'sample-classname',
+	};
+
+	describe( 'Render the Spinner component', () => {
+		const renderer = new ShallowRenderer();
+		renderer.render( <Spinner { ...testProps } /> );
+
+		const wrapper = shallow( renderer.getRenderOutput() );
+
+		it( 'component exists', () => {
+			expect( wrapper.find( 'Spinner' ) ).to.exist;
+		} );
+
+		it( 'validate the class name', () => {
+			expect( wrapper.hasClass( 'sample-classname' ) ).to.equal( true );
+		} );
+	} );
+} );

projects/js-packages/components/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@automattic/jetpack-components",
-	"version": "0.5.0",
+	"version": "0.6.0-alpha",
 	"description": "Jetpack Components Package",
 	"author": "Automattic",
 	"license": "GPL-2.0-or-later",

projects/js-packages/connection/changelog/add-jetpack-spinner-to-storybook

@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Updated package dependencies.

projects/js-packages/connection/package.json

@@ -1,12 +1,12 @@
 {
 	"name": "@automattic/jetpack-connection",
-	"version": "0.9.0",
+	"version": "0.9.1-alpha",
 	"description": "Jetpack Connection Component",
 	"author": "Automattic",
 	"license": "GPL-2.0-or-later",
 	"dependencies": {
 		"@automattic/jetpack-api": "workspace:^0.5.0",
-		"@automattic/jetpack-components": "workspace:^0.5.0",
+		"@automattic/jetpack-components": "workspace:^0.6.0-alpha",
 		"@wordpress/base-styles": "4.0.2",
 		"@wordpress/browserslist-config": "4.1.0",
 		"@wordpress/components": "19.0.0",

projects/js-packages/idc/changelog/add-jetpack-spinner-to-storybook

@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Updated package dependencies.

projects/js-packages/idc/package.json

@@ -6,7 +6,7 @@
 	"license": "GPL-2.0-or-later",
 	"dependencies": {
 		"@automattic/jetpack-api": "workspace:^0.5.0",
-		"@automattic/jetpack-components": "workspace:^0.5.0",
+		"@automattic/jetpack-components": "workspace:^0.6.0-alpha",
 		"@wordpress/base-styles": "4.0.2",
 		"@wordpress/components": "19.0.0",
 		"@wordpress/compose": "5.0.4",

projects/js-packages/storybook/changelog/add-jetpack-spinner-to-storybook

@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Updated package dependencies.

projects/js-packages/storybook/package.json

@@ -27,8 +27,8 @@
 	},
 	"devDependencies": {
 		"@automattic/jetpack-base-styles": "workspace:^0.1.0-alpha",
-		"@automattic/jetpack-components": "workspace:^0.5.0",
-		"@automattic/jetpack-connection": "workspace:^0.9.0",
+		"@automattic/jetpack-components": "workspace:^0.6.0-alpha",
+		"@automattic/jetpack-connection": "workspace:^0.9.1-alpha",
 		"@babel/core": "7.15.0",
 		"@babel/plugin-syntax-jsx": "7.14.5",
 		"@babel/runtime-corejs3": "7.15.3",

projects/packages/connection-ui/changelog/add-jetpack-spinner-to-storybook

@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Updated package dependencies.

projects/packages/connection-ui/package.json

@@ -15,7 +15,7 @@
 	},
 	"dependencies": {
 		"@automattic/jetpack-api": "workspace:^0.5.0",
-		"@automattic/jetpack-connection": "workspace:^0.9.0",
+		"@automattic/jetpack-connection": "workspace:^0.9.1-alpha",
 		"@automattic/jetpack-idc": "workspace:^0.4.2-alpha",
 		"@wordpress/data": "6.1.2"
 	},

projects/plugins/backup/changelog/add-jetpack-spinner-to-storybook

@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Updated package dependencies.

projects/plugins/backup/package.json

@@ -28,8 +28,8 @@
 	],
 	"dependencies": {
 		"@automattic/jetpack-api": "workspace:^0.5.0",
-		"@automattic/jetpack-components": "workspace:^0.5.0",
-		"@automattic/jetpack-connection": "workspace:^0.9.0",
+		"@automattic/jetpack-components": "workspace:^0.6.0-alpha",
+		"@automattic/jetpack-connection": "workspace:^0.9.1-alpha",
 		"@wordpress/api-fetch": "5.2.4",
 		"@wordpress/data": "6.1.2",
 		"@wordpress/date": "4.2.2",

projects/plugins/jetpack/changelog/add-jetpack-spinner-to-storybook

@@ -0,0 +1,4 @@
+Significance: patch
+Type: other
+
+Updated package dependencies.

projects/plugins/jetpack/changelog/update-contact-info-and-map-widget-deprecate

@@ -0,0 +1,4 @@
+Significance: minor
+Type: compat
+
+Contact Info and Map widget: Hide widget from the block inserter and Legacy widget block drop-down menu

projects/plugins/jetpack/modules/widgets/contact-info.php

@@ -48,6 +48,18 @@ public function __construct() {
 			}
 
 			add_action( 'wp_ajax_customize-contact-info-api-key', array( $this, 'ajax_check_api_key' ) );
+			add_filter( 'widget_types_to_hide_from_legacy_widget_block', array( $this, 'hide_widget_in_block_editor' ) );
+		}
+
+		/**
+		 * Remove "Contact info and Map" widget from Legacy Widget block.
+		 *
+		 * @param array $widget_types Widget type data.
+		 * This only applies to new blocks being added.
+		 */
+		public function hide_widget_in_block_editor( $widget_types ) {
+			$widget_types[] = 'widget_contact_info';
+			return $widget_types;
 		}
 
 		/**

projects/plugins/jetpack/package.json

@@ -64,8 +64,8 @@
 		"@automattic/format-currency": "1.0.0-alpha.0",
 		"@automattic/jetpack-analytics": "workspace:^0.1.2",
 		"@automattic/jetpack-api": "workspace:^0.5.0",
-		"@automattic/jetpack-components": "workspace:^0.5.0",
-		"@automattic/jetpack-connection": "workspace:^0.9.0",
+		"@automattic/jetpack-components": "workspace:^0.6.0-alpha",
+		"@automattic/jetpack-connection": "workspace:^0.9.1-alpha",
 		"@automattic/popup-monitor": "1.0.0",
 		"@automattic/request-external-access": "1.0.0",
 		"@automattic/social-previews": "1.1.1",