Skip to content

Commit 681ab09

Browse files
authored
Merge branch 'main' into v15/feature/emm-theme
2 parents c68d710 + 4e83912 commit 681ab09

File tree

5 files changed

+16
-11
lines changed

5 files changed

+16
-11
lines changed

src/packages/core/extension-registry/models/index.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ import type { ManifestLocalization } from './localization.model.js';
2929
import type { ManifestMenu } from './menu.model.js';
3030
import type { ManifestMenuItem, ManifestMenuItemLinkKind, ManifestMenuItemTreeKind } from './menu-item.model.js';
3131
import type { ManifestPreviewAppProvider } from './preview-app.model.js';
32-
import type { ManifestPropertyAction, ManifestPropertyActionDefaultKind } from './property-action.model.js';
3332
import type { ManifestPropertyEditorUi, ManifestPropertyEditorSchema } from './property-editor.model.js';
3433
import type { ManifestRepository } from './repository.model.js';
3534
import type { ManifestSection } from './section.model.js';
@@ -74,7 +73,6 @@ export type * from './mfa-login-provider.model.js';
7473
export type * from './monaco-markdown-editor-action.model.js';
7574
export type * from './picker-search-result-item.model.js';
7675
export type * from './preview-app.model.js';
77-
export type * from './property-action.model.js';
7876
export type * from './property-editor.model.js';
7977
export type * from './repository.model.js';
8078
export type * from './section-sidebar-app.model.js';
@@ -103,8 +101,6 @@ export type ManifestEntityActions =
103101
| ManifestEntityActionTrashKind
104102
| ManifestEntityActionUpdateFolderKind;
105103

106-
export type ManifestPropertyActions = ManifestPropertyAction | ManifestPropertyActionDefaultKind;
107-
108104
export type ManifestTypes =
109105
| ManifestAppEntryPoint
110106
| ManifestAuthProvider
@@ -138,7 +134,6 @@ export type ManifestTypes =
138134
| ManifestMonacoMarkdownEditorAction
139135
| ManifestPickerSearchResultItem
140136
| ManifestPreviewAppProvider
141-
| ManifestPropertyActions
142137
| ManifestPropertyEditorSchema
143138
| ManifestPropertyEditorUi
144139
| ManifestRepository

src/packages/core/property-action/components/property-action-menu/property-action-menu.element.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import type { UmbPropertyActionArgs } from '../property-action/types.js';
22
import { css, customElement, html, nothing, property, repeat, state } from '@umbraco-cms/backoffice/external/lit';
33
import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry';
4-
import type { ManifestPropertyAction, MetaPropertyAction } from '@umbraco-cms/backoffice/extension-registry';
4+
import type { ManifestPropertyAction, MetaPropertyAction } from '@umbraco-cms/backoffice/property-action';
55
import { UmbExtensionsElementAndApiInitializer } from '@umbraco-cms/backoffice/extension-api';
66
import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
77
import { UmbTextStyles } from '@umbraco-cms/backoffice/style';

src/packages/core/property-action/components/property-action/default/property-action.element.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
import type { UmbPropertyAction } from '../index.js';
2-
import { UmbActionExecutedEvent } from '@umbraco-cms/backoffice/event';
3-
import { html, customElement, property, state, ifDefined, nothing } from '@umbraco-cms/backoffice/external/lit';
4-
import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
52
import type {
63
ManifestPropertyActionDefaultKind,
74
MetaPropertyActionDefaultKind,
8-
} from '@umbraco-cms/backoffice/extension-registry';
5+
} from '../../../extensions/property-action.extension.js';
6+
import { UmbActionExecutedEvent } from '@umbraco-cms/backoffice/event';
7+
import { html, customElement, property, state, ifDefined, nothing } from '@umbraco-cms/backoffice/external/lit';
8+
import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
9+
910
import type { UUIMenuItemEvent } from '@umbraco-cms/backoffice/external/uui';
1011

1112
@customElement('umb-property-action')

src/packages/core/extension-registry/models/property-action.model.ts renamed to src/packages/core/property-action/extensions/property-action.extension.ts

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import type { UmbPropertyAction } from '../../property-action/components/property-action/property-action.interface.js';
1+
import type { UmbPropertyAction } from '../components/property-action/property-action.interface.js';
22
import type { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api';
33
import type { ManifestElementAndApi, ManifestWithDynamicConditions } from '@umbraco-cms/backoffice/extension-api';
44

@@ -39,3 +39,11 @@ export interface MetaPropertyActionDefaultKind extends MetaPropertyAction {
3939
*/
4040
label: string;
4141
}
42+
43+
export type UmbPropertyActionExtensions = ManifestPropertyAction | ManifestPropertyActionDefaultKind;
44+
45+
declare global {
46+
interface UmbExtensionManifestMap {
47+
UmbPropertyActionExtensions: UmbPropertyActionExtensions;
48+
}
49+
}
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
export * from './components/index.js';
2+
export * from './extensions/property-action.extension.js';

0 commit comments

Comments
 (0)