@bitrix24/b24ui-nuxt 0.5.10 → 0.5.11

package/dist/runtime/components/Button.vue

@@ -1,223 +1,160 @@
-<script>
-import _appConfig from "#build/app.config";
-import theme from "#build/b24ui/button";
-import { tv } from "../utils/tv";
-const appConfigButton = _appConfig;
-const button = tv({ extend: tv(theme), ...appConfigButton.b24ui?.button || {} });
+<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/button'
+import type { LinkProps } from './Link.vue'
+import type { UseComponentIconsProps } from '../composables/useComponentIcons'
+import { tv } from '../utils/tv'
+import type { AvatarProps } from '../types'
+import type { PartialString } from '../types/utils'
+
+const appConfigButton = _appConfig as AppConfig & { b24ui: { button: Partial<typeof theme> } }
+
+const button = tv({ extend: tv(theme), ...(appConfigButton.b24ui?.button || {}) })
+
+type ButtonVariants = VariantProps<typeof button>
+
+export interface ButtonProps extends Omit<UseComponentIconsProps, 'trailing' | 'trailingIcon'>, Omit<LinkProps, 'raw' | 'custom'> {
+  label?: string
+  /**
+   * @defaultValue 'default'
+   */
+  color?: ButtonVariants['color']
+  activeColor?: ButtonVariants['color']
+  /**
+   * @defaultValue 'normal'
+   */
+  depth?: ButtonVariants['depth']
+  activeDepth?: ButtonVariants['depth']
+  /**
+   * @defaultValue 'md'
+   */
+  size?: ButtonVariants['size']
+  /**
+   * Rounds the corners of the button
+   * @defaultValue false
+   */
+  rounded?: boolean
+  /**
+   * Render the button full width
+   * @defaultValue false
+   */
+  block?: boolean
+  /**
+   * Set loading state automatically based on the `@click` promise state
+   * @defaultValue false
+   */
+  loadingAuto?: boolean
+  /**
+   * Disable uppercase label
+   * @defaultValue false
+   */
+  normalCase?: boolean
+  /**
+   * Shows LoaderWaitIcon in loading mode
+   * @defaultValue false
+   */
+  useWait?: boolean
+  /**
+   * Shows LoaderClockIcon icon in loading mode
+   * @defaultValue false
+   */
+  useClock?: boolean
+  /**
+   * Shows icons.chevronDown on the right side
+   * @defaultValue false
+   */
+  useDropdown?: boolean
+  onClick?: ((event: MouseEvent) => void | Promise<void>) | Array<((event: MouseEvent) => void | Promise<void>)>
+  class?: any
+  /**
+   * The class to apply when the link is active
+   * @defaultValue ''
+   */
+  activeClass?: string
+  /**
+   * The class to apply when the link is inactive
+   * @defaultValue ''
+   */
+  inactiveClass?: string
+  b24ui?: PartialString<typeof button.slots>
+}
+
+export interface ButtonSlots {
+  leading(props?: {}): any
+  default(props?: {}): any
+  trailing(props?: {}): any
+}
 </script>
 
-<script setup>
-import { computed, ref, inject } from "vue";
-import { useForwardProps } from "reka-ui";
-import { useComponentIcons } from "../composables/useComponentIcons";
-import { useButtonGroup } from "../composables/useButtonGroup";
-import { formLoadingInjectionKey } from "../composables/useFormField";
-import { pickLinkProps } from "../utils/link";
-const props = defineProps({
-  label: {
-    type: String,
-    required: false
-  },
-  color: {
-    type: null,
-    required: false
-  },
-  activeColor: {
-    type: null,
-    required: false
-  },
-  depth: {
-    type: null,
-    required: false
-  },
-  activeDepth: {
-    type: null,
-    required: false
-  },
-  size: {
-    type: null,
-    required: false
-  },
-  rounded: {
-    type: Boolean,
-    required: false
-  },
-  block: {
-    type: Boolean,
-    required: false
-  },
-  loadingAuto: {
-    type: Boolean,
-    required: false
-  },
-  normalCase: {
-    type: Boolean,
-    required: false
-  },
-  useWait: {
-    type: Boolean,
-    required: false
-  },
-  useClock: {
-    type: Boolean,
-    required: false
-  },
-  useDropdown: {
-    type: Boolean,
-    required: false
-  },
-  onClick: {
-    type: [Function, Array],
-    required: false
-  },
-  class: {
-    type: null,
-    required: false
-  },
-  activeClass: {
-    type: String,
-    required: false,
-    default: ""
-  },
-  inactiveClass: {
-    type: String,
-    required: false,
-    default: ""
-  },
-  b24ui: {
-    type: null,
-    required: false
-  },
-  icon: {
-    type: [Function, Object],
-    required: false
-  },
-  avatar: {
-    type: Object,
-    required: false
-  },
-  loading: {
-    type: Boolean,
-    required: false
-  },
-  as: {
-    type: null,
-    required: false
-  },
-  type: {
-    type: null,
-    required: false,
-    default: "button"
-  },
-  disabled: {
-    type: Boolean,
-    required: false
-  },
-  active: {
-    type: Boolean,
-    required: false,
-    default: void 0
-  },
-  exact: {
-    type: Boolean,
-    required: false
-  },
-  exactQuery: {
-    type: [Boolean, String],
-    required: false
-  },
-  exactHash: {
-    type: Boolean,
-    required: false
-  },
-  isAction: {
-    type: Boolean,
-    required: false
-  },
-  to: {
-    type: null,
-    required: false
-  },
-  href: {
-    type: null,
-    required: false
-  },
-  external: {
-    type: Boolean,
-    required: false
-  },
-  target: {
-    type: [String, Object, null],
-    required: false
-  },
-  rel: {
-    type: [String, Object, null],
-    required: false
-  },
-  noRel: {
-    type: Boolean,
-    required: false
-  },
-  prefetchedClass: {
-    type: String,
-    required: false
-  },
-  prefetch: {
-    type: Boolean,
-    required: false
-  },
-  prefetchOn: {
-    type: [String, Object],
-    required: false
-  },
-  noPrefetch: {
-    type: Boolean,
-    required: false
-  },
-  exactActiveClass: {
-    type: String,
-    required: false
-  },
-  ariaCurrentValue: {
-    type: String,
-    required: false
-  },
-  viewTransition: {
-    type: Boolean,
-    required: false
-  },
-  replace: {
-    type: Boolean,
-    required: false
-  }
-});
-const slots = defineSlots();
-const linkProps = useForwardProps(pickLinkProps(props));
-const { orientation, size: buttonSize, noSplit } = useButtonGroup(props);
-const loadingAutoState = ref(false);
-const formLoading = inject(formLoadingInjectionKey, void 0);
-async function onClickWrapper(event) {
-  loadingAutoState.value = true;
-  const callbacks = Array.isArray(props.onClick) ? props.onClick : [props.onClick];
+<script setup lang="ts">
+import { type Ref, computed, ref, inject } from 'vue'
+import { useForwardProps } from 'reka-ui'
+import { useComponentIcons } from '../composables/useComponentIcons'
+import { useButtonGroup } from '../composables/useButtonGroup'
+import { formLoadingInjectionKey } from '../composables/useFormField'
+import { omit } from '../utils'
+import { pickLinkProps } from '../utils/link'
+import B24Avatar from './Avatar.vue'
+import B24Link from './Link.vue'
+import B24LinkBase from './LinkBase.vue'
+import ChevronDownIcon from '@bitrix24/b24icons-vue/actions/ChevronDownIcon'
+import LoaderWaitIcon from '@bitrix24/b24icons-vue/animated/LoaderWaitIcon'
+import LoaderClockIcon from '@bitrix24/b24icons-vue/animated/LoaderClockIcon'
+import SpinnerIcon from '@bitrix24/b24icons-vue/specialized/SpinnerIcon'
+
+const props = withDefaults(defineProps<ButtonProps>(), {
+  type: 'button',
+  active: undefined,
+  activeClass: '',
+  inactiveClass: ''
+})
+
+const slots = defineSlots<ButtonSlots>()
+
+const linkProps = useForwardProps(pickLinkProps(props))
+
+/**
+ * @memo Problem use at Docs (vue): omit not exports
+ */
+const proxyLinkProps = computed(() => {
+  return omit(linkProps.value, ['type', 'disabled', 'onClick'])
+})
+
+const { orientation, size: buttonSize, noSplit } = useButtonGroup<ButtonProps>(props)
+
+const loadingAutoState = ref(false)
+const formLoading = inject<Ref<boolean> | undefined>(formLoadingInjectionKey, undefined)
+
+async function onClickWrapper(event: MouseEvent) {
+  loadingAutoState.value = true
+  const callbacks = Array.isArray(props.onClick) ? props.onClick : [props.onClick]
   try {
-    await Promise.all(callbacks.map((fn) => fn?.(event)));
+    await Promise.all(callbacks.map(fn => fn?.(event)))
   } finally {
-    loadingAutoState.value = false;
+    loadingAutoState.value = false
   }
 }
+
 const isLoading = computed(() => {
-  return props.loading || props.loadingAuto && (loadingAutoState.value || formLoading?.value && props.type === "submit");
-});
+  return props.loading || (props.loadingAuto && (loadingAutoState.value || (formLoading?.value && props.type === 'submit')))
+})
+
 const { isLeading, leadingIconName } = useComponentIcons(
   computed(() => ({ ...props, loading: false }))
-);
+)
+
 const isLabel = computed(() => {
-  let isUseSlot = false;
+  let isUseSlot = false
+
   if (slots && !!slots.default) {
-    isUseSlot = true;
+    isUseSlot = true
   }
-  return (props?.label || "").length > 0 || isUseSlot;
-});
+
+  return (props?.label || '').length > 0 || isUseSlot
+})
+
 const b24ui = computed(() => tv({
   extend: button,
   variants: {
@@ -245,7 +182,7 @@ const b24ui = computed(() => tv({
   useClock: Boolean(props.useClock),
   leading: Boolean(isLeading.value),
   buttonGroup: orientation.value
-}));
+}))
 </script>
 
 <template>
@@ -254,17 +191,17 @@ const b24ui = computed(() => tv({
     :type="type"
     :disabled="disabled || isLoading"
     :class="b24ui.base({ class: [props.class, props.b24ui?.base] })"
-    v-bind="omit(linkProps, ['type', 'disabled', 'onClick'])"
+    v-bind="proxyLinkProps"
     custom
   >
     <B24LinkBase
       v-bind="slotProps"
       :class="b24ui.base({
-  class: [props.class, props.b24ui?.base],
-  active,
-  ...active && activeDepth ? { depth: activeDepth } : {},
-  ...active && activeColor ? { color: activeColor } : {}
-})"
+        class: [props.class, props.b24ui?.base],
+        active,
+        ...(active && activeDepth ? { depth: activeDepth } : {}),
+        ...(active && activeColor ? { color: activeColor } : {})
+      })"
       @click="onClickWrapper"
     >
       <div
@@ -277,19 +214,19 @@ const b24ui = computed(() => tv({
       </div>
       <div
         :class="[
-  b24ui.baseLine({ class: [props.b24ui?.baseLine] }),
-  isLoading ? 'invisible' : ''
-]"
+          b24ui.baseLine({ class: [props.b24ui?.baseLine] }),
+          isLoading ? 'invisible' : ''
+        ]"
       >
         <slot name="leading">
           <Component
             :is="leadingIconName"
-            v-if="isLeading && typeof leadingIconName !== 'undefined'"
+            v-if="isLeading && (typeof leadingIconName !== 'undefined')"
             :class="b24ui.leadingIcon({ class: props.b24ui?.leadingIcon })"
           />
           <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 })"
           />

package/dist/runtime/components/ButtonGroup.vue

@@ -1,44 +1,60 @@
-<script>
-import _appConfig from "#build/app.config";
-import theme from "#build/b24ui/button-group";
-import { tv } from "../utils/tv";
-const appConfigButtonGroup = _appConfig;
-const buttonGroup = tv({ extend: tv(theme), ...appConfigButtonGroup.b24ui?.buttonGroup });
+<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/button-group'
+import { tv } from '../utils/tv'
+
+const appConfigButtonGroup = _appConfig as AppConfig & { b24ui: { buttonGroup: Partial<typeof theme> } }
+
+const buttonGroup = tv({ extend: tv(theme), ...(appConfigButtonGroup.b24ui?.buttonGroup) })
+
+type ButtonGroupVariants = VariantProps<typeof buttonGroup>
+
+export interface ButtonGroupProps {
+  /**
+   * The element or component this component should render as.
+   * @defaultValue 'div'
+   */
+  as?: any
+  /**
+   * @defaultValue 'md'
+   */
+  size?: ButtonGroupVariants['size']
+  /**
+   * The orientation the buttons are laid out.
+   * @defaultValue 'horizontal'
+   */
+  orientation?: ButtonGroupVariants['orientation']
+  /**
+   * Disable show split
+   * @defaultValue false
+   */
+  noSplit?: boolean
+  class?: any
+}
+
+export interface ButtonGroupSlots {
+  default(props?: {}): any
+}
 </script>
 
-<script setup>
-import { provide, computed } from "vue";
-import { buttonGroupInjectionKey } from "../composables/useButtonGroup";
-const props = defineProps({
-  as: {
-    type: null,
-    required: false
-  },
-  size: {
-    type: null,
-    required: false
-  },
-  orientation: {
-    type: null,
-    required: false,
-    default: "horizontal"
-  },
-  noSplit: {
-    type: Boolean,
-    required: false,
-    default: false
-  },
-  class: {
-    type: null,
-    required: false
-  }
-});
-defineSlots();
+<script setup lang="ts">
+import { provide, computed } from 'vue'
+import { Primitive } from 'reka-ui'
+import { buttonGroupInjectionKey } from '../composables/useButtonGroup'
+
+const props = withDefaults(defineProps<ButtonGroupProps>(), {
+  orientation: 'horizontal',
+  noSplit: false
+})
+defineSlots<ButtonGroupSlots>()
+
 provide(buttonGroupInjectionKey, computed(() => ({
   orientation: props.orientation,
   noSplit: Boolean(props.noSplit),
   size: props.size
-})));
+})))
 </script>
 
 <template>