Merge remote-tracking branch 'origin/v15/feature/tiptap' into v15/feature/rte/tiptap/render-toolbar

Author: JesmoDev

examples/dashboard-with-property-dataset/index.ts

@@ -1,4 +1,4 @@
-import type { ManifestDashboard } from '@umbraco-cms/backoffice/extension-registry';
+import type { ManifestDashboard } from '@umbraco-cms/backoffice/dashboard';
 
 export const manifests: Array<ManifestDashboard> = [
 	{

examples/manifest-picker/index.ts

@@ -1,4 +1,4 @@
-import type { ManifestDashboard } from '@umbraco-cms/backoffice/extension-registry';
+import type { ManifestDashboard } from '@umbraco-cms/backoffice/dashboard';
 
 export const manifests: Array<ManifestDashboard> = [
 	{

examples/sorter-with-nested-containers/index.ts

@@ -1,4 +1,4 @@
-import type { ManifestDashboard } from '@umbraco-cms/backoffice/extension-registry';
+import type { ManifestDashboard } from '@umbraco-cms/backoffice/dashboard';
 
 export const manifests: Array<ManifestDashboard> = [
 	{

examples/sorter-with-two-containers/index.ts

@@ -1,4 +1,4 @@
-import type { ManifestDashboard } from '@umbraco-cms/backoffice/extension-registry';
+import type { ManifestDashboard } from '@umbraco-cms/backoffice/dashboard';
 
 export const manifests: Array<ManifestDashboard> = [
 	{

package-lock.json

@@ -32,6 +32,7 @@
 		"./culture": "./dist-cms/packages/core/culture/index.js",
 		"./picker": "./dist-cms/packages/core/picker/index.js",
 		"./current-user": "./dist-cms/packages/user/current-user/index.js",
+		"./dashboard": "./dist-cms/packages/core/dashboard/index.js",
 		"./data-type": "./dist-cms/packages/data-type/index.js",
 		"./debug": "./dist-cms/packages/core/debug/index.js",
 		"./dictionary": "./dist-cms/packages/dictionary/index.js",
@@ -43,6 +44,7 @@
 		"./entity": "./dist-cms/packages/core/entity/index.js",
 		"./event": "./dist-cms/packages/core/event/index.js",
 		"./extension-registry": "./dist-cms/packages/core/extension-registry/index.js",
+		"./health-check": "./dist-cms/packages/health-check/index.js",
 		"./help": "./dist-cms/packages/help/index.js",
 		"./icon": "./dist-cms/packages/core/icon-registry/index.js",
 		"./id": "./dist-cms/packages/core/id/index.js",
@@ -213,6 +215,8 @@
 		"@tiptap/extension-paragraph": "^2.7.4",
 		"@tiptap/extension-placeholder": "^2.7.4",
 		"@tiptap/extension-strike": "^2.7.4",
+		"@tiptap/extension-subscript": "^2.7.4",
+		"@tiptap/extension-superscript": "^2.7.4",
 		"@tiptap/extension-table": "^2.7.4",
 		"@tiptap/extension-table-cell": "^2.7.4",
 		"@tiptap/extension-table-header": "^2.7.4",

package.json

@@ -23,6 +23,8 @@ export { Link } from '@tiptap/extension-link';
 export { ListItem } from '@tiptap/extension-list-item';
 export { OrderedList } from '@tiptap/extension-ordered-list';
 export { Strike } from '@tiptap/extension-strike';
+export { Subscript } from '@tiptap/extension-subscript';
+export { Superscript } from '@tiptap/extension-superscript';
 export { Table } from '@tiptap/extension-table';
 export { TableCell } from '@tiptap/extension-table-cell';
 export { TableHeader } from '@tiptap/extension-table-header';

src/external/tiptap/index.ts

@@ -43,6 +43,6 @@ export class UmbBlockRteManagerContext<
 	 * @internal
 	 */
 	public deleteLayoutElement(contentKey: string) {
-		this.removeBlockUdi(contentKey);
+		this.removeBlockKey(contentKey);
 	}
 }

src/packages/block/block-rte/context/block-rte-manager.context.ts

@@ -95,7 +95,7 @@ export abstract class UmbBlockEntriesContext<
 		layoutEntry: BlockLayoutType,
 		content: UmbBlockDataModel,
 		settings: UmbBlockDataModel | undefined,
-		originData: UmbBlockWorkspaceOriginData,
+		originData: BlockOriginData,
 	): Promise<boolean>;
 	//edit?
 	//editSettings

src/packages/block/block/context/block-entries.context.ts

@@ -91,6 +91,9 @@ export abstract class UmbBlockManagerContext<
 	setContents(contents: Array<UmbBlockDataModel>) {
 		this.#contents.setValue(contents);
 	}
+	getContents() {
+		return this.#contents.value;
+	}
 	setSettings(settings: Array<UmbBlockDataModel>) {
 		this.#settings.setValue(settings);
 	}
@@ -307,7 +310,7 @@ export abstract class UmbBlockManagerContext<
 		}
 	}
 
-	protected removeBlockUdi(contentUdi: string) {
-		this.#contents.removeOne(contentUdi);
+	protected removeBlockKey(contentKey: string) {
+		this.#contents.removeOne(contentKey);
 	}
 }