Prevent possible race conditions while accessing watchdog in initializer

ckeditor · Jun 7, 2024 · f2118e1 · f2118e1
1 parent 6b114d7
commit f2118e1
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/ckeditor.tsx b/src/ckeditor.tsx
@@ -223,7 +223,9 @@ export default class CKEditor<TEditor extends Editor> extends React.Component<Pr
 		}
 
 		const watchdog = ( () => {
-			if ( isContextWatchdogValueWithStatus( 'initialized', this.context ) ) {
+			// There is small delay where React did not update the context yet but watchdog is already destroyed.
+			// However editor should be created again in such case, after receiving new context.
+			if ( isContextWatchdogValueWithStatus( 'initialized', this.context ) && this.context.watchdog.state !== 'destroyed' ) {
 				return new EditorWatchdogAdapter( this.context.watchdog );
 			}