Skip to content

Commit 4101b33

Browse files
Merge branch 'main' into v14/bugfix/document-media-tree-item-collection-icon
2 parents 3389079 + 0c2d4e2 commit 4101b33

File tree

5 files changed

+110
-17
lines changed

5 files changed

+110
-17
lines changed

package-lock.json

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

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@
227227
"@types/chai": "^4.3.5",
228228
"@types/mocha": "^10.0.1",
229229
"@typescript-eslint/eslint-plugin": "^7.1.0",
230-
"@typescript-eslint/parser": "^7.1.0",
230+
"@typescript-eslint/parser": "^7.15.0",
231231
"@web/dev-server-esbuild": "^1.0.2",
232232
"@web/dev-server-import-maps": "^0.2.0",
233233
"@web/dev-server-rollup": "^0.6.3",
@@ -247,7 +247,7 @@
247247
"lucide-static": "^0.379.0",
248248
"msw": "^1.3.2",
249249
"playwright-msw": "^3.0.1",
250-
"prettier": "3.2.5",
250+
"prettier": "3.3.2",
251251
"react": "^18.2.0",
252252
"react-dom": "^18.2.0",
253253
"remark-gfm": "^3.0.1",

src/libs/observable-api/states/array-state.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,10 @@ export class UmbArrayState<T> extends UmbDeepState<T[]> {
3535
*/
3636
sortBy(sortMethod?: (a: T, b: T) => number) {
3737
this.#sortMethod = sortMethod;
38-
super.setValue(this.getValue().sort(this.#sortMethod));
38+
const value = this.getValue();
39+
if(value) {
40+
super.setValue([...value].sort(this.#sortMethod));
41+
}
3942
return this;
4043
}
4144

@@ -51,7 +54,7 @@ export class UmbArrayState<T> extends UmbDeepState<T[]> {
5154
*/
5255
override setValue(value: T[]) {
5356
if (this.#sortMethod) {
54-
super.setValue(value.sort(this.#sortMethod));
57+
super.setValue([...value].sort(this.#sortMethod));
5558
} else {
5659
super.setValue(value);
5760
}

src/packages/block/block-list/property-editors/block-list-editor/manifests.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { manifest as blockListSchemaManifest } from './Umbraco.BlockList.js';
21
import type { ManifestTypes } from '@umbraco-cms/backoffice/extension-registry';
2+
import { manifest as blockListSchemaManifest } from './Umbraco.BlockList.js';
33

44
export const UMB_BLOCK_LIST_PROPERTY_EDITOR_ALIAS = 'Umbraco.BlockList';
55

src/packages/user/current-user/modals/current-user/current-user-modal.element.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,9 @@ export class UmbCurrentUserModalElement extends UmbLitElement {
8484
static override styles: CSSResultGroup = [
8585
UmbTextStyles,
8686
css`
87+
:host {
88+
color: var(--uui-color-text);
89+
}
8790
#main {
8891
display: flex;
8992
flex-direction: column;

0 commit comments

Comments
 (0)