From f26bdf8030aadab4bc153a520d2450c52fa57b2f Mon Sep 17 00:00:00 2001 From: Bernie Reiter Date: Wed, 18 Sep 2019 06:13:31 -0400 Subject: [PATCH 1/2] [not verified] Add @automattic/components dependency --- package.json | 1 + yarn.lock | 15 +++++++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index b59dfd206e37a..4e97d248ad1f1 100644 --- a/package.json +++ b/package.json @@ -80,6 +80,7 @@ "dependencies": { "@automattic/calypso-build": "5.0.1", "@automattic/calypso-color-schemes": "1.0.0", + "@automattic/components": "1.0.0-alpha.0", "@automattic/custom-colors-loader": "automattic/custom-colors-loader", "@automattic/format-currency": "1.0.0-alpha.0", "@babel/core": "7.4.0", diff --git a/yarn.lock b/yarn.lock index 419c5b23405d2..fc3b891871981 100644 --- a/yarn.lock +++ b/yarn.lock @@ -50,6 +50,17 @@ resolved "https://registry.yarnpkg.com/@automattic/calypso-color-schemes/-/calypso-color-schemes-1.0.0.tgz#17a14e3257bd90b40e960d624cca4353d4d20c34" integrity sha512-W7r4pgcBauLx65oTLbHKV84ScnfEKmW7T/sXkPfByHhuIE7+OpubmiiBsizWatk1I/puUTmj+SDqEOJMOyRdzA== +"@automattic/components@1.0.0-alpha.0": + version "1.0.0-alpha.0" + resolved "https://registry.yarnpkg.com/@automattic/components/-/components-1.0.0-alpha.0.tgz#49147015bb4031a3d0df4ddf553805f6f1e95273" + integrity sha512-dJp5N//s40lO7fdpv+6PeXvfZO1b8fJZwyCB7Aw6Ej08RKHnLDxgP6WzvTkLEBX9kasq/uh6oHnNf/t1NUyw8g== + dependencies: + classnames "2.2.6" + enzyme "^3.10.0" + gridicons "^3.3.1" + prop-types "^15.7.2" + react "^16.8.3" + "@automattic/custom-colors-loader@automattic/custom-colors-loader": version "1.0.0" resolved "https://codeload.github.com/automattic/custom-colors-loader/tar.gz/e102d3ae049662e77ba9ba9e9f9cf0627313b38c" @@ -5038,7 +5049,7 @@ enzyme-to-json@3.4.3, enzyme-to-json@^3.3.0: dependencies: lodash "^4.17.15" -enzyme@3.10.0: +enzyme@3.10.0, enzyme@^3.10.0: version "3.10.0" resolved "https://registry.yarnpkg.com/enzyme/-/enzyme-3.10.0.tgz#7218e347c4a7746e133f8e964aada4a3523452f6" integrity sha512-p2yy9Y7t/PFbPoTvrWde7JIYB2ZyGC+NgTNbVEGvZ5/EyoYSr9aG/2rSbVvyNvMHEhw9/dmGUJHWtfQIEiX9pg== @@ -6471,7 +6482,7 @@ grid-index@^1.1.0: resolved "https://registry.yarnpkg.com/grid-index/-/grid-index-1.1.0.tgz#97f8221edec1026c8377b86446a7c71e79522ea7" integrity sha512-HZRwumpOGUrHyxO5bqKZL0B0GlUpwtCAzZ42sgxUPniu33R1LSFH5yrIcBCHjkctCAh3mtWKcKd9J4vDDdeVHA== -gridicons@3.3.1: +gridicons@3.3.1, gridicons@^3.3.1: version "3.3.1" resolved "https://registry.yarnpkg.com/gridicons/-/gridicons-3.3.1.tgz#12c098fac5f6b59aecd42082ed5ef5edc391dfd4" integrity sha512-eQsmujjLptLtyhGuu31US3mXkcptYHkgEE/s277HWv+j6c3Z2gYyjoHcBKwSFbQwxbfhToRd5uzYimR2ExWJdQ== From 73eccab94219975397ac4ebb37fc416315ab2e07 Mon Sep 17 00:00:00 2001 From: Bernie Reiter Date: Wed, 18 Sep 2019 12:24:51 +0200 Subject: [PATCH 2/2] Add Ribbon to Paid blocks in block picker --- extensions/shared/register-jetpack-block.js | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/extensions/shared/register-jetpack-block.js b/extensions/shared/register-jetpack-block.js index a23f20ef777a5..e424ec0f768e4 100644 --- a/extensions/shared/register-jetpack-block.js +++ b/extensions/shared/register-jetpack-block.js @@ -1,8 +1,10 @@ /** * External dependencies */ +import { __ } from '@wordpress/i18n'; import { addFilter } from '@wordpress/hooks'; import { registerBlockType } from '@wordpress/blocks'; +import { Ribbon } from '@automattic/components'; /** * Internal dependencies @@ -49,6 +51,14 @@ export default function registerJetpackBlock( name, settings, childBlocks = [] ) title: betaExtensions.includes( name ) ? `${ settings.title } (beta)` : settings.title, edit: requiredPlan ? wrapPaidBlock( { requiredPlan } )( settings.edit ) : settings.edit, example: requiredPlan ? undefined : settings.example, + icon: requiredPlan ? ( + <> + { __( 'Paid' ) } + { settings.icon } + + ) : ( + settings.icon + ), } ); if ( requiredPlan ) {