@bitrix24/b24ui-nuxt 0.6.8 → 0.7.0

package/dist/runtime/vue/components/Link.vue

@@ -3,15 +3,16 @@ import theme from "#build/b24ui/link";
 </script>
 
 <script setup>
-import { computed, getCurrentInstance } from "vue";
+import { computed } from "vue";
 import { defu } from "defu";
-import { isEqual, diff } from "ohash/utils";
+import { isEqual } from "ohash/utils";
 import { useForwardProps } from "reka-ui";
 import { reactiveOmit } from "@vueuse/core";
 import { hasProtocol } from "ufo";
 import { useRoute, RouterLink } from "vue-router";
 import { useAppConfig } from "#imports";
 import { tv } from "../../utils/tv";
+import { isPartiallyEqual } from "../../utils/link";
 import B24LinkBase from "./../../components/LinkBase.vue";
 defineOptions({ inheritAttrs: false });
 const props = defineProps({
@@ -44,20 +45,9 @@ const props = defineProps({
   replace: { type: Boolean, required: false }
 });
 defineSlots();
-const hasRouter = computed(() => {
-  const app = getCurrentInstance()?.appContext.app;
-  return !!app?.config?.globalProperties?.$router;
-});
-const route = computed(() => {
-  if (!hasRouter.value) return null;
-  try {
-    return useRoute();
-  } catch {
-    return null;
-  }
-});
+const route = useRoute();
 const appConfig = useAppConfig();
-const routerLinkProps = useForwardProps(reactiveOmit(props, "as", "type", "disabled", "active", "exact", "exactQuery", "exactHash", "activeClass", "inactiveClass", "to", "raw", "class"));
+const routerLinkProps = useForwardProps(reactiveOmit(props, "as", "type", "disabled", "active", "exact", "exactQuery", "exactHash", "activeClass", "inactiveClass", "to", "href", "raw", "custom", "class"));
 const b24ui = computed(() => tv({
   extend: tv(theme),
   ...defu({
@@ -69,34 +59,29 @@ const b24ui = computed(() => tv({
     }
   }, appConfig.b24ui?.link || {})
 }));
-function isPartiallyEqual(item1, item2) {
-  const diffedKeys = diff(item1, item2).reduce((filtered, q) => {
-    if (q.type === "added") {
-      filtered.add(q.key);
-    }
-    return filtered;
-  }, /* @__PURE__ */ new Set());
-  const item1Filtered = Object.fromEntries(Object.entries(item1).filter(([key]) => !diffedKeys.has(key)));
-  const item2Filtered = Object.fromEntries(Object.entries(item2).filter(([key]) => !diffedKeys.has(key)));
-  return isEqual(item1Filtered, item2Filtered);
-}
+const to = computed(() => props.to ?? props.href);
 const isExternal = computed(() => {
-  if (!props.to) return false;
-  return typeof props.to === "string" && hasProtocol(props.to, { acceptRelative: true });
+  if (props.external) {
+    return true;
+  }
+  if (!to.value) {
+    return false;
+  }
+  return typeof to.value === "string" && hasProtocol(to.value, { acceptRelative: true });
 });
 function isLinkActive({ route: linkRoute, isActive, isExactActive }) {
   if (props.active !== void 0) {
     return props.active;
   }
-  if (!props.to || !route.value) {
+  if (!to.value) {
     return false;
   }
   if (props.exactQuery === "partial") {
-    if (!isPartiallyEqual(linkRoute.query, route.value.query)) return false;
+    if (!isPartiallyEqual(linkRoute.query, route.query)) return false;
   } else if (props.exactQuery === true) {
-    if (!isEqual(linkRoute.query, route.value.query)) return false;
+    if (!isEqual(linkRoute.query, route.query)) return false;
   }
-  if (props.exactHash && linkRoute.hash !== route.value.hash) {
+  if (props.exactHash && linkRoute.hash !== route.hash) {
     return false;
   }
   if (props.exact && isExactActive) {
@@ -122,8 +107,8 @@ function resolveLinkClass({ route: route2, isActive, isExactActive } = {}) {
 </script>
 
 <template>
-  <template v-if="hasRouter && !isExternal">
-    <RouterLink v-slot="{ href, navigate, route: linkRoute, isActive, isExactActive }" v-bind="routerLinkProps" :to="to || '#'" custom>
+  <template v-if="!isExternal && !!to">
+    <RouterLink v-slot="{ href, navigate, route: linkRoute, isActive, isExactActive }" v-bind="routerLinkProps" :to="to" custom>
       <template v-if="custom">
         <slot
           v-bind="{
@@ -133,7 +118,7 @@ function resolveLinkClass({ route: route2, isActive, isExactActive } = {}) {
   type,
   disabled,
   target: props.target ? props.target : void 0,
-  href: to ? href : void 0,
+  href,
   navigate,
   active: isLinkActive({ route: linkRoute, isActive, isExactActive })
 }"
@@ -147,7 +132,7 @@ function resolveLinkClass({ route: route2, isActive, isExactActive } = {}) {
   as,
   type,
   disabled,
-  href: to ? href : void 0,
+  href,
   navigate
 }"
         :class="resolveLinkClass({ route: linkRoute, isActive, isExactActive })"
@@ -167,7 +152,8 @@ function resolveLinkClass({ route: route2, isActive, isExactActive } = {}) {
   disabled,
   href: to,
   target: isExternal ? '_blank' : void 0,
-  active: props?.active || false
+  active,
+  isExternal
 }"
       />
     </template>
@@ -179,12 +165,12 @@ function resolveLinkClass({ route: route2, isActive, isExactActive } = {}) {
   type,
   disabled,
   href: to,
-  target: isExternal ? '_blank' : void 0
+  target: isExternal ? '_blank' : void 0,
+  isExternal
 }"
-      :is-external="isExternal"
       :class="resolveLinkClass()"
     >
-      <slot :active="props?.active || false" />
+      <slot :active="active" />
     </B24LinkBase>
   </template>
 </template>

package/dist/runtime/vue/composables/useAppConfig.js

@@ -1,2 +1,4 @@
+import { reactive } from "vue";
 import appConfig from "#build/app.config";
-export const useAppConfig = () => appConfig;
+const _appConfig = reactive(appConfig);
+export const useAppConfig = () => _appConfig;

package/dist/runtime/vue/stubs.d.ts

@@ -2,6 +2,7 @@ import type { Ref } from 'vue';
 import type { NuxtApp } from '#app';
 export { useHead } from '@unhead/vue';
 export { useRoute, useRouter } from 'vue-router';
+export { useAppConfig } from './composables/useAppConfig';
 export { defineShortcuts } from '../composables/defineShortcuts';
 export { defineLocale } from '../composables/defineLocale';
 export { useLocale } from '../composables/useLocale';
@@ -16,7 +17,6 @@ export declare const useColorMode: () => {
     readonly value: import("@vueuse/core").BasicColorMode;
     forced: boolean;
 };
-export declare const useAppConfig: () => any;
 export declare const useCookie: <T = string>(_name: string, _options?: Record<string, any>) => {
     value: Ref<T, T>;
     get: () => T;

package/dist/runtime/vue/stubs.js

@@ -4,6 +4,7 @@ import appConfig from "#build/app.config";
 import { useColorMode as useColorModeVueUse } from "@vueuse/core";
 export { useHead } from "@unhead/vue";
 export { useRoute, useRouter } from "vue-router";
+export { useAppConfig } from "./composables/useAppConfig.js";
 export { defineShortcuts } from "../composables/defineShortcuts.js";
 export { defineLocale } from "../composables/defineLocale.js";
 export { useLocale } from "../composables/useLocale.js";
@@ -29,7 +30,6 @@ export const useColorMode = () => {
     forced: false
   };
 };
-export const useAppConfig = () => appConfig;
 export const useCookie = (_name, _options = {}) => {
   const value = ref(null);
   return {