@weni/unnnic-system 3.9.4 → 3.11.0

package/src/components/Input/Input.vue

@@ -1,19 +1,14 @@
 <template>
-  <div :class="['unnnic-form', size]">
-    <p
-      v-if="hasLabelSlot"
-      class="unnnic-form__label"
-    >
-      <slot name="label" />
-    </p>
-
-    <p
-      v-else-if="label"
-      class="unnnic-form__label"
-    >
-      {{ fullySanitize(label) }}
-    </p>
-
+  <UnnnicFormElement
+    :label="label || $slots.label"
+    :size="size"
+    :disabled="disabled"
+    :message="message"
+    :tooltip="tooltip"
+    :error="computedError"
+    :class="['unnnic-form', size]"
+    data-testid="form-element"
+  >
     <TextInput
       v-bind="$attrs"
       v-model="val"
@@ -21,31 +16,37 @@
       :placeholder="placeholder"
       :iconLeft="iconLeft"
       :iconRight="iconRight"
-      :type="type"
+      :type="errors.length > 0 && !disabled ? 'error' : type"
       :iconLeftClickable="iconLeftClickable"
       :iconRightClickable="iconRightClickable"
       :hasCloudyColor="hasCloudyColor"
       :size="size"
       :mask="mask"
       :nativeType="nativeType"
+      :maxlength="maxlength"
+      :disabled="disabled"
     />
 
-    <p
-      v-if="message"
-      class="unnnic-form__message"
+    <template
+      v-if="maxlength && showMaxlengthCounter"
+      #rightMessage
     >
-      {{ fullySanitize(message) }}
-    </p>
-  </div>
+      {{ (val || '').length }} / {{ maxlength }}
+    </template>
+  </UnnnicFormElement>
 </template>
 
 <script>
 import { fullySanitize } from '../../utils/sanitize';
 import TextInput from './TextInput.vue';
+import UnnnicFormElement from '../FormElement/FormElement.vue';
 
 export default {
   name: 'UnnnicInput',
-  components: { TextInput },
+  components: {
+    TextInput,
+    UnnnicFormElement,
+  },
   props: {
     placeholder: {
       type: String,
@@ -68,19 +69,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 +93,11 @@ export default {
     },
     iconLeftClickable: {
       type: Boolean,
-      default: null,
+      default: false,
     },
     iconRightClickable: {
       type: Boolean,
-      default: null,
+      default: false,
     },
     hasCloudyColor: {
       type: Boolean,
@@ -106,6 +111,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() {
@@ -114,8 +135,12 @@ export default {
     };
   },
   computed: {
-    hasLabelSlot() {
-      return !!this.$slots.label;
+    computedError() {
+      if (Array.isArray(this.errors)) {
+        return this.errors.join(', ') || this.type === 'error';
+      }
+
+      return this.errors || this.type === 'error';
     },
   },
   watch: {
@@ -136,29 +161,9 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@use '@/assets/scss/unnnic' as *;
-
-.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;
-  }
-
-  &__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;
-    color: $unnnic-color-neutral-cloudy;
-    margin: $unnnic-spacing-stack-xs 0;
-  }
-
-  &.sm &__label {
-    font-size: $unnnic-font-size-body-md;
-    line-height: $unnnic-font-size-body-md + $unnnic-line-height-medium;
-  }
+* {
+  margin: 0;
+  padding: 0;
+  box-sizing: border-box;
 }
 </style>

package/src/components/Input/TextInput.vue

@@ -1,11 +1,5 @@
 <template>
-  <div
-    :class="[
-      'text-input',
-      `size--${size}`,
-      `text-input--icon-right-size-${iconRightSize}`,
-    ]"
-  >
+  <div :class="['text-input', `size--${size}`]">
     <BaseInput
       v-bind="attributes"
       ref="base-input"
@@ -18,6 +12,7 @@
       class="input-itself"
       :hasIconLeft="!!iconLeft"
       :hasIconRight="!!iconRight || allowTogglePassword"
+      :maxlength="maxlength"
       @focus="onFocus"
       @blur="onBlur"
     />
@@ -26,7 +21,7 @@
       v-if="iconLeft"
       :scheme="iconScheme"
       :icon="iconLeft"
-      size="sm"
+      size="ant"
       :clickable="iconLeftClickable"
       :class="['icon-left', { clickable: iconLeftClickable }]"
       @click="onIconLeftClick"
@@ -36,7 +31,7 @@
       v-if="iconRightSvg"
       :scheme="iconScheme"
       :icon="iconRightSvg"
-      :size="iconRightSize"
+      size="ant"
       :clickable="iconRightClickable || allowTogglePassword"
       :class="[
         'icon-right',
@@ -92,22 +87,22 @@ export default {
       type: Boolean,
       default: null,
     },
-    iconRightSize: {
-      type: String,
-      default: 'sm',
-    },
     allowTogglePassword: {
       type: Boolean,
       default: null,
     },
-    hasCloudyColor: {
-      type: Boolean,
-      default: null,
-    },
     size: {
       type: String,
       default: 'md',
     },
+    maxlength: {
+      type: Number,
+      default: null,
+    },
+    disabled: {
+      type: Boolean,
+      default: false,
+    },
   },
   emits: ['icon-left-click', 'icon-right-click'],
   data() {
@@ -118,7 +113,7 @@ export default {
   },
   computed: {
     isDisabled() {
-      return this.$attrs.disabled;
+      return this.$attrs.disabled || this.disabled;
     },
 
     iconRightSvg() {
@@ -130,23 +125,11 @@ export default {
     },
 
     iconScheme() {
-      if (this.type === 'error') {
-        return 'aux-red-500';
-      }
-
       if (this.isDisabled) {
-        return 'neutral-cleanest';
-      }
-
-      if (this.modelValue || this.isFocused) {
-        return 'neutral-dark';
-      }
-
-      if (this.hasCloudyColor) {
-        return 'neutral-cloudy';
+        return 'fg-muted';
       }
 
-      return 'neutral-cloudy';
+      return 'fg-base';
     },
 
     attributes() {
@@ -183,6 +166,10 @@ export default {
 <style lang="scss" scoped>
 @use '@/assets/scss/unnnic' as *;
 
+.text-input {
+  position: relative;
+}
+
 .icon {
   &-left,
   &-right {
@@ -193,32 +180,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__/Input.spec.js

@@ -40,29 +40,21 @@ describe('Input.vue', () => {
     expect(wrapper.exists()).toBe(true);
   });
 
-  test('renders label correctly', async () => {
-    const label = wrapper.find('.unnnic-form__label');
-    expect(label.exists()).toBe(true);
-    expect(label.text()).toBe('Sample Label');
-
-    await wrapper.setProps({ label: null });
-    expect(wrapper.find('.unnnic-form__label').exists()).toBe(false);
-  });
-
-  test('renders message correctly', async () => {
-    const message = wrapper.find('.unnnic-form__message');
-    expect(message.exists()).toBe(true);
-    expect(message.text()).toBe('Error message');
-
-    await wrapper.setProps({ message: null });
-    expect(wrapper.find('.unnnic-form__message').exists()).toBe(false);
+  test('renders form element correctly', async () => {
+    const formElement = wrapper.findComponent('[data-testid="form-element"]');
+    expect(formElement.exists()).toBe(true);
+    expect(formElement.props('label')).toBe('Sample Label');
+    expect(formElement.props('size')).toBe('md');
+    expect(formElement.props('message')).toBe('Error message');
+    expect(formElement.props('disabled')).toBe(false);
+    expect(formElement.props('tooltip')).toBe('');
+    expect(formElement.props('error')).toBe(false);
   });
 
-  test('applies the correct size class', async () => {
-    expect(wrapper.classes()).toContain('md');
-
-    await wrapper.setProps({ size: 'sm' });
-    expect(wrapper.classes()).toContain('sm');
+  test('renders maxlength counter correctly', async () => {
+    expect(wrapper.text()).not.toContain('0 / 10');
+    await wrapper.setProps({ maxlength: 10, showMaxlengthCounter: true });
+    expect(wrapper.text()).toContain('0 / 10');
   });
 
   test('renders TextInput component', () => {
@@ -96,18 +88,6 @@ describe('Input.vue', () => {
     expect(wrapper.vm.val).toBe('new value');
   });
 
-  test('hasLabelSlot computed property works correctly', async () => {
-    expect(wrapper.vm.hasLabelSlot).toBe(false);
-
-    wrapper = mount(Input, {
-      slots: {
-        label: '<span>Custom Label</span>',
-      },
-    });
-
-    expect(wrapper.vm.hasLabelSlot).toBe(true);
-  });
-
   test('correctly mounts with initial modelValue', async () => {
     wrapper = mount(Input, {
       props: {

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

@@ -19,7 +19,6 @@ describe('TextInput.vue', () => {
         iconLeftClickable: true,
         iconRightClickable: true,
         allowTogglePassword: false,
-        hasCloudyColor: false,
         size: 'md',
       },
       global: {
@@ -74,22 +73,21 @@ 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-base');
 
     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('fg-base');
 
     await wrapper.setData({ isFocused: true });
-    expect(wrapper.vm.iconScheme).toBe('neutral-dark');
+    expect(wrapper.vm.iconScheme).toBe('fg-base');
 
-    await wrapper.setProps({ hasCloudyColor: true, modelValue: '' });
-    await wrapper.setData({ isFocused: false });
-    expect(wrapper.vm.iconScheme).toBe('neutral-cloudy');
+    await wrapper.setProps({ disabled: true });
+    expect(wrapper.vm.iconScheme).toBe('fg-muted');
   });
 
   test('attributes computed property returns combined attributes and props', () => {

package/src/components/Input/__test__/__snapshots__/Input.spec.js.snap

@@ -1,9 +1,18 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`Input.vue > matches the snapshot 1`] = `
-"<div data-v-d890ad85="" class="unnnic-form md">
-  <p data-v-d890ad85="" class="unnnic-form__label">Sample Label</p>
-  <div data-v-a0d36167="" data-v-d890ad85="" class="text-input size--md text-input--icon-right-size-sm unnnic-form-input" mask="####-####"><input data-v-86533b41="" data-v-a0d36167="" class="unnnic-form-input input-itself input size-md normal input--has-icon-left input--has-icon-right unnnic-form-input input-itself" placeholder="Enter text" iconleft="search" iconright="clear" iconleftclickable="true" iconrightclickable="true" iconrightsize="sm" hascloudycolor="false" type="text" value=""><span data-v-26446d8e="" data-v-a0d36167="" class="unnnic-icon material-symbols-rounded unnnic-icon-scheme--neutral-cloudy unnnic-icon-size--sm unnnic-icon__size--sm unnnic--clickable icon-left clickable" data-testid="material-icon" translate="no">search</span><span data-v-26446d8e="" data-v-a0d36167="" class="unnnic-icon material-symbols-rounded unnnic-icon-scheme--neutral-cloudy unnnic-icon-size--sm unnnic-icon__size--sm unnnic--clickable icon-right clickable" data-testid="material-icon" translate="no">clear</span></div>
-  <p data-v-d890ad85="" class="unnnic-form__message">Error message</p>
-</div>"
+"<section data-v-9f8d6c86="" data-v-d890ad85="" class="unnnic-form-element unnnic-form md" data-testid="form-element">
+  <section data-v-7f222291="" data-v-9f8d6c86="" class="unnnic-label unnnic-form-element__label">
+    <p data-v-7f222291="" class="unnnic-label__label">Sample Label</p>
+    <!--v-if-->
+  </section>
+  <div data-v-a0d36167="" data-v-d890ad85="" class="text-input size--md unnnic-form-input" hascloudycolor="false" mask="####-####"><input data-v-86533b41="" data-v-a0d36167="" class="unnnic-form-input input-itself input size-md normal input--has-icon-left input--has-icon-right unnnic-form-input input-itself" hascloudycolor="false" placeholder="Enter text" iconleft="search" iconright="clear" iconleftclickable="true" iconrightclickable="true" type="text" value=""><span data-v-26446d8e="" data-v-a0d36167="" class="unnnic-icon material-symbols-rounded unnnic-icon-scheme--fg-base unnnic-icon-size--ant unnnic-icon__size--ant unnnic--clickable icon-left clickable" data-testid="material-icon" translate="no">search</span><span data-v-26446d8e="" data-v-a0d36167="" class="unnnic-icon material-symbols-rounded unnnic-icon-scheme--fg-base unnnic-icon-size--ant unnnic-icon__size--ant unnnic--clickable icon-right clickable" data-testid="material-icon" translate="no">clear</span></div>
+  <section data-v-9f8d6c86="" class="unnnic-form-element__hints-container">
+    <section data-v-9f8d6c86="" class="unnnic-form-element__message-container">
+      <p data-v-9f8d6c86="" class="unnnic-form-element__message">Error message</p>
+      <!--v-if-->
+    </section>
+    <!--v-if-->
+  </section>
+</section>"
 `;

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

@@ -1,3 +1,3 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
-exports[`TextInput.vue > matches the snapshot 1`] = `"<div data-v-a0d36167="" class="text-input size--md text-input--icon-right-size-sm"><input data-v-86533b41="" data-v-a0d36167="" placeholder="Enter text" iconleft="search" iconright="clear" iconleftclickable="true" iconrightclickable="true" iconrightsize="sm" allowtogglepassword="false" hascloudycolor="false" class="input-itself input size-md normal input--has-icon-left input--has-icon-right input-itself" type="text" value=""><span data-v-26446d8e="" data-v-a0d36167="" class="unnnic-icon material-symbols-rounded unnnic-icon-scheme--neutral-cloudy unnnic-icon-size--sm unnnic-icon__size--sm unnnic--clickable icon-left clickable" data-testid="material-icon" translate="no">search</span><span data-v-26446d8e="" data-v-a0d36167="" class="unnnic-icon material-symbols-rounded unnnic-icon-scheme--neutral-cloudy unnnic-icon-size--sm unnnic-icon__size--sm unnnic--clickable icon-right clickable" data-testid="material-icon" translate="no">clear</span></div>"`;
+exports[`TextInput.vue > matches the snapshot 1`] = `"<div data-v-a0d36167="" class="text-input size--md"><input data-v-86533b41="" data-v-a0d36167="" placeholder="Enter text" iconleft="search" iconright="clear" iconleftclickable="true" iconrightclickable="true" allowtogglepassword="false" class="input-itself input size-md normal input--has-icon-left input--has-icon-right input-itself" type="text" value=""><span data-v-26446d8e="" data-v-a0d36167="" class="unnnic-icon material-symbols-rounded unnnic-icon-scheme--fg-base unnnic-icon-size--ant unnnic-icon__size--ant unnnic--clickable icon-left clickable" data-testid="material-icon" translate="no">search</span><span data-v-26446d8e="" data-v-a0d36167="" class="unnnic-icon material-symbols-rounded unnnic-icon-scheme--fg-base unnnic-icon-size--ant unnnic-icon__size--ant unnnic--clickable icon-right clickable" data-testid="material-icon" translate="no">clear</span></div>"`;

package/src/components/Label/Label.vue

@@ -1,34 +1,65 @@
 <template>
-  <p class="unnnic-label__label">{{ fullySanitize(label) }}</p>
+  <section class="unnnic-label">
+    <p class="unnnic-label__label">{{ fullySanitize(props.label) }}</p>
+    <UnnnicToolTip
+      v-if="tooltip"
+      enabled
+      :text="tooltip"
+      :enableHtml="props.useHtmlTooltip"
+    >
+      <UnnnicIcon
+        icon="help"
+        size="sm"
+        scheme="fg-base"
+      />
+    </UnnnicToolTip>
+  </section>
 </template>
 
-<script>
-import { fullySanitize } from '../../utils/sanitize';
-export default {
+<script setup lang="ts">
+import { fullySanitize } from '@/utils/sanitize';
+
+import UnnnicToolTip from '../ToolTip/ToolTip.vue';
+import UnnnicIcon from '../Icon.vue';
+
+defineOptions({
   name: 'UnnnicLabel',
-  props: {
-    label: {
-      type: String,
-      default: null,
-    },
-  },
-  methods: {
-    fullySanitize,
-  },
-};
+});
+
+export interface LabelProps {
+  label?: string;
+  tooltip?: string;
+  useHtmlTooltip?: boolean;
+}
+
+const props = withDefaults(defineProps<LabelProps>(), {
+  label: '',
+  tooltip: '',
+  useHtmlTooltip: false,
+});
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
 @use '@/assets/scss/unnnic' as *;
 
+* {
+  box-sizing: border-box;
+  padding: $unnnic-space-0;
+  margin: $unnnic-space-0;
+}
+
 .unnnic-label {
+  display: flex;
+  align-items: center;
+  gap: $unnnic-space-2;
+  color: $unnnic-color-fg-base;
+
   &__label {
-    font-family: $unnnic-font-family-secondary;
-    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;
+    font: $unnnic-font-body;
+  }
+
+  :deep(.unnnic-tooltip) {
+    display: flex;
   }
 }
 </style>

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

@@ -24,7 +24,7 @@ describe('Label', () => {
   });
 
   it('applies the correct classes and styles', () => {
-    const label = wrapper.findComponent('.unnnic-label__label');
+    const label = wrapper.find('.unnnic-label__label');
     expect(label.html()).toMatchSnapshot();
   });
 });

package/src/components/Label/__tests__/__snapshots__/Label.spec.js.snap

@@ -1,3 +1,3 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
-exports[`Label > applies the correct classes and styles 1`] = `"<p class="unnnic-label__label">Label Test</p>"`;
+exports[`Label > applies the correct classes and styles 1`] = `"<p data-v-7f222291="" class="unnnic-label__label">Label Test</p>"`;