@bitrix24/b24ui-nuxt 0.5.10 → 0.5.11

package/dist/runtime/components/Switch.vue

@@ -1,110 +1,105 @@
-<script>
-import _appConfig from "#build/app.config";
-import theme from "#build/b24ui/switch";
-import { tv } from "../utils/tv";
-const appConfigSwitch = _appConfig;
-const switchTv = tv({ extend: tv(theme), ...appConfigSwitch.b24ui?.switch || {} });
+<script lang="ts">
+import type { VariantProps } from 'tailwind-variants'
+import type { SwitchRootProps } from 'reka-ui'
+import type { AppConfig } from '@nuxt/schema'
+import _appConfig from '#build/app.config'
+import theme from '#build/b24ui/switch'
+import { tv } from '../utils/tv'
+import type { IconComponent } from '../types'
+import type { PartialString } from '../types/utils'
+
+const appConfigSwitch = _appConfig as AppConfig & { b24ui: { switch: Partial<typeof theme> } }
+
+const switchTv = tv({ extend: tv(theme), ...(appConfigSwitch.b24ui?.switch || {}) })
+
+type SwitchVariants = VariantProps<typeof switchTv>
+
+export interface SwitchProps extends Pick<SwitchRootProps, 'disabled' | 'id' | 'name' | 'required' | 'value' | 'defaultValue'> {
+  /**
+   * The element or component this component should render as.
+   * @defaultValue 'div'
+   */
+  as?: any
+  /**
+   * @defaultValue 'primary'
+   */
+  color?: SwitchVariants['color']
+  /**
+   * @defaultValue 'md'
+   */
+  size?: SwitchVariants['size']
+  /**
+   * When `true`, the loading icon will be displayed
+   * @defaultValue false
+   */
+  loading?: boolean
+  /**
+   * The icon when the `loading` prop is `true`.
+   * @defaultValue icons.refresh
+   * @IconComponent
+   */
+  loadingIcon?: IconComponent
+  /**
+   * Display an icon when the switch is checked.
+   * @IconComponent
+   */
+  checkedIcon?: IconComponent
+  /**
+   * Display an icon when the switch is unchecked.
+   * @IconComponent
+   */
+  uncheckedIcon?: IconComponent
+  label?: string
+  description?: string
+  class?: any
+  b24ui?: PartialString<typeof switchTv.slots>
+}
+
+export type SwitchEmits = {
+  change: [payload: Event]
+}
+
+export interface SwitchSlots {
+  label(props: { label?: string }): any
+  description(props: { description?: string }): any
+}
 </script>
 
-<script setup>
-import { computed, useId } from "vue";
-import { useForwardProps } from "reka-ui";
-import { reactivePick } from "@vueuse/core";
-import { useFormField } from "../composables/useFormField";
-defineOptions({ inheritAttrs: false });
-const props = defineProps({
-  as: {
-    type: null,
-    required: false
-  },
-  color: {
-    type: null,
-    required: false
-  },
-  size: {
-    type: null,
-    required: false
-  },
-  loading: {
-    type: Boolean,
-    required: false
-  },
-  loadingIcon: {
-    type: [Function, Object],
-    required: false
-  },
-  checkedIcon: {
-    type: [Function, Object],
-    required: false
-  },
-  uncheckedIcon: {
-    type: [Function, Object],
-    required: false
-  },
-  label: {
-    type: String,
-    required: false
-  },
-  description: {
-    type: String,
-    required: false
-  },
-  class: {
-    type: null,
-    required: false
-  },
-  b24ui: {
-    type: null,
-    required: false
-  },
-  disabled: {
-    type: Boolean,
-    required: false
-  },
-  id: {
-    type: String,
-    required: false
-  },
-  name: {
-    type: String,
-    required: false
-  },
-  required: {
-    type: Boolean,
-    required: false
-  },
-  value: {
-    type: String,
-    required: false
-  },
-  defaultValue: {
-    type: Boolean,
-    required: false
-  }
-});
-const slots = defineSlots();
-const emits = defineEmits(["change"]);
-const modelValue = defineModel({
-  "type": Boolean,
-  ...{
-    default: void 0
-  }
-});
-const rootProps = useForwardProps(reactivePick(props, "required", "value", "defaultValue"));
-const { id: _id, emitFormChange, emitFormInput, size, color, name, disabled, ariaAttrs } = useFormField(props);
-const id = _id.value ?? useId();
+<script setup lang="ts">
+import { computed, useId } from 'vue'
+import { Primitive, SwitchRoot, SwitchThumb, useForwardProps, Label } from 'reka-ui'
+import { reactivePick } from '@vueuse/core'
+import { useFormField } from '../composables/useFormField'
+import { omit } from '../utils'
+import icons from '../dictionary/icons'
+
+defineOptions({ inheritAttrs: false })
+
+const props = defineProps<SwitchProps>()
+const slots = defineSlots<SwitchSlots>()
+const emits = defineEmits<SwitchEmits>()
+
+const modelValue = defineModel<boolean>({ default: undefined })
+
+const rootProps = useForwardProps(reactivePick(props, 'required', 'value', 'defaultValue'))
+
+const { id: _id, emitFormChange, emitFormInput, size, color, name, disabled, ariaAttrs } = useFormField<SwitchProps>(props)
+const id = _id.value ?? useId()
+
 const b24ui = computed(() => switchTv({
   size: size.value,
   color: color.value,
   required: props.required,
   loading: props.loading,
   disabled: disabled.value || props.loading
-}));
-function onUpdate(value) {
-  const event = new Event("change", { target: { value } });
-  emits("change", event);
-  emitFormChange();
-  emitFormInput();
+}))
+
+function onUpdate(value: any) {
+  // @ts-expect-error - 'target' does not exist in type 'EventInit'
+  const event = new Event('change', { target: { value } })
+  emits('change', event)
+  emitFormChange()
+  emitFormInput()
 }
 </script>
 
@@ -141,7 +136,7 @@ function onUpdate(value) {
         </SwitchThumb>
       </SwitchRoot>
     </div>
-    <div v-if="label || !!slots.label || (description || !!slots.description)" :class="b24ui.wrapper({ class: props.b24ui?.wrapper })">
+    <div v-if="(label || !!slots.label) || (description || !!slots.description)" :class="b24ui.wrapper({ class: props.b24ui?.wrapper })">
       <Label v-if="label || !!slots.label" :for="id" :class="b24ui.label({ class: props.b24ui?.label })">
         <slot name="label" :label="label">
           {{ label }}

package/dist/runtime/components/Tabs.vue

@@ -1,87 +1,113 @@
-<script>
-import _appConfig from "#build/app.config";
-import theme from "#build/b24ui/tabs";
-import { tv } from "../utils/tv";
-const appConfigTabs = _appConfig;
-const tabs = tv({ extend: tv(theme), ...appConfigTabs.b24ui?.tabs || {} });
+<script lang="ts">
+import type { VariantProps } from 'tailwind-variants'
+import type { TabsRootProps, TabsRootEmits } from 'reka-ui'
+import type { AppConfig } from '@nuxt/schema'
+import _appConfig from '#build/app.config'
+import theme from '#build/b24ui/tabs'
+import { tv } from '../utils/tv'
+import type { AvatarProps, IconComponent } from '../types'
+import type { DynamicSlots, PartialString } from '../types/utils'
+
+const appConfigTabs = _appConfig as AppConfig & { b24ui: { tabs: Partial<typeof theme> } }
+
+const tabs = tv({ extend: tv(theme), ...(appConfigTabs.b24ui?.tabs || {}) })
+
+export interface TabsItem {
+  label?: string
+  /**
+   * @IconComponent
+   */
+  icon?: IconComponent
+  avatar?: AvatarProps
+  slot?: string
+  content?: string
+  /** A unique value for the tab item. Defaults to the index. */
+  value?: string | number
+  disabled?: boolean
+  [key: string]: any
+}
+
+type TabsVariants = VariantProps<typeof tabs>
+
+export interface TabsProps<T extends TabsItem = TabsItem> extends Pick<TabsRootProps<string | number>, 'defaultValue' | 'modelValue' | 'activationMode' | 'unmountOnHide'> {
+  /**
+   * The element or component this component should render as.
+   * @defaultValue 'div'
+   */
+  as?: any
+  items?: T[]
+  /**
+   * @defaultValue 'default'
+   */
+  color?: TabsVariants['color']
+  /**
+   * @defaultValue 'link'
+   */
+  variant?: TabsVariants['variant']
+  /**
+   * @defaultValue 'md'
+   */
+  size?: TabsVariants['size']
+  /**
+   * The orientation of the tabs.
+   * @defaultValue 'horizontal'
+   */
+  orientation?: TabsRootProps['orientation']
+  /**
+   * The content of the tabs, can be disabled to prevent rendering the content.
+   * @defaultValue true
+   */
+  content?: boolean
+  /**
+   * The key used to get the label from the item.
+   * @defaultValue 'label'
+   */
+  labelKey?: string
+  class?: any
+  b24ui?: PartialString<typeof tabs.slots>
+}
+
+export interface TabsEmits extends TabsRootEmits<string | number> {}
+
+type SlotProps<T extends TabsItem> = (props: { item: T, index: number }) => any
+
+export type TabsSlots<T extends TabsItem = TabsItem> = {
+  leading: SlotProps<T>
+  default: SlotProps<T>
+  trailing: SlotProps<T>
+  content: SlotProps<T>
+} & DynamicSlots<T, undefined, { index: number }>
 </script>
 
-<script setup>
-import { computed } from "vue";
-import { useForwardPropsEmits } from "reka-ui";
-import { reactivePick } from "@vueuse/core";
-const props = defineProps({
-  as: {
-    type: null,
-    required: false
-  },
-  items: {
-    type: Array,
-    required: false
-  },
-  color: {
-    type: null,
-    required: false
-  },
-  variant: {
-    type: null,
-    required: false
-  },
-  size: {
-    type: null,
-    required: false
-  },
-  orientation: {
-    type: null,
-    required: false,
-    default: "horizontal"
-  },
-  content: {
-    type: Boolean,
-    required: false,
-    default: true
-  },
-  labelKey: {
-    type: String,
-    required: false,
-    default: "label"
-  },
-  class: {
-    type: null,
-    required: false
-  },
-  b24ui: {
-    type: null,
-    required: false
-  },
-  defaultValue: {
-    type: null,
-    required: false,
-    default: "0"
-  },
-  modelValue: {
-    type: null,
-    required: false
-  },
-  activationMode: {
-    type: String,
-    required: false
-  },
-  unmountOnHide: {
-    type: Boolean,
-    required: false,
-    default: true
-  }
-});
-const emits = defineEmits(["update:modelValue"]);
-const slots = defineSlots();
-const rootProps = useForwardPropsEmits(reactivePick(props, "as", "modelValue", "defaultValue", "orientation", "activationMode", "unmountOnHide"), emits);
+<script setup lang="ts" generic="T extends TabsItem">
+import { computed } from 'vue'
+import { TabsRoot, TabsList, TabsIndicator, TabsTrigger, TabsContent, useForwardPropsEmits } from 'reka-ui'
+import { reactivePick } from '@vueuse/core'
+import { get } from '../utils'
+import B24Avatar from './Avatar.vue'
+
+const props = withDefaults(defineProps<TabsProps<T>>(), {
+  content: true,
+  defaultValue: '0',
+  orientation: 'horizontal',
+  unmountOnHide: true,
+  labelKey: 'label'
+})
+const emits = defineEmits<TabsEmits>()
+const slots = defineSlots<TabsSlots<T>>()
+
+const rootProps = useForwardPropsEmits(reactivePick(props, 'as', 'modelValue', 'defaultValue', 'orientation', 'activationMode', 'unmountOnHide'), emits)
+
+const getLabel = (item: TabsItem) => {
+  return get(item, props.labelKey as string)
+}
+
 const b24ui = computed(() => tabs({
   color: props.color,
   variant: props.variant,
   size: props.size,
   orientation: props.orientation
-}));
+}))
 </script>
 
 <template>
@@ -96,11 +122,11 @@ const b24ui = computed(() => tabs({
             v-if="item.icon"
             :class="b24ui.leadingIcon({ class: props.b24ui?.leadingIcon })"
           />
-          <B24Avatar v-else-if="item.avatar" :size="props.b24ui?.leadingAvatarSize || b24ui.leadingAvatarSize()" v-bind="item.avatar" :class="b24ui.leadingAvatar({ class: props.b24ui?.leadingAvatar })" />
+          <B24Avatar v-else-if="item.avatar" :size="((props.b24ui?.leadingAvatarSize || b24ui.leadingAvatarSize()) as AvatarProps['size'])" v-bind="item.avatar" :class="b24ui.leadingAvatar({ class: props.b24ui?.leadingAvatar })" />
         </slot>
 
-        <span v-if="get(item, props.labelKey) || !!slots.default" :class="b24ui.label({ class: props.b24ui?.label })">
-          <slot :item="item" :index="index">{{ get(item, props.labelKey) }}</slot>
+        <span v-if="getLabel(item) || !!slots.default" :class="b24ui.label({ class: props.b24ui?.label })">
+          <slot :item="item" :index="index">{{ getLabel(item) }}</slot>
         </span>
 
         <slot name="trailing" :item="item" :index="index" />
@@ -109,7 +135,7 @@ const b24ui = computed(() => tabs({
 
     <template v-if="!!content">
       <TabsContent v-for="(item, index) in items" :key="index" :value="item.value || String(index)" :class="b24ui.content({ class: props.b24ui?.content })">
-        <slot :name="item.slot || 'content'" :item="item" :index="index">
+        <slot :name="((item.slot || 'content') as keyof TabsSlots<T>)" :item="(item as Extract<T, { slot: string; }>)" :index="index">
           {{ item.content }}
         </slot>
       </TabsContent>