@weni/unnnic-system 3.5.3-alpha.1 → 3.6.0

package/src/components/Radio/Radio.vue

@@ -1,33 +1,29 @@
 <!-- eslint-disable vue/multi-word-component-names -->
 <template>
-  <section class="unnnic-radio-container">
-    <label>
-      <input
-        class="unnnic-radio"
-        type="radio"
-        :disabled="disabled"
-        :checked="computedModelValue === value"
-        @change="click"
-        :name="computedName"
-        v-bind="pick($attrs, ['id'])"
-      />
-
-      <p
-        :class="[
-          'unnnic-radio__label',
-          { 'unnnic-radio__label--disabled': disabled },
-        ]"
-      >
-        {{ label }}
-        <slot />
-      </p>
-    </label>
-  </section>
+  <div
+    :class="[
+      'unnnic-radio-container',
+      `unnnic-radio-container--${size}`,
+      disabled ? 'disabled' : null,
+    ]"
+    @click="click"
+  >
+    <UnnnicIcon
+      class="unnnic-radio"
+      :icon="icon"
+      :scheme="color"
+      :size="size"
+    />
+
+    <span class="label">
+      <slot />
+    </span>
+  </div>
 </template>
 
 <script setup>
-import { pick } from 'lodash';
-import { inject, computed } from 'vue';
+import { computed } from 'vue';
+import UnnnicIcon from '../Icon.vue';
 
 const props = defineProps({
   modelValue: {
@@ -42,88 +38,79 @@ const props = defineProps({
     type: Boolean,
     default: false,
   },
-  label: {
+  size: {
     type: String,
-    default: '',
-  },
-  name: {
-    type: String,
-    default: '',
+    default: 'md',
+    validator(value) {
+      return ['md', 'sm'].includes(value);
+    },
   },
 });
 
 const emit = defineEmits(['update:modelValue']);
 
-const contextModelValue = inject('contextModelValue', undefined);
-const contextName = inject('contextName', undefined);
+const valueName = computed(() =>
+  props.modelValue === props.value ? 'selected' : 'default',
+);
+const icon = computed(
+  () =>
+    ({
+      selected: 'radio-selected',
+      default: props.disabled ? 'radio-disable' : 'radio-default',
+    })[valueName.value],
+);
+const color = computed(() => {
+  if (props.disabled) {
+    return 'brand-sec';
+  }
+
+  return valueName.value === 'selected' ? 'brand-weni' : 'neutral-cleanest';
+});
 
 function click() {
   if (!props.disabled) {
     emit('update:modelValue', props.value);
-
-    if (contextModelValue) {
-      contextModelValue.value = props.value;
-    }
   }
 }
-
-const computedModelValue = computed(() => {
-  return contextModelValue?.value || props.modelValue;
-});
-
-const computedName = computed(() => {
-  return contextName?.value || props.name;
-});
 </script>
 
 <style lang="scss" scoped>
 @use '@/assets/scss/unnnic' as *;
 
-$radio-size: 21px;
-
 .unnnic-radio-container {
   display: inline-flex;
-  flex-direction: column;
+  align-items: center;
 
-  label {
-    display: flex;
-    align-items: center;
-    gap: $unnnic-space-2;
+  &:not(.disabled) {
+    cursor: pointer;
   }
 
-  .unnnic-radio {
-    appearance: none;
-    width: $radio-size;
-    height: $radio-size;
-    margin: 0;
-    background-color: $unnnic-color-bg-base;
-    border: 1px solid $unnnic-color-border-base;
-    border-radius: $unnnic-radius-full;
-    box-sizing: border-box;
-    outline: none;
+  &--sm .unnnic-radio {
+    margin: $unnnic-spacing-stack-nano $unnnic-spacing-inline-nano;
+  }
 
-    &:checked {
-      border-width: 0;
-      background-color: $unnnic-color-bg-active;
-      background-image: url('@/assets/icons/radio-checked.svg');
-      background-position: center;
-      background-repeat: no-repeat;
-    }
+  &--md .unnnic-radio {
+    margin: $unnnic-spacing-stack-nano 0;
+    margin-left: $unnnic-spacing-inline-nano;
+    margin-right: $unnnic-spacing-inline-xs;
+  }
 
-    &:disabled {
-      background-color: $unnnic-color-bg-muted;
-      border: 1px solid $unnnic-color-border-muted;
-    }
+  .label {
+    font-family: $unnnic-font-family-secondary;
+    font-weight: $unnnic-font-weight-regular;
+    color: $unnnic-color-neutral-darkest;
+    margin: $unnnic-spacing-stack-nano 0;
+    margin-right: $unnnic-spacing-inline-nano;
   }
 
-  .unnnic-radio__label {
-    margin: 0;
-    font: $unnnic-font-body;
-    color: $unnnic-color-fg-emphasized;
+  &--sm .label {
+    font-size: $unnnic-font-size-body-md;
+    line-height: $unnnic-font-size-body-md + $unnnic-line-height-md;
+  }
 
-    &--disabled {
-      color: $unnnic-color-fg-muted;
-    }
+  &--md .label {
+    font-size: $unnnic-font-size-body-gt;
+    line-height: $unnnic-font-size-body-gt + $unnnic-line-height-md;
   }
 }
 </style>

package/src/components/Radio/__test__/Radio.spec.js

@@ -33,35 +33,41 @@ describe('Radio.vue', () => {
     expect(wrapper.exists()).toBe(true);
   });
 
-  test('renders input with correct attributes', () => {
-    const input = wrapper.find('input');
-    expect(input.exists()).toBe(true);
-    expect(input.attributes('type')).toBe('radio');
-    expect(input.attributes('disabled')).toBe(undefined);
-    expect(input.attributes('checked')).toBe(undefined);
+  test('renders UnnnicIcon component with correct props', () => {
+    const unnnicIcon = wrapper.findComponent(UnnnicIcon);
+    expect(unnnicIcon.exists()).toBe(true);
+    expect(unnnicIcon.props('icon')).toBe('radio-default');
+    expect(unnnicIcon.props('scheme')).toBe('neutral-cleanest');
+    expect(unnnicIcon.props('size')).toBe('md');
+  });
+
+  test('applies the correct size class', async () => {
+    expect(wrapper.classes()).toContain('unnnic-radio-container--md');
+
+    await wrapper.setProps({ size: 'sm' });
+    expect(wrapper.classes()).toContain('unnnic-radio-container--sm');
   });
 
   test('applies disabled class when disabled prop is true', async () => {
     await wrapper.setProps({ disabled: true });
-    expect(wrapper.find('.unnnic-radio__label').classes()).toContain(
-      'unnnic-radio__label--disabled',
-    );
+    expect(wrapper.classes()).toContain('disabled');
   });
 
   test('icon changes based on valueName', async () => {
     await wrapper.setProps({ modelValue: 'option1' });
-    const input = wrapper.find('input');
-    expect(input.attributes()).toHaveProperty('checked');
+    const unnnicIcon = wrapper.findComponent(UnnnicIcon);
+    expect(unnnicIcon.props('icon')).toBe('radio-selected');
   });
 
   test('icon and color change when disabled is true', async () => {
     await wrapper.setProps({ disabled: true });
-    const input = wrapper.find('input');
-    expect(input.attributes()).toHaveProperty('disabled');
+    const unnnicIcon = wrapper.findComponent(UnnnicIcon);
+    expect(unnnicIcon.props('icon')).toBe('radio-disable');
+    expect(unnnicIcon.props('scheme')).toBe('brand-sec');
   });
 
   test('emits update:modelValue with correct value when clicked and not disabled', async () => {
-    await wrapper.find('input').trigger('change');
+    await wrapper.trigger('click');
     expect(wrapper.emitted('update:modelValue')).toBeTruthy();
     expect(wrapper.emitted('update:modelValue')[0]).toEqual(['option1']);
   });

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

@@ -1,7 +1,7 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`Radio.vue > matches the snapshot 1`] = `
-"<section data-v-38c6bf5e="" class="unnnic-radio-container" size="md"><label data-v-38c6bf5e=""><input data-v-38c6bf5e="" class="unnnic-radio" type="radio" name="">
-    <p data-v-38c6bf5e="" class="unnnic-radio__label"> Option 1</p>
-  </label></section>"
+"<div data-v-38c6bf5e="" class="unnnic-radio-container unnnic-radio-container--md"><svg data-v-26446d8e="" data-v-38c6bf5e="" width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg" class="unnnic-icon unnnic-icon--size-svg-md unnnic-icon__size--md unnnic-icon-scheme--neutral-cleanest unnnic-radio" data-testid="custom-icon">
+    <circle cx="20" cy="20.0005" r="14.5" stroke="#3B414D" class="primary-stroke"></circle>
+  </svg><span data-v-38c6bf5e="" class="label">Option 1</span></div>"
 `;

package/src/components/Switch/Switch.vue

@@ -1,55 +1,49 @@
 <template>
-  <section class="unnnic-switch-wrapper">
-    <UnnnicLabel
-      v-if="label"
-      :label="label"
-      :tooltip="labelTooltip"
-      :useHtmlTooltip="labelUseHtmlTooltip"
-      class="unnnic-switch__label"
+  <div class="unnnic-switch">
+    <div
+      v-if="textLeft"
+      data-test-id="switch-text-left"
+      :class="[
+        'unnnic-switch__label',
+        'unnnic-switch__label__left',
+        `unnnic-switch__label__${size}`,
+      ]"
+    >
+      {{ textLeft }}
+    </div>
+
+    <UnnnicIcon
+      :class="{ 'unnnic-switch__icon': true, active: isActive }"
+      :icon="currentIcon"
+      :size="iconSize"
+      :scheme="iconScheme"
+      :lineHeight="iconLineHeight"
+      :disabled="disabled"
+      :clickable="!disabled"
+      data-test-id="switch-icon"
+      @click="toggleState"
     />
 
-    <label>
-      <input
-        class="unnnic-switch"
-        type="checkbox"
-        :disabled="disabled"
-        :checked="modelValue"
-        @change="toggleState"
-        v-bind="pick($attrs, ['id', 'name'])"
-      />
-
-      <p
-        v-if="option || textLeft || textRight"
-        :class="[
-          'unnnic-switch__option',
-          { 'unnnic-switch__option--disabled': disabled },
-        ]"
-        data-testid="switch-option"
-      >
-        {{ option }}
-        {{ textLeft }}
-        {{ textRight }}
-      </p>
-    </label>
-
-    <p
-      v-if="helper"
-      class="unnnic-switch__helper"
+    <div
+      v-if="textRight"
+      data-test-id="switch-text-right"
+      :class="[
+        'unnnic-switch__label',
+        'unnnic-switch__label__right',
+        `unnnic-switch__label__${size}`,
+      ]"
     >
-      {{ helper }}
-    </p>
-  </section>
+      {{ textRight }}
+    </div>
+  </div>
 </template>
 
 <script>
-import { pick } from 'lodash';
-import UnnnicLabel from '../Label/Label.vue';
+import UnnnicIcon from '../Icon.vue';
 
 export default {
   name: 'UnnnicSwitch',
-  components: {
-    UnnnicLabel,
-  },
+  components: { UnnnicIcon },
   props: {
     size: {
       type: String,
@@ -58,32 +52,6 @@ export default {
         return ['small', 'medium'].indexOf(value) !== -1;
       },
     },
-
-    label: {
-      type: String,
-      default: '',
-    },
-
-    labelTooltip: {
-      type: String,
-      default: '',
-    },
-
-    labelUseHtmlTooltip: {
-      type: Boolean,
-      default: false,
-    },
-
-    option: {
-      type: String,
-      default: '',
-    },
-
-    helper: {
-      type: String,
-      default: '',
-    },
-
     textLeft: {
       type: String,
       default: '',
@@ -110,6 +78,33 @@ export default {
       isActive: false,
     };
   },
+  computed: {
+    currentIcon() {
+      if (this.disabled) {
+        return this.isActive
+          ? 'switch-selected-disabled'
+          : 'switch-default-disabled';
+      }
+
+      return 'switch-default';
+    },
+
+    iconSize() {
+      return this.size === 'small' ? 'sm' : 'md';
+    },
+
+    iconScheme() {
+      if (this.disabled) {
+        return 'neutral-soft';
+      }
+
+      return this.isActive === false ? 'neutral-soft' : 'brand-weni';
+    },
+
+    iconLineHeight() {
+      return this.size === 'small' ? 'sm' : '';
+    },
+  },
 
   watch: {
     modelValue: {
@@ -121,8 +116,6 @@ export default {
   },
 
   methods: {
-    pick,
-
     toggleState() {
       if (!this.disabled) {
         if (this.useVModel) {
@@ -140,67 +133,51 @@ export default {
 <style lang="scss" scoped>
 @use '@/assets/scss/unnnic' as *;
 
-$switch-width: 38px;
-$switch-height: 20px;
-
-.unnnic-switch-wrapper {
+.unnnic-switch {
   display: flex;
-  flex-direction: column;
+  flex-direction: row;
 
-  label {
-    display: flex;
-    align-items: center;
-    column-gap: $unnnic-space-2;
-  }
-}
+  &__label {
+    font-family: $unnnic-font-family-secondary;
+    font-weight: $unnnic-font-weight-regular;
+    color: $unnnic-color-neutral-dark;
 
-.unnnic-switch {
-  appearance: none;
-  width: $switch-width;
-  height: $switch-height;
-  margin: 0;
-  background-color: $unnnic-color-bg-muted;
-  border-radius: $unnnic-radius-3;
-  box-sizing: border-box;
-  outline: none;
-
-  background-image: url('@/assets/icons/switch-checked.svg');
-  background-repeat: no-repeat;
-  background-position: 4px center;
-
-  transition:
-    200ms linear background-position,
-    200ms linear background-color;
-
-  &:checked {
-    background-color: $unnnic-color-bg-active;
-    background-position: 20px center;
-  }
+    margin: $unnnic-spacing-stack-nano 0;
+    margin-right: $unnnic-inline-nano;
 
-  &:disabled {
-    background-color: $unnnic-color-bg-muted;
-    background-image: url('@/assets/icons/switch-checked-disabled.svg');
-  }
+    &__small {
+      font-size: $unnnic-font-size-body-md;
+      line-height: $unnnic-font-size-body-md + $unnnic-line-height-md;
+    }
 
-  &__label {
-    margin-bottom: $unnnic-space-3;
+    &__medium {
+      font-size: $unnnic-font-size-body-gt;
+      line-height: $unnnic-font-size-body-gt + $unnnic-line-height-md;
+    }
   }
 
-  &__option {
-    margin: 0;
-    font: $unnnic-font-body;
-    color: $unnnic-color-fg-emphasized;
+  &__icon {
+    align-self: center;
+    margin: $unnnic-spacing-stack-nano $unnnic-inline-nano;
+
+    :deep(#default-circle) {
+      transition: 0.2s linear transform;
+    }
 
-    &--disabled {
-      color: $unnnic-color-fg-muted;
+    &.active {
+      :deep(#default-circle) {
+        transform: translateX(45%);
+      }
     }
   }
+}
 
-  &__helper {
-    margin: 0;
-    margin-left: $switch-width + $unnnic-space-2;
-    font: $unnnic-font-caption-2;
-    color: $unnnic-color-fg-base;
+.unnnic-icon__size {
+  &--md {
+    width: 3 * $unnnic-font-size;
+  }
+  &--sm {
+    width: 2 * $unnnic-font-size;
   }
 }
 </style>

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

@@ -12,26 +12,93 @@ describe('Switch', () => {
   beforeEach(() => {
     wrapper = createWrapper({ modelValue: false });
   });
+  it('should render the component correctly with default props', () => {
+    expect(wrapper.exists()).toBe(true);
+    expect(wrapper.findComponent({ name: 'UnnnicIcon' }).exists()).toBe(true);
+    expect(wrapper.text()).toBe('');
+  });
+
+  it('should render the left text (textLeft) when provided', async () => {
+    await wrapper.setProps({ textLeft: 'Left Text' });
+
+    // This check ensures that the icon is placed before the switch text
+    const switchChildren = wrapper.findComponent(Switch).element.children;
+    expect(switchChildren[0].getAttribute('data-test-id')).toBe(
+      'switch-text-left',
+    );
+    expect(switchChildren[1].getAttribute('data-test-id')).toBe('switch-icon');
+  });
+
+  it('should render the right text (textRight) when provided', async () => {
+    await wrapper.setProps({ textRight: 'Right Text' });
+
+    // This check ensures that the icon is placed after the switch text
+    const switchChildren = wrapper.findComponent(Switch).element.children;
+    expect(switchChildren[0].getAttribute('data-test-id')).toBe('switch-icon');
+    expect(switchChildren[1].getAttribute('data-test-id')).toBe(
+      'switch-text-right',
+    );
+  });
+
+  it('should render the correct icon when the switch is disabled/enabled', async () => {
+    await wrapper.setProps({ disabled: true });
+    const disabledIconComponent = wrapper.findComponent({ name: 'UnnnicIcon' });
+    expect(disabledIconComponent.props('icon')).toBe('switch-default-disabled');
 
-  it('should render the option when provided', async () => {
-    await wrapper.setProps({ option: 'Option Text' });
+    await wrapper.setProps({ modelValue: true });
+    const enabledIconComponent = wrapper.findComponent({ name: 'UnnnicIcon' });
+    expect(enabledIconComponent.props('icon')).toBe('switch-selected-disabled');
+  });
 
-    const switchOption = wrapper.find('[data-testid="switch-option"]');
-    expect(switchOption.text()).toBe('Option Text');
+  it('should render the correct icon based on the isActive state', async () => {
+    expect(wrapper.vm.isActive).toBe(false);
+    await wrapper.setProps({ modelValue: true });
+    expect(wrapper.vm.isActive).toBe(true);
+    expect(wrapper.findComponent({ name: 'UnnnicIcon' }).props('icon')).toBe(
+      'switch-default',
+    );
+  });
+
+  it('should render the correct icon size based on the size prop', async () => {
+    await wrapper.setProps({ size: 'small' });
+    expect(wrapper.findComponent({ name: 'UnnnicIcon' }).props('size')).toBe(
+      'sm',
+    );
+
+    await wrapper.setProps({ size: 'medium' });
+    expect(wrapper.findComponent({ name: 'UnnnicIcon' }).props('size')).toBe(
+      'md',
+    );
+  });
+
+  it('should change the icon color based on the state', async () => {
+    expect(wrapper.findComponent({ name: 'UnnnicIcon' }).props('scheme')).toBe(
+      'neutral-soft',
+    );
+
+    await wrapper.setProps({ modelValue: true });
+    expect(wrapper.findComponent({ name: 'UnnnicIcon' }).props('scheme')).toBe(
+      'brand-weni',
+    );
+
+    await wrapper.setProps({ disabled: true });
+    expect(wrapper.findComponent({ name: 'UnnnicIcon' }).props('scheme')).toBe(
+      'neutral-soft',
+    );
   });
 
   it('should toggle isActive state and emit the correct event when toggleState is called', async () => {
     const initialIsActive = wrapper.vm.isActive;
-    const switchInput = wrapper.find('input[type="checkbox"]');
-    await switchInput.trigger('change');
+    const switchIcon = wrapper.findComponent('[ data-test-id="switch-icon"]');
+    await switchIcon.trigger('click');
     expect(wrapper.emitted('update:model-value')).toBeTruthy();
     expect(wrapper.vm.isActive).toBe(!initialIsActive);
   });
 
   it('should not change state when disabled is true', async () => {
     await wrapper.setProps({ disabled: true });
-    const switchInput = wrapper.find('input[type="checkbox"]');
-    await switchInput.trigger('change');
+    const switchIcon = wrapper.findComponent('[ data-test-id="switch-icon"]');
+    await switchIcon.trigger('click');
     expect(wrapper.emitted('update:model-value')).toBeFalsy();
     expect(wrapper.vm.isActive).toBe(false);
   });

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

@@ -1,10 +1,11 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`Switch > should match the snapshot 1`] = `
-"<section data-v-e4356c9d="" class="unnnic-switch-wrapper">
-  <!--v-if--><label data-v-e4356c9d=""><input data-v-e4356c9d="" class="unnnic-switch" type="checkbox">
-    <!--v-if-->
-  </label>
+"<div data-v-e4356c9d="" class="unnnic-switch">
+  <!--v-if--><svg data-v-3d58a7dd="" data-v-26446d8e="" data-v-e4356c9d="" id="default" width="80" height="40" viewBox="0 0 80 40" xmlns="http://www.w3.org/2000/svg" class="unnnic-icon unnnic-icon--size-svg-md unnnic-icon__size--md unnnic--clickable unnnic-icon-scheme--neutral-soft unnnic-switch__icon" data-testid="custom-icon" lineHeight="" disabled="false" data-test-id="switch-icon">
+    <rect data-v-3d58a7dd="" x="4.20013" y="2.10046" width="71.6" height="35.8" rx="17.9" class="primary"></rect>
+    <circle data-v-3d58a7dd="" id="default-circle" cx="22.5" cy="20.0005" r="12.5" fill="white"></circle>
+  </svg>
   <!--v-if-->
-</section>"
+</div>"
 `;