From 0530500635d0be22b0d2b0d6b1569bfc2f28bba7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ella=20van=C2=A0Durpe?= <ella@vandurpe.com>
Date: Thu, 20 Aug 2020 16:05:21 +0300
Subject: [PATCH] Change to RichText

---
 packages/block-library/src/code/block.json |  2 +-
 packages/block-library/src/code/edit.js    |  9 ++-------
 packages/block-library/src/code/save.js    | 10 +++++++++-
 packages/block-library/src/code/utils.js   |  6 ------
 4 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/packages/block-library/src/code/block.json b/packages/block-library/src/code/block.json
index f79e9f9bbb0ed..9b3916f1460f0 100644
--- a/packages/block-library/src/code/block.json
+++ b/packages/block-library/src/code/block.json
@@ -4,7 +4,7 @@
 	"attributes": {
 		"content": {
 			"type": "string",
-			"source": "text",
+			"source": "html",
 			"selector": "code"
 		}
 	},
diff --git a/packages/block-library/src/code/edit.js b/packages/block-library/src/code/edit.js
index 8873464fc9b54..757d5035c6e17 100644
--- a/packages/block-library/src/code/edit.js
+++ b/packages/block-library/src/code/edit.js
@@ -2,12 +2,8 @@
  * WordPress dependencies
  */
 import { __ } from '@wordpress/i18n';
-
-/**
- * Internal dependencies
- */
 import {
-	PlainText,
+	RichText,
 	__experimentalUseBlockWrapperProps as useBlockWrapperProps,
 } from '@wordpress/block-editor';
 
@@ -15,8 +11,7 @@ export default function CodeEdit( { attributes, setAttributes } ) {
 	const blockWrapperProps = useBlockWrapperProps();
 	return (
 		<pre { ...blockWrapperProps }>
-			<PlainText
-				__experimentalVersion={ 2 }
+			<RichText
 				tagName="code"
 				value={ attributes.content }
 				onChange={ ( content ) => setAttributes( { content } ) }
diff --git a/packages/block-library/src/code/save.js b/packages/block-library/src/code/save.js
index 06ee8a2026bd7..22b5e17a2cd65 100644
--- a/packages/block-library/src/code/save.js
+++ b/packages/block-library/src/code/save.js
@@ -1,3 +1,8 @@
+/**
+ * WordPress dependencies
+ */
+import { RichText } from '@wordpress/block-editor';
+
 /**
  * Internal dependencies
  */
@@ -6,7 +11,10 @@ import { escape } from './utils';
 export default function save( { attributes } ) {
 	return (
 		<pre>
-			<code>{ escape( attributes.content ) }</code>
+			<RichText.Content
+				tagName="code"
+				value={ escape( attributes.content ) }
+			/>
 		</pre>
 	);
 }
diff --git a/packages/block-library/src/code/utils.js b/packages/block-library/src/code/utils.js
index 30609b1f0ee74..dcc2d1943422f 100644
--- a/packages/block-library/src/code/utils.js
+++ b/packages/block-library/src/code/utils.js
@@ -3,11 +3,6 @@
  */
 import { flow } from 'lodash';
 
-/**
- * WordPress dependencies
- */
-import { escapeEditableHTML } from '@wordpress/escape-html';
-
 /**
  * Escapes ampersands, shortcodes, and links.
  *
@@ -16,7 +11,6 @@ import { escapeEditableHTML } from '@wordpress/escape-html';
  */
 export function escape( content ) {
 	return flow(
-		escapeEditableHTML,
 		escapeOpeningSquareBrackets,
 		escapeProtocolInIsolatedUrls
 	)( content || '' );