@weni/unnnic-system 3.5.3-alpha.2 → 3.6.0

package/src/components/Checkbox/Checkbox.vue

@@ -1,44 +1,37 @@
 <!-- eslint-disable vue/multi-word-component-names -->
 <template>
-  <section class="unnnic-checkbox-wrapper">
-    <label>
-      <input
-        :class="[
-          'unnnic-checkbox',
-          { 'unnnic-checkbox--less': modelValue === 'less' },
-        ]"
-        type="checkbox"
-        :disabled="disabled"
-        :checked="modelValue === 'less' || modelValue"
-        @change="click"
-        v-bind="pick($attrs, ['id', 'name'])"
-      />
-
-      <p
-        v-if="label || textRight"
-        :class="[
-          'unnnic-checkbox__label',
-          { 'unnnic-checkbox__label--disabled': disabled },
-        ]"
-        data-testid="checkbox-text-right"
-      >
-        {{ label || textRight }}
-      </p>
-    </label>
-
-    <p
-      v-if="helper"
-      class="unnnic-checkbox__helper"
+  <div class="unnnic-checkbox-wrapper">
+    <UnnnicIcon
+      class="unnnic-checkbox"
+      :class="{ disabled }"
+      :icon="icon"
+      :scheme="color"
+      :clickable="!disabled"
+      :size="size"
+      @click="click"
+    />
+
+    <div
+      v-if="textRight"
+      :class="[
+        'unnnic-checkbox__label',
+        'unnnic-checkbox__label__right',
+        `unnnic-checkbox__label__${size}`,
+      ]"
+      data-testid="checkbox-text-right"
     >
-      {{ helper }}
-    </p>
-  </section>
+      {{ textRight }}
+    </div>
+  </div>
 </template>
 
 <script>
-import { pick } from 'lodash';
+import UnnnicIcon from '../Icon.vue';
 
 export default {
+  components: {
+    UnnnicIcon,
+  },
   model: {
     event: 'change',
   },
@@ -57,16 +50,13 @@ export default {
       default: false,
     },
 
-    label: {
-      type: String,
-      default: '',
-    },
-
-    helper: {
+    size: {
       type: String,
-      default: '',
+      default: 'md',
+      validator(value) {
+        return ['md', 'sm'].includes(value);
+      },
     },
-
     textRight: {
       type: String,
       default: '',
@@ -85,11 +75,25 @@ export default {
 
       return 'less';
     },
+
+    icon() {
+      return {
+        checked: 'checkbox-select',
+        default: this.disabled ? 'checkbox-disable' : 'checkbox-default',
+        less: 'checkbox-less',
+      }[this.valueName];
+    },
+
+    color() {
+      if (this.valueName === 'default') {
+        return 'neutral-clean';
+      }
+
+      return 'brand-weni';
+    },
   },
 
   methods: {
-    pick,
-
     click() {
       const isChecked = ['checked', 'less'].includes(this.valueName);
       this.$emit('change', !isChecked);
@@ -102,73 +106,35 @@ export default {
 <style lang="scss" scoped>
 @use '@/assets/scss/unnnic' as *;
 
-$checkbox-size: 21px;
-
 .unnnic-checkbox-wrapper {
   display: flex;
-  flex-direction: column;
   align-items: flex-start;
-}
-
-label {
-  display: flex;
-  align-items: center;
-  column-gap: $unnnic-space-2;
+  cursor: pointer;
 }
 
 .unnnic-checkbox {
-  appearance: none;
-  width: $checkbox-size;
-  height: $checkbox-size;
-  margin: 0;
-  background-color: $unnnic-color-bg-base;
-  border: 1px solid $unnnic-color-border-base;
-  border-radius: $unnnic-radius-1;
-  box-sizing: border-box;
-
-  outline: none;
-
-  &:checked {
-    border-width: 0;
-    background-color: $unnnic-color-bg-active;
-    background-image: url('../../assets/icons/checkbox-checked.svg');
-    background-repeat: no-repeat;
-    background-position: center;
-
-    &.unnnic-checkbox--less {
-      background-image: url('../../assets/icons/checkbox-less.svg');
-    }
-  }
-
-  &:disabled,
-  &:disabled:checked {
-    background-color: $unnnic-color-bg-muted;
-    border: 1px solid $unnnic-color-border-muted;
-  }
-
-  &:disabled:checked {
-    background-image: url('../../assets/icons/checkbox-checked-disabled.svg');
-
-    &.unnnic-checkbox--less {
-      background-image: url('../../assets/icons/checkbox-less-disabled.svg');
+  &.disabled {
+    :deep(.primary) {
+      fill: $unnnic-color-neutral-cleanest;
     }
   }
 }
 
 .unnnic-checkbox__label {
-  margin: 0;
-  font: $unnnic-font-body;
-  color: $unnnic-color-fg-emphasized;
-
-  &--disabled {
-    color: $unnnic-color-fg-muted;
+  font-family: $unnnic-font-family-secondary;
+  font-weight: $unnnic-font-weight-regular;
+  color: $unnnic-color-neutral-darkest;
+
+  &__sm {
+    margin-left: $unnnic-inline-nano;
+    font-size: $unnnic-font-size-body-md;
+    line-height: $unnnic-font-size-body-md + $unnnic-line-height-md;
   }
-}
 
-.unnnic-checkbox__helper {
-  margin: 0;
-  margin-left: $checkbox-size + $unnnic-space-2;
-  font: $unnnic-font-caption-2;
-  color: $unnnic-color-fg-base;
+  &__md {
+    margin-left: $unnnic-inline-xs;
+    font-size: $unnnic-font-size-body-gt;
+    line-height: $unnnic-font-size-body-gt + $unnnic-line-height-md;
+  }
 }
 </style>

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

@@ -24,28 +24,43 @@ describe('Checkbox', () => {
 
   it('should checkbox emit change events', async () => {
     wrapper = createWrapper();
-    const checkbox = wrapper.find('input[type="checkbox"]');
+    const checkbox = wrapper.findComponent({ name: 'UnnnicIcon' });
 
     // click false to true
-    await checkbox.trigger('change');
+    await checkbox.trigger('click');
     expect(wrapper.emitted('change')[0][0]).eq(true);
 
     // click true to false
     await wrapper.setProps({ modelValue: true });
-    await checkbox.trigger('change');
+    await checkbox.trigger('click');
     expect(wrapper.emitted('change')[1][0]).eq(false);
 
     // click less to false
     await wrapper.setProps({ modelValue: 'less' });
-    expect(wrapper.vm.valueName).eq('less');
-    await checkbox.trigger('change');
+    expect(wrapper.vm.icon).eq('checkbox-less');
+    await checkbox.trigger('click');
     expect(wrapper.emitted('change')[2][0]).eq(false);
   });
 
   it('should checkbox disabled', async () => {
     wrapper = createWrapper({ disabled: true });
-    const checkbox = wrapper.find('input[type="checkbox"]');
+    const checkbox = wrapper.findComponent({ name: 'UnnnicIcon' });
     await checkbox.trigger('click');
     expect(wrapper.emitted('change')).eq(undefined);
   });
+
+  it('should define sizes', async () => {
+    wrapper = createWrapper({ size: 'sm', textRight: 'Label' });
+    const checkbox = wrapper.findComponent({ name: 'UnnnicIcon' });
+    const label = wrapper.find('.unnnic-checkbox__label');
+
+    // sm
+    expect(checkbox.classes()).include('unnnic-icon__size--sm');
+    expect(label.classes()).include('unnnic-checkbox__label__sm');
+
+    // md
+    await wrapper.setProps({ size: 'md' });
+    expect(checkbox.classes()).include('unnnic-icon__size--md');
+    expect(label.classes()).include('unnnic-checkbox__label__md');
+  });
 });

package/src/components/FormElement/FormElement.vue

@@ -17,31 +17,52 @@
 
     <slot></slot>
 
-    <section class="unnnic-form-element__hints-container">
-      <section class="unnnic-form-element__message-container">
-        <p
-          v-if="message"
-          class="unnnic-form-element__message"
-        >
-          {{ fullySanitize(message) }}
-        </p>
-        <p
-          v-if="!!error.length"
-          class="unnnic-form-element__message error"
-        >
-          {{ Array.isArray(error) ? error.join(', ') : error }}
-        </p>
-      </section>
-      <p v-if="!!$slots.rightMessage">
+    <p
+      v-if="shouldShowErrorSection"
+      class="unnnic-form-element__error"
+    >
+      <template v-if="error !== true">
+        <UnnnicIcon
+          size="sm"
+          icon="warning"
+          scheme="aux-red-500"
+        />
+
+        {{ fullySanitize(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"
+    >
+      {{ fullySanitize(message) }}
+
+      <span
+        v-if="!shouldShowErrorSection && !!$slots.rightMessage"
+        class="unnnic-form-element__right-message"
+      >
         <slot name="rightMessage"></slot>
-      </p>
-    </section>
+      </span>
+    </p>
   </section>
 </template>
 
 <script>
+import UnnnicIcon from '../../components/Icon.vue';
 import { fullySanitize } from '../../utils/sanitize';
 export default {
+  components: {
+    UnnnicIcon,
+  },
+
   props: {
     size: {
       type: String,
@@ -49,18 +70,28 @@ export default {
       validator: (size) => ['md', 'sm'].includes(size),
     },
 
-    label: { type: String, default: '' },
+    label: String,
 
-    fixedLabel: { type: Boolean, default: false },
+    fixedLabel: Boolean,
 
     error: {
       type: [Boolean, String],
       default: false,
     },
 
-    message: { type: String, default: '' },
+    message: String,
+
+    disabled: Boolean,
+  },
+
+  data() {
+    return {};
+  },
 
-    disabled: { type: Boolean, default: false },
+  computed: {
+    shouldShowErrorSection() {
+      return this.error && (this.error !== true || !!this.$slots.rightMessage);
+    },
   },
   methods: {
     fullySanitize,
@@ -71,66 +102,75 @@ export default {
 <style lang="scss" scoped>
 @use '@/assets/scss/unnnic' as *;
 
-* {
-  margin: $unnnic-space-0;
-  padding: $unnnic-space-0;
-  box-sizing: border-box;
-}
-
 .unnnic-form-element {
   &__label {
-    font: $unnnic-font-body;
+    margin: 0;
+    margin-bottom: $unnnic-spacing-nano;
+
     color: $unnnic-color-neutral-cloudy;
-    margin-bottom: $unnnic-space-1;
-    display: flex;
-    align-items: center;
-    gap: $unnnic-space-2;
+    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;
+
+    $label-bottom-spacing: 3px;
 
     &--fixed {
-      margin-top: -$unnnic-font-size-body-gt - $unnnic-space-2 + $unnnic-space-1;
+      margin-top: -$unnnic-font-size-body-gt - $unnnic-line-height-md +
+        $label-bottom-spacing;
     }
 
     &--fixed {
-      margin-bottom: $unnnic-space-0;
+      margin-bottom: 0;
       position: absolute;
-      padding: $unnnic-space-0 $unnnic-space-1;
-      margin-left: $unnnic-space-2;
+      padding: 0 $unnnic-spacing-nano;
+      margin-left: $unnnic-spacing-xs;
 
       &:after {
         content: ' ';
         position: absolute;
-        left: $unnnic-space-0;
-        bottom: $unnnic-space-1 - $unnnic-border-width-thinner;
+        left: 0;
+        bottom: $label-bottom-spacing - $unnnic-border-width-thinner;
         width: 100%;
         height: $unnnic-border-width-thinner;
-        background-color: $unnnic-color-white;
+        background-color: $unnnic-color-neutral-white;
       }
     }
   }
 
+  &__error,
   &__message {
-    &.error {
-      color: $unnnic-color-fg-critical;
-    }
+    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;
   }
 
-  &__hints-container {
+  &__message {
     display: flex;
-    justify-content: space-between;
-    margin-top: $unnnic-space-1;
-    font: $unnnic-font-caption-2;
-    color: $unnnic-color-fg-base;
+    column-gap: $unnnic-spacing-nano;
   }
 
-  &__message-container {
+  &__right-message {
+    margin-left: auto;
+  }
+
+  &__error {
     display: flex;
-    flex-direction: column;
-    gap: $unnnic-space-1;
+    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/Icon.vue

@@ -1,24 +1,7 @@
 <template>
-  <Icon
-    v-if="isIconify"
-    :icon="props.icon as string"
-    :class="[
-      'unnnic-icon',
-      `unnnic-icon-scheme--${scheme}`,
-      `unnnic-icon-size--${size}`,
-      {
-        'unnnic--clickable': clickable,
-      },
-    ]"
-    data-testid="iconify-icon"
-    @click="onClick"
-    @mousedown="(event) => $emit('mousedown', event)"
-    @mouseup="(event) => $emit('mouseup', event)"
-  />
-
   <component
     :is="customSvgIcon"
-    v-else-if="customSvgIcon"
+    v-if="customSvgIcon"
     :class="[
       'unnnic-icon',
       `unnnic-icon--size-svg-${size}`,
@@ -57,7 +40,6 @@
 
 <script setup lang="ts">
 import { computed } from 'vue';
-import { Icon } from '@iconify/vue';
 
 import icons from '../utils/icons';
 import OldIconsMap from './Icon/OldIconsMap.json';
@@ -85,10 +67,6 @@ const emit = defineEmits<{
   mouseup: [event: Event];
 }>();
 
-const isIconify = computed(
-  () => (props.icon as string)?.includes(':') ?? false,
-);
-
 const customSvgIcon = computed(() => icons[props.icon as string] ?? null);
 
 const materialSymbolsName = computed(

package/src/components/Input/BaseInput.vue

@@ -4,18 +4,16 @@
     v-mask="mask"
     v-bind="attributes"
     :value="fullySanitize(modelValue)"
-    :class="[classes, { focus: forceActiveStatus }]"
+    :class="classes"
     :type="nativeType"
-    :readonly="readonly"
   />
+
   <input
     v-else
     v-bind="attributes"
     :value="fullySanitize(modelValue)"
-    :class="[classes, { focus: forceActiveStatus }]"
+    :class="classes"
     :type="nativeType"
-    :maxlength="maxlength"
-    :readonly="readonly"
   />
 </template>
 
@@ -51,19 +49,6 @@ export default {
     },
     hasIconLeft: Boolean,
     hasIconRight: Boolean,
-    hasClearIcon: Boolean,
-    maxlength: {
-      type: Number,
-      default: null,
-    },
-    readonly: {
-      type: Boolean,
-      default: false,
-    },
-    forceActiveStatus: {
-      type: Boolean,
-      default: false,
-    },
   },
   emits: ['update:modelValue'],
   data() {
@@ -88,7 +73,6 @@ export default {
         {
           'input--has-icon-left': this.hasIconLeft,
           'input--has-icon-right': this.hasIconRight,
-          'input--has-clear-icon': this.hasClearIcon,
         },
       ];
     },
@@ -112,28 +96,27 @@ export default {
   &.size {
     &-md {
       @include input-md-font;
-      padding: $unnnic-space-3 $unnnic-space-4;
+
+      padding: ($unnnic-spacing-ant - $unnnic-border-width-thinner)
+        ($unnnic-spacing-sm - $unnnic-border-width-thinner);
     }
 
     &-sm {
       @include input-sm-font;
-      padding: $unnnic-space-2 $unnnic-space-4;
+
+      padding: $unnnic-spacing-xs
+        ($unnnic-spacing-sm - $unnnic-border-width-thinner);
     }
   }
 
   &.input--has-icon-left {
-    padding-left: $unnnic-space-10;
+    padding-left: $unnnic-spacing-sm + $unnnic-icon-size-sm +
+      $unnnic-spacing-xs - $unnnic-border-width-thinner;
   }
 
   &.input--has-icon-right {
-    padding-right: $unnnic-space-10;
-    &.input--has-clear-icon {
-      padding-right: $unnnic-space-10 + $unnnic-space-6;
-    }
-  }
-
-  &.input--has-clear-icon {
-    padding-right: $unnnic-space-10;
+    padding-right: $unnnic-spacing-sm + $unnnic-icon-size-sm +
+      $unnnic-spacing-xs - $unnnic-border-width-thinner;
   }
 
   &.error {
@@ -143,7 +126,7 @@ export default {
   &:-ms-input-placeholder,
   &::-ms-input-placeholder {
     /* Internet Explorer 10-11 */
-    color: $unnnic-color-fg-muted;
+    color: $unnnic-color-brand-sec;
   }
 }
 </style>

package/src/components/Input/Input.scss

@@ -1,41 +1,43 @@
 @use '@/assets/scss/unnnic' as *;
 
 @mixin input-base {
-  background: $unnnic-color-white;
-  border: $unnnic-border-width-thinner solid $unnnic-color-border-base;
+  background: $unnnic-color-neutral-white;
+  border: $unnnic-border-width-thinner solid $unnnic-color-neutral-clean;
   outline: none;
-  border-radius: $unnnic-radius-2;
-  color: $unnnic-color-fg-emphasized;
-  caret-color: $unnnic-color-fg-muted;
-  font: $unnnic-font-body;
+  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,
-  &.focus {
-    border-color: $unnnic-color-border-active;
+  &:focus {
+    border-color: $unnnic-color-weni-600;
   }
 
   &::placeholder {
-    color: $unnnic-color-fg-muted;
-    opacity: 1;
-    /* Firefox */
+    color: $unnnic-color-neutral-cleanest;
+    opacity: 1; /* Firefox */
   }
 
   &:disabled {
-    border-color: $unnnic-color-border-muted;
-    background-color: $unnnic-color-bg-muted;
+    border-color: $unnnic-color-neutral-cleanest;
+    background-color: $unnnic-color-neutral-lightest;
     cursor: not-allowed;
-    color: $unnnic-color-fg-muted;
+    color: $unnnic-color-neutral-cleanest;
   }
 }
 
 @mixin input-sm-font {
-  font: $unnnic-font-body;
+  font-size: $unnnic-font-size-body-md;
+  line-height: $unnnic-font-size-body-md + $unnnic-line-height-medium;
 }
 
 @mixin input-md-font {
-  font: $unnnic-font-body;
+  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-border-critical;
-}
+  border-color: $unnnic-color-aux-red-500;
+  color: $unnnic-color-aux-red-500;
+}