Skip to content

Commit ce85f3c

Browse files
authored
Merge pull request #2048 from umbraco/v14/bugfix/export-multi-url-and-align-element-name
Bugfix: Export multi url and align element name
2 parents 7ce4168 + 76ebe14 commit ce85f3c

File tree

14 files changed

+325
-281
lines changed

14 files changed

+325
-281
lines changed

package-lock.json

Lines changed: 264 additions & 247 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
"./menu": "./dist-cms/packages/core/menu/index.js",
5757
"./modal": "./dist-cms/packages/core/modal/index.js",
5858
"./models": "./dist-cms/packages/core/models/index.js",
59+
"./multi-url-picker": "./dist-cms/packages/multi-url-picker/index.js",
5960
"./notification": "./dist-cms/packages/core/notification/index.js",
6061
"./object-type": "./dist-cms/packages/object-type/index.js",
6162
"./package": "./dist-cms/packages/packages/package/index.js",
@@ -135,15 +136,14 @@
135136
"./src/packages/documents",
136137
"./src/packages/health-check",
137138
"./src/packages/language",
138-
"./src/packages/tags",
139-
"./src/packages/umbraco-news",
140-
"./src/packages/webhook",
141-
"./src/packages/health-check",
139+
"./src/packages/media",
140+
"./src/packages/multi-url-picker",
141+
"./src/packages/property-editors",
142142
"./src/packages/tags",
143143
"./src/packages/templating",
144-
"./src/packages/property-editors",
145-
"./src/packages/media",
146-
"./src/packages/user"
144+
"./src/packages/umbraco-news",
145+
"./src/packages/user",
146+
"./src/packages/webhook"
147147
],
148148
"scripts": {
149149
"backoffice:test:e2e": "npx playwright test",
@@ -157,6 +157,7 @@
157157
"check": "npm run lint:errors && npm run compile && npm run build-storybook && npm run generate:jsonschema:dist",
158158
"check:paths": "node ./devops/build/check-path-length.js src 140",
159159
"compile": "tsc",
160+
"postinstall": "npm run generate:tsconfig",
160161
"dev": "vite",
161162
"dev:server": "VITE_UMBRACO_USE_MSW=off vite",
162163
"dev:mock": "VITE_UMBRACO_USE_MSW=on vite",
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export * from './input-multi-url/index.js';
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export * from './input-multi-url.element.js';

src/packages/multi-url-picker/multi-url-picker/multi-url-picker.element.ts renamed to src/packages/multi-url-picker/components/input-multi-url/input-multi-url.element.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import type { UmbLinkPickerLink } from '../link-picker-modal/types.js';
2-
import { UMB_LINK_PICKER_MODAL } from '../link-picker-modal/link-picker-modal.token.js';
1+
import type { UmbLinkPickerLink } from '../../link-picker-modal/types.js';
2+
import { UMB_LINK_PICKER_MODAL } from '../../link-picker-modal/link-picker-modal.token.js';
33
import { css, customElement, html, property, repeat, state } from '@umbraco-cms/backoffice/external/lit';
44
import { simpleHashCode } from '@umbraco-cms/backoffice/observable-api';
55
import { UmbChangeEvent } from '@umbraco-cms/backoffice/event';
@@ -18,9 +18,9 @@ import type { UUIModalSidebarSize } from '@umbraco-cms/backoffice/external/uui';
1818
* @fires blur - when the input loses focus
1919
* @fires focus - when the input gains focus
2020
*/
21-
const elementName = 'umb-multi-url-picker';
21+
const elementName = 'umb-input-multi-url';
2222
@customElement(elementName)
23-
export class UmbMultiUrlPickerElement extends UUIFormControlMixin(UmbLitElement, '') {
23+
export class UmbInputMultiUrlElement extends UUIFormControlMixin(UmbLitElement, '') {
2424
#sorter = new UmbSorterController<UmbLinkPickerLink>(this, {
2525
getUniqueOfElement: (element) => {
2626
return element.id;
@@ -296,6 +296,6 @@ export class UmbMultiUrlPickerElement extends UUIFormControlMixin(UmbLitElement,
296296

297297
declare global {
298298
interface HTMLElementTagNameMap {
299-
[elementName]: UmbMultiUrlPickerElement;
299+
[elementName]: UmbInputMultiUrlElement;
300300
}
301301
}
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
import type { Meta, StoryObj } from '@storybook/web-components';
2+
import './input-multi-url.element.js';
3+
import type { UmbInputMultiUrlElement } from './input-multi-url.element.js';
4+
5+
const meta: Meta<UmbInputMultiUrlElement> = {
6+
title: 'Components/Inputs/Multi URL',
7+
component: 'umb-input-multi-url',
8+
};
9+
10+
export default meta;
11+
type Story = StoryObj<UmbInputMultiUrlElement>;
12+
13+
export const Overview: Story = {
14+
args: {},
15+
};
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
export * from './components/index.js';
2+
export * from './link-picker-modal/index.js';
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
export type * from './types.js';
2+
export * from './constants.js';
3+
export * from './link-picker-modal.token.js';

src/packages/multi-url-picker/multi-url-picker/index.ts

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/packages/multi-url-picker/multi-url-picker/multi-url-picker.stories.ts

Lines changed: 0 additions & 15 deletions
This file was deleted.

0 commit comments

Comments
 (0)