ckeditor5-phoenix 1.25.0 → 1.26.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ckeditor5-phoenix",
-  "version": "1.25.0",
+  "version": "1.26.0",
   "description": "CKEditor 5 integration for Phoenix Framework",
   "author": "Mateusz Bagiński <cziken58@gmail.com>",
   "license": "MIT",
@@ -23,18 +23,9 @@
     "src",
     "test-utils"
   ],
-  "scripts": {
-    "clean": "rm -rf dist",
-    "build": "npm run clean && vite build && node ./scripts/check-dist-imports.mjs",
-    "watch": "vite build --watch",
-    "dev": "vite build --watch",
-    "typecheck": "tsc --noEmit --pretty",
-    "test": "vitest --coverage",
-    "test:watch": "vitest --watch --coverage"
-  },
   "dependencies": {
-    "ckeditor5": "^47.6.0",
-    "ckeditor5-premium-features": "^47.4.0",
+    "ckeditor5": "^48.1.0",
+    "ckeditor5-premium-features": "^48.1.0",
     "phoenix_live_view": "^1.0.17"
   },
   "devDependencies": {
@@ -46,5 +37,14 @@
     "vite-plugin-dts": "^4.5.4",
     "vite-tsconfig-paths": "^5.1.4",
     "vitest": "^3.2.3"
+  },
+  "scripts": {
+    "clean": "rm -rf dist",
+    "build": "npm run clean && vite build && node ./scripts/check-dist-imports.mjs",
+    "watch": "vite build --watch",
+    "dev": "vite build --watch",
+    "typecheck": "tsc --noEmit --pretty",
+    "test": "vitest --coverage",
+    "test:watch": "vitest --watch --coverage"
   }
-}
+}

package/src/hooks/editor/editor.ts

@@ -121,7 +121,29 @@ class EditorHookImpl extends ClassHook {
         };
       });
 
-      this.onBeforeDestroy(unmountEffect);
+      this.onBeforeDestroy(async () => {
+        // If for some reason editor not fired `destroy`, enforce deregistration.
+        EditorsRegistry.the.unregister(editorId);
+        unmountEffect();
+
+        const editorContext = unwrapEditorContext(editor);
+        const watchdog = unwrapEditorWatchdog(editor);
+
+        if (editorContext) {
+          // If context is present, make sure it's not in unmounting phase, as it'll kill the editors.
+          // If it's being destroyed, don't do anything, as the context will take care of it.
+          if (editorContext.state !== 'unavailable') {
+            await editorContext.context.remove(editorContext.editorContextId);
+          }
+        }
+        else if (watchdog) {
+          await watchdog.destroy();
+        }
+        else {
+          await editor.destroy();
+        }
+      });
+
       EditorsRegistry.the.register(editorId, editor);
     }
     catch (error: any) {
@@ -140,41 +162,10 @@ class EditorHookImpl extends ClassHook {
   }
 
   /**
-   * Destroys the editor instance when the component is destroyed.
-   * This is important to prevent memory leaks and ensure that the editor is properly cleaned up.
+   * Destroys editor component.
    */
   override async destroyed() {
-    const { editorId } = this.attrs;
-
-    // Let's hide the element during destruction to prevent flickering.
     this.el.style.display = 'none';
-
-    // Let's wait for the mounted promise to resolve before proceeding with destruction.
-    const editor = await EditorsRegistry.the.waitFor(editorId);
-
-    /* v8 ignore next 3 */
-    if (!editor) {
-      return;
-    }
-
-    EditorsRegistry.the.unregister(editorId);
-
-    const editorContext = unwrapEditorContext(editor);
-    const watchdog = unwrapEditorWatchdog(editor);
-
-    if (editorContext) {
-      // If context is present, make sure it's not in unmounting phase, as it'll kill the editors.
-      // If it's being destroyed, don't do anything, as the context will take care of it.
-      if (editorContext.state !== 'unavailable') {
-        await editorContext.context.remove(editorContext.editorContextId);
-      }
-    }
-    else if (watchdog) {
-      await watchdog.destroy();
-    }
-    else {
-      await editor.destroy();
-    }
   }
 
   /**
@@ -290,7 +281,7 @@ class EditorHookImpl extends ClassHook {
 
       const editor = await (async () => {
         if (!context || !(sourceElements instanceof HTMLElement)) {
-          return Constructor.create(sourceElements as any, parsedConfig);
+          return (Constructor.create as any)(sourceElements, parsedConfig);
         }
 
         const result = await createEditorInContext({