@weni/unnnic-system 3.2.5 → 3.2.7-alpha.0

package/src/components/FormElement/FormElement.vue

@@ -17,51 +17,28 @@
 
     <slot></slot>
 
-    <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"
-      >
+    <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">
         <slot name="rightMessage"></slot>
-      </span>
-    </p>
+      </p>
+    </section>
   </section>
 </template>
 
 <script>
-import UnnnicIcon from '../../components/Icon.vue';
 import { fullySanitize } from '../../utils/sanitize';
 export default {
-  components: {
-    UnnnicIcon,
-  },
 
   props: {
     size: {
@@ -70,28 +47,18 @@ export default {
       validator: (size) => ['md', 'sm'].includes(size),
     },
 
-    label: String,
+    label: { type: String, default: '' },
 
-    fixedLabel: Boolean,
+    fixedLabel: { type: Boolean, default: false },
 
     error: {
       type: [Boolean, String],
       default: false,
     },
 
-    message: String,
-
-    disabled: Boolean,
-  },
+    message: { type: String, default: '' },
 
-  data() {
-    return {};
-  },
-
-  computed: {
-    shouldShowErrorSection() {
-      return this.error && (this.error !== true || !!this.$slots.rightMessage);
-    },
+    disabled: { type: Boolean, default: false },
   },
   methods: {
     fullySanitize,
@@ -102,75 +69,68 @@ 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 {
-    margin: 0;
-    margin-bottom: $unnnic-spacing-nano;
-
+    font: $unnnic-font-body;
     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;
-
-    $label-bottom-spacing: 3px;
+    margin-bottom: $unnnic-space-1;
+    display: flex;
+    align-items: center;
+    gap: $unnnic-space-2;
 
     &--fixed {
-      margin-top: -$unnnic-font-size-body-gt - $unnnic-line-height-md +
-        $label-bottom-spacing;
+      margin-top: -$unnnic-font-size-body-gt - $unnnic-space-2 +
+        $unnnic-space-1;
     }
 
     &--fixed {
-      margin-bottom: 0;
+      margin-bottom: $unnnic-space-0;
       position: absolute;
-      padding: 0 $unnnic-spacing-nano;
-      margin-left: $unnnic-spacing-xs;
+      padding: $unnnic-space-0 $unnnic-space-1;
+      margin-left: $unnnic-space-2;
 
       &:after {
         content: ' ';
         position: absolute;
-        left: 0;
-        bottom: $label-bottom-spacing - $unnnic-border-width-thinner;
+        left: $unnnic-space-0;
+        bottom: $unnnic-space-1 - $unnnic-border-width-thinner;
         width: 100%;
         height: $unnnic-border-width-thinner;
-        background-color: $unnnic-color-neutral-white;
+        background-color: $unnnic-color-white;
       }
     }
   }
 
-  &__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;
+    &.error {
+      color: $unnnic-color-fg-critical;
+    }
   }
 
-  &__message {
+  &__hints-container {
     display: flex;
-    column-gap: $unnnic-spacing-nano;
-  }
-
-  &__right-message {
-    margin-left: auto;
+    justify-content: space-between;
+    margin-top: $unnnic-space-1;
+    font: $unnnic-font-caption-2;
+    color: $unnnic-color-fg-base;
   }
 
-  &__error {
+  &__message-container {
     display: flex;
-    column-gap: $unnnic-spacing-nano;
-    align-items: center;
-
-    color: $unnnic-color-aux-red-500;
+    flex-direction: column;
+    gap: $unnnic-space-1;
   }
 
+
   &--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

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

package/src/components/Input/Input.scss

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

package/src/components/Input/Input.vue

@@ -6,13 +6,18 @@
     >
       <slot name="label" />
     </p>
-
-    <p
+    <section 
       v-else-if="label"
       class="unnnic-form__label"
     >
-      {{ fullySanitize(label) }}
-    </p>
+      <p>
+        {{ fullySanitize(label) }}
+      </p>
+      <UnnnicToolTip v-if="tooltip" enabled :text="tooltip">
+        <UnnnicIcon icon="help" size="sm" scheme="fg-base" />
+      </UnnnicToolTip>
+    </section>
+    
 
     <TextInput
       v-bind="$attrs"
@@ -28,24 +33,38 @@
       :size="size"
       :mask="mask"
       :nativeType="nativeType"
+      :maxlength="maxlength"
+      :disabled="disabled"
     />
 
-    <p
-      v-if="message"
-      class="unnnic-form__message"
-    >
-      {{ fullySanitize(message) }}
-    </p>
+    <section class="unnnic-form__hints-container">
+      <section class="unnnic-form__message-container">
+        <p
+          v-if="message"
+          class="unnnic-form__message"
+        >
+          {{ fullySanitize(message) }}
+        </p>
+        <p v-if="!!errors.length" class="unnnic-form__message error">
+          {{ Array.isArray(errors) ? errors.join(', ') : errors }}
+        </p>
+      </section>
+      <p v-if="maxlength && showMaxlengthCounter">
+        {{ (val || '').length }} / {{ maxlength }}
+      </p>
+    </section>
   </div>
 </template>
 
 <script>
 import { fullySanitize } from '../../utils/sanitize';
 import TextInput from './TextInput.vue';
+import UnnnicToolTip from '../ToolTip/ToolTip.vue';
+import UnnnicIcon from '../Icon.vue';
 
 export default {
   name: 'UnnnicInput',
-  components: { TextInput },
+  components: { TextInput, UnnnicToolTip, UnnnicIcon },
   props: {
     placeholder: {
       type: String,
@@ -68,19 +87,23 @@ export default {
     },
     message: {
       type: String,
-      default: null,
+      default: '',
+    },
+    errors: {
+      type: [String, Array],
+      default: '',
     },
     label: {
       type: String,
-      default: null,
+      default: '',
     },
     iconLeft: {
       type: String,
-      default: null,
+      default: '',
     },
     iconRight: {
       type: String,
-      default: null,
+      default: '',
     },
     allowTogglePassword: {
       type: Boolean,
@@ -88,11 +111,11 @@ export default {
     },
     iconLeftClickable: {
       type: Boolean,
-      default: null,
+      default: false,
     },
     iconRightClickable: {
       type: Boolean,
-      default: null,
+      default: false,
     },
     hasCloudyColor: {
       type: Boolean,
@@ -106,6 +129,22 @@ export default {
       type: [String, Array],
       default: '',
     },
+    tooltip: {
+      type: String,
+      default: '',
+    },
+    maxlength: {
+      type: [Number, null],
+      default: null,
+    },
+    showMaxlengthCounter: {
+      type: Boolean,
+      default: false,
+    },
+    disabled: {
+      type: Boolean,
+      default: false,
+    },
   },
   emits: ['update:modelValue'],
   data() {
@@ -138,27 +177,46 @@ export default {
 <style lang="scss" scoped>
 @use '@/assets/scss/unnnic' as *;
 
+* {
+  margin: 0;
+  padding: 0;
+  box-sizing: border-box;
+}
+
 .unnnic-form {
-  font-family: $unnnic-font-family-secondary;
   position: relative;
 
   &__message {
-    font-size: $unnnic-font-size-body-md;
-    margin: $unnnic-spacing-stack-nano 0;
-    color: $unnnic-color-feedback-red;
+    &.error {
+      color: $unnnic-color-fg-critical;
+    }
   }
 
   &__label {
-    font-weight: $unnnic-font-weight-regular;
-    line-height: $unnnic-font-size-body-gt + $unnnic-line-height-medium;
-    font-size: $unnnic-font-size-body-gt;
+    font: $unnnic-font-body;
     color: $unnnic-color-neutral-cloudy;
-    margin: $unnnic-spacing-stack-xs 0;
+    margin-bottom: $unnnic-space-1;
+    display: flex;
+    align-items: center;
+    gap: $unnnic-space-2;
+
+    :deep(.unnnic-tooltip) {
+      display: flex;
+    }
+  }
+
+  &__hints-container {
+    display: flex;
+    justify-content: space-between;
+    margin-top: $unnnic-space-1;
+    font: $unnnic-font-caption-2;
+    color: $unnnic-color-fg-base;
   }
 
-  &.sm &__label {
-    font-size: $unnnic-font-size-body-md;
-    line-height: $unnnic-font-size-body-md + $unnnic-line-height-medium;
+  &__message-container {
+    display: flex;
+    flex-direction: column;
+    gap: $unnnic-space-1;
   }
 }
 </style>

package/src/components/Input/TextInput.vue

@@ -3,7 +3,6 @@
     :class="[
       'text-input',
       `size--${size}`,
-      `text-input--icon-right-size-${iconRightSize}`,
     ]"
   >
     <BaseInput
@@ -18,6 +17,7 @@
       class="input-itself"
       :hasIconLeft="!!iconLeft"
       :hasIconRight="!!iconRight || allowTogglePassword"
+      :maxlength="maxlength"
       @focus="onFocus"
       @blur="onBlur"
     />
@@ -26,7 +26,7 @@
       v-if="iconLeft"
       :scheme="iconScheme"
       :icon="iconLeft"
-      size="sm"
+      size="ant"
       :clickable="iconLeftClickable"
       :class="['icon-left', { clickable: iconLeftClickable }]"
       @click="onIconLeftClick"
@@ -36,7 +36,7 @@
       v-if="iconRightSvg"
       :scheme="iconScheme"
       :icon="iconRightSvg"
-      :size="iconRightSize"
+      size="ant"
       :clickable="iconRightClickable || allowTogglePassword"
       :class="[
         'icon-right',
@@ -92,10 +92,6 @@ export default {
       type: Boolean,
       default: null,
     },
-    iconRightSize: {
-      type: String,
-      default: 'sm',
-    },
     allowTogglePassword: {
       type: Boolean,
       default: null,
@@ -108,6 +104,14 @@ export default {
       type: String,
       default: 'md',
     },
+    maxlength: {
+      type: Number,
+      default: null,
+    },
+    disabled: {
+      type: Boolean,
+      default: false,
+    },
   },
   emits: ['icon-left-click', 'icon-right-click'],
   data() {
@@ -118,7 +122,7 @@ export default {
   },
   computed: {
     isDisabled() {
-      return this.$attrs.disabled;
+      return this.$attrs.disabled || this.disabled;
     },
 
     iconRightSvg() {
@@ -131,22 +135,22 @@ export default {
 
     iconScheme() {
       if (this.type === 'error') {
-        return 'aux-red-500';
+        return 'fg-critical';
       }
 
       if (this.isDisabled) {
-        return 'neutral-cleanest';
+        return 'fg-muted';
       }
 
       if (this.modelValue || this.isFocused) {
-        return 'neutral-dark';
+        return 'color-gray-700';
       }
 
       if (this.hasCloudyColor) {
-        return 'neutral-cloudy';
+        return 'fg-base';
       }
 
-      return 'neutral-cloudy';
+      return 'fg-base';
     },
 
     attributes() {
@@ -183,6 +187,10 @@ export default {
 <style lang="scss" scoped>
 @use '@/assets/scss/unnnic' as *;
 
+.text-input {
+  position: relative;
+}
+
 .icon {
   &-left,
   &-right {
@@ -193,32 +201,16 @@ export default {
 
   &-left {
     position: absolute;
-    top: $unnnic-spacing-ant + 0.1875 * $unnnic-font-size;
-    left: $unnnic-inline-sm - $unnnic-border-width-thinner;
+    top: 50%;
+    transform: translateY(-50%);
+    left: $unnnic-space-4;
   }
 
   &-right {
     position: absolute;
-    top: $unnnic-spacing-ant + 0.1875 * $unnnic-font-size;
-    right: $unnnic-inline-sm - $unnnic-border-width-thinner;
-  }
-}
-.text-input {
-  position: relative;
-
-  &.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;
+    top: 50%;
+    transform: translateY(-50%);
+    right: $unnnic-space-4;
   }
 }
 </style>

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

@@ -74,22 +74,22 @@ describe('TextInput.vue', () => {
 
   test('computes the correct iconScheme based on various states', async () => {
     await wrapper.setProps({ type: 'error' });
-    expect(wrapper.vm.iconScheme).toBe('aux-red-500');
+    expect(wrapper.vm.iconScheme).toBe('fg-critical');
 
     await wrapper.setProps({ type: 'normal' });
     await wrapper.setData({ isDisabled: true });
-    expect(wrapper.vm.iconScheme).toBe('neutral-cloudy');
+    expect(wrapper.vm.iconScheme).toBe('fg-base');
 
     await wrapper.setData({ isDisabled: false });
     await wrapper.setProps({ modelValue: 'text' });
-    expect(wrapper.vm.iconScheme).toBe('neutral-dark');
+    expect(wrapper.vm.iconScheme).toBe('color-gray-700');
 
     await wrapper.setData({ isFocused: true });
-    expect(wrapper.vm.iconScheme).toBe('neutral-dark');
+    expect(wrapper.vm.iconScheme).toBe('color-gray-700');
 
     await wrapper.setProps({ hasCloudyColor: true, modelValue: '' });
     await wrapper.setData({ isFocused: false });
-    expect(wrapper.vm.iconScheme).toBe('neutral-cloudy');
+    expect(wrapper.vm.iconScheme).toBe('fg-base');
   });
 
   test('attributes computed property returns combined attributes and props', () => {