@bitrix24/b24ui-nuxt 0.5.10 → 0.5.11

package/dist/runtime/components/Avatar.vue

@@ -1,80 +1,92 @@
-<script>
-import _appConfig from "#build/app.config";
-import theme from "#build/b24ui/avatar";
-import { tv } from "../utils/tv";
-const appConfigAvatar = _appConfig;
-const avatar = tv({ extend: tv(theme), ...appConfigAvatar.b24ui?.avatar || {} });
+<script lang="ts">
+import type { VariantProps } from 'tailwind-variants'
+import type { AppConfig } from '@nuxt/schema'
+import _appConfig from '#build/app.config'
+import theme from '#build/b24ui/avatar'
+import { tv } from '../utils/tv'
+import type { IconComponent } from '../types'
+
+const appConfigAvatar = _appConfig as AppConfig & { b24ui: { avatar: Partial<typeof theme> } }
+
+const avatar = tv({ extend: tv(theme), ...(appConfigAvatar.b24ui?.avatar || {}) })
+
+type AvatarVariants = VariantProps<typeof avatar>
+
+export interface AvatarProps {
+  /**
+   * The element or component this component should render as.
+   * @defaultValue 'span'
+   */
+  as?: any
+  src?: string
+  alt?: string
+  /**
+   * Display an icon on the left side.
+   * @IconComponent
+   */
+  icon?: IconComponent
+  text?: string
+  /**
+   * @defaultValue 'md'
+   */
+  size?: AvatarVariants['size']
+  class?: any
+  style?: any
+  b24ui?: Partial<typeof avatar.slots>
+}
+
+export interface AvatarSlots {
+  default(props?: {}): any
+}
 </script>
 
-<script setup>
-import { ref, computed, watch } from "vue";
-import { useAvatarGroup } from "../composables/useAvatarGroup";
-defineOptions({ inheritAttrs: false });
-const props = defineProps({
-  as: {
-    type: null,
-    required: false,
-    default: "span"
-  },
-  src: {
-    type: String,
-    required: false
-  },
-  alt: {
-    type: String,
-    required: false
-  },
-  icon: {
-    type: [Function, Object],
-    required: false
-  },
-  text: {
-    type: String,
-    required: false
-  },
-  size: {
-    type: null,
-    required: false
-  },
-  class: {
-    type: null,
-    required: false
-  },
-  style: {
-    type: null,
-    required: false
-  },
-  b24ui: {
-    type: Object,
-    required: false
-  }
-});
-const fallback = computed(
-  () => props.text || (props.alt || "").replace(/[+\-*)(}\][{]/g, "").split(" ").map((word) => word.charAt(0)).join("").substring(0, 2)
-);
-const { size } = useAvatarGroup(props);
+<script setup lang="ts">
+import { ref, computed, watch } from 'vue'
+import { Primitive, Slot } from 'reka-ui'
+import ImageComponent from '#build/b24ui-image-component'
+import { useAvatarGroup } from '../composables/useAvatarGroup'
+
+defineOptions({ inheritAttrs: false })
+
+const props = withDefaults(defineProps<AvatarProps>(), { as: 'span' })
+
+const fallback = computed(() => props.text || (props.alt || '')
+  .replace(/[+\-*)(}\][{]/g, '')
+  .split(' ')
+  .map(word => word.charAt(0))
+  .join('')
+  .substring(0, 2)
+)
+
+const { size } = useAvatarGroup(props)
+
+// eslint-disable-next-line vue/no-dupe-keys
 const b24ui = computed(() => avatar({
   size: size.value
-}));
+}))
+
 const sizePx = computed(() => ({
-  "3xs": 10,
-  "2xs": 14,
-  "xs": 18,
-  "sm": 22,
-  "md": 32,
-  "lg": 42,
-  "xl": 48,
-  "2xl": 60,
-  "3xl": 94
-})[props.size || "md"]);
-const error = ref(false);
+  '3xs': 10,
+  '2xs': 14,
+  'xs': 18,
+  'sm': 22,
+  'md': 32,
+  'lg': 42,
+  'xl': 48,
+  '2xl': 60,
+  '3xl': 94
+})[props.size || 'md'])
+
+const error = ref(false)
+
 watch(() => props.src, () => {
   if (error.value) {
-    error.value = false;
+    error.value = false
   }
-});
+})
+
 function onError() {
-  error.value = true;
+  error.value = true
 }
 </script>
 
@@ -96,7 +108,7 @@ function onError() {
     <Slot v-else v-bind="$attrs">
       <slot>
         <Component :is="icon" v-if="icon" :class="b24ui.icon({ class: props.b24ui?.icon })" />
-        <span v-else :class="b24ui.fallback({ class: props.b24ui?.fallback })">{{ fallback || "\xA0" }}</span>
+        <span v-else :class="b24ui.fallback({ class: props.b24ui?.fallback })">{{ fallback || '&nbsp;' }}</span>
       </slot>
     </Slot>
   </Primitive>

package/dist/runtime/components/AvatarGroup.vue

@@ -1,74 +1,97 @@
-<script>
-import _appConfig from "#build/app.config";
-import theme from "#build/b24ui/avatar-group";
-import { tv } from "../utils/tv";
-const appConfigAvatarGroup = _appConfig;
-const avatarGroup = tv({ extend: tv(theme), ...appConfigAvatarGroup.b24ui?.avatarGroup || {} });
+<script lang="ts">
+import type { VariantProps } from 'tailwind-variants'
+import type { AppConfig } from '@nuxt/schema'
+import _appConfig from '#build/app.config'
+import theme from '#build/b24ui/avatar-group'
+import { tv } from '../utils/tv'
+
+const appConfigAvatarGroup = _appConfig as AppConfig & { b24ui: { avatarGroup: Partial<typeof theme> } }
+
+const avatarGroup = tv({ extend: tv(theme), ...(appConfigAvatarGroup.b24ui?.avatarGroup || {}) })
+
+type AvatarGroupVariants = VariantProps<typeof avatarGroup>
+
+export interface AvatarGroupProps {
+  /**
+   * The element or component this component should render as.
+   * @defaultValue 'div'
+   */
+  as?: any
+  /**
+   * @defaultValue 'md'
+   */
+  size?: AvatarGroupVariants['size']
+  /**
+   * The maximum number of avatars to display.
+   */
+  max?: number | string
+  class?: any
+  b24ui?: Partial<typeof avatarGroup.slots>
+}
+
+export interface AvatarGroupSlots {
+  default(props?: {}): any
+}
 </script>
 
-<script setup>
-import { computed, provide } from "vue";
-import { avatarGroupInjectionKey } from "../composables/useAvatarGroup";
-const props = defineProps({
-  as: {
-    type: null,
-    required: false
-  },
-  size: {
-    type: null,
-    required: false
-  },
-  max: {
-    type: [Number, String],
-    required: false
-  },
-  class: {
-    type: null,
-    required: false
-  },
-  b24ui: {
-    type: Object,
-    required: false
-  }
-});
-const slots = defineSlots();
+<script setup lang="ts">
+import { computed, provide } from 'vue'
+import { Primitive } from 'reka-ui'
+import { avatarGroupInjectionKey } from '../composables/useAvatarGroup'
+import B24Avatar from './Avatar.vue'
+
+const props = defineProps<AvatarGroupProps>()
+const slots = defineSlots<AvatarGroupSlots>()
+
 const b24ui = computed(() => avatarGroup({
   size: props.size
-}));
-const max = computed(() => typeof props.max === "string" ? Number.parseInt(props.max, 10) : props.max);
+}))
+
+const max = computed(() => typeof props.max === 'string' ? Number.parseInt(props.max, 10) : props.max)
+
 const children = computed(() => {
-  let children2 = slots.default?.();
-  if (children2?.length) {
-    children2 = children2.flatMap((child) => {
-      if (typeof child.type === "symbol") {
-        if (typeof child.children === "string") {
-          return;
+  let children = slots.default?.()
+  if (children?.length) {
+    children = children.flatMap((child: any) => {
+      if (typeof child.type === 'symbol') {
+        // `v-if="false"` or commented node
+        if (typeof child.children === 'string') {
+          return
         }
-        return child.children;
+
+        return child.children
       }
-      return child;
-    }).filter(Boolean);
+
+      return child
+    }).filter(Boolean)
   }
-  return children2 || [];
-});
+
+  return children || []
+})
+
 const visibleAvatars = computed(() => {
   if (!children.value.length) {
-    return [];
+    return []
   }
+
   if (!max.value || max.value <= 0) {
-    return [...children.value];
+    return [...children.value]
   }
-  return [...children.value].slice(0, max.value);
-});
+
+  return [...children.value].slice(0, max.value)
+})
+
 const hiddenCount = computed(() => {
   if (!children.value.length) {
-    return 0;
+    return 0
   }
-  return children.value.length - visibleAvatars.value.length;
-});
+
+  return children.value.length - visibleAvatars.value.length
+})
+
 provide(avatarGroupInjectionKey, computed(() => ({
   size: props.size
-})));
+})))
 </script>
 
 <template>

package/dist/runtime/components/Badge.vue

@@ -1,88 +1,88 @@
-<script>
-import _appConfig from "#build/app.config";
-import theme from "#build/b24ui/badge";
-import { tv } from "../utils/tv";
-const appConfigBadge = _appConfig;
-const badge = tv({ extend: tv(theme), ...appConfigBadge.b24ui?.badge || {} });
+<script lang="ts">
+import type { VariantProps } from 'tailwind-variants'
+import type { AppConfig } from '@nuxt/schema'
+import _appConfig from '#build/app.config'
+import theme from '#build/b24ui/badge'
+import type { UseComponentIconsProps } from '../composables/useComponentIcons'
+import { tv } from '../utils/tv'
+import type { AvatarProps } from '../types'
+
+const appConfigBadge = _appConfig as AppConfig & { b24ui: { badge: Partial<typeof theme> } }
+
+const badge = tv({ extend: tv(theme), ...(appConfigBadge.b24ui?.badge || {}) })
+
+type BadgeVariants = VariantProps<typeof badge>
+
+export interface BadgeProps extends Omit<UseComponentIconsProps, 'loading' | 'loadingIcon'> {
+  /**
+   * The element or component this component should render as.
+   * @defaultValue 'span'
+   */
+  as?: any
+  label?: string | number
+  /**
+   * @defaultValue 'default'
+   */
+  color?: BadgeVariants['color']
+  /**
+   * @defaultValue 'normal'
+   */
+  depth?: BadgeVariants['depth']
+  /**
+   * @defaultValue 'md'
+   */
+  size?: BadgeVariants['size']
+  /**
+   * Shows 'underline' on hover
+   * @defaultValue false
+   */
+  useLink?: boolean
+  /**
+   * Shows icons.close on the right side
+   * @defaultValue false
+   */
+  useClose?: boolean
+  onCloseClick?: ((event: MouseEvent) => void | Promise<void>) | Array<((event: MouseEvent) => void | Promise<void>)>
+  /**
+   * Fills the background
+   * @defaultValue false
+   */
+  useFill?: boolean
+  class?: any
+  b24ui?: Partial<typeof badge.slots>
+}
+
+export interface BadgeSlots {
+  leading(props?: {}): any
+  default(props?: {}): any
+  trailing(props?: {}): any
+}
 </script>
 
-<script setup>
-import { computed } from "vue";
-import { useButtonGroup } from "../composables/useButtonGroup";
-import { useComponentIcons } from "../composables/useComponentIcons";
-const props = defineProps({
-  as: {
-    type: null,
-    required: false,
-    default: "span"
-  },
-  label: {
-    type: [String, Number],
-    required: false
-  },
-  color: {
-    type: null,
-    required: false
-  },
-  depth: {
-    type: null,
-    required: false
-  },
-  size: {
-    type: null,
-    required: false
-  },
-  useLink: {
-    type: Boolean,
-    required: false
-  },
-  useClose: {
-    type: Boolean,
-    required: false
-  },
-  onCloseClick: {
-    type: [Function, Array],
-    required: false
-  },
-  useFill: {
-    type: Boolean,
-    required: false
-  },
-  class: {
-    type: null,
-    required: false
-  },
-  b24ui: {
-    type: Object,
-    required: false
-  },
-  icon: {
-    type: [Function, Object],
-    required: false
-  },
-  avatar: {
-    type: Object,
-    required: false
-  },
-  trailing: {
-    type: Boolean,
-    required: false
-  },
-  trailingIcon: {
-    type: [Function, Object],
-    required: false
-  }
-});
-defineSlots();
-async function onCloseClickWrapper(event) {
-  const callbacks = Array.isArray(props.onCloseClick) ? props.onCloseClick : [props.onCloseClick];
+<script setup lang="ts">
+import { computed } from 'vue'
+import { Primitive } from 'reka-ui'
+import { useButtonGroup } from '../composables/useButtonGroup'
+import { useComponentIcons } from '../composables/useComponentIcons'
+import Cross20Icon from '@bitrix24/b24icons-vue/actions/Cross20Icon'
+import B24Avatar from './Avatar.vue'
+
+const props = withDefaults(defineProps<BadgeProps>(), {
+  as: 'span'
+})
+
+defineSlots<BadgeSlots>()
+
+async function onCloseClickWrapper(event: MouseEvent) {
+  const callbacks = Array.isArray(props.onCloseClick) ? props.onCloseClick : [props.onCloseClick]
   try {
-    await Promise.all(callbacks.map((fn) => fn?.(event)));
-  } finally {
-  }
+    await Promise.all(callbacks.map(fn => fn?.(event)))
+  } finally { /* empty */ }
 }
-const { orientation, size: buttonGroupSize } = useButtonGroup(props);
-const { isLeading, leadingIconName } = useComponentIcons(props);
+
+const { orientation, size: buttonGroupSize } = useButtonGroup<BadgeProps>(props)
+const { isLeading, leadingIconName } = useComponentIcons(props)
+
 const b24ui = computed(() => badge({
   color: props.color,
   depth: props.depth,
@@ -92,7 +92,7 @@ const b24ui = computed(() => badge({
   useClose: Boolean(props.useClose),
   useFill: Boolean(props.useFill),
   leading: Boolean(isLeading.value)
-}));
+}))
 </script>
 
 <template>
@@ -112,7 +112,7 @@ const b24ui = computed(() => badge({
         />
         <B24Avatar
           v-else-if="!!avatar"
-          :size="props.b24ui?.leadingAvatarSize || b24ui.leadingAvatarSize()"
+          :size="((props.b24ui?.leadingAvatarSize || b24ui.leadingAvatarSize()) as AvatarProps['size'])"
           v-bind="avatar"
           :class="b24ui.leadingAvatar({ class: props.b24ui?.leadingAvatar })"
         />