Skip to content

Commit 70e3031

Browse files
authored
Merge branch 'main' into v14/feature/sorter-nested-example
2 parents 71ac7f7 + 66de491 commit 70e3031

File tree

32 files changed

+2314
-2063
lines changed

32 files changed

+2314
-2063
lines changed

package-lock.json

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

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@
128128
"workspaces": [
129129
"./src/packages/data-type",
130130
"./src/packages/dictionary",
131+
"./src/packages/language",
131132
"./src/packages/umbraco-news",
132133
"./src/packages/webhook"
133134
],

public/mockServiceWorker.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/* tslint:disable */
33

44
/**
5-
* Mock Service Worker (1.3.2).
5+
* Mock Service Worker (1.3.3).
66
* @see https://github.com/mswjs/msw
77
* - Please do NOT modify this file.
88
* - Please do NOT serve this file on production.

src/assets/lang/en-us.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ export default {
4646
logout: 'Exit',
4747
move: 'Move to',
4848
notify: 'Notifications',
49-
protect: 'Restrict Public Access',
49+
protect: 'Public Access',
5050
publish: 'Publish',
5151
refreshNode: 'Reload',
5252
remove: 'Remove',

src/assets/lang/en.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ export default {
4545
logout: 'Exit',
4646
move: 'Move to',
4747
notify: 'Notifications',
48-
protect: 'Restrict Public Access',
48+
protect: 'Public Access',
4949
publish: 'Publish',
5050
refreshNode: 'Reload',
5151
remove: 'Remove',

src/libs/context-api/consume/context-consumer.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { expect, oneEvent } from '@open-wc/testing';
22
import { UmbContextProvider } from '../provide/context-provider.js';
33
import { UmbContextToken } from '../token/context-token.js';
44
import { UmbContextConsumer } from './context-consumer.js';
5-
import type { UmbContextRequestEventImplementation} from './context-request.event.js';
5+
import type { UmbContextRequestEventImplementation } from './context-request.event.js';
66
import { UMB_CONTENT_REQUEST_EVENT_TYPE } from './context-request.event.js';
77

88
const testContextAlias = 'my-test-context';
@@ -39,7 +39,7 @@ describe('UmbContextConsumer', () => {
3939

4040
describe('events', () => {
4141
it('dispatches context request event when constructed', async () => {
42-
const listener = oneEvent(window, UMB_CONTENT_REQUEST_EVENT_TYPE, false);
42+
const listener = oneEvent(window, UMB_CONTENT_REQUEST_EVENT_TYPE);
4343

4444
consumer.hostConnected();
4545

src/packages/core/components/dropdown/dropdown.element.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@ export class UmbDropdownElement extends UmbLitElement {
4545
}
4646
}
4747

48-
// TODO: This ignorer is just neede for JSON SCHEMA TO WORK, As its not updated with latest TS jet.
49-
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
50-
// @ts-ignore
5148
#onToggle(event: ToggleEvent) {
49+
// TODO: This ignorer is just neede for JSON SCHEMA TO WORK, As its not updated with latest TS jet.
50+
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
51+
// @ts-ignore
5252
this.open = event.newState === 'open';
5353
}
5454

src/packages/core/property/property-dataset/property-dataset.element.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ describe('UmbBasicVariantElement', () => {
133133
});
134134

135135
it('fires change event', async () => {
136-
const listener = oneEvent(datasetElement, UmbChangeEvent.TYPE, false);
136+
const listener = oneEvent(datasetElement, UmbChangeEvent.TYPE);
137137

138138
expect(propertyEditor.alias).to.eq('testAlias');
139139
propertyEditor.setValue('testValue3');
@@ -153,7 +153,7 @@ describe('UmbBasicVariantElement', () => {
153153
adapterPropertyEditor.alias = 'testAdapterAlias';
154154
datasetElement.appendChild(adapterPropertyEditor);
155155

156-
const listener = oneEvent(datasetElement, UmbChangeEvent.TYPE, false);
156+
const listener = oneEvent(datasetElement, UmbChangeEvent.TYPE);
157157

158158
// The alias of the original property editor must be 'testAlias' for the adapter to set the value of it.
159159
expect(propertyEditor.alias).to.eq('testAlias');

src/packages/core/utils/pagination-manager/pagination.manager.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ describe('UmbPaginationManager', () => {
141141
});
142142

143143
it('dispatches a change event', async () => {
144-
const listener = oneEvent(manager, UmbChangeEvent.TYPE, false);
144+
const listener = oneEvent(manager, UmbChangeEvent.TYPE);
145145
manager.setCurrentPageNumber(2);
146146
const event = (await listener) as unknown as UmbChangeEvent;
147147
const target = event.target as UmbPaginationManager;

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,10 @@ export class UmbWorkspaceActionMenuElement extends UmbLitElement {
8080
}
8181
}
8282

83-
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
84-
// @ts-ignore
8583
#onPopoverToggle(event: ToggleEvent) {
84+
// TODO: This ignorer is just neede for JSON SCHEMA TO WORK, As its not updated with latest TS jet.
85+
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
86+
// @ts-ignore
8687
this._popoverOpen = event.newState === 'open';
8788
}
8889

@@ -110,12 +111,12 @@ export class UmbWorkspaceActionMenuElement extends UmbLitElement {
110111
this._items,
111112
(ext) => ext.alias,
112113
(ext) => ext.component,
113-
)
114+
)
114115
: ''}
115116
</uui-scroll-container>
116117
</umb-popover-layout>
117118
</uui-popover-container>
118-
`
119+
`
119120
: nothing;
120121
}
121122

0 commit comments

Comments
 (0)