@wordpress/format-library 3.8.0 → 3.11.0

package/src/link/utils.js

@@ -1,8 +1,3 @@
-/**
- * External dependencies
- */
-import { startsWith, find, partialRight } from 'lodash';
-
 /**
  * WordPress dependencies
  */
@@ -47,7 +42,7 @@ export function isValidHref( href ) {
 		// Add some extra checks for http(s) URIs, since these are the most common use-case.
 		// This ensures URIs with an http protocol have exactly two forward slashes following the protocol.
 		if (
-			startsWith( protocol, 'http' ) &&
+			protocol.startsWith( 'http' ) &&
 			! /^https?:\/\/[^\/\s]/i.test( trimmedHref )
 		) {
 			return false;
@@ -75,7 +70,7 @@ export function isValidHref( href ) {
 	}
 
 	// Validate anchor links.
-	if ( startsWith( trimmedHref, '#' ) && ! isValidFragment( trimmedHref ) ) {
+	if ( trimmedHref.startsWith( '#' ) && ! isValidFragment( trimmedHref ) ) {
 		return false;
 	}
 
@@ -146,17 +141,17 @@ export function getFormatBoundary(
 	// Clone formats to avoid modifying source formats.
 	const newFormats = formats.slice();
 
-	const formatAtStart = find( newFormats[ startIndex ], {
-		type: format.type,
-	} );
+	const formatAtStart = newFormats[ startIndex ]?.find(
+		( { type } ) => type === format.type
+	);
 
-	const formatAtEnd = find( newFormats[ endIndex ], {
-		type: format.type,
-	} );
+	const formatAtEnd = newFormats[ endIndex ]?.find(
+		( { type } ) => type === format.type
+	);
 
-	const formatAtEndMinusOne = find( newFormats[ endIndex - 1 ], {
-		type: format.type,
-	} );
+	const formatAtEndMinusOne = newFormats[ endIndex - 1 ]?.find(
+		( { type } ) => type === format.type
+	);
 
 	if ( !! formatAtStart ) {
 		// Set values to conform to "start"
@@ -239,6 +234,11 @@ function walkToBoundary(
 	return index;
 }
 
+const partialRight =
+	( fn, ...partialArgs ) =>
+	( ...args ) =>
+		fn( ...args, ...partialArgs );
+
 const walkToStart = partialRight( walkToBoundary, 'backwards' );
 
 const walkToEnd = partialRight( walkToBoundary, 'forwards' );

package/src/strikethrough/index.js

@@ -3,7 +3,10 @@
  */
 import { __ } from '@wordpress/i18n';
 import { toggleFormat } from '@wordpress/rich-text';
-import { RichTextToolbarButton } from '@wordpress/block-editor';
+import {
+	RichTextToolbarButton,
+	RichTextShortcut,
+} from '@wordpress/block-editor';
 import { formatStrikethrough } from '@wordpress/icons';
 
 const name = 'core/strikethrough';
@@ -21,13 +24,20 @@ export const strikethrough = {
 		}
 
 		return (
-			<RichTextToolbarButton
-				icon={ formatStrikethrough }
-				title={ title }
-				onClick={ onClick }
-				isActive={ isActive }
-				role="menuitemcheckbox"
-			/>
+			<>
+				<RichTextShortcut
+					type="access"
+					character="d"
+					onUse={ onClick }
+				/>
+				<RichTextToolbarButton
+					icon={ formatStrikethrough }
+					title={ title }
+					onClick={ onClick }
+					isActive={ isActive }
+					role="menuitemcheckbox"
+				/>
+			</>
 		);
 	},
 };

package/src/text-color/index.js

@@ -65,12 +65,14 @@ function TextColorEdit( {
 	const allowCustomControl = useSetting( 'color.custom' );
 	const colors = useSetting( 'color.palette' ) || EMPTY_ARRAY;
 	const [ isAddingColor, setIsAddingColor ] = useState( false );
-	const enableIsAddingColor = useCallback( () => setIsAddingColor( true ), [
-		setIsAddingColor,
-	] );
-	const disableIsAddingColor = useCallback( () => setIsAddingColor( false ), [
-		setIsAddingColor,
-	] );
+	const enableIsAddingColor = useCallback(
+		() => setIsAddingColor( true ),
+		[ setIsAddingColor ]
+	);
+	const disableIsAddingColor = useCallback(
+		() => setIsAddingColor( false ),
+		[ setIsAddingColor ]
+	);
 	const colorIndicatorStyle = useMemo(
 		() =>
 			fillComputedColors(

package/src/text-color/index.native.js

@@ -72,12 +72,14 @@ function TextColorEdit( {
 	const allowCustomControl = useSetting( 'color.custom' );
 	const colors = useMobileGlobalStylesColors();
 	const [ isAddingColor, setIsAddingColor ] = useState( false );
-	const enableIsAddingColor = useCallback( () => setIsAddingColor( true ), [
-		setIsAddingColor,
-	] );
-	const disableIsAddingColor = useCallback( () => setIsAddingColor( false ), [
-		setIsAddingColor,
-	] );
+	const enableIsAddingColor = useCallback(
+		() => setIsAddingColor( true ),
+		[ setIsAddingColor ]
+	);
+	const disableIsAddingColor = useCallback(
+		() => setIsAddingColor( false ),
+		[ setIsAddingColor ]
+	);
 	const colorIndicatorStyle = useMemo(
 		() =>
 			fillComputedColors(

package/src/text-color/inline.native.js

@@ -1,9 +1,3 @@
-/**
- * External dependencies
- */
-
-import { reject } from 'lodash';
-
 /**
  * WordPress dependencies
  */
@@ -110,7 +104,9 @@ function setColors( value, name, colorSettings, colors ) {
 		const newFormat = applyFormat( value, format );
 		const { activeFormats } = newFormat;
 		newFormat.formats[ value.start ] = [
-			...reject( activeFormats, { type: format.type } ),
+			...( activeFormats?.filter(
+				( { type } ) => type !== format.type
+			) || [] ),
 			format,
 		];
 		return newFormat;

package/src/text-color/test/index.native.js

@@ -55,11 +55,8 @@ describe( 'Text color', () => {
 	} );
 
 	it( 'allows toggling the highlight color feature to type new text', async () => {
-		const {
-			getByA11yLabel,
-			getByTestId,
-			getByA11yHint,
-		} = await initializeEditor();
+		const { getByA11yLabel, getByTestId, getByA11yHint } =
+			await initializeEditor();
 
 		// Wait for the editor placeholder
 		const paragraphPlaceholder = await waitFor( () =>