@conduction/nextcloud-vue 2.56.0-beta.24 → 2.56.0-beta.25

package/dist/esm/components/CnAppNav/CnAppNav.vue2.js

@@ -14,6 +14,7 @@ import __sfc_main$1 from '../CnMenuWidget/CnMenuItemIcon.vue.js';
 import { useLook } from '../../composables/useLook.js';
 import { isAppInstalled } from '../../utils/appInstalled.js';
 import { isSvgPath } from '../../utils/iconUtils.js';
+import { resolveBrand } from '../../utils/resolveBrand.js';
 import { passesContextPredicates } from '../../utils/visibleIfContext.js';
 import __sfc_main from '../CnActionButtons/CnActionButtons.vue.js';
 import { bridgedMdiForCssIcon } from '../CnIcon/cssIconBridge.js';
@@ -109,6 +110,12 @@ var script = {
 
 	inject: {
 		cnManifest: { default: null },
+		/**
+		 * Provided by CnAppRoot as true while the board look draws the brand
+		 * block in Nextcloud's header (screens-brand-block-top-bar): the
+		 * navigation then skips its own.
+		 */
+		cnBrandInHeader: { default: false },
 		cnTranslate: { default: () => (key) => key },
 		/**
 		 * Provided by CnAppRoot — opens the host app's
@@ -338,6 +345,17 @@ var script = {
 			return this.translate ?? this.cnTranslate
 		},
 
+		/**
+		 * The brand the navigation draws itself: the resolved brand, or null
+		 * while the app's top bar draws it.
+		 *
+		 * @spec openspec/changes/screens-brand-block-top-bar/specs/layout-components/spec.md#requirement-the-navigation-does-not-draw-a-brand-block-the-bar-already-draws
+		 * @return {object|null}
+		 */
+		navBrand() {
+			return this.cnBrandInHeader ? null : this.resolvedBrand
+		},
+
 		/**
 		 * The brand to draw: the `brand` prop, else the manifest's
 		 * `nav.brand`. Name and caption go through the translate function,
@@ -349,20 +367,7 @@ var script = {
 		 * @spec openspec/changes/detail-action-model-and-case-surfaces/specs/detail-action-model/spec.md#requirement-navigation-brand
 		 */
 		resolvedBrand() {
-			const declared = this.brand ?? this.effectiveManifest?.nav?.brand;
-			if (!declared || typeof declared !== 'object') {
-				return null
-			}
-			const text = (value) => (typeof value === 'string' && value !== '' ? this.effectiveTranslate(value) : '');
-			const brand = {
-				logo: typeof declared.logo === 'string' ? declared.logo : '',
-				// A URL, or `true` for the theme's emblem (--nldesign-emblem-url).
-				emblem: declared.emblem === true ? true : (typeof declared.emblem === 'string' ? declared.emblem : ''),
-				name: text(declared.name),
-				caption: text(declared.caption),
-				alt: text(declared.alt),
-			};
-			return (brand.logo || brand.emblem || brand.name || brand.caption) ? brand : null
+			return resolveBrand(this.brand ?? this.effectiveManifest?.nav?.brand, (value) => this.effectiveTranslate(value))
 		},
 
 		/**