@vc-shell/framework 1.0.148 → 1.0.150

package/ui/components/organisms/vc-app/_internal/vc-app-bar/vc-app-bar.vue

@@ -5,7 +5,7 @@
   >
     <slot name="app-switcher"></slot>
 
-    <template v-if="!$isMobile.value || quantity === 0">
+    <template v-if="!$isMobile.value || blades.length === 0">
       <!-- Logo -->
       <img
         class="tw-h-1/2 tw-cursor-pointer tw-mx-3"
@@ -26,15 +26,15 @@
     <template v-if="$isMobile.value">
       <!-- Show blades name when at least one blade is opened -->
       <div
-        v-if="quantity === 1"
+        v-if="blades.length === 1"
         class="tw-overflow-ellipsis tw-overflow-hidden tw-whitespace-nowrap tw-text-2xl tw-leading-header tw-ml-2"
       >
-        {{ viewTitle || "" }}
+        {{ toValue(blades[blades.length - 1]?.props?.navigation?.instance)?.title || "" }}
       </div>
 
       <!-- Show back link when more than one blade is opened -->
       <VcLink
-        v-else-if="quantity > 1"
+        v-else-if="blades.length > 1"
         class="tw-ml-3"
         @click="$emit('backlink:click')"
       >
@@ -56,7 +56,7 @@
 
     <!-- Show menu toggler on mobile devices -->
     <div
-      v-if="$isMobile.value"
+      v-if="!disableMenu && $isMobile.value"
       class="tw-text-[#319ed4] tw-w-[var(--app-bar-button-width)] tw-flex tw-items-center tw-justify-center tw-h-full tw-box-border tw-cursor-pointer"
       @click="$emit('menubutton:click')"
     >
@@ -70,11 +70,12 @@ import { useI18n } from "vue-i18n";
 import { VcIcon, VcLink } from "./../../../../";
 import { IBladeToolbar } from "./../../../../../../core/types";
 import { useBladeNavigation } from "./../../../../../../shared";
-import { ref, watch, nextTick } from "vue";
+import { toValue } from "vue";
 
 export interface Props {
   logo?: string;
   title?: string;
+  disableMenu?: boolean;
 }
 
 export interface Emits {
@@ -91,20 +92,6 @@ defineEmits<Emits>();
 const { t } = useI18n({ useScope: "global" });
 
 const { blades } = useBladeNavigation();
-
-const viewTitle = ref();
-const quantity = ref();
-
-watch(
-  () => blades,
-  async (newVal) => {
-    await nextTick(() => {
-      viewTitle.value = Object.values(newVal.value?.instances || {})[0]?.title;
-      quantity.value = Object.values(newVal.value?.components || {}).length;
-    });
-  },
-  { deep: true, immediate: true, flush: "post" },
-);
 </script>
 
 <style lang="scss">

package/ui/components/organisms/vc-app/_internal/vc-app-menu/vc-app-menu.vue

@@ -18,7 +18,7 @@
       <!-- Show menu close handler on mobile devices -->
       <div
         v-if="$isMobile.value"
-        class="tw-text-[#319ed4] tw-flex tw-justify-end tw-items-center tw-p-4"
+        class="tw-text-[#319ed4] tw-flex tw-justify-end tw-items-center tw-p-4 tw-cursor-pointer"
       >
         <VcIcon
           icon="fas fa-times"

package/ui/components/organisms/vc-app/vc-app.vue

@@ -21,8 +21,9 @@
       class="tw-shrink-0"
       :logo="logo"
       :title="title"
+      :disable-menu="disableMenu"
       @menubutton:click="($refs.menu as Record<'isMobileVisible', boolean>).isMobileVisible = true"
-      @backlink:click="closeBlade(Object.keys(blades?.components || {}).length - 1)"
+      @backlink:click="closeBlade(blades.length - 1)"
       @logo:click="openRoot"
     >
       <template #app-switcher>
@@ -64,19 +65,18 @@
     </VcAppBar>
 
     <div class="tw-overflow-hidden tw-flex tw-grow tw-basis-0">
-      <slot name="navigation-menu">
-        <!-- Init main menu -->
-        <VcAppMenu
-          ref="menu"
-          class="tw-shrink-0"
-          :version="version"
-          @item:click="onMenuItemClick"
-        >
-          <template #mobile>
-            <UserDropdownButton class="tw-p-0 tw-mb-2 tw-w-full tw-h-auto" />
-          </template>
-        </VcAppMenu>
-      </slot>
+      <!-- Init main menu -->
+      <VcAppMenu
+        v-if="!disableMenu"
+        ref="menu"
+        class="tw-shrink-0"
+        :version="version"
+        @item:click="onMenuItemClick"
+      >
+        <template #mobile>
+          <UserDropdownButton class="tw-p-0 tw-mb-2 tw-w-full tw-h-auto" />
+        </template>
+      </VcAppMenu>
 
       <!-- Blade navigation -->
       <div
@@ -107,7 +107,6 @@ import {
   NotificationDropdown,
   BladeRoutesRecord,
 } from "./../../../../shared/components";
-import { useI18n } from "vue-i18n";
 import { useNotifications, useUser } from "../../../../core/composables";
 import { useRoute, useRouter } from "vue-router";
 import { watchOnce } from "@vueuse/core";
@@ -119,6 +118,7 @@ export interface Props {
   version?: string;
   theme?: "light" | "dark";
   title?: string;
+  disableMenu?: boolean;
 }
 
 defineOptions({
@@ -128,7 +128,6 @@ defineOptions({
 defineSlots<{
   "app-switcher": void;
   toolbar: void;
-  "navigation-menu": void;
   "toolbar:prepend": void;
   "toolbar:language-selector": void;
   "toolbar:notifications-dropdown": void;
@@ -145,7 +144,7 @@ const router = useRouter();
 
 const { openBlade, closeBlade, resolveBladeByName, blades } = useBladeNavigation();
 const { appsList, switchApp, getApps } = useAppSwitcher();
-const { locale: currentLocale } = useI18n({ useScope: "global" });
+
 const { loadFromHistory } = useNotifications();
 const route = useRoute();
 const { isAuthenticated } = useUser();
@@ -165,10 +164,6 @@ const onMenuItemClick = function (item: MenuItem) {
   }
 };
 
-function langInit() {
-  currentLocale.value = localStorage.getItem("VC_LANGUAGE_SETTINGS") ?? "en";
-}
-
 const openRoot = async () => {
   router.push("/");
 };
@@ -177,7 +172,6 @@ watchOnce(
   () => props.isReady,
   async (newVal) => {
     if (isAuthenticated.value && newVal) {
-      langInit();
       await loadFromHistory();
       await getApps();
     }

package/core/composables/useI18n/index.ts

@@ -1,7 +0,0 @@
-import { useI18n as VueUseI18n } from "vue-i18n";
-
-/** @deprecated use `useI18n({ useScope: "global" })` directly from `vue-i18n` */
-export function useI18n() {
-  console.debug(`[@vc-shell/framework#useI18n] - Entry point`);
-  return VueUseI18n({ useScope: "global" });
-}

package/dist/core/composables/useI18n/index.d.ts

@@ -1,3 +0,0 @@
-/** @deprecated use `useI18n({ useScope: "global" })` directly from `vue-i18n` */
-export declare function useI18n(): import("vue-i18n").Composer<{}, {}, {}, string, never, string>;
-//# sourceMappingURL=index.d.ts.map

package/dist/core/composables/useI18n/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../core/composables/useI18n/index.ts"],"names":[],"mappings":"AAEA,iFAAiF;AACjF,wBAAgB,OAAO,mEAGtB"}