@saasmakers/ui 2.0.21 → 2.0.22

package/app/components/bases/BaseAvatar.vue

@@ -5,10 +5,10 @@ import type { BaseAvatar } from '../../types/bases'
 const props = withDefaults(defineProps<BaseAvatar>(), {
   bordered: true,
   borderWidth: 3,
-  circular: true,
   editable: false,
   maxSizeMb: undefined,
   shadow: true,
+  shape: 'circle',
   src: undefined,
   to: undefined,
 })
@@ -102,7 +102,8 @@ function onMouseLeave() {
       :aria-label="editable ? t('edit') : undefined"
       class="relative h-full w-full overflow-hidden"
       :class="{
-        'rounded-full': circular,
+        'rounded-full': shape === 'circle',
+        'rounded-lg': shape === 'square',
         'shadow': shadow,
         'cursor-pointer': isClickable,
       }"
@@ -116,7 +117,8 @@ function onMouseLeave() {
       <img
         class="h-full w-full object-cover drag-none"
         :class="{
-          'rounded-full': circular,
+          'rounded-full': shape === 'circle',
+          'rounded-lg': shape === 'square',
           'border-white dark:border-white': bordered,
           'border-2': bordered && borderWidth === 2,
           'border-3': bordered && borderWidth === 3,

package/app/components/bases/BaseButton.vue

@@ -1,10 +1,11 @@
 <script lang="ts" setup>
 import { NuxtLinkLocale } from '#components'
-import type { BaseButton } from '../../types/bases'
+import type { BaseButton, BaseButtonShape } from '../../types/bases'
+
+const fixedSizeButtonShapes = ['square', 'circle'] satisfies BaseButtonShape[]
 
 const props = withDefaults(defineProps<BaseButton>(), {
   background: true,
-  circular: false,
   color: 'black',
   confirmation: false,
   disabled: false,
@@ -15,6 +16,7 @@ const props = withDefaults(defineProps<BaseButton>(), {
   light: false,
   loading: false,
   reverse: false,
+  shape: 'default',
   size: 'base',
   text: '',
   to: undefined,
@@ -33,6 +35,10 @@ defineSlots<{
 const confirming = ref(false)
 const { t } = useI18n()
 
+const hasFixedSize = computed(() => {
+  return fixedSizeButtonShapes.includes(props.shape)
+})
+
 function onClick(event: MouseEvent) {
   if (!props.loading) {
     if (props.confirmation) {
@@ -56,21 +62,21 @@ function onClick(event: MouseEvent) {
     :is="to ? NuxtLinkLocale : 'button'"
     class="relative inline-block select-none appearance-none border uppercase focus-visible:outline-none"
     :class="{
-      'flex items-center justify-center': circular,
+      'flex items-center justify-center': hasFixedSize,
       'cursor-not-allowed opacity-50': disabled,
       'cursor-wait': loading,
       'cursor-pointer': !loading,
       'w-full': fullWidth,
       'bg-transparent shadow-none': light,
       'shadow-sm': !light,
-      'rounded-lg': !circular,
-      'rounded-full': circular,
-      'h-6 w-6': size === '2xs' && circular,
-      'h-8 w-8': size === 'xs' && circular && !confirming,
-      'h-10 w-10': size === 'sm' && circular && !confirming,
-      'h-12 w-12': size === 'base' && circular && !confirming,
-      'h-14 w-14': size === 'lg' && circular && !confirming,
-      'h-16 w-16': size === 'xl' && circular && !confirming,
+      'rounded-lg': shape !== 'circle',
+      'rounded-full': shape === 'circle',
+      'h-6 w-6': size === '2xs' && hasFixedSize,
+      'h-8 w-8': size === 'xs' && hasFixedSize && !confirming,
+      'h-10 w-10': size === 'sm' && hasFixedSize && !confirming,
+      'h-12 w-12': size === 'base' && hasFixedSize && !confirming,
+      'h-14 w-14': size === 'lg' && hasFixedSize && !confirming,
+      'h-16 w-16': size === 'xl' && hasFixedSize && !confirming,
       'border-gray-900 dark:border-gray-100 bg-gray-900 dark:bg-gray-100 text-white dark:text-black': color === 'black' && !light,
       'hover:bg-black dark:hover:bg-white hover:text-white dark:hover:text-black': color === 'black' && !light && !disabled && !loading,
       'border-gray-900 dark:border-gray-100 text-gray-900 dark:text-gray-100': color === 'black' && light,
@@ -94,12 +100,12 @@ function onClick(event: MouseEvent) {
       'border-white dark:border-gray-900 text-white dark:text-black': color === 'white' && light,
       'hover:border-black dark:hover:border-white hover:text-black dark:hover:text-white': color !== 'white' && light && !disabled && !loading,
       'hover:bg-white dark:hover:bg-gray-900 hover:text-gray-800 dark:hover:text-gray-200': color === 'white' && light && !disabled && !loading,
-      'h-6 px-3': size === '2xs' && (!circular || confirming),
-      'h-8 px-4': size === 'xs' && (!circular || confirming),
-      'h-10 px-5': size === 'sm' && (!circular || confirming),
-      'h-12 px-6': size === 'base' && (!circular || confirming),
-      'h-13 px-6.5': size === 'lg' && (!circular || confirming),
-      'h-14 px-7': size === 'xl' && (!circular || confirming),
+      'h-6 px-3': size === '2xs' && (!hasFixedSize || confirming),
+      'h-8 px-4': size === 'xs' && (!hasFixedSize || confirming),
+      'h-10 px-5': size === 'sm' && (!hasFixedSize || confirming),
+      'h-12 px-6': size === 'base' && (!hasFixedSize || confirming),
+      'h-13 px-6.5': size === 'lg' && (!hasFixedSize || confirming),
+      'h-14 px-7': size === 'xl' && (!hasFixedSize || confirming),
     }"
     :disabled="disabled"
     :to="to"

package/app/components/fields/FieldAvatar.vue

@@ -128,7 +128,7 @@ function onOpenFilePicker() {
 
         <BaseText
           class="min-w-0 flex-1 text-gray-900 dark:text-gray-100"
-          :size="({ base: 'sm', lg: 'base', sm: 'xs' } as const)[size]"
+          :size="({ base: 'sm', lg: 'base', sm: 'xs', xs: '2xs' } as const)[size]"
           :text="loading ? t('actionLoading') : (action || t('action'))"
         />
       </div>

package/app/components/fields/FieldInput.vue

@@ -166,6 +166,7 @@ defineExpose({ blur, focus })
     <div
       class="flex items-center"
       :class="{
+        'h-8': size === 'xs',
         'h-10': size === 'sm',
         'h-12': size === 'base',
         'h-14': size === 'lg',
@@ -199,6 +200,7 @@ defineExpose({ blur, focus })
             'px-10': border === 'bottom' && type !== 'password',
             'border-0 p-0': border === 'none' && type !== 'password',
             'border-0 pr-9': border === 'none' && type === 'password',
+            'text-2xs': size === 'xs',
             'text-xs': size === 'sm',
             'text-sm': size === 'base',
             'text-base': size === 'lg',

package/app/components/fields/FieldLabel.vue

@@ -29,6 +29,8 @@ const textSize = computed<BaseSize>(() => {
       return 'base'
     case 'sm':
       return 'xs'
+    case 'xs':
+      return '2xs'
     default:
       return 'sm'
   }
@@ -69,9 +71,11 @@ function onKeyDown(event: KeyboardEvent) {
       'text-gray-500 dark:text-gray-500 line-through': lineThrough,
       'hover:text-black dark:hover:text-white': isClickable && !lineThrough,
       'w-0 truncate': truncate,
+      'mb-1.5': size === 'xs' && hasMarginBottom,
       'mb-2': size === 'sm' && hasMarginBottom,
       'mb-2.5': size === 'base' && hasMarginBottom,
       'mb-3': size === 'lg' && hasMarginBottom,
+      'ml-1': size === 'xs' && hasMarginLeft,
       'ml-1.5': size === 'sm' && hasMarginLeft,
       'ml-2': size === 'base' && hasMarginLeft,
       'ml-2.5': size === 'lg' && hasMarginLeft,

package/app/types/bases.d.ts

@@ -24,13 +24,17 @@ export interface BaseAlert {
 // Global types for bases
 export type BaseAlignment = 'center' | 'left' | 'right'
 
+export type BaseButtonShape = 'circle' | 'default' | 'square'
+
+export type BaseAvatarShape = 'circle' | 'square'
+
 export interface BaseAvatar {
   bordered?: boolean
   borderWidth?: number
-  circular?: boolean
   editable?: boolean
   maxSizeMb?: number
   shadow?: boolean
+  shape?: BaseAvatarShape
   src?: string
   to?: RouteLocationNamedI18n
 }
@@ -49,7 +53,6 @@ export type BaseBorderedColor = 'black' | 'gray'
 
 export interface BaseButton {
   background?: boolean
-  circular?: boolean
   color?: BaseColor
   confirmation?: boolean
   disabled?: boolean
@@ -60,6 +63,7 @@ export interface BaseButton {
   light?: boolean
   loading?: boolean
   reverse?: boolean
+  shape?: BaseButtonShape
   size?: BaseButtonSize
   text?: BaseTextText
   to?: RouteLocationNamedI18n

package/app/types/fields.d.ts

@@ -155,7 +155,7 @@ export interface FieldSelectOption {
   value: string
 }
 
-export type FieldSize = 'base' | 'lg' | 'sm'
+export type FieldSize = 'base' | 'lg' | 'sm' | 'xs'
 
 export type FieldStatus
   = | 'default'

package/app/types/global.d.ts

@@ -66,6 +66,8 @@ declare global {
   type BaseQuoteSize = import('./bases').BaseQuoteSize
   type BaseShortcut = import('./bases').BaseShortcut
   type BaseSize = import('./bases').BaseSize
+  type BaseButtonShape = import('./bases').BaseButtonShape
+  type BaseAvatarShape = import('./bases').BaseAvatarShape
   type BaseSpinner = import('./bases').BaseSpinner
   type BaseStatus = import('./bases').BaseStatus
   type BaseTag = import('./bases').BaseTag

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saasmakers/ui",
-  "version": "2.0.21",
+  "version": "2.0.22",
   "private": false,
   "description": "Reusable Nuxt UI components for SaaS Makers projects",
   "license": "MIT",