From af08058ff5021b432ba327adebfdf03109a6bc7a Mon Sep 17 00:00:00 2001 From: Carolina Nymark Date: Fri, 29 Apr 2022 06:57:19 +0200 Subject: [PATCH] Switch logic, again, so that next points to right and previous points to left --- .../block-library/src/post-navigation-link/edit.js | 12 ++++++------ .../block-library/src/post-navigation-link/index.php | 12 ++++++------ .../src/post-navigation-link/style.scss | 4 ++-- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/packages/block-library/src/post-navigation-link/edit.js b/packages/block-library/src/post-navigation-link/edit.js index 5c4f07de0b4ae..54ffc86a721b2 100644 --- a/packages/block-library/src/post-navigation-link/edit.js +++ b/packages/block-library/src/post-navigation-link/edit.js @@ -30,8 +30,8 @@ export default function PostNavigationLinkEdit( { const arrowMap = { none: '', - arrow: isNext ? '←' : '→', - chevron: isNext ? '«' : '»', + arrow: isNext ? '→' : '←', + chevron: isNext ? '»' : '«', }; const displayArrow = arrowMap[ arrow ]; @@ -120,9 +120,9 @@ export default function PostNavigationLinkEdit( { />
- { isNext && displayArrow && ( + { ! isNext && displayArrow && ( { displayArrow } @@ -145,9 +145,9 @@ export default function PostNavigationLinkEdit( { { __( 'An example title' ) } ) } - { ! isNext && displayArrow && ( + { isNext && displayArrow && ( { displayArrow } diff --git a/packages/block-library/src/post-navigation-link/index.php b/packages/block-library/src/post-navigation-link/index.php index bb9aa1d28e62a..2fe0923d95be5 100644 --- a/packages/block-library/src/post-navigation-link/index.php +++ b/packages/block-library/src/post-navigation-link/index.php @@ -37,12 +37,12 @@ function render_block_core_post_navigation_link( $attributes, $content ) { $arrow_map = array( 'none' => '', 'arrow' => array( - 'next' => '←', - 'previous' => '→', + 'next' => '→', + 'previous' => '←', ), 'chevron' => array( - 'next' => '«', - 'previous' => '»', + 'next' => '»', + 'previous' => '«', ), ); @@ -88,9 +88,9 @@ function render_block_core_post_navigation_link( $attributes, $content ) { $arrow = $arrow_map[ $attributes['arrow'] ][ $navigation_type ]; if ( 'next' === $navigation_type ) { - $format = '' . $arrow . ' %link'; + $format = '%link ' . $arrow . ''; } else { - $format = '%link ' . $arrow . ''; + $format = '' . $arrow . ' %link'; } } diff --git a/packages/block-library/src/post-navigation-link/style.scss b/packages/block-library/src/post-navigation-link/style.scss index be954a15d46f0..7af462c380819 100644 --- a/packages/block-library/src/post-navigation-link/style.scss +++ b/packages/block-library/src/post-navigation-link/style.scss @@ -2,7 +2,7 @@ .wp-block-post-navigation-link__arrow-previous { display: inline-block; - margin-left: 1ch; + margin-right: 1ch; // chevron(`»`) symbol doesn't need the mirroring by us. &:not(.is-arrow-chevron) { // Flip for RTL. @@ -12,7 +12,7 @@ .wp-block-post-navigation-link__arrow-next { display: inline-block; - margin-right: 1ch; + margin-left: 1ch; // chevron(`»`) symbol doesn't need the mirroring by us. &:not(.is-arrow-chevron) { // Flip for RTL.