fix eslint errors

10up · Aug 25, 2023 · fd891fc · fd891fc
1 parent 2de2346
commit fd891fc
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 22 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -18,7 +18,8 @@
 		"Backbone": "readonly",
 		"_": "readonly",
 		"File": "readonly",
-		"Headers": "readonly"
+		"Headers": "readonly",
+		"requestAnimationFrame": "readonly"
 	},
 	"extends": ["plugin:@wordpress/eslint-plugin/recommended"],
 	"ignorePatterns": ["*.json"]

diff --git a/src/js/gutenberg-plugins/content-resizing-plugin.js b/src/js/gutenberg-plugins/content-resizing-plugin.js
@@ -55,6 +55,7 @@ const aiIconSvg = (
 const DEFAULT_STATE = {
 	clientId: '',
 	resizingType: null,
+	isResizing: false,
 };
 
 const resizeContentStore = createReduxStore( 'resize-content-store', {
@@ -71,6 +72,12 @@ const resizeContentStore = createReduxStore( 'resize-content-store', {
 					...state,
 					resizingType: action.resizingType,
 				};
+
+			case 'SET_IS_RESIZING':
+				return {
+					...state,
+					isResizing: action.isResizing,
+				};
 		}
 
 		return state;
@@ -88,6 +95,12 @@ const resizeContentStore = createReduxStore( 'resize-content-store', {
 				resizingType,
 			};
 		},
+		setIsResizing( isResizing ) {
+			return {
+				type: 'SET_IS_RESIZING',
+				isResizing,
+			};
+		},
 	},
 	selectors: {
 		getClientId( state ) {
@@ -96,13 +109,14 @@ const resizeContentStore = createReduxStore( 'resize-content-store', {
 		getResizingType( state ) {
 			return state.resizingType;
 		},
+		getIsResizing( state ) {
+			return state.isResizing;
+		},
 	},
 } );
 
 register( resizeContentStore );
 
-let isProcessAnimating = false;
-
 const ContentResizingPlugin = () => {
 	// Holds the original text of the block being procesed.
 	const [ blockContentAsPlainText, setBlockContentAsPlainText ] =
@@ -114,19 +128,19 @@ const ContentResizingPlugin = () => {
 	// Holds the GPT response array.
 	const [ textArray, setTextArray ] = useState( [] );
 
-	// Indicates if content resizing is in progress.
-	const [ isResizing, setIsResizing ] = useState( false );
-
 	// Indicates if the modal window with the result is open/closed.
 	const [ isModalOpen, setIsModalOpen ] = useState( false );
 
-	const { isMultiBlocksSelected, resizingType } = useSelect( ( __select ) => {
-		return {
-			isMultiBlocksSelected:
-				__select( blockEditorStore ).hasMultiSelection(),
-			resizingType: __select( resizeContentStore ).getResizingType(),
-		};
-	} );
+	const { isMultiBlocksSelected, resizingType, isResizing } = useSelect(
+		( __select ) => {
+			return {
+				isMultiBlocksSelected:
+					__select( blockEditorStore ).hasMultiSelection(),
+				resizingType: __select( resizeContentStore ).getResizingType(),
+				isResizing: __select( resizeContentStore ).getIsResizing(),
+			};
+		}
+	);
 
 	// Sets required states before resizing content.
 	useEffect( () => {
@@ -139,22 +153,21 @@ const ContentResizingPlugin = () => {
 
 	// Triggers AJAX request to resize the content.
 	useEffect( () => {
-		if ( isResizing ) {
+		if ( isResizing && selectedBlock ) {
 			( async () => {
 				const __textArray = await getResizedContent();
 				setTextArray( __textArray );
 				setIsModalOpen( true );
 			} )();
 		}
-	}, [ isResizing, getResizedContent ] );
+	}, [ isResizing, selectedBlock ] );
 
 	// Resets to default states.
 	function resetStates() {
 		setSelectedBlock( null );
 		setTextArray( [] );
 		setIsModalOpen( false );
 		dispatch( resizeContentStore ).setResizingType( null );
-		isProcessAnimating = false;
 	}
 
 	/**
@@ -169,7 +182,7 @@ const ContentResizingPlugin = () => {
 
 		setSelectedBlock( block );
 		setBlockContentAsPlainText( toPlainText( blockContent ) );
-		setIsResizing( true );
+		dispatch( resizeContentStore ).setIsResizing( true );
 	}
 
 	/**
@@ -200,12 +213,12 @@ const ContentResizingPlugin = () => {
 		if ( 200 === response.status ) {
 			__textArray = await response.json();
 		} else {
-			setIsResizing( false );
+			dispatch( resizeContentStore ).setIsResizing( false );
 			dispatch( resizeContentStore ).setClientId( '' );
 			resetStates();
 		}
 
-		setIsResizing( false );
+		dispatch( resizeContentStore ).setIsResizing( false );
 		dispatch( resizeContentStore ).setClientId( '' );
 
 		return __textArray;
@@ -385,8 +398,11 @@ registerPlugin( 'tenup-openai-expand-reduce-content', {
 
 const colorsArray = [ '#8c2525', '#ca4444', '#303030' ];
 
+let timeoutId = 0;
+
 function processAnimation( content = '' ) {
-	if ( isProcessAnimating ) {
+	if ( ! select( resizeContentStore ).getIsResizing() ) {
+		clearTimeout( timeoutId );
 		return;
 	}
 
@@ -410,7 +426,7 @@ function processAnimation( content = '' ) {
 		).innerHTML = formattedCharArray.join( ' ' );
 	}
 
-	setTimeout( () => {
+	timeoutId = setTimeout( () => {
 		requestAnimationFrame( () => processAnimation( content ) );
 	}, 1000 / 1.35 );
 }
@@ -451,7 +467,7 @@ const withInspectorControls = createHigherOrderComponent( ( BlockEdit ) => {
 
 		const __plainTextContent = toPlainText( props.attributes.content );
 
-		if ( ! isProcessAnimating ) {
+		if ( select( resizeContentStore ).getIsResizing() ) {
 			requestAnimationFrame( () =>
 				processAnimation( __plainTextContent )
 			);