@weni/unnnic-system 3.2.9-alpha.7 → 3.2.9

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,18 +49,6 @@ export default {
     },
     hasIconLeft: Boolean,
     hasIconRight: Boolean,
-    maxlength: {
-      type: Number,
-      default: null,
-    },
-    readonly: {
-      type: Boolean,
-      default: false,
-    },
-    forceActiveStatus: {
-      type: Boolean,
-      default: false,
-    },
   },
   emits: ['update:modelValue'],
   data() {
@@ -110,21 +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;
+    padding-right: $unnnic-spacing-sm + $unnnic-icon-size-sm +
+      $unnnic-spacing-xs - $unnnic-border-width-thinner;
   }
 
   &.error {
@@ -134,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;
+}

package/src/components/Input/Input.vue

@@ -7,18 +7,17 @@
       <slot name="label" />
     </p>
 
-    <UnnnicLabel
+    <p
       v-else-if="label"
       class="unnnic-form__label"
-      :label="label"
-      :tooltip="tooltip"
-    />
+    >
+      {{ fullySanitize(label) }}
+    </p>
 
     <TextInput
       v-bind="$attrs"
       v-model="val"
       class="unnnic-form-input"
-      :forceActiveStatus="forceActiveStatus"
       :placeholder="placeholder"
       :iconLeft="iconLeft"
       :iconRight="iconRight"
@@ -29,41 +28,24 @@
       :size="size"
       :mask="mask"
       :nativeType="nativeType"
-      :maxlength="maxlength"
-      :disabled="disabled"
-      :readonly="readonly"
     />
 
-    <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>
+    <p
+      v-if="message"
+      class="unnnic-form__message"
+    >
+      {{ fullySanitize(message) }}
+    </p>
   </div>
 </template>
 
 <script>
 import { fullySanitize } from '../../utils/sanitize';
 import TextInput from './TextInput.vue';
-import UnnnicLabel from '../Label/Label.vue';
 
 export default {
   name: 'UnnnicInput',
-  components: { TextInput, UnnnicLabel },
+  components: { TextInput },
   props: {
     placeholder: {
       type: String,
@@ -86,23 +68,19 @@ export default {
     },
     message: {
       type: String,
-      default: '',
-    },
-    errors: {
-      type: [String, Array],
-      default: '',
+      default: null,
     },
     label: {
       type: String,
-      default: '',
+      default: null,
     },
     iconLeft: {
       type: String,
-      default: '',
+      default: null,
     },
     iconRight: {
       type: String,
-      default: '',
+      default: null,
     },
     allowTogglePassword: {
       type: Boolean,
@@ -110,11 +88,11 @@ export default {
     },
     iconLeftClickable: {
       type: Boolean,
-      default: false,
+      default: null,
     },
     iconRightClickable: {
       type: Boolean,
-      default: false,
+      default: null,
     },
     hasCloudyColor: {
       type: Boolean,
@@ -128,30 +106,6 @@ 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,
-    },
-    readonly: {
-      type: Boolean,
-      default: false,
-    },
-    forceActiveStatus: {
-      type: Boolean,
-      default: false,
-    },
   },
   emits: ['update:modelValue'],
   data() {
@@ -184,37 +138,27 @@ 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 {
-    &.error {
-      color: $unnnic-color-fg-critical;
-    }
+    font-size: $unnnic-font-size-body-md;
+    margin: $unnnic-spacing-stack-nano 0;
+    color: $unnnic-color-feedback-red;
   }
 
   &__label {
-    margin-bottom: $unnnic-space-1;
-  }
-
-  &__hints-container {
-    display: flex;
-    justify-content: space-between;
-    margin-top: $unnnic-space-1;
-    font: $unnnic-font-caption-2;
-    color: $unnnic-color-fg-base;
+    font-weight: $unnnic-font-weight-regular;
+    line-height: $unnnic-font-size-body-gt + $unnnic-line-height-medium;
+    font-size: $unnnic-font-size-body-gt;
+    color: $unnnic-color-neutral-cloudy;
+    margin: $unnnic-spacing-stack-xs 0;
   }
 
-  &__message-container {
-    display: flex;
-    flex-direction: column;
-    gap: $unnnic-space-1;
+  &.sm &__label {
+    font-size: $unnnic-font-size-body-md;
+    line-height: $unnnic-font-size-body-md + $unnnic-line-height-medium;
   }
 }
 </style>