Skip to content

Commit 5397c7b

Browse files
Merge branch 'main' into 14/bugfix/calculate-user-start-nodes
2 parents 22fe629 + 9077e80 commit 5397c7b

File tree

8 files changed

+101
-9
lines changed

8 files changed

+101
-9
lines changed

package-lock.json

Lines changed: 8 additions & 0 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
@@ -127,6 +127,7 @@
127127
},
128128
"workspaces": [
129129
"./src/packages/block",
130+
"./src/packages/core",
130131
"./src/packages/data-type",
131132
"./src/packages/dictionary",
132133
"./src/packages/documents",

src/packages/core/content-type/workspace/views/design/content-type-design-editor-property.element.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -484,11 +484,13 @@ export class UmbContentTypeDesignEditorPropertyElement extends UmbLitElement {
484484
position: absolute;
485485
top: var(--uui-size-space-2);
486486
right: var(--uui-size-space-2);
487-
display: none;
487+
opacity: 0;
488488
}
489+
489490
#editor:hover uui-action-bar,
490-
#editor:focus uui-action-bar {
491-
display: block;
491+
#editor:focus uui-action-bar,
492+
#editor:focus-within uui-action-bar {
493+
opacity: 1;
492494
}
493495
494496
a {

src/packages/core/package.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"name": "@umbraco-backoffice/core",
3+
"private": true,
4+
"type": "module",
5+
"scripts": {
6+
"build": "vite build"
7+
}
8+
}

src/packages/core/vite.config.ts

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
import { defineConfig } from 'vite';
2+
import { rmSync } from 'fs';
3+
import { getDefaultConfig } from '../../vite-config-base';
4+
5+
const dist = '../../../dist-cms/packages/core';
6+
7+
// delete the unbundled dist folder
8+
rmSync(dist, { recursive: true, force: true });
9+
10+
export default defineConfig({
11+
...getDefaultConfig({
12+
dist,
13+
entry: {
14+
'action/index': './action/index.ts',
15+
'audit-log/index': './audit-log/index.ts',
16+
'auth/index': './auth/index.ts',
17+
'collection/index': './collection/index.ts',
18+
'components/index': './components/index.ts',
19+
'content-type/index': './content-type/index.ts',
20+
'content/index': './content/index.ts',
21+
'culture/index': './culture/index.ts',
22+
'debug/index': './debug/index.ts',
23+
'entity-action/index': './entity-action/index.ts',
24+
'entity-bulk-action/index': './entity-bulk-action/index.ts',
25+
'entity/index': './entity/index.ts',
26+
'entry-point': 'entry-point.ts',
27+
'event/index': './event/index.ts',
28+
'extension-registry/index': './extension-registry/index.ts',
29+
'icon-registry/index': './icon-registry/index.ts',
30+
'id/index': './id/index.ts',
31+
'lit-element/index': './lit-element/index.ts',
32+
'localization/index': './localization/index.ts',
33+
'menu/index': './menu/index.ts',
34+
'modal/index': './modal/index.ts',
35+
'models/index': './models/index.ts',
36+
'notification/index': './notification/index.ts',
37+
'picker-input/index': './picker-input/index.ts',
38+
'property-action/index': './property-action/index.ts',
39+
'property-editor/index': './property-editor/index.ts',
40+
'property/index': './property/index.ts',
41+
'recycle-bin/index': './recycle-bin/index.ts',
42+
'repository/index': './repository/index.ts',
43+
'resources/index': './resources/index.ts',
44+
'router/index': './router/index.ts',
45+
'section/index': './section/index.ts',
46+
'server-file-system/index': './server-file-system/index.ts',
47+
'sorter/index': './sorter/index.ts',
48+
'store/index': './store/index.ts',
49+
'style/index': './style/index.ts',
50+
'temporary-file/index': './temporary-file/index.ts',
51+
'themes/index': './themes/index.ts',
52+
'tree/index': './tree/index.ts',
53+
'utils/index': './utils/index.ts',
54+
'validation/index': './validation/index.ts',
55+
'variant/index': './variant/index.ts',
56+
'workspace/index': './workspace/index.ts',
57+
//'settings/index': './settings/index.ts', // currently no index file so it is left out
58+
manifests: 'manifests.ts',
59+
},
60+
}),
61+
});

src/packages/core/workspace/components/workspace-editor/workspace-editor.element.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,13 +73,13 @@ export class UmbWorkspaceEditorElement extends UmbLitElement {
7373

7474
// If we have a post fix then we need to add a direct from the empty url of the split-view-index:
7575
// TODO: This is problematic, cause if a workspaceView appears later, then this takes over. And it is also a problem if it does not use redirect, but just a view defined with and empty path.
76-
/*const firstRoute = newRoutes[0];
76+
const firstRoute = newRoutes[0];
7777
if (firstRoute) {
7878
newRoutes.push({
7979
path: ``,
8080
redirectTo: firstRoute.path,
8181
});
82-
}*/
82+
}
8383
}
8484

8585
this._routes = newRoutes;

src/packages/property-editors/textarea/property-editor-ui-textarea.element.ts

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,15 @@ export class UmbPropertyEditorUITextareaElement extends UmbLitElement implements
1111
@property()
1212
value = '';
1313

14+
/**
15+
* Sets the input to readonly mode, meaning value cannot be changed but still able to read and select its content.
16+
* @type {boolean}
17+
* @attr
18+
* @default false
19+
*/
20+
@property({ type: Boolean, reflect: true })
21+
readonly = false;
22+
1423
@state()
1524
private _maxChars?: number;
1625

@@ -52,7 +61,8 @@ export class UmbPropertyEditorUITextareaElement extends UmbLitElement implements
5261
.maxlength=${this._maxChars}
5362
.rows=${this._rows}
5463
.value=${this.value ?? ''}
55-
@input=${this.#onInput}></uui-textarea>
64+
@input=${this.#onInput}
65+
?readonly=${this.readonly}></uui-textarea>
5666
`;
5767
}
5868

src/vite-config-base.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
import type { UserConfig } from 'vite';
1+
import type { BuildOptions, UserConfig, LibraryOptions } from 'vite';
22

33
interface UmbViteDefaultConfigArgs {
4-
dist: string;
5-
entry?: string[] | Record<string, string>;
4+
dist: BuildOptions['outDir'];
5+
entry?: LibraryOptions['entry'];
6+
plugins?: UserConfig['plugins'];
67
}
78

89
export const getDefaultConfig = (args: UmbViteDefaultConfigArgs): UserConfig => {
@@ -19,5 +20,6 @@ export const getDefaultConfig = (args: UmbViteDefaultConfigArgs): UserConfig =>
1920
external: [/^@umbraco/],
2021
},
2122
},
23+
plugins: args.plugins,
2224
};
2325
};

0 commit comments

Comments
 (0)