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

T367115: Fix format removal bug #124

Merged
merged 1 commit into from
Jun 11, 2024
Merged

T367115: Fix format removal bug #124

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
63 changes: 28 additions & 35 deletions src/link/edit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { useEffect, useState, useRef } from '@wordpress/element';
import { useEffect, useState, useRef, useCallback } from '@wordpress/element';
import { BlockControls } from '@wordpress/block-editor';
import { ToolbarGroup, ToolbarButton } from '@wordpress/components';
import {
Expand Down Expand Up @@ -45,7 +45,6 @@ const Edit = ( {
const [ viewingPreview, setViewingPreview ] = useState( false );
const startViewingPreview = () => setViewingPreview( true );
const stopViewingPreview = () => setViewingPreview( false );
const [ lastValue, setLastValue ] = useState( value );
const valueRef = useRef( value );
const toolbarButtonRef = useRef();

Expand Down Expand Up @@ -99,47 +98,30 @@ const Edit = ( {
stopViewingPreview();
};

const removesPreviewFormat = () => {
const counter = ( count, format ) => {
if ( format[ 0 ].type === formatType ) {
return count + 1;
}
return count;
};
const lastValueCount = lastValue.formats && lastValue.formats.reduce( counter, 0 );
const valueCount = value.formats && value.formats.reduce( counter, 0 );

if ( valueCount === 0 ) {
return false;
}

return lastValueCount > valueCount;
};

const goToEdit = () => {
startAddingPreview();
stopViewingPreview();
};

const getFormatStart = ( position ) => {
const getFormatStart = useCallback( ( position ) => {
if (
value.formats[ position ] &&
value.formats[ position ][ 0 ].type === formatType
) {
return getFormatStart( position - 1 );
}
return position;
};
}, [ value.formats ] );

const getFormatEnd = ( position ) => {
const getFormatEnd = useCallback( ( position ) => {
if (
value.formats[ position ] &&
value.formats[ position ][ 0 ].type === formatType
) {
return getFormatEnd( position + 1 );
}
return position;
};
}, [ value.formats ] );

const getTrimmedStart = ( selectedValue ) => {
const selectedString = selectedValue.text.slice(
Expand Down Expand Up @@ -167,6 +149,27 @@ const Edit = ( {
return selectedValue.end;
};

const handleTextFormatRemoval = useCallback( () => {
// Assuming a Left-To-Right language:
// --> cursorDirection > 0 means cursor is moving left
// --> cursorDirection < 0 means cursor is moving right
const previousValue = valueRef.current;
const cursorDirection = previousValue.start - value.start;
const editDetected = value.text !== previousValue.text;
const involvesPreviewFormat =
cursorDirection >= 0
? previousValue.formats[ value.start ] &&
previousValue.formats[ value.start ][ 0 ].type === formatType
: previousValue.formats[ value.end - 1 ] &&
previousValue.formats[ value.end - 1 ][ 0 ].type === formatType;

if ( editDetected && involvesPreviewFormat ) {
const formatStart = getFormatStart( value.start - 1 );
const formatEnd = getFormatEnd( value.end + 1 );
onChange( removeFormat( value, formatType, formatStart, formatEnd ) );
}
}, [ getFormatStart, getFormatEnd, onChange, value ] );

useEffect( () => {
if ( Object.keys( activeAttributes ).length ) {
stopAddingPreview();
Expand All @@ -177,19 +180,9 @@ const Edit = ( {
}, [ activeAttributes ] );

useEffect( () => {
handleTextFormatRemoval();
valueRef.current = value;

if ( removesPreviewFormat() ) {
const formatStart = getFormatStart( value.start - 1 );
const formatEnd = getFormatEnd( value.end + 1 );
onChange( removeFormat( value, formatType, formatStart, formatEnd ) );
}
}, [ value.formats ] );

useEffect( () => {
// Update lastValue with the previous value
setLastValue( valueRef.current );
}, [ value ] );
}, [ value, handleTextFormatRemoval ] );

return (
<>
Expand Down
Loading