Merge branch 'main' into v15/bugfix/document-blueprint-alignment

madsrasmussen · web-flow · commit bb1c5dbdfc10 · 2024-10-01T12:37:48.000+02:00
diff --git a/src/packages/core/extension-registry/extensions/index.ts b/src/packages/core/extension-registry/extensions/index.ts
@@ -7,10 +7,6 @@ export type * from './external-login-provider-element.interface.js';
 export type * from './external-login-provider.extension.js';
 export type * from './global-context.extension.js';
 export type * from './header-app.extension.js';
-export type * from './menu-item-element.interface.js';
-export type * from './menu-item-element.interface.js';
-export type * from './menu-item.extension.js';
-export type * from './menu.extension.js';
 export type * from './mfa-login-provider.extension.js';
 export type * from './preview-app.extension.js';
 export type * from './repository.extension.js';
diff --git a/src/packages/core/extension-registry/extensions/menu-item.extension.ts b/src/packages/core/extension-registry/extensions/menu-item.extension.ts
diff --git a/src/packages/core/menu/components/menu-item/index.ts b/src/packages/core/menu/components/menu-item/index.ts
@@ -1 +1,2 @@
 export * from './menu-item-default.element.js';
+export * from './link/index.js';
diff --git a/src/packages/core/menu/components/menu-item/link/index.ts b/src/packages/core/menu/components/menu-item/link/index.ts
@@ -0,0 +1 @@
+export * from './types.js';
diff --git a/src/packages/core/menu/components/menu-item/link/link-menu-item.element.ts b/src/packages/core/menu/components/menu-item/link/link-menu-item.element.ts
@@ -1,6 +1,7 @@
+import type { UmbMenuItemElement } from '../../../menu-item-element.interface.js';
+import type { ManifestMenuItemLinkKind } from './types.js';
 import { customElement, html, property } from '@umbraco-cms/backoffice/external/lit';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
-import type { ManifestMenuItemLinkKind, UmbMenuItemElement } from '@umbraco-cms/backoffice/extension-registry';
 
 const elementName = 'umb-link-menu-item';
 @customElement(elementName)
diff --git a/src/packages/core/menu/components/menu-item/link/types.ts b/src/packages/core/menu/components/menu-item/link/types.ts
@@ -0,0 +1,17 @@
+import type { ManifestMenuItem, MetaMenuItem } from '../../../menu-item.extension.js';
+
+export interface ManifestMenuItemLinkKind extends ManifestMenuItem {
+	type: 'menuItem';
+	kind: 'link';
+	meta: MetaMenuItemLinkKind;
+}
+
+export interface MetaMenuItemLinkKind extends MetaMenuItem {
+	href: string;
+}
+
+declare global {
+	interface UmbExtensionManifestMap {
+		umbLinkMenuItemKind: ManifestMenuItemLinkKind;
+	}
+}
diff --git a/src/packages/core/menu/components/menu-item/menu-item-default.element.ts b/src/packages/core/menu/components/menu-item/menu-item-default.element.ts
@@ -1,7 +1,8 @@
+import type { UmbMenuItemElement } from '../../menu-item-element.interface.js';
+import type { ManifestMenuItem } from '../../menu-item.extension.js';
 import { customElement, html, property, state } from '@umbraco-cms/backoffice/external/lit';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import { UMB_SECTION_CONTEXT } from '@umbraco-cms/backoffice/section';
-import type { ManifestMenuItem, UmbMenuItemElement } from '@umbraco-cms/backoffice/extension-registry';
 
 @customElement('umb-menu-item-default')
 export class UmbMenuItemDefaultElement extends UmbLitElement implements UmbMenuItemElement {
diff --git a/src/packages/core/menu/components/menu/menu.context.ts b/src/packages/core/menu/components/menu/menu.context.ts
@@ -1,4 +1,4 @@
-import type { ManifestMenu } from '@umbraco-cms/backoffice/extension-registry';
+import type { ManifestMenu } from '../../menu.extension.js';
 import { UmbContextToken } from '@umbraco-cms/backoffice/context-api';
 import { UmbDeepState } from '@umbraco-cms/backoffice/observable-api';
 
diff --git a/src/packages/core/menu/components/menu/menu.element.ts b/src/packages/core/menu/components/menu/menu.element.ts
@@ -1,5 +1,6 @@
+import type { ManifestMenu } from '../../menu.extension.js';
+import type { ManifestMenuItem } from '../../menu-item.extension.js';
 import { html, customElement, property } from '@umbraco-cms/backoffice/external/lit';
-import type { ManifestMenu, ManifestMenuItem } from '@umbraco-cms/backoffice/extension-registry';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 
 import '../menu-item/menu-item-default.element.js';
diff --git a/src/packages/core/menu/index.ts b/src/packages/core/menu/index.ts
@@ -2,5 +2,8 @@ export * from './components/index.js';
 export * from './menu-tree-structure-workspace-context-base.js';
 export * from './menu-variant-tree-structure-workspace-context-base.js';
 export * from './types.js';
+export type * from './menu-item-element.interface.js';
+export type * from './menu-item.extension.js';
+export type * from './menu.extension.js';
 
 export type { UmbMenuStructureWorkspaceContext } from './menu-structure-workspace-context.interface.js';
diff --git a/src/packages/core/menu/menu-item-element.interface.ts b/src/packages/core/menu/menu-item-element.interface.ts
diff --git a/src/packages/core/menu/menu-item.extension.ts b/src/packages/core/menu/menu-item.extension.ts
@@ -0,0 +1,22 @@
+import type { UmbMenuItemElement } from './menu-item-element.interface.js';
+import type { ManifestWithDynamicConditions, ManifestElement } from '@umbraco-cms/backoffice/extension-api';
+
+export interface ManifestMenuItem
+	extends ManifestElement<UmbMenuItemElement>,
+		ManifestWithDynamicConditions<UmbExtensionCondition> {
+	type: 'menuItem';
+	meta: MetaMenuItem;
+}
+
+export interface MetaMenuItem {
+	label: string;
+	menus: Array<string>;
+	entityType?: string;
+	icon?: string;
+}
+
+declare global {
+	interface UmbExtensionManifestMap {
+		umbMenuItem: ManifestMenuItem;
+	}
+}
diff --git a/src/packages/core/menu/menu.extension.ts b/src/packages/core/menu/menu.extension.ts
diff --git a/src/packages/core/menu/section-sidebar-menu/section-sidebar-menu.element.ts b/src/packages/core/menu/section-sidebar-menu/section-sidebar-menu.element.ts
@@ -1,9 +1,10 @@
 import type { ManifestSectionSidebarAppBaseMenu, ManifestSectionSidebarAppMenuKind } from './types.js';
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
 import { css, html, customElement, property } from '@umbraco-cms/backoffice/external/lit';
-import type { ManifestMenu, UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry';
+import type { UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry';
 import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
+import type { ManifestMenu } from '../menu.extension.js';
 
 // TODO: Move to separate file:
 const manifest: UmbExtensionManifestKind = {
diff --git a/src/packages/core/tree/tree-menu-item-default/index.ts b/src/packages/core/tree/tree-menu-item-default/index.ts
@@ -1 +1,2 @@
 export * from './tree-menu-item-default.element.js';
+export * from './types.js';
diff --git a/src/packages/core/tree/tree-menu-item-default/tree-menu-item-default.element.ts b/src/packages/core/tree/tree-menu-item-default/tree-menu-item-default.element.ts
@@ -1,11 +1,9 @@
+import type { ManifestMenuItemTreeKind } from './types.js';
 import { html, nothing, customElement, property } from '@umbraco-cms/backoffice/external/lit';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
-import type {
-	ManifestMenuItemTreeKind,
-	UmbExtensionManifestKind,
-	UmbMenuItemElement,
-} from '@umbraco-cms/backoffice/extension-registry';
+import type { UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry';
 import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry';
+import type { UmbMenuItemElement } from '@umbraco-cms/backoffice/menu';
 
 // TODO: Move to separate file:
 const manifest: UmbExtensionManifestKind = {
diff --git a/src/packages/core/tree/tree-menu-item-default/types.ts b/src/packages/core/tree/tree-menu-item-default/types.ts
@@ -0,0 +1,18 @@
+import type { ManifestMenuItem, MetaMenuItem } from '@umbraco-cms/backoffice/menu';
+
+export interface ManifestMenuItemTreeKind extends ManifestMenuItem {
+	type: 'menuItem';
+	kind: 'tree';
+	meta: MetaMenuItemTreeKind;
+}
+
+export interface MetaMenuItemTreeKind extends MetaMenuItem {
+	treeAlias: string;
+	hideTreeRoot?: boolean;
+}
+
+declare global {
+	interface UmbExtensionManifestMap {
+		umbTreeMenuItemKind: ManifestMenuItemTreeKind;
+	}
+}
diff --git a/src/packages/help/header-app/help-header-app.element.ts b/src/packages/help/header-app/help-header-app.element.ts
@@ -2,7 +2,8 @@ import { UMB_HELP_MENU_ALIAS } from '../menu/index.js';
 import type { CSSResultGroup } from '@umbraco-cms/backoffice/external/lit';
 import { css, html, customElement, state, nothing } from '@umbraco-cms/backoffice/external/lit';
 import { UmbHeaderAppButtonElement } from '@umbraco-cms/backoffice/components';
-import { umbExtensionsRegistry, type ManifestMenu } from '@umbraco-cms/backoffice/extension-registry';
+import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry';
+import type { ManifestMenu } from '@umbraco-cms/backoffice/menu';
 import { UmbExtensionsManifestInitializer } from '@umbraco-cms/backoffice/extension-api';
 
 const elementName = 'umb-help-header-app';
diff --git a/src/packages/rte/tiny-mce/property-editors/tiny-mce/manifests.ts b/src/packages/rte/tiny-mce/property-editors/tiny-mce/manifests.ts
@@ -46,7 +46,7 @@ export const manifests: Array<UmbExtensionManifest> = [
 									{ alias: 'alignleft', label: 'Align left', icon: 'align-left' },
 									{ alias: 'aligncenter', label: 'Align center', icon: 'align-center' },
 									{ alias: 'alignright', label: 'Align right', icon: 'align-right' },
-									{ alias: 'alignjustify', label: 'Justify justify', icon: 'align-justify' },
+									{ alias: 'alignjustify', label: 'Align justify', icon: 'align-justify' },
 									{ alias: 'bullist', label: 'Bullet list', icon: 'unordered-list' },
 									{ alias: 'numlist', label: 'Numbered list', icon: 'ordered-list' },
 									{ alias: 'outdent', label: 'Outdent', icon: 'outdent' },
diff --git a/src/packages/rte/tiny-mce/property-editors/toolbar/property-editor-ui-tiny-mce-toolbar-configuration.element.ts b/src/packages/rte/tiny-mce/property-editors/toolbar/property-editor-ui-tiny-mce-toolbar-configuration.element.ts
@@ -114,17 +114,17 @@ export class UmbPropertyEditorUITinyMceToolbarConfigurationElement
 
 	override render() {
 		return html`<ul>
-			${repeat(
-				this._toolbarConfig,
-				(v) => v.alias,
+				${repeat(
+					this._toolbarConfig,
+					(v) => v.alias,
 				(v) =>
 					html`<li>
-						<uui-checkbox label=${v.label} value=${v.alias} ?checked=${v.selected} @change=${this.onChange}>
-							<uui-icon .svg=${tinyIconSet?.icons[v.icon ?? 'alignjustify']}></uui-icon>
+							<uui-checkbox label=${v.label} value=${v.alias} ?checked=${v.selected} @change=${this.onChange}>
+								<uui-icon .svg=${tinyIconSet?.icons[v.icon ?? 'alignjustify']}></uui-icon>
 							${v.label}
-						</uui-checkbox>
+							</uui-checkbox>
 					</li>`,
-			)}
+				)}
 		</ul>`;
 	}
 
@@ -135,6 +135,12 @@ export class UmbPropertyEditorUITinyMceToolbarConfigurationElement
 				list-style: none;
 				padding: 0;
 				margin: 0;
+
+				uui-icon {
+					width: 1.5em;
+					height: 1.5em;
+					margin-right: 5px;
+				}
 			}
 		`,
 	];

Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`	`1`	`export * from './menu-item-default.element.js';`
	`2`	`+export * from './link/index.js';`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import type { ManifestMenu } from '@umbraco-cms/backoffice/extension-registry';`
	`1`	`+import type { ManifestMenu } from '../../menu.extension.js';`
`2`	`2`	`import { UmbContextToken } from '@umbraco-cms/backoffice/context-api';`
`3`	`3`	`import { UmbDeepState } from '@umbraco-cms/backoffice/observable-api';`
`4`	`4`