@weni/unnnic-system 2.13.0 → 2.13.1

package/src/components/FormElement/FormElement.vue

@@ -1,39 +1,68 @@
 <template>
-  <div class="unnnic-form-element">
-    <div
+  <section
+    class="unnnic-form-element"
+    :class="{ 'unnnic-form-element--disabled': disabled }"
+  >
+    <p
       v-if="label"
       :class="[
-        'label unnnic-font secondary color-neutral-cloudy',
+        'unnnic-form-element__label',
         {
-          'body-md': size === 'sm',
-          'body-gt': size == 'md',
-          'label--fixed': fixedLabel,
+          'unnnic-form-element__label--fixed': fixedLabel,
         },
       ]"
     >
       {{ label }}
-    </div>
+    </p>
 
     <slot></slot>
 
-    <div
-      v-if="error && error !== true"
-      class="message unnnic-font secondary body-md color-feedback-red"
+    <p
+      v-if="shouldShowErrorSection"
+      class="unnnic-form-element__error"
     >
-      {{ error }}
-    </div>
-
-    <div
-      v-if="message"
-      class="message unnnic-font secondary body-md color-neutral-cloudy"
+      <template v-if="error !== true">
+        <UnnnicIcon
+          size="sm"
+          icon="warning"
+          scheme="aux-red-500"
+        />
+
+        {{ error }}
+      </template>
+
+      <span
+        v-if="!!$slots.rightMessage"
+        class="unnnic-form-element__right-message"
+      >
+        <slot name="rightMessage"></slot>
+      </span>
+    </p>
+
+    <p
+      v-if="message || !!$slots.rightMessage"
+      class="unnnic-form-element__message"
     >
       {{ message }}
-    </div>
-  </div>
+
+      <span
+        v-if="!shouldShowErrorSection && !!$slots.rightMessage"
+        class="unnnic-form-element__right-message"
+      >
+        <slot name="rightMessage"></slot>
+      </span>
+    </p>
+  </section>
 </template>
 
 <script>
+import UnnnicIcon from '../../components/Icon.vue';
+
 export default {
+  components: {
+    UnnnicIcon,
+  },
+
   props: {
     size: {
       type: String,
@@ -45,14 +74,25 @@ export default {
 
     fixedLabel: Boolean,
 
-    error: [Boolean, String],
+    error: {
+      type: [Boolean, String],
+      default: false,
+    },
 
     message: String,
+
+    disabled: Boolean,
   },
 
   data() {
     return {};
   },
+
+  computed: {
+    shouldShowErrorSection() {
+      return this.error && (this.error !== true || !!this.$slots.rightMessage);
+    },
+  },
 };
 </script>
 
@@ -60,17 +100,19 @@ export default {
 @import '../../assets/scss/unnnic.scss';
 
 .unnnic-form-element {
-  .label {
-    margin-bottom: $unnnic-spacing-xs;
+  &__label {
+    margin: 0;
+    margin-bottom: $unnnic-spacing-nano;
 
-    $label-bottom-spacing: 3px;
+    color: $unnnic-color-neutral-cloudy;
+    font-family: $unnnic-font-family-secondary;
+    font-weight: $unnnic-font-weight-regular;
+    font-size: $unnnic-font-size-body-gt;
+    line-height: $unnnic-font-size-body-gt + $unnnic-line-height-md;
 
-    &--fixed.unnnic-font.body-md {
-      margin-top: -$unnnic-font-size-body-md - $unnnic-line-height-md +
-        $label-bottom-spacing;
-    }
+    $label-bottom-spacing: 3px;
 
-    &--fixed.unnnic-font.body-gt {
+    &--fixed {
       margin-top: -$unnnic-font-size-body-gt - $unnnic-line-height-md +
         $label-bottom-spacing;
     }
@@ -93,8 +135,39 @@ export default {
     }
   }
 
-  .message {
+  &__error,
+  &__message {
+    margin: 0;
     margin-top: $unnnic-spacing-stack-nano;
+
+    color: $unnnic-color-neutral-cloudy;
+    font-family: $unnnic-font-family-secondary;
+    font-weight: $unnnic-font-weight-regular;
+    font-size: $unnnic-font-size-body-md;
+    line-height: $unnnic-font-size-body-md + $unnnic-line-height-md;
+  }
+
+  &__message {
+    display: flex;
+    column-gap: $unnnic-spacing-nano;
+  }
+
+  &__right-message {
+    margin-left: auto;
+  }
+
+  &__error {
+    display: flex;
+    column-gap: $unnnic-spacing-nano;
+    align-items: center;
+
+    color: $unnnic-color-aux-red-500;
+  }
+
+  &--disabled .unnnic-form-element__label,
+  &--disabled .unnnic-form-element__message {
+    user-select: none;
+    color: $unnnic-color-neutral-cleanest;
   }
 }
 </style>

package/src/components/Input/BaseInput.vue

@@ -46,6 +46,8 @@ export default {
       type: [String, Array],
       default: '',
     },
+    hasIconLeft: Boolean,
+    hasIconRight: Boolean,
   },
   emits: ['update:modelValue'],
   data() {
@@ -63,7 +65,15 @@ export default {
     },
 
     classes() {
-      return ['input', `size-${this.size}`, this.type];
+      return [
+        'input',
+        `size-${this.size}`,
+        this.type,
+        {
+          'input--has-icon-left': this.hasIconLeft,
+          'input--has-icon-right': this.hasIconRight,
+        },
+      ];
     },
   },
 };
@@ -71,48 +81,42 @@ export default {
 
 <style lang="scss" scoped>
 @import '../../assets/scss/unnnic.scss';
+@import './Input.scss';
 
 .input {
-  background: $unnnic-color-neutral-snow;
-  border: none;
-  outline-style: solid;
-  outline-color: $unnnic-color-neutral-soft;
-  outline-width: $unnnic-border-width-thinner;
-  outline-offset: -$unnnic-border-width-thinner;
-  border-radius: $unnnic-border-radius-sm;
-  color: $unnnic-color-neutral-dark;
-  caret-color: $unnnic-color-neutral-clean;
-  font-weight: $unnnic-font-weight-regular;
-  font-family: $unnnic-font-family-secondary;
+  @include input-base;
+
   box-sizing: border-box;
   width: 100%;
 
   &.size {
     &-md {
-      font-size: $unnnic-font-size-body-gt;
-      line-height: $unnnic-font-size-body-gt + $unnnic-line-height-medium;
-      padding: $unnnic-squish-xs;
+      @include input-md-font;
+
+      padding: ($unnnic-spacing-ant - $unnnic-border-width-thinner)
+        ($unnnic-spacing-sm - $unnnic-border-width-thinner);
     }
 
     &-sm {
-      font-size: $unnnic-font-size-body-md;
-      line-height: $unnnic-font-size-body-md + $unnnic-line-height-medium;
-      padding: $unnnic-squish-nano;
+      @include input-sm-font;
+
+      padding: $unnnic-spacing-xs
+        ($unnnic-spacing-sm - $unnnic-border-width-thinner);
     }
   }
 
-  &:focus {
-    outline-color: $unnnic-color-neutral-clean;
+  &.input--has-icon-left {
+    padding-left: $unnnic-spacing-sm + $unnnic-icon-size-sm + $unnnic-spacing-xs -
+      $unnnic-border-width-thinner;
   }
 
-  &.error {
-    outline-color: $unnnic-color-feedback-red;
-    color: $unnnic-color-feedback-red;
+  &.input--has-icon-right {
+    padding-right: $unnnic-spacing-sm + $unnnic-icon-size-sm +
+      $unnnic-spacing-xs - $unnnic-border-width-thinner;
   }
 
-  &::placeholder {
-    color: $unnnic-color-neutral-cleanest;
-    opacity: 1; /* Firefox */
+  &.error {
+    @include input-error;
   }
 
   &:-ms-input-placeholder,
@@ -120,17 +124,5 @@ export default {
     /* Internet Explorer 10-11 */
     color: $unnnic-color-brand-sec;
   }
-
-  &:disabled {
-    outline-color: $unnnic-color-neutral-cleanest;
-    background-color: $unnnic-color-neutral-lightest;
-    cursor: not-allowed;
-    color: $unnnic-color-neutral-cleanest;
-
-    &::placeholder {
-      color: $unnnic-color-neutral-cleanest;
-      opacity: 1; /* Firefox */
-    }
-  }
 }
 </style>

package/src/components/Input/Input.scss

@@ -0,0 +1,43 @@
+@import '../../assets/scss/unnnic.scss';
+
+@mixin input-base {
+  background: $unnnic-color-neutral-white;
+  border: $unnnic-border-width-thinner solid $unnnic-color-neutral-clean;
+  outline: none;
+  border-radius: $unnnic-border-radius-sm;
+  color: $unnnic-color-neutral-darkest;
+  caret-color: $unnnic-color-neutral-clean;
+  font-weight: $unnnic-font-weight-regular;
+  font-family: $unnnic-font-family-secondary;
+
+  &:focus {
+    border-color: $unnnic-color-weni-600;
+  }
+
+  &::placeholder {
+    color: $unnnic-color-neutral-cleanest;
+    opacity: 1; /* Firefox */
+  }
+
+  &:disabled {
+    border-color: $unnnic-color-neutral-cleanest;
+    background-color: $unnnic-color-neutral-lightest;
+    cursor: not-allowed;
+    color: $unnnic-color-neutral-cleanest;
+  }
+}
+
+@mixin input-sm-font {
+  font-size: $unnnic-font-size-body-md;
+  line-height: $unnnic-font-size-body-md + $unnnic-line-height-medium;
+}
+
+@mixin input-md-font {
+  font-size: $unnnic-font-size-body-gt;
+  line-height: $unnnic-font-size-body-gt + $unnnic-line-height-medium;
+}
+
+@mixin input-error {
+  border-color: $unnnic-color-aux-red-500;
+  color: $unnnic-color-aux-red-500;
+}

package/src/components/Input/TextInput.vue

@@ -3,10 +3,7 @@
     :class="[
       'text-input',
       `size--${size}`,
-      {
-        'has-icon-left': !!iconLeft,
-        'has-icon-right': !!iconRight || allowTogglePassword,
-      },
+      `text-input--icon-right-size-${iconRightSize}`,
     ]"
   >
     <BaseInput
@@ -19,6 +16,8 @@
       "
       :type="type"
       class="input-itself"
+      :hasIconLeft="!!iconLeft"
+      :hasIconRight="!!iconRight || allowTogglePassword"
       @focus="onFocus"
       @blur="onBlur"
     />
@@ -37,7 +36,7 @@
       v-if="iconRightSvg"
       :scheme="iconScheme"
       :icon="iconRightSvg"
-      size="sm"
+      :size="iconRightSize"
       :clickable="iconRightClickable || allowTogglePassword"
       :class="[
         'icon-right',
@@ -93,6 +92,10 @@ export default {
       type: Boolean,
       default: null,
     },
+    iconRightSize: {
+      type: String,
+      default: 'sm',
+    },
     allowTogglePassword: {
       type: Boolean,
       default: null,
@@ -110,11 +113,14 @@ export default {
   data() {
     return {
       isFocused: false,
-      isDisabled: false,
       showPassword: false,
     };
   },
   computed: {
+    isDisabled() {
+      return this.$attrs.disabled;
+    },
+
     iconRightSvg() {
       if (this.allowTogglePassword) {
         return this.showPassword ? 'view-off-1' : 'view-1-1';
@@ -125,7 +131,7 @@ export default {
 
     iconScheme() {
       if (this.type === 'error') {
-        return 'feedback-red';
+        return 'aux-red-500';
       }
 
       if (this.isDisabled) {
@@ -147,9 +153,7 @@ export default {
       return { ...this.$attrs, ...this.$attrs['v-bind'], ...this.$props };
     },
   },
-  mounted() {
-    this.isDisabled = !!this.$refs['base-input'].$el.disabled;
-  },
+
   methods: {
     focus() {
       this.$refs['base-input'].$el.focus();
@@ -190,36 +194,31 @@ export default {
   &-left {
     position: absolute;
     top: $unnnic-spacing-ant + 0.1875 * $unnnic-font-size;
-    left: $unnnic-inline-sm;
+    left: $unnnic-inline-sm - $unnnic-border-width-thinner;
   }
 
   &-right {
     position: absolute;
     top: $unnnic-spacing-ant + 0.1875 * $unnnic-font-size;
-    right: $unnnic-inline-sm;
+    right: $unnnic-inline-sm - $unnnic-border-width-thinner;
   }
 }
 .text-input {
   position: relative;
 
-  &.size--md,
-  &.size--sm {
-    &.has-icon-left .input-itself {
-      padding-left: $unnnic-spacing-sm + $unnnic-icon-size-sm +
-        $unnnic-spacing-xs;
-    }
-
-    &.has-icon-right .input-itself {
-      padding-right: $unnnic-spacing-sm + $unnnic-icon-size-sm +
-        $unnnic-spacing-xs;
-    }
-  }
-
   &.size--sm {
     .icon-left,
     .icon-right {
       top: $unnnic-spacing-xs + 0.125 * $unnnic-font-size;
     }
   }
+
+  &.size--sm.text-input--icon-right-size-ant .icon-right {
+    top: 0.5625 * $unnnic-font-size;
+  }
+
+  &.size--md.text-input--icon-right-size-ant .icon-right {
+    top: 0.8125 * $unnnic-font-size;
+  }
 }
 </style>

package/src/components/Input/__test__/TextInput.spec.js

@@ -74,11 +74,11 @@ describe('TextInput.vue', () => {
 
   test('computes the correct iconScheme based on various states', async () => {
     await wrapper.setProps({ type: 'error' });
-    expect(wrapper.vm.iconScheme).toBe('feedback-red');
+    expect(wrapper.vm.iconScheme).toBe('aux-red-500');
 
     await wrapper.setProps({ type: 'normal' });
     await wrapper.setData({ isDisabled: true });
-    expect(wrapper.vm.iconScheme).toBe('neutral-cleanest');
+    expect(wrapper.vm.iconScheme).toBe('neutral-cloudy');
 
     await wrapper.setData({ isDisabled: false });
     await wrapper.setProps({ modelValue: 'text' });

package/src/components/Input/__test__/__snapshots__/Input.spec.js.snap

@@ -3,7 +3,7 @@
 exports[`Input.vue > matches the snapshot 1`] = `
 "<div data-v-d890ad85="" class="unnnic-form md">
   <p data-v-d890ad85="" class="unnnic-form__label">Sample Label</p>
-  <div data-v-a0d36167="" data-v-d890ad85="" class="text-input size--md has-icon-left has-icon-right unnnic-form-input" mask="####-####"><input data-v-86533b41="" data-v-a0d36167="" class="unnnic-form-input input-itself input size-md normal unnnic-form-input input-itself" placeholder="Enter text" iconleft="search" iconright="clear" iconleftclickable="true" iconrightclickable="true" hascloudycolor="false" type="text"><span data-v-26446d8e="" data-v-a0d36167="" class="material-symbols-rounded unnnic-icon-scheme--neutral-cloudy unnnic-icon-size--sm unnnic--clickable icon-left clickable" data-testid="material-icon">search</span><span data-v-26446d8e="" data-v-a0d36167="" class="material-symbols-rounded unnnic-icon-scheme--neutral-cloudy unnnic-icon-size--sm unnnic--clickable icon-right clickable" data-testid="material-icon">clear</span></div>
+  <div data-v-a0d36167="" data-v-d890ad85="" class="text-input size--md text-input--icon-right-size-sm unnnic-form-input" mask="####-####"><input data-v-86533b41="" data-v-a0d36167="" class="unnnic-form-input input-itself input size-md normal input--has-icon-left input--has-icon-right unnnic-form-input input-itself" placeholder="Enter text" iconleft="search" iconright="clear" iconleftclickable="true" iconrightclickable="true" iconrightsize="sm" hascloudycolor="false" type="text"><span data-v-26446d8e="" data-v-a0d36167="" class="material-symbols-rounded unnnic-icon-scheme--neutral-cloudy unnnic-icon-size--sm unnnic--clickable icon-left clickable" data-testid="material-icon">search</span><span data-v-26446d8e="" data-v-a0d36167="" class="material-symbols-rounded unnnic-icon-scheme--neutral-cloudy unnnic-icon-size--sm unnnic--clickable icon-right clickable" data-testid="material-icon">clear</span></div>
   <p data-v-d890ad85="" class="unnnic-form__message">Error message</p>
 </div>"
 `;

package/src/components/Input/__test__/__snapshots__/TextInput.spec.js.snap

@@ -1,3 +1,3 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
-exports[`TextInput.vue > matches the snapshot 1`] = `"<div data-v-a0d36167="" class="text-input size--md has-icon-left has-icon-right"><input data-v-86533b41="" data-v-a0d36167="" placeholder="Enter text" iconleft="search" iconright="clear" iconleftclickable="true" iconrightclickable="true" allowtogglepassword="false" hascloudycolor="false" class="input-itself input size-md normal input-itself" type="text"><span data-v-26446d8e="" data-v-a0d36167="" class="material-symbols-rounded unnnic-icon-scheme--neutral-cloudy unnnic-icon-size--sm unnnic--clickable icon-left clickable" data-testid="material-icon">search</span><span data-v-26446d8e="" data-v-a0d36167="" class="material-symbols-rounded unnnic-icon-scheme--neutral-cloudy unnnic-icon-size--sm unnnic--clickable icon-right clickable" data-testid="material-icon">clear</span></div>"`;
+exports[`TextInput.vue > matches the snapshot 1`] = `"<div data-v-a0d36167="" class="text-input size--md text-input--icon-right-size-sm"><input data-v-86533b41="" data-v-a0d36167="" placeholder="Enter text" iconleft="search" iconright="clear" iconleftclickable="true" iconrightclickable="true" iconrightsize="sm" allowtogglepassword="false" hascloudycolor="false" class="input-itself input size-md normal input--has-icon-left input--has-icon-right input-itself" type="text"><span data-v-26446d8e="" data-v-a0d36167="" class="material-symbols-rounded unnnic-icon-scheme--neutral-cloudy unnnic-icon-size--sm unnnic--clickable icon-left clickable" data-testid="material-icon">search</span><span data-v-26446d8e="" data-v-a0d36167="" class="material-symbols-rounded unnnic-icon-scheme--neutral-cloudy unnnic-icon-size--sm unnnic--clickable icon-right clickable" data-testid="material-icon">clear</span></div>"`;

package/src/components/Pagination/Pagination.vue

@@ -6,6 +6,7 @@
       size="small"
       iconCenter="arrow-left-1-1"
       :disabled="!canPrevious || disabled"
+      data-test="previous-button"
       @click="previousPage"
     />
 
@@ -18,6 +19,7 @@
         ['left-hidden', 'right-hidden'].includes(page) ? '...' : String(page)
       "
       :disabled="disabled"
+      data-test="page-button"
       @click="selectPage(page)"
     />
 
@@ -26,6 +28,7 @@
       size="small"
       iconCenter="arrow-right-1-1"
       :disabled="!canNext || disabled"
+      data-test="next-button"
       @click="nextPage"
     />
   </div>
@@ -61,6 +64,8 @@ export default {
     },
   },
 
+  emits: ['update:model-value'],
+
   data() {
     return {
       reference: 3,
@@ -102,19 +107,33 @@ export default {
     },
   },
 
+  created() {
+    const pageNumber = this.modelValue;
+
+    this.selectPage(pageNumber, true);
+
+    if (!this.pages.includes(pageNumber)) {
+      this.setReference(pageNumber);
+    }
+  },
+
   methods: {
-    selectPage(page) {
+    selectPage(page, dontEmit) {
       if (page === 'left-hidden') {
         const pageNumber =
           this.pages[this.pages.indexOf('left-hidden') + 1] - 1;
 
-        this.$emit('update:model-value', pageNumber);
+        if (!dontEmit) {
+          this.$emit('update:model-value', pageNumber);
+        }
         this.setReference(pageNumber);
       } else if (page === 'right-hidden') {
         const pageNumber =
           this.pages[this.pages.indexOf('right-hidden') - 1] + 1;
 
-        this.$emit('update:model-value', pageNumber);
+        if (!dontEmit) {
+          this.$emit('update:model-value', pageNumber);
+        }
 
         if (this.pages.includes('left-hidden')) {
           this.setReference(
@@ -123,7 +142,7 @@ export default {
         } else {
           this.setReference(4);
         }
-      } else {
+      } else if (!dontEmit) {
         this.$emit('update:model-value', page);
       }
     },