@weni/unnnic-system 3.3.1-alpha.3 → 3.3.2

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/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/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;
+}