@weni/unnnic-system 3.11.2 → 3.11.3-alpha.0

package/src/components/Drawer/__tests__/Drawer.spec.js

@@ -5,6 +5,13 @@ import Drawer from '../Drawer.vue';
 describe('Drawer.vue', () => {
   let wrapper;
 
+  const templateSlot = { template: `<div><slot /></div>` };
+  const globalStubs = {
+    UnnnicIcon: true,
+    UnnnicButton: true,
+    Teleport: templateSlot,
+  };
+
   beforeEach(() => {
     wrapper = mount(Drawer, {
       props: {
@@ -15,15 +22,14 @@ describe('Drawer.vue', () => {
         secondaryButtonText: 'Secondary Action',
       },
       global: {
-        stubs: ['UnnnicIcon', 'UnnnicButton'],
+        stubs: globalStubs,
       },
     });
   });
 
   const element = (id) => wrapper.find(`[data-testid="${id}"]`);
   const component = (id) => wrapper.findComponent(`[data-testid="${id}"]`);
-  const drawer = () => element('drawer');
-  const overlay = () => element('overlay');
+  const drawerRoot = () => wrapper.findComponent({ name: 'UnnnicDrawerNext' });
   const title = () => element('drawer-title');
   const description = () => element('drawer-description');
   const primaryButton = () => component('primary-button');
@@ -31,6 +37,8 @@ describe('Drawer.vue', () => {
   const footer = () => element('footer');
   const closeIcon = () => component('close-icon');
   const drawerContainer = () => element('drawer-container');
+  const drawerContentComponent = () =>
+    wrapper.findComponent({ name: 'UnnnicDrawerContent' });
 
   describe('Component Rendering', () => {
     describe('Component Rendering', () => {
@@ -39,21 +47,21 @@ describe('Drawer.vue', () => {
       });
 
       it('should render the drawer when modelValue is true', () => {
-        expect(drawer().exists()).toBe(true);
+        expect(drawerRoot().props('open')).toBe(true);
       });
 
       it('should not render the drawer when modelValue is false', async () => {
         await wrapper.setProps({ modelValue: false });
-        expect(drawer().exists()).toBe(false);
+        expect(drawerRoot().props('open')).toBe(false);
       });
 
       it('should render the overlay when withoutOverlay is false', () => {
-        expect(overlay().exists()).toBe(true);
+        expect(drawerContentComponent().props('showOverlay')).toBe(true);
       });
 
       it('should not render the overlay when withoutOverlay is true', async () => {
         await wrapper.setProps({ withoutOverlay: true });
-        expect(overlay().exists()).toBe(false);
+        expect(drawerContentComponent().props('showOverlay')).toBe(false);
       });
 
       it('should display the title and description correctly', () => {
@@ -75,7 +83,11 @@ describe('Drawer.vue', () => {
           slots: {
             content: '<div data-testid="slot-content">Slot Content</div>',
           },
+          global: {
+            stubs: globalStubs,
+          },
         });
+
         expect(wrapper.find('[data-testid="slot-content"]').exists()).toBe(
           true,
         );
@@ -93,6 +105,9 @@ describe('Drawer.vue', () => {
           slots: {
             title: '<h2 data-testid="custom-title">Custom Title Content</h2>',
           },
+          global: {
+            stubs: globalStubs,
+          },
         });
 
         expect(title().exists()).toBe(false);
@@ -113,6 +128,9 @@ describe('Drawer.vue', () => {
           slots: {
             title: '<div data-testid="custom-title">Slot Title</div>',
           },
+          global: {
+            stubs: globalStubs,
+          },
         });
 
         expect(title().exists()).toBe(false);
@@ -164,7 +182,7 @@ describe('Drawer.vue', () => {
     });
   });
 
-  describe('Interactions and Transitions', () => {
+  describe('Interactions', () => {
     beforeEach(() => {
       vi.useFakeTimers();
     });
@@ -174,9 +192,6 @@ describe('Drawer.vue', () => {
 
     it('should close the drawer when the close icon is clicked', async () => {
       await closeIcon().trigger('click');
-
-      vi.advanceTimersByTime(200);
-
       expect(wrapper.emitted('close')).toBeTruthy();
     });
 
@@ -184,8 +199,6 @@ describe('Drawer.vue', () => {
       await wrapper.setProps({ distinctCloseBack: true });
       await closeIcon().trigger('click');
 
-      vi.advanceTimersByTime(200);
-
       expect(wrapper.emitted('back')).toBeTruthy();
     });
 
@@ -193,49 +206,21 @@ describe('Drawer.vue', () => {
       await closeIcon().trigger('click');
       expect(wrapper.emitted('back')).toBeUndefined();
     });
-
-    it('should correctly handle transitions when closing the drawer', async () => {
-      await wrapper.vm.close();
-      expect(wrapper.vm.showDrawer).toBe(false);
-
-      setTimeout(() => {
-        expect(drawer().exists()).toBe(false);
-      }, 200);
-    });
-
-    it('should handle overlay clicks to close the drawer when withoutOverlay is false', async () => {
-      expect(overlay().exists()).toBe(true);
-      await overlay().trigger('click');
-
-      vi.advanceTimersByTime(200);
-
-      expect(wrapper.emitted('close')).toBeTruthy();
-    });
-
-    it('should execute the callback after 200ms timeout and reset showDrawer', async () => {
-      const callbackMock = vi.fn();
-      wrapper.vm.transitionClose(callbackMock);
-
-      expect(wrapper.vm.showDrawer).toBe(false);
-
-      vi.advanceTimersByTime(200);
-
-      expect(callbackMock).toHaveBeenCalled();
-      expect(wrapper.vm.showDrawer).toBe(true);
-    });
   });
 
   describe('Props and Computed Properties', () => {
     it('should render the correct size class based on size prop', async () => {
       await wrapper.setProps({ size: 'lg' });
-      expect(drawerContainer().classes()).toContain(
+      expect(drawerContentComponent().props('class')).toContain(
         'unnnic-drawer__container--lg',
       );
+      expect(drawerContentComponent().props('size')).toBe('large');
 
       await wrapper.setProps({ size: 'xl' });
-      expect(drawerContainer().classes()).toContain(
+      expect(drawerContentComponent().props('class')).toContain(
         'unnnic-drawer__container--xl',
       );
+      expect(drawerContentComponent().props('size')).toBe('extra-large');
     });
 
     it('should display footer if either primaryButtonText or secondaryButtonText is provided', async () => {
@@ -275,7 +260,7 @@ describe('Drawer.vue', () => {
 
     it('should use correct icon for close button based on closeIcon prop', async () => {
       await wrapper.setProps({ closeIcon: 'custom_close_icon' });
-      expect(closeIcon().props('icon')).toBe('custom_close_icon');
+      expect(closeIcon().props('iconCenter')).toBe('custom_close_icon');
     });
 
     it('should validate all size prop values correctly', () => {

package/src/components/Drawer/__tests__/__snapshots__/Drawer.spec.js.snap

@@ -1,23 +1,22 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`Drawer.vue > Component Rendering > Component Rendering > matches the snapshot 1`] = `
-"<aside data-v-196de012="" class="unnnic-drawer" data-testid="drawer">
-  <section data-v-196de012="" class="unnnic-drawer__overlay" data-testid="overlay"></section>
-  <transition-stub data-v-196de012="" name="drawer" appear="true" persisted="false" css="true">
-    <section data-v-196de012="" data-testid="drawer-container" class="unnnic-drawer__container unnnic-drawer__container--md">
-      <header data-v-196de012="" class="unnnic-drawer__header">
-        <section data-v-196de012="" class="unnnic-drawer__title-container">
-          <h1 data-v-196de012="" class="unnnic-drawer__title" data-testid="drawer-title">Test Title</h1>
-          <p data-v-196de012="" class="unnnic-drawer__description" data-testid="drawer-description">Test Description</p>
-        </section>
-        <unnnic-icon-stub data-v-196de012="" filled="false" icon="arrow_back" clickable="true" size="avatar-nano" scheme="neutral-darkest" class="unnnic-drawer__close" data-testid="close-icon"></unnnic-icon-stub>
-      </header>
-      <section data-v-196de012="" class="unnnic-drawer__content"></section>
-      <footer data-v-196de012="" class="unnnic-drawer__footer" data-testid="footer">
-        <unnnic-button-stub data-v-196de012="" size="large" text="Secondary Action" type="tertiary" float="false" iconleft="" iconright="" iconcenter="" iconsfilled="false" disabled="false" loading="false" data-testid="secondary-button"></unnnic-button-stub>
-        <unnnic-button-stub data-v-196de012="" size="large" text="Primary Action" type="primary" float="false" iconleft="" iconright="" iconcenter="" iconsfilled="false" disabled="false" loading="false" data-testid="primary-button"></unnnic-button-stub>
-      </footer>
-    </section>
-  </transition-stub>
-</aside>"
+"<div data-v-e761d31f="" data-v-196de012="" disabled="false" defer="false" forcemount="false" data-testid="drawer-container">
+  <div data-v-7f241b30="" data-v-e761d31f="" data-state="open" style="pointer-events: auto;" data-vaul-overlay="" data-vaul-snap-points="false" data-vaul-snap-points-overlay="true" class="unnnic-drawer__overlay"></div>
+  <div data-v-e761d31f="" data-dismissable-layer="" style="--snap-point-height: 0; --initial-transform: calc(100% + 8px); pointer-events: auto;" tabindex="-1" data-vaul-drawer="" data-vaul-drawer-direction="right" data-vaul-delayed-snap-points="false" data-vaul-snap-points="false" size="medium" showoverlay="true" class="unnnic-drawer__content unnnic-drawer__content--medium unnnic-drawer__container unnnic-drawer__container--md" id="" role="dialog" aria-describedby="reka-dialog-description-v-1" aria-labelledby="reka-dialog-title-v-0" data-state="open">
+    <header data-v-39d0dfb8="" data-v-196de012="" class="unnnic-drawer__header unnnic-drawer__header">
+      <section data-v-196de012="" class="unnnic-drawer__title-container">
+        <h2 data-v-97709962="" data-v-196de012="" id="reka-dialog-title-v-0" class="unnnic-drawer__title unnnic-drawer__title" data-testid="drawer-title">Test Title</h2>
+        <p data-v-750ea255="" data-v-196de012="" id="reka-dialog-description-v-1" class="unnnic-drawer__description unnnic-drawer__description" data-testid="drawer-description">Test Description</p>
+      </section><button data-v-4a771f40="" data-v-196de012="" type="button" class="unnnic-drawer__close">
+        <unnnic-button-stub data-v-196de012="" size="small" text="" type="tertiary" float="false" iconleft="" iconright="" iconcenter="arrow_forward" iconsfilled="false" disabled="false" loading="false" class="unnnic-drawer__close-icon" data-testid="close-icon"></unnnic-button-stub>
+      </button>
+    </header>
+    <section data-v-196de012="" class="unnnic-drawer__content"></section>
+    <footer data-v-02ebc5b4="" data-v-196de012="" class="unnnic-drawer__footer unnnic-drawer__footer" data-testid="footer">
+      <unnnic-button-stub data-v-196de012="" size="large" text="Secondary Action" type="tertiary" float="false" iconleft="" iconright="" iconcenter="" iconsfilled="false" disabled="false" loading="false" data-testid="secondary-button"></unnnic-button-stub>
+      <unnnic-button-stub data-v-196de012="" size="large" text="Primary Action" type="primary" float="false" iconleft="" iconright="" iconcenter="" iconsfilled="false" disabled="false" loading="false" data-testid="primary-button"></unnnic-button-stub>
+    </footer>
+  </div>
+</div>"
 `;

package/src/components/ModalDialog/ModalDialog.vue

@@ -1,64 +1,46 @@
 <template>
-  <section
-    v-if="modelValue"
-    class="unnnic-modal-dialog"
-    data-testid="modal-dialog"
+  <UnnnicDialog
+    :open="modelValue"
+    @update:open="$emit('update:modelValue', $event)"
   >
-    <section
-      class="unnnic-modal-dialog__overlay"
-      data-testid="modal-overlay"
-      @click.stop="!persistent && close()"
-    />
-    <section
-      :class="[
-        'unnnic-modal-dialog__container',
-        `unnnic-modal-dialog__container--${size}`,
-      ]"
-      data-testid="modal-container"
+    <UnnnicDialogContent
+      :size="size === 'sm' ? 'small' : size === 'lg' ? 'large' : 'medium'"
+      :parentClass="['unnnic-modal-dialog', $attrs.class]"
+      class="unnnic-modal-dialog__container"
+      data-testid="modal-dialog"
+      @escape-key-down="persistentHandler"
+      @pointer-down-outside="persistentHandler"
     >
       <section
-        v-if="$slots.leftSidebar"
-        class="unnnic-modal-dialog__container__left-sidebar"
+        :class="[
+          'unnnic-modal-dialog__container__body',
+          {
+            'unnnic-modal-dialog__container__body--left-sidebar':
+              $slots.leftSidebar,
+          },
+        ]"
       >
-        <slot name="leftSidebar" />
-      </section>
-
-      <section class="unnnic-modal-dialog__container__body">
-        <header
+        <section
+          v-if="$slots.leftSidebar"
+          class="unnnic-modal-dialog__container__left-sidebar"
+        >
+          <slot name="leftSidebar" />
+        </section>
+        <UnnnicDialogHeader
           v-if="title"
-          class="unnnic-modal-dialog__container__header"
+          :closeButton="showCloseIcon"
+          :type="type"
         >
-          <section class="unnnic-modal-dialog__container__title-container">
-            <UnnnicIcon
-              v-if="icon || type"
-              data-testid="title-icon"
-              class="unnnic-modal-dialog__container__title-icon"
-              :icon="icon || iconsMapper[type]?.icon"
-              :scheme="iconScheme || iconsMapper[type]?.scheme"
-              size="md"
-            />
-            <h1
-              class="unnnic-modal-dialog__container__title-text"
-              data-testid="title-text"
-            >
-              {{ title }}
-            </h1>
-          </section>
-          <UnnnicIcon
-            v-if="showCloseIcon"
-            data-testid="close-icon"
-            icon="close"
-            clickable
-            scheme="neutral-cloudy"
-            @click="close()"
-          />
-        </header>
+          <UnnnicDialogTitle>
+            {{ title }}
+          </UnnnicDialogTitle>
+        </UnnnicDialogHeader>
         <section class="unnnic-modal-dialog__container__content">
           <slot></slot>
         </section>
-        <section
+
+        <UnnnicDialogFooter
           v-if="primaryButtonProps.text"
-          data-testid="actions-section"
           :class="[
             'unnnic-modal-dialog__container__actions',
             {
@@ -66,6 +48,8 @@
                 showActionsDivider,
             },
           ]"
+          :divider="showActionsDivider"
+          data-testid="actions-section"
         >
           <UnnnicButton
             v-if="!hideSecondaryButton"
@@ -92,22 +76,30 @@
             class="unnnic-modal-dialog__container__actions__primary-button"
             @click.stop="$emit('primaryButtonClick')"
           />
-        </section>
+        </UnnnicDialogFooter>
       </section>
-    </section>
-  </section>
+    </UnnnicDialogContent>
+  </UnnnicDialog>
 </template>
 
 <script>
-import UnnnicIcon from '../Icon.vue';
 import UnnnicButton from '../Button/Button.vue';
 import UnnnicI18n from '../../mixins/i18n';
+import UnnnicDialog from '../ui/dialog/Dialog.vue';
+import UnnnicDialogContent from '../ui/dialog/DialogContent.vue';
+import UnnnicDialogHeader from '../ui/dialog/DialogHeader.vue';
+import UnnnicDialogTitle from '../ui/dialog/DialogTitle.vue';
+import UnnnicDialogFooter from '../ui/dialog/DialogFooter.vue';
 
 export default {
   name: 'UnnnicModalDialog',
   components: {
-    UnnnicIcon,
     UnnnicButton,
+    UnnnicDialog,
+    UnnnicDialogContent,
+    UnnnicDialogHeader,
+    UnnnicDialogTitle,
+    UnnnicDialogFooter,
   },
   mixins: [UnnnicI18n],
   props: {
@@ -177,11 +169,6 @@ export default {
           es: 'Cancelar',
         },
       },
-      iconsMapper: {
-        success: { icon: 'check_circle', scheme: 'aux-green-500' },
-        warning: { icon: 'warning', scheme: 'aux-red-500' },
-        attention: { icon: 'error', scheme: 'aux-yellow-500' },
-      },
       primaryButtonTypeMapper: {
         success: 'primary',
         warning: 'warning',
@@ -201,91 +188,39 @@ export default {
     updateBodyOverflow(isHidden) {
       document.body.style.overflow = isHidden ? 'hidden' : '';
     },
+    persistentHandler(event) {
+      if (this.persistent) {
+        event.preventDefault();
+      }
+    },
   },
 };
 </script>
 
 <style lang="scss" scoped>
 @use '@/assets/scss/unnnic' as *;
-* {
-  margin: 0;
-  padding: 0;
-  box-sizing: border-box;
-}
-.unnnic-modal-dialog {
-  width: 100vw;
-  height: 100vh;
-  position: fixed;
-  left: 0;
-  top: 0;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  z-index: 9999;
-
-  &__overlay {
-    position: absolute;
-    width: 100%;
-    height: 100%;
-    background-color: rgba(0, 0, 0, 0.4);
-  }
-}
-
 .unnnic-modal-dialog__container {
-  display: flex;
-  background: $unnnic-color-neutral-white;
-  border-radius: $unnnic-spacing-xs;
-  box-shadow: $unnnic-shadow-level-near;
-  position: fixed;
-  max-height: calc(100vh - $unnnic-spacing-giant);
-  overflow: hidden;
-
-  &--sm {
-    width: 400px;
-  }
-  &--md {
-    width: 600px;
-  }
-  &--lg {
-    width: 800px;
-  }
-
   &__left-sidebar {
     background-color: $unnnic-color-neutral-black;
     color: $unnnic-color-neutral-white;
+
+    grid-area: left-sidebar;
+    grid-row: span 3;
   }
 
   &__body {
     flex: 1;
     display: flex;
     flex-direction: column;
-  }
-
-  &__header {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    border-bottom: 1px solid $unnnic-color-neutral-soft;
-    padding: $unnnic-spacing-md;
-    flex-shrink: 0;
-  }
 
-  &__title-container {
-    display: flex;
-    align-items: center;
-    gap: $unnnic-spacing-ant;
-  }
-
-  &__title-icon {
-    font-size: 28px;
-  }
+    overflow-y: auto;
 
-  &__title-text {
-    font-family: $unnnic-font-family-secondary;
-    font-size: $unnnic-font-size-title-sm;
-    font-weight: $unnnic-font-weight-black;
-    line-height: 28px;
-    color: $unnnic-color-neutral-darkest;
+    &--left-sidebar {
+      border-radius: $unnnic-radius-4 0 0 $unnnic-radius-4;
+      display: grid;
+      grid-template-columns: auto 1fr;
+      grid-template-areas: 'left-sidebar content';
+    }
   }
 
   &__content {
@@ -309,26 +244,5 @@ export default {
       border-radius: $unnnic-border-radius-pill;
     }
   }
-
-  &__actions {
-    display: grid;
-    grid-template-columns: 1fr 1fr;
-    grid-template-areas: 'secondary-button primary-button';
-    gap: $unnnic-spacing-sm;
-    padding: $unnnic-spacing-md;
-    flex-shrink: 0;
-
-    &--divider {
-      border-top: 1px solid $unnnic-color-neutral-soft;
-    }
-
-    &__secondary-button {
-      grid-area: secondary-button;
-    }
-
-    &__primary-button {
-      grid-area: primary-button;
-    }
-  }
 }
 </style>