Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use @wordpress/escape-html escapeHTML in Link UI in preference to Lodash method #46184

Merged
merged 2 commits into from
Nov 30, 2022
Merged

Use @wordpress/escape-html escapeHTML in Link UI in preference to Lodash method #46184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
84d1747
Use WP escape package in block library
getdave Nov 30, 2022
bdfc82c
Utilise WP method over lodash method
getdave Nov 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 18 additions & 17 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions packages/block-library/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
"@wordpress/deprecated": "file:../deprecated",
"@wordpress/dom": "file:../dom",
"@wordpress/element": "file:../element",
"@wordpress/escape-html": "file:../escape-html",
"@wordpress/hooks": "file:../hooks",
"@wordpress/html-entities": "file:../html-entities",
"@wordpress/i18n": "file:../i18n",
Expand Down
10 changes: 3 additions & 7 deletions packages/block-library/src/navigation-link/update-attributes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
/**
* External dependencies
*/
import escapeHtml from 'escape-html';

/**
* WordPress dependencies
*/
import { safeDecodeURI } from '@wordpress/url';
import { escapeHTML } from '@wordpress/escape-html';

/**
* @typedef {'post-type'|'custom'|'taxonomy'|'post-type-archive'} WPNavigationLinkKind
Expand Down Expand Up @@ -78,8 +74,8 @@ export const updateAttributes = (
// - https://github.com/WordPress/gutenberg/pull/41063
// - https://github.com/WordPress/gutenberg/pull/18617.
const label = useNewLabel
? escapeHtml( newLabel )
: originalLabel || escapeHtml( newUrlWithoutHttp );
? escapeHTML( newLabel )
: originalLabel || escapeHTML( newUrlWithoutHttp );

// In https://github.com/WordPress/gutenberg/pull/24670 we decided to use "tag" in favor of "post_tag"
const type = newType === 'post_tag' ? 'tag' : newType.replace( '-', '_' );
Expand Down