Switch logic, again, so that next points to right and previous points…

… to left
WordPress · Apr 29, 2022 · af08058 · af08058
1 parent 62cc7d1
commit af08058
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git 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( {
 				/>
 			</BlockControls>
 			<div { ...blockProps }>
-				{ isNext && displayArrow && (
+				{ ! isNext && displayArrow && (
 					<span
-						className={ `wp-block-post-navigation-link__arrow-next is-arrow-${ arrow }` }
+						className={ `wp-block-post-navigation-link__arrow-previous is-arrow-${ arrow }` }
 					>
 						{ displayArrow }
 					</span>
@@ -145,9 +145,9 @@ export default function PostNavigationLinkEdit( {
 						{ __( 'An example title' ) }
 					</a>
 				) }
-				{ ! isNext && displayArrow && (
+				{ isNext && displayArrow && (
 					<span
-						className={ `wp-block-post-navigation-link__arrow-previous is-arrow-${ arrow }` }
+						className={ `wp-block-post-navigation-link__arrow-next is-arrow-${ arrow }` }
 					>
 						{ displayArrow }
 					</span>

diff --git 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 = '<span class="wp-block-post-navigation-link__arrow-next is-arrow-' . $attributes['arrow'] . '">' . $arrow . '</span> %link';
+			$format = '%link <span class="wp-block-post-navigation-link__arrow-next is-arrow-' . $attributes['arrow'] . '">' . $arrow . '</span>';
 		} else {
-			$format = '%link <span class="wp-block-post-navigation-link__arrow-previous is-arrow-' . $attributes['arrow'] . '">' . $arrow . '</span>';
+			$format = '<span class="wp-block-post-navigation-link__arrow-previous is-arrow-' . $attributes['arrow'] . '">' . $arrow . '</span> %link';
 		}
 	}
 

diff --git 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.