diff --git a/env/export-content/includes/parser.php b/env/export-content/includes/parser.php index 26088f6d..5078a41f 100644 --- a/env/export-content/includes/parser.php +++ b/env/export-content/includes/parser.php @@ -54,6 +54,7 @@ public function __construct( string $content = '' ) { // Shared custom blocks. 'wporg/link-wrapper' => new Parsers\HTMLParser( 'a', [ 'href' ] ), + 'wporg/modal' => new Parsers\AttributeParser( [ 'label' ] ), ]; } diff --git a/env/export-content/includes/parsers/BlockParser.php b/env/export-content/includes/parsers/BlockParser.php index 6649681e..7d8d6cfd 100644 --- a/env/export-content/includes/parsers/BlockParser.php +++ b/env/export-content/includes/parsers/BlockParser.php @@ -61,7 +61,9 @@ private function get_attribute( string $attribute_name, array $block ) : array { private function set_attribute( string $attribute_name, array &$block, array $replacements ) { if ( isset( $block['attrs'][ $attribute_name ] ) && is_string( $block['attrs'][ $attribute_name ] ) ) { if ( isset( $replacements[ $block['attrs'][ $attribute_name ] ] ) ) { - $block['attrs'][ $attribute_name ] = $replacements[ $block['attrs'][ $attribute_name ] ]; + $replace = $replacements[ $block['attrs'][ $attribute_name ] ]; + $replace = str_replace( "\n", ' ', $replace ); + $block['attrs'][ $attribute_name ] = $replace; } } } diff --git a/env/export-content/tests/block-parser-test.php b/env/export-content/tests/block-parser-test.php index 8570c2d2..2ceaca19 100644 --- a/env/export-content/tests/block-parser-test.php +++ b/env/export-content/tests/block-parser-test.php @@ -80,6 +80,10 @@ public function data_block_content_strings() { "\n
CookieLogged-in Users Only?
welcome-{blog_id}No
showCommentsNo
\n", [ 'Cookie', 'Logged-in Users Only?', 'welcome-{blog_id}', 'No', 'showComments' ], ], + [ + "\n\n
\n

Howdy!

\n
\n\n", + [ 'Download WordPress [latest_version]', 'Howdy!' ], + ], ]; } @@ -178,6 +182,11 @@ public function data_block_content_i18n_with_shortcode() { "\n
\n
Download WordPress [latest_version]
\n
\n", "\n
\n
\n
\n", ], + [ + // Modal, with shortcode in the label (shortcode in attribute). + "\n\n
\n

Howdy!

\n
\n\n", + "\n\n
\n

\n
\n\n", + ], ]; } diff --git a/source/wp-content/themes/wporg-main-2022/functions.php b/source/wp-content/themes/wporg-main-2022/functions.php index 3f654cb4..2427c3c5 100644 --- a/source/wp-content/themes/wporg-main-2022/functions.php +++ b/source/wp-content/themes/wporg-main-2022/functions.php @@ -44,33 +44,6 @@ function enqueue_assets() { ); wp_style_add_data( 'wporg-main-2022-style', 'rtl', 'replace' ); - if ( is_page( 'download' ) ) { - $path = __DIR__ . '/build/download/index.js'; - $deps_path = __DIR__ . '/build/download/index.asset.php'; - $script_info = file_exists( $deps_path ) - ? require $deps_path - : array( - 'dependencies' => array(), - 'version' => filemtime( $path ), - ); - - wp_enqueue_script( - 'wporg-main-2022-download-script', - get_stylesheet_directory_uri() . '/build/download/index.js', - $script_info['dependencies'], - $script_info['version'], - true - ); - - wp_enqueue_style( - 'wporg-main-2022-download-style', - get_stylesheet_directory_uri() . '/build/download/style-index.css', - array(), - filemtime( __DIR__ . '/build/download/style-index.css' ) - ); - wp_style_add_data( 'wporg-main-2022-download-style', 'rtl', 'replace' ); - } - if ( is_page( 'stats' ) ) { // phpcs:ignore WordPress.WP.EnqueuedResourceParameters wp_enqueue_script( 'google-charts', 'https://www.gstatic.com/charts/loader.js', [], null, true ); diff --git a/source/wp-content/themes/wporg-main-2022/patterns/download.php b/source/wp-content/themes/wporg-main-2022/patterns/download.php index 232eea6d..572b20fb 100644 --- a/source/wp-content/themes/wporg-main-2022/patterns/download.php +++ b/source/wp-content/themes/wporg-main-2022/patterns/download.php @@ -28,20 +28,51 @@

- -
-
- + +
+ +
+

+ + + +

+
+ + + +
+

+ + + +
+

Get involved in WordPress ↗︎', 'wporg' ); ?>

+ + + +

Join a local WordPress meetup ↗︎', 'wporg' ); ?>

+ + + +

Attend a WordCamp ↗︎', 'wporg' ); ?>

+ - + +

Support WordPress and open source education ↗︎', 'wporg' ); ?>

+
+
+ + + + +
- +
+ - +

-
    +
      • @@ -134,7 +165,7 @@
      -
        +
        • WordPress courses ↗', 'wporg' ); ?>
          • diff --git a/source/wp-content/themes/wporg-main-2022/src/components/download-modal/download-modal.js b/source/wp-content/themes/wporg-main-2022/src/components/download-modal/download-modal.js deleted file mode 100644 index 27468182..00000000 --- a/source/wp-content/themes/wporg-main-2022/src/components/download-modal/download-modal.js +++ /dev/null @@ -1,45 +0,0 @@ -/** - * WordPress dependencies - */ -import { __ } from '@wordpress/i18n'; -import { Modal } from '@wordpress/components'; - -const DownloadModal = ( { onClose } ) => ( - - <> -

          - { __( 'Thanks for downloading WordPress', 'wporg' ) } -

          -
          -

          - { __( - "You're an important part of the global community that has used, built, and transformed the platform into what it is today. Find out more ways you can contribute and make an impact on the future of the web.", - 'wporg' - ) } -

          - -
          - -           -); - -export default DownloadModal; diff --git a/source/wp-content/themes/wporg-main-2022/src/components/download-modal/index.js b/source/wp-content/themes/wporg-main-2022/src/components/download-modal/index.js deleted file mode 100644 index c4a15f05..00000000 --- a/source/wp-content/themes/wporg-main-2022/src/components/download-modal/index.js +++ /dev/null @@ -1,39 +0,0 @@ -/** - * WordPress dependencies - */ -import { useEffect, useState } from '@wordpress/element'; - -/** - * Internal dependencies - */ -import DownloadModal from './download-modal'; - -const DownloadModalContainer = () => { - const [ showModal, setShowModal ] = useState( false ); - - useEffect( () => { - const downloadButtonLink = document.querySelector( '#wporg__download-button .wp-block-button__link' ); - - if ( ! downloadButtonLink ) { - return; - } - - downloadButtonLink.addEventListener( 'click', () => { - setShowModal( true ); - } ); - - return () => { - downloadButtonLink.removeEventListener( 'click' ); - }; - }, [] ); - - return showModal ? ( - { - setShowModal( false ); - } } - /> - ) : null; -}; - -export default DownloadModalContainer; diff --git a/source/wp-content/themes/wporg-main-2022/src/download/block.json b/source/wp-content/themes/wporg-main-2022/src/download/block.json deleted file mode 100644 index 0869f98b..00000000 --- a/source/wp-content/themes/wporg-main-2022/src/download/block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "script": "file:./index.js" -} diff --git a/source/wp-content/themes/wporg-main-2022/src/download/index.js b/source/wp-content/themes/wporg-main-2022/src/download/index.js deleted file mode 100644 index 34296f9c..00000000 --- a/source/wp-content/themes/wporg-main-2022/src/download/index.js +++ /dev/null @@ -1,19 +0,0 @@ -import './style.scss'; -import DownloadModalContainer from '../components/download-modal/'; - -const initDownloadModal = () => { - const container = document.createElement( 'div' ); - - container.setAttribute( 'id', 'wporg__download-modal-container' ); - document.body.appendChild( container ); - - wp.element.render( , container ); -}; - -const init = () => { - if ( document.getElementById( 'wporg__download-button' ) ) { - initDownloadModal(); - } -}; - -window.addEventListener( 'load', init ); diff --git a/source/wp-content/themes/wporg-main-2022/src/download/style.scss b/source/wp-content/themes/wporg-main-2022/src/download/style.scss deleted file mode 100644 index 91fb5cf6..00000000 --- a/source/wp-content/themes/wporg-main-2022/src/download/style.scss +++ /dev/null @@ -1,101 +0,0 @@ -/* - * Download modal - */ - -.components-modal__screen-overlay { - position: fixed; - z-index: 251; /* global header z-index + 1 */ - top: 0; - left: 0; - width: 100vw; - height: 100vh; - background: rgba(30, 30, 30, 0.8); - display: flex; - align-items: center; - justify-content: center; - padding: 20px; -} - -.components-modal__frame { - background: var(--wp--preset--color--white); - max-width: 568px; -} - - -.wporg__download-modal { - .components-modal__header, - .wporg__download-modal-sub-header, - .wporg__download-modal-content { - padding: 41px 46px; - } - - .components-modal__header, - .wporg__download-modal-sub-header { - background: var(--wp--preset--color--blueberry-1); - color: var(--wp--preset--color--white); - } - - .components-modal__header { - display: flex; - padding-bottom: 0; - position: unset; - height: unset; - align-items: unset; - - .components-button { - --components-modal__close-button-size: 40px; - --components-modal__close-button-position: calc(var(--components-modal__close-button-size) / -2); - width: var(--components-modal__close-button-size); - height: var(--components-modal__close-button-size); - margin-right: var(--components-modal__close-button-position); - margin-top: var(--components-modal__close-button-position); - background: transparent; - border: none; - cursor: pointer; - display: flex; - align-items: center; - justify-content: center; - - svg { - fill: var(--wp--preset--color--white); - } - - .components-tooltip { - color: var(--wp--preset--color--white); - } - } - } - - .components-modal__header-heading-container { - flex: 1; - } - - .components-modal__header-heading { - font-size: var(--wp--preset--font-size--heading-2); - font-weight: var(--wp--custom--heading--typography--font-weight); - line-height: var(--wp--custom--heading--level-2--typography--line-height); - margin: 0 0 0.5em; - } - - .wporg__download-modal-sub-header { - margin: 0; - padding-top: 0; - } - - .components-modal__content { - margin-top: 0; - padding: 0; - } - - .wporg__download-modal-content { - p:first-child { - margin-top: 0; - } - - ul { - list-style: none; - padding-left: 0; - margin-bottom: 0; - } - } -}