@weni/unnnic-system 3.4.1-alpha.2 → 3.5.0

package/src/components/Button/Button.vue

@@ -6,16 +6,20 @@
     :class="[
       'unnnic-button',
       `unnnic-button--size-${size}`,
-      `unnnic-button--${buttonType}`,
+      `unnnic-button--${type}`,
       iconCenter ? `unnnic-button--icon-on-center` : null,
       float ? `unnnic-button--float` : null,
     ]"
   >
-    <UnnnicIconLoading
+    <UnnnicIcon
       v-if="loading"
+      icon="loading-circle-1"
       :scheme="iconScheme"
       :size="iconSize"
+      :filled="iconsFilled"
       :style="{ position: 'absolute' }"
+      class="rotation"
+      :next="next"
       data-testid="icon-loading"
     />
 
@@ -68,7 +72,6 @@
 <script setup lang="ts">
 import { computed, watch, useSlots } from 'vue';
 import UnnnicIcon from '../Icon.vue';
-import UnnnicIconLoading from '../IconLoading/IconLoading.vue';
 import type { ButtonProps, ButtonSize, ButtonType } from './types';
 import type { SchemeColor } from '@/types/scheme-colors';
 
@@ -99,8 +102,8 @@ const buttonDisabled = computed(() => {
 });
 
 const iconSize = computed(() => {
-  if (props.size === 'extra-large') return 'lg';
-  return 'ant';
+  if (props.size === 'small') return 'sm';
+  return 'md';
 });
 
 const hasText = computed(() => {
@@ -117,11 +120,12 @@ const iconScheme = computed((): SchemeColor => {
     primary: 'neutral-white',
     secondary: 'neutral-dark',
     tertiary: 'neutral-dark',
+    alternative: 'neutral-white',
     warning: 'neutral-white',
     attention: 'neutral-white',
   };
 
-  return typeToSchemeMap[buttonType.value] || 'neutral-white';
+  return typeToSchemeMap[props.type] || 'neutral-white';
 });
 
 const isSizePropValid = computed(() => {
@@ -132,23 +136,16 @@ const isSizePropValid = computed(() => {
   );
 });
 
-const buttonType = computed(() => {
-  return (
-    {
-      alternative: 'tertiary',
-    }[props.type] || props.type
-  );
-});
-
 const isTypePropValid = computed(() => {
   const validTypes: ButtonType[] = [
     'primary',
     'secondary',
     'tertiary',
+    'alternative',
     'warning',
     'attention',
   ];
-  return validTypes.includes(buttonType.value);
+  return validTypes.includes(props.type);
 });
 
 const validateProps = () => {
@@ -162,8 +159,6 @@ const validateProps = () => {
 
     if (!isTypePropValid.value) {
       errorMessage += ' Invalid type prop.';
-      errorMessage +=
-        ' Please provide one of the following types: primary, secondary, tertiary, warning, attention. Alternative is discontinued and it was forced renamed to tertiary.';
     }
 
     throw new Error(errorMessage);
@@ -201,12 +196,13 @@ watch(
   display: inline-flex;
   align-items: center;
   justify-content: center;
-  border-radius: $unnnic-radius-2;
+  border-radius: $unnnic-border-radius-sm;
   border: 0;
   outline: none;
   overflow: hidden;
   white-space: nowrap;
-  font: $unnnic-font-action;
+  font-weight: $unnnic-font-weight-regular;
+  font-family: $unnnic-font-family-secondary;
   cursor: pointer;
   position: relative;
 
@@ -220,91 +216,129 @@ watch(
     }
   }
 
-  &--primary,
-  &--warning,
-  &--attention {
-    color: $unnnic-color-fg-inverted;
-  }
-
-  &--secondary,
-  &--tertiary {
-    color: $unnnic-color-fg-emphasized;
-  }
-
   &--primary {
-    background-color: $unnnic-color-bg-active;
+    background-color: $unnnic-color-weni-600;
+    color: $unnnic-color-neutral-white;
 
     &:hover:enabled {
-      background-color: $unnnic-color-teal-700;
+      background-color: $unnnic-color-weni-700;
     }
 
     &:active:enabled {
-      background-color: $unnnic-color-teal-800;
+      background-color: $unnnic-color-weni-800;
     }
   }
 
   &--secondary {
-    background-color: $unnnic-color-bg-base;
+    background-color: $unnnic-color-neutral-white;
+    color: $unnnic-color-neutral-dark;
     box-shadow: inset 0 0 0 $unnnic-border-width-thinner
-      $unnnic-color-border-base;
+      $unnnic-color-neutral-cleanest;
 
     &:hover:enabled {
-      background-color: $unnnic-color-gray-50;
-    }
-
-    &:active:enabled {
-      background-color: $unnnic-color-gray-100;
+      background-color: $unnnic-color-neutral-light;
     }
 
     &:disabled {
       box-shadow: none;
     }
+
+    &:active:enabled {
+      background-color: $unnnic-color-neutral-soft;
+    }
   }
 
   &--tertiary {
     background-color: transparent;
+    color: $unnnic-color-neutral-dark;
 
     &:hover:enabled {
-      background-color: rgba($unnnic-color-gray-400, 0.1);
+      background-color: $unnnic-color-neutral-light;
+    }
+
+    &:disabled {
+      color: $unnnic-color-neutral-clean;
+      cursor: not-allowed;
     }
 
     &:active:enabled {
-      background-color: rgba($unnnic-color-gray-400, 0.2);
+      background-color: $unnnic-color-neutral-soft;
+    }
+  }
+
+  &--alternative {
+    background-color: $unnnic-color-weni-50;
+    color: $unnnic-color-weni-800;
+
+    :deep(svg .primary) {
+      fill: $unnnic-color-weni-800;
+    }
+
+    :deep(svg .primary-stroke) {
+      stroke: $unnnic-color-weni-800;
+    }
+
+    &:hover:enabled {
+      background-color: $unnnic-color-weni-100;
+    }
+
+    &:disabled {
+      :deep(svg .primary) {
+        fill: $unnnic-color-neutral-clean;
+      }
+
+      :deep(svg .primary-stroke) {
+        stroke: $unnnic-color-neutral-clean;
+      }
+    }
+
+    &:active:enabled {
+      background-color: $unnnic-color-weni-200;
+      color: $unnnic-color-weni-900;
+
+      :deep(svg .primary) {
+        fill: $unnnic-color-weni-900;
+      }
+
+      :deep(svg .primary-stroke) {
+        stroke: $unnnic-color-weni-900;
+      }
     }
   }
 
   &--warning {
-    background-color: $unnnic-color-red-500;
+    background-color: $unnnic-color-aux-red-500;
     color: $unnnic-color-neutral-white;
 
     &:hover:enabled {
-      background-color: $unnnic-color-red-600;
+      background-color: $unnnic-color-aux-red-700;
     }
 
     &:active:enabled {
-      background-color: $unnnic-color-red-700;
+      background-color: $unnnic-color-aux-red-900;
     }
   }
 
   &--attention {
-    background-color: $unnnic-color-yellow-500;
+    background-color: $unnnic-color-aux-yellow-500;
+    color: $unnnic-color-neutral-white;
 
     &:hover:enabled {
-      background-color: $unnnic-color-yellow-600;
+      background-color: $unnnic-color-aux-yellow-700;
     }
 
     &:active:enabled {
-      background-color: $unnnic-color-yellow-700;
+      background-color: $unnnic-color-aux-yellow-900;
     }
   }
 
   &--primary:disabled,
   &--secondary:disabled,
-  &--tertiary:disabled,
+  &--alternative:disabled,
   &--warning:disabled,
   &--attention:disabled {
-    background-color: $unnnic-color-bg-muted;
-    color: $unnnic-color-fg-muted;
+    background-color: $unnnic-color-neutral-soft;
+    color: $unnnic-color-neutral-clean;
     cursor: not-allowed;
   }
 
@@ -317,12 +351,26 @@ watch(
     box-shadow: $unnnic-shadow-level-near;
   }
 
-  &--size-large {
-    padding: $unnnic-space-3 $unnnic-space-4;
-  }
+  &--size {
+    &-extra-large,
+    &-large,
+    &-small {
+      padding: $unnnic-squish-xs;
+      font-size: $unnnic-font-size-body-gt;
+      line-height: ($unnnic-font-size-body-gt + $unnnic-line-height-medium);
+    }
+
+    &-extra-large {
+      height: 58px;
+    }
 
-  &--size-small {
-    padding: $unnnic-space-2 $unnnic-space-4;
+    &-large {
+      height: 46px;
+    }
+
+    &-small {
+      height: 38px;
+    }
   }
 }
 </style>
@@ -340,8 +388,8 @@ watch(
     }
 
     &-large {
-      height: 45px;
-      width: 45px;
+      height: 46px;
+      width: 46px;
     }
 
     &-large,
@@ -356,8 +404,8 @@ watch(
 
     &-small {
       padding: $unnnic-inset-nano;
-      height: 37px;
-      width: 37px;
+      height: 38px;
+      width: 38px;
 
       .unnnic-icon {
         width: $unnnic-icon-size-ant;

package/src/components/Button/types.ts

@@ -4,6 +4,7 @@ export type ButtonType =
   | 'primary'
   | 'secondary'
   | 'tertiary'
+  | 'alternative'
   | 'warning'
   | 'attention';
 

package/src/components/Checkbox/Checkbox.vue

@@ -1,41 +1,37 @@
 <!-- eslint-disable vue/multi-word-component-names -->
 <template>
-  <section class="unnnic-checkbox-wrapper">
-    <label>
-      <input
-        class="unnnic-checkbox"
-        type="checkbox"
-        :disabled="disabled"
-        :checked="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',
   },
@@ -54,16 +50,13 @@ export default {
       default: false,
     },
 
-    label: {
+    size: {
       type: String,
-      default: '',
-    },
-
-    helper: {
-      type: String,
-      default: '',
+      default: 'md',
+      validator(value) {
+        return ['md', 'sm'].includes(value);
+      },
     },
-
     textRight: {
       type: String,
       default: '',
@@ -82,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);
@@ -99,65 +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;
-  }
-
-  &: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');
+  &.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');
+  });
 });