@saasmakers/ui 1.3.8 → 1.4.0

package/app/components/bases/BaseToast.stories.ts

@@ -27,3 +27,16 @@ export const Default: StoryObj<typeof BaseToast> = {
     text: 'Toast message',
   } satisfies Partial<BaseToast>,
 }
+
+export const WithAction: StoryObj<typeof BaseToast> = {
+  args: {
+    action: {
+      label: 'Undo',
+      // eslint-disable-next-line no-console
+      onClick: () => console.log('action clicked'),
+    },
+    id: 'toast-2',
+    status: 'success',
+    text: 'Toast message',
+  } satisfies Partial<BaseToast>,
+}

package/app/components/bases/BaseToast.vue

@@ -9,11 +9,18 @@ const props = withDefaults(defineProps<BaseToast>(), {
 })
 
 const emit = defineEmits<{
+  action: [event: MouseEvent, toast: BaseToast]
   close: [event: MouseEvent, toast: BaseToast]
 }>()
 
 const { getIcon } = useLayerIcons()
 
+function onAction(event: KeyboardEvent | MouseEvent) {
+  if (props.action) {
+    emit('action', event as MouseEvent, props)
+  }
+}
+
 function onClose(event: KeyboardEvent | MouseEvent) {
   if (props.hasClose) {
     emit('close', event as MouseEvent, props)
@@ -37,6 +44,30 @@ function onClose(event: KeyboardEvent | MouseEvent) {
       :text="text"
     />
 
+    <template v-if="action">
+      <div class="ml-2 mr-1.5 h-5 border-l border-gray-700 flex-initial dark:border-gray-300" />
+
+      <button
+        class="cursor-pointer bg-transparent flex-initial"
+        type="button"
+        @click.stop="onAction"
+      >
+        <BaseText
+          bold
+          class="pointer-events-none"
+          :class="{
+            'text-red-400 dark:text-red-600': status === 'error',
+            'text-indigo-400 dark:text-indigo-600': status === 'info',
+            'text-orange-400 dark:text-orange-600': status === 'warning',
+            'text-teal-400 dark:text-teal-600': status === 'success',
+          }"
+          no-wrap
+          :text="action.label"
+          uppercase
+        />
+      </button>
+    </template>
+
     <template v-if="hasClose">
       <div class="ml-2 mr-1.5 h-5 border-l border-gray-700 flex-initial dark:border-gray-300" />
 

package/app/components/fields/FieldInput.stories.ts

@@ -50,6 +50,7 @@ export default {
       ] satisfies FieldSize[],
     },
     slugOnly: { control: 'boolean' },
+    trim: { control: 'boolean' },
     type: {
       control: 'select',
       options: [
@@ -88,3 +89,12 @@ export const SlugOnly: StoryObj<typeof FieldInput> = {
     slugOnly: true,
   } satisfies Partial<FieldInput>,
 }
+
+export const Trim: StoryObj<typeof FieldInput> = {
+  args: {
+    label: 'First name',
+    modelValue: 'Julien  ',
+    placeholder: 'Enter your first name',
+    trim: true,
+  } satisfies Partial<FieldInput>,
+}

package/app/components/fields/FieldInput.vue

@@ -22,6 +22,7 @@ const props = withDefaults(defineProps<Omit<FieldInput, 'modelValue'>>(), {
   required: false,
   size: 'base',
   slugOnly: false,
+  trim: false,
   type: 'text',
   uppercase: false,
   validation: undefined,
@@ -67,6 +68,10 @@ function focus() {
 }
 
 function onFieldBlur(event: FocusEvent) {
+  if (props.trim) {
+    modelValue.value = modelValue.value.toString().trim()
+  }
+
   emit('blur', event)
 }
 
@@ -99,7 +104,11 @@ function onFieldKeyDown(event: KeyboardEvent) {
   }
 
   else if (event.key === 'Enter' && modelValue.value) {
-    emit('submit', event, value)
+    if (props.trim) {
+      modelValue.value = modelValue.value.toString().trim()
+    }
+
+    emit('submit', event, modelValue.value.toString())
   }
 
   else if (props.type === 'number' && [

package/app/components/layout/LayoutToasts.vue

@@ -2,6 +2,12 @@
 const { fadeInUp } = useMotion()
 const toasts = useToasts()
 
+async function onToastAction(_event: MouseEvent, toast: BaseToast) {
+  toasts.closeToast(toast.id)
+
+  await toast.action?.onClick()
+}
+
 function onToastClose(_event: MouseEvent, toast: BaseToast) {
   toasts.closeToast(toast.id)
 }
@@ -20,8 +26,10 @@ function onToastClose(_event: MouseEvent, toast: BaseToast) {
         <BaseToast
           :id="toast.id"
           :key="toast.id"
+          :action="toast.action"
           :status="toast.status"
           :text="toast.text"
+          @action="onToastAction"
           @close="onToastClose"
         />
       </Motion>

package/app/composables/useToasts.ts

@@ -17,9 +17,10 @@ export default function useToast() {
     }
   }
 
-  const createToast = (message: string, status: BaseStatus = 'success', i18nParams?: Record<string, number | string>) => {
+  const createToast = (message: string, status: BaseStatus = 'success', i18nParams?: Record<string, number | string>, action?: BaseToastAction) => {
     if (import.meta.client) {
       const toast: BaseToast = {
+        action,
         id: crypto.randomUUID(),
         status: status || 'success',
         text: message.includes(' ') ? message : nuxtApp.$i18n.t(`toasts.${message}`, i18nParams || {}),
@@ -27,8 +28,8 @@ export default function useToast() {
 
       toasts.value.push(toast)
 
-      // Remove toast after 5 seconds
-      setTimeout(() => closeToast(toast.id), 5 * 1000)
+      // Give more time to interact when the toast offers an action
+      setTimeout(() => closeToast(toast.id), (action ? 8 : 5) * 1000)
     }
   }
 

package/app/types/bases.d.ts

@@ -358,8 +358,14 @@ export type BaseTextText = string | {
 }
 
 export interface BaseToast {
+  action?: BaseToastAction
   hasClose?: boolean
   id: string
   status?: BaseStatus
   text: BaseTextText
 }
+
+export interface BaseToastAction {
+  label: BaseTextText
+  onClick: () => Promise<void> | void
+}

package/app/types/fields.d.ts

@@ -70,6 +70,7 @@ export interface FieldInput {
   required?: boolean
   size?: FieldSize
   slugOnly?: boolean
+  trim?: boolean
   type?: FieldInputType
   uppercase?: boolean
   validation?: VuelidateValidation

package/app/types/global.d.ts

@@ -57,6 +57,8 @@ declare global {
   type BaseText = Bases.BaseText
   type BaseTextText = Bases.BaseTextText
   type BaseToast = Bases.BaseToast
+  type BaseToastAction = Bases.BaseToastAction
+
   // Libraries
   type ChartistBarChartData = import('chartist').BarChartData
   type ChartistLineChartData = import('chartist').LineChartData

package/package.json

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