@weni/unnnic-system 3.6.0 → 3.7.1-alpha.0

package/src/components/Button/Button.vue

@@ -6,19 +6,16 @@
     :class="[
       'unnnic-button',
       `unnnic-button--size-${size}`,
-      `unnnic-button--${type}`,
+      `unnnic-button--${buttonType}`,
       iconCenter ? `unnnic-button--icon-on-center` : null,
       float ? `unnnic-button--float` : null,
     ]"
   >
-    <UnnnicIcon
+    <UnnnicIconLoading
       v-if="loading"
-      icon="loading-circle-1"
       :scheme="iconScheme"
       :size="iconSize"
-      :filled="iconsFilled"
       :style="{ position: 'absolute' }"
-      class="rotation"
       data-testid="icon-loading"
     />
 
@@ -30,6 +27,7 @@
       :filled="iconsFilled"
       :class="{ 'unnnic-button__icon-left': hasText }"
       :style="{ visibility: loading ? 'hidden' : 'visible' }"
+      :next="next"
       data-testid="icon-left"
     />
 
@@ -40,6 +38,7 @@
       :style="{ visibility: loading ? 'hidden' : 'visible' }"
       :size="iconSize"
       :filled="iconsFilled"
+      :next="next"
       data-testid="icon-center"
     />
 
@@ -60,6 +59,7 @@
       :filled="iconsFilled"
       :class="{ 'unnnic-button__icon-right': hasText }"
       :style="{ visibility: loading ? 'hidden' : 'visible' }"
+      :next="next"
       data-testid="icon-right"
     />
   </button>
@@ -68,6 +68,7 @@
 <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';
 
@@ -86,6 +87,7 @@ const props = withDefaults(defineProps<ButtonProps>(), {
   iconRight: '',
   iconCenter: '',
   iconsFilled: false,
+  next: false,
   disabled: false,
   loading: false,
 });
@@ -97,8 +99,8 @@ const buttonDisabled = computed(() => {
 });
 
 const iconSize = computed(() => {
-  if (props.size === 'small') return 'sm';
-  return 'md';
+  if (props.size === 'extra-large') return 'lg';
+  return 'ant';
 });
 
 const hasText = computed(() => {
@@ -115,12 +117,11 @@ const iconScheme = computed((): SchemeColor => {
     primary: 'neutral-white',
     secondary: 'neutral-dark',
     tertiary: 'neutral-dark',
-    alternative: 'neutral-white',
     warning: 'neutral-white',
     attention: 'neutral-white',
   };
 
-  return typeToSchemeMap[props.type] || 'neutral-white';
+  return typeToSchemeMap[buttonType.value] || 'neutral-white';
 });
 
 const isSizePropValid = computed(() => {
@@ -131,16 +132,23 @@ 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(props.type);
+  return validTypes.includes(buttonType.value);
 });
 
 const validateProps = () => {
@@ -154,6 +162,8 @@ 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);
@@ -191,16 +201,23 @@ watch(
   display: inline-flex;
   align-items: center;
   justify-content: center;
-  border-radius: $unnnic-border-radius-sm;
+  border-radius: $unnnic-radius-2;
   border: 0;
   outline: none;
   overflow: hidden;
   white-space: nowrap;
-  font-weight: $unnnic-font-weight-regular;
-  font-family: $unnnic-font-family-secondary;
+  font: $unnnic-font-action;
   cursor: pointer;
   position: relative;
 
+  transition-property: color, background-color, border-color;
+  transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
+  transition-duration: 0.15s;
+
+  * > {
+    cursor: pointer;
+  }
+
   &__icon {
     &-left {
       margin-right: $unnnic-inline-nano;
@@ -211,129 +228,91 @@ watch(
     }
   }
 
+  &--primary,
+  &--warning,
+  &--attention {
+    color: $unnnic-color-fg-inverted;
+  }
+
+  &--secondary,
+  &--tertiary {
+    color: $unnnic-color-fg-emphasized;
+  }
+
   &--primary {
-    background-color: $unnnic-color-weni-600;
-    color: $unnnic-color-neutral-white;
+    background-color: $unnnic-color-bg-active;
 
     &:hover:enabled {
-      background-color: $unnnic-color-weni-700;
+      background-color: $unnnic-color-teal-700;
     }
 
     &:active:enabled {
-      background-color: $unnnic-color-weni-800;
+      background-color: $unnnic-color-teal-800;
     }
   }
 
   &--secondary {
-    background-color: $unnnic-color-neutral-white;
-    color: $unnnic-color-neutral-dark;
+    background-color: $unnnic-color-bg-base;
     box-shadow: inset 0 0 0 $unnnic-border-width-thinner
-      $unnnic-color-neutral-cleanest;
+      $unnnic-color-border-base;
 
     &:hover:enabled {
-      background-color: $unnnic-color-neutral-light;
-    }
-
-    &:disabled {
-      box-shadow: none;
+      background-color: $unnnic-color-gray-50;
     }
 
     &:active:enabled {
-      background-color: $unnnic-color-neutral-soft;
-    }
-  }
-
-  &--tertiary {
-    background-color: transparent;
-    color: $unnnic-color-neutral-dark;
-
-    &:hover:enabled {
-      background-color: $unnnic-color-neutral-light;
+      background-color: $unnnic-color-gray-100;
     }
 
     &:disabled {
-      color: $unnnic-color-neutral-clean;
-      cursor: not-allowed;
-    }
-
-    &:active:enabled {
-      background-color: $unnnic-color-neutral-soft;
+      box-shadow: none;
     }
   }
 
-  &--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;
-    }
+  &--tertiary {
+    background-color: transparent;
 
     &: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;
-      }
+      background-color: rgba($unnnic-color-gray-400, 0.1);
     }
 
     &: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;
-      }
+      background-color: rgba($unnnic-color-gray-400, 0.2);
     }
   }
 
   &--warning {
-    background-color: $unnnic-color-aux-red-500;
+    background-color: $unnnic-color-red-500;
     color: $unnnic-color-neutral-white;
 
     &:hover:enabled {
-      background-color: $unnnic-color-aux-red-700;
+      background-color: $unnnic-color-red-600;
     }
 
     &:active:enabled {
-      background-color: $unnnic-color-aux-red-900;
+      background-color: $unnnic-color-red-700;
     }
   }
 
   &--attention {
-    background-color: $unnnic-color-aux-yellow-500;
-    color: $unnnic-color-neutral-white;
+    background-color: $unnnic-color-yellow-500;
 
     &:hover:enabled {
-      background-color: $unnnic-color-aux-yellow-700;
+      background-color: $unnnic-color-yellow-600;
     }
 
     &:active:enabled {
-      background-color: $unnnic-color-aux-yellow-900;
+      background-color: $unnnic-color-yellow-700;
     }
   }
 
   &--primary:disabled,
   &--secondary:disabled,
-  &--alternative:disabled,
+  &--tertiary:disabled,
   &--warning:disabled,
   &--attention:disabled {
-    background-color: $unnnic-color-neutral-soft;
-    color: $unnnic-color-neutral-clean;
+    background-color: $unnnic-color-bg-muted;
+    color: $unnnic-color-fg-muted;
     cursor: not-allowed;
   }
 
@@ -346,26 +325,12 @@ watch(
     box-shadow: $unnnic-shadow-level-near;
   }
 
-  &--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;
-    }
-
-    &-large {
-      height: 46px;
-    }
+  &--size-large {
+    padding: $unnnic-space-3 $unnnic-space-4;
+  }
 
-    &-small {
-      height: 38px;
-    }
+  &--size-small {
+    padding: $unnnic-space-2 $unnnic-space-4;
   }
 }
 </style>
@@ -383,29 +348,19 @@ watch(
     }
 
     &-large {
-      height: 46px;
-      width: 46px;
+      height: 45px;
+      width: 45px;
     }
 
     &-large,
     &-extra-large {
       padding: $unnnic-inset-xs;
-
-      .unnnic-icon {
-        width: $unnnic-icon-size-md;
-        height: $unnnic-icon-size-md;
-      }
     }
 
     &-small {
       padding: $unnnic-inset-nano;
-      height: 38px;
-      width: 38px;
-
-      .unnnic-icon {
-        width: $unnnic-icon-size-ant;
-        height: $unnnic-icon-size-ant;
-      }
+      height: 37px;
+      width: 37px;
     }
   }
 }

package/src/components/Button/types.ts

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

package/src/components/Checkbox/Checkbox.vue

@@ -1,37 +1,44 @@
 <!-- eslint-disable vue/multi-word-component-names -->
 <template>
-  <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"
+  <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"
     >
-      {{ textRight }}
-    </div>
-  </div>
+      {{ helper }}
+    </p>
+  </section>
 </template>
 
 <script>
-import UnnnicIcon from '../Icon.vue';
+import { pick } from 'lodash';
 
 export default {
-  components: {
-    UnnnicIcon,
-  },
   model: {
     event: 'change',
   },
@@ -50,13 +57,16 @@ export default {
       default: false,
     },
 
-    size: {
+    label: {
       type: String,
-      default: 'md',
-      validator(value) {
-        return ['md', 'sm'].includes(value);
-      },
+      default: '',
+    },
+
+    helper: {
+      type: String,
+      default: '',
     },
+
     textRight: {
       type: String,
       default: '',
@@ -75,25 +85,11 @@ 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);
@@ -106,35 +102,73 @@ 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;
-  cursor: pointer;
+}
+
+label {
+  display: flex;
+  align-items: center;
+  column-gap: $unnnic-space-2;
 }
 
 .unnnic-checkbox {
-  &.disabled {
-    :deep(.primary) {
-      fill: $unnnic-color-neutral-cleanest;
+  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');
     }
   }
 }
 
 .unnnic-checkbox__label {
-  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;
-  }
+  margin: 0;
+  font: $unnnic-font-body;
+  color: $unnnic-color-fg-emphasized;
 
-  &__md {
-    margin-left: $unnnic-inline-xs;
-    font-size: $unnnic-font-size-body-gt;
-    line-height: $unnnic-font-size-body-gt + $unnnic-line-height-md;
+  &--disabled {
+    color: $unnnic-color-fg-muted;
   }
 }
+
+.unnnic-checkbox__helper {
+  margin: 0;
+  margin-left: $checkbox-size + $unnnic-space-2;
+  font: $unnnic-font-caption-2;
+  color: $unnnic-color-fg-base;
+}
 </style>

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

@@ -24,43 +24,28 @@ describe('Checkbox', () => {
 
   it('should checkbox emit change events', async () => {
     wrapper = createWrapper();
-    const checkbox = wrapper.findComponent({ name: 'UnnnicIcon' });
+    const checkbox = wrapper.find('input[type="checkbox"]');
 
     // click false to true
-    await checkbox.trigger('click');
+    await checkbox.trigger('change');
     expect(wrapper.emitted('change')[0][0]).eq(true);
 
     // click true to false
     await wrapper.setProps({ modelValue: true });
-    await checkbox.trigger('click');
+    await checkbox.trigger('change');
     expect(wrapper.emitted('change')[1][0]).eq(false);
 
     // click less to false
     await wrapper.setProps({ modelValue: 'less' });
-    expect(wrapper.vm.icon).eq('checkbox-less');
-    await checkbox.trigger('click');
+    expect(wrapper.vm.valueName).eq('less');
+    await checkbox.trigger('change');
     expect(wrapper.emitted('change')[2][0]).eq(false);
   });
 
   it('should checkbox disabled', async () => {
     wrapper = createWrapper({ disabled: true });
-    const checkbox = wrapper.findComponent({ name: 'UnnnicIcon' });
+    const checkbox = wrapper.find('input[type="checkbox"]');
     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');
-  });
 });