ckeditor5-blazor 1.10.3 → 1.11.1

package/src/elements/editor/utils/normalize-editor-language.ts

@@ -0,0 +1,25 @@
+import type { EditorLanguage } from '../typings';
+
+/**
+ * Normalize editor language into object.
+ *
+ * @param lang Editor language.
+ * @returns Language object.
+ */
+export function normalizeEditorLanguage(lang: EditorLanguage | string): EditorLanguage {
+  if (!lang) {
+    return {
+      ui: 'en',
+      content: 'en',
+    };
+  }
+
+  if (typeof lang === 'string') {
+    return {
+      ui: lang,
+      content: lang,
+    };
+  }
+
+  return lang;
+}

package/src/elements/editor/utils/query-all-editor-editables.ts

@@ -0,0 +1,74 @@
+import type { EditorId } from '../typings';
+
+/**
+ * Queries all editable elements within a specific editor instance. It picks
+ * initial values from actually rendered elements or from the editor container's
+ * `data-cke-content` attribute, whichever is available.
+ *
+ * Roots present in the editor container's content but without a matching
+ * `cke5-editable` element yet are included with `element: null` — these are
+ * "pending" roots that haven't been attached to the DOM yet.
+ *
+ * @param editorId The ID of the editor to query.
+ * @returns An object mapping root names to their corresponding elements and content.
+ */
+export function queryAllEditorEditables(editorId: EditorId): Record<string, EditableItem> {
+  const acc = Array
+    .from(document.querySelectorAll<HTMLElement>(`cke5-editable[data-cke-editor-id="${editorId}"]`))
+    .reduce<Record<string, EditableItem>>((acc, element) => {
+      const rootName = element.getAttribute('data-cke-root-name')!;
+
+      acc[rootName] = {
+        element: element.querySelector<HTMLElement>('[data-cke-editable-content]'),
+        content: element.getAttribute('data-cke-content'),
+      };
+
+      return acc;
+    }, Object.create({}));
+
+  const rootEditorElement = document.querySelector<HTMLElement>(`cke5-editor[data-cke-editor-id="${editorId}"]`);
+
+  /* v8 ignore next -- @preserve */
+  if (!rootEditorElement) {
+    return acc;
+  }
+
+  // v8 ignore next -- @preserve
+  const editorContent: Record<string, string> = JSON.parse(rootEditorElement.getAttribute('data-cke-content')!) ?? {};
+  const classicMainElement = document.querySelector<HTMLElement>(`#${editorId}_editor`);
+
+  if (classicMainElement && !acc['main']) {
+    acc['main'] = {
+      element: classicMainElement,
+      content: editorContent['main'] || '',
+    };
+  }
+
+  for (const [rootName, rootContent] of Object.entries(editorContent)) {
+    if (acc[rootName]) {
+      // Editable element is already present — fill content from editor level if the editable didn't provide its own.
+      acc[rootName] = {
+        ...acc[rootName],
+        content: acc[rootName].content ?? rootContent,
+      };
+    }
+    else {
+      // Root has server-provided content but its editable element hasn't been attached to the DOM yet.
+      acc[rootName] = {
+        element: null,
+        content: rootContent,
+      };
+    }
+  }
+
+  return acc;
+}
+
+/**
+ * Type representing an editable item within an editor.
+ * `element` is null when the root's DOM element hasn't appeared yet (pending root).
+ */
+export type EditableItem = {
+  element: HTMLElement | null;
+  content: string | null;
+};

package/dist/elements/editor/utils/query-editor-editables.d.ts

@@ -1,25 +0,0 @@
-import { EditorId } from '../typings';
-/**
- * Gets the initial root elements for the editor based on its type.
- *
- * @param editorId The editor's ID.
- * @returns The root element(s) for the editor.
- */
-export declare function queryEditablesElements(editorId: EditorId): Record<string, HTMLElement>;
-/**
- * Gets the initial data for the roots of the editor. If the editor is a single editing-like editor,
- * it retrieves the initial value from the element's attribute. Otherwise, it returns an object mapping
- * editable names to their initial values.
- *
- * @param editorId The editor's ID.
- * @returns The initial values for the editor's roots.
- */
-export declare function queryEditablesSnapshotContent(editorId: EditorId): Record<string, string>;
-/**
- * Type representing an editable item within an editor.
- */
-export type EditableItem = {
-    element: HTMLElement;
-    content: string | null;
-};
-//# sourceMappingURL=query-editor-editables.d.ts.map

package/dist/elements/editor/utils/query-editor-editables.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"query-editor-editables.d.ts","sourceRoot":"","sources":["../../../../../src/elements/editor/utils/query-editor-editables.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAI3C;;;;;GAKG;AACH,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,QAAQ,+BAIxD;AAED;;;;;;;GAOG;AACH,wBAAgB,6BAA6B,CAAC,QAAQ,EAAE,QAAQ,GAIW,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAChG;AAiED;;GAEG;AACH,MAAM,MAAM,YAAY,GAAG;IACzB,OAAO,EAAE,WAAW,CAAC;IACrB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;CACxB,CAAC"}

package/src/elements/editor/utils/query-editor-editables.ts

@@ -1,101 +0,0 @@
-import type { EditorId } from '../typings';
-
-import { filterObjectValues, mapObjectValues } from '../../../shared';
-
-/**
- * Gets the initial root elements for the editor based on its type.
- *
- * @param editorId The editor's ID.
- * @returns The root element(s) for the editor.
- */
-export function queryEditablesElements(editorId: EditorId) {
-  const editables = queryAllEditorEditables(editorId);
-
-  return mapObjectValues(editables, ({ element }) => element);
-}
-
-/**
- * Gets the initial data for the roots of the editor. If the editor is a single editing-like editor,
- * it retrieves the initial value from the element's attribute. Otherwise, it returns an object mapping
- * editable names to their initial values.
- *
- * @param editorId The editor's ID.
- * @returns The initial values for the editor's roots.
- */
-export function queryEditablesSnapshotContent(editorId: EditorId) {
-  const editables = queryAllEditorEditables(editorId);
-  const values = mapObjectValues(editables, ({ content }) => content);
-
-  return filterObjectValues(values, value => typeof value === 'string') as Record<string, string>;
-}
-
-/**
- * Queries all editable elements within a specific editor instance. It picks
- * initial values from actually rendered elements or from the editor container's.
- *
- * It may differ from the `initialData` used during editor creation, as it might
- * not set all roots or set different values.
- *
- * @param editorId The ID of the editor to query.
- * @returns An object mapping editable names to their corresponding elements and initial values.
- */
-function queryAllEditorEditables(editorId: EditorId) {
-  const acc = (
-    Array
-      .from(document.querySelectorAll<HTMLElement>(`cke5-editable[data-cke-editor-id="${editorId}"]`))
-      .reduce<Record<string, EditableItem>>((acc, element) => {
-        const rootName = element.getAttribute('data-cke-root-name')!;
-        const content = element.getAttribute('data-cke-content');
-
-        acc[rootName] = {
-          element: element.querySelector<HTMLElement>('[data-cke-editable-content]')!,
-          content,
-        };
-
-        return acc;
-      }, Object.create({}))
-  );
-
-  const editor = document.querySelector<HTMLElement>(`cke5-editor[data-cke-editor-id="${editorId}"]`);
-
-  /* v8 ignore next -- @preserve */
-  if (!editor) {
-    return acc;
-  }
-
-  const currentMain = acc['main'];
-  const initialRootEditableValue = JSON.parse(editor.getAttribute('data-cke-content')!);
-  const contentElement = document.querySelector<HTMLElement>(`#${editorId}_editor `);
-
-  // If found `main` editable, but it has no content, try to fill it from the editor container.
-  if (currentMain && initialRootEditableValue?.['main']) {
-    return {
-      ...acc,
-      main: {
-        ...currentMain,
-        content: currentMain.content || initialRootEditableValue['main'],
-      },
-    };
-  }
-
-  // If no `main` editable found, try to create it from the editor container.
-  if (contentElement) {
-    return {
-      ...acc,
-      main: {
-        element: contentElement,
-        content: initialRootEditableValue?.['main'] || null,
-      },
-    };
-  }
-
-  return acc;
-}
-
-/**
- * Type representing an editable item within an editor.
- */
-export type EditableItem = {
-  element: HTMLElement;
-  content: string | null;
-};