@weni/unnnic-system 3.2.9-alpha.9 → 3.3.0

package/src/components/ChartFunnel/DefaultFunnel/ChartDefaultFunnelBase.vue

@@ -44,6 +44,8 @@
 </template>
 
 <script setup lang="ts">
+import { computed } from 'vue';
+
 interface FunnelStep {
   percentage: number | string;
   value: number | string;
@@ -52,9 +54,13 @@ interface FunnelStep {
   color: string;
 }
 
-defineProps<{
+const props = defineProps<{
   data: FunnelStep[];
 }>();
+
+const calculatedTransform = computed(() => {
+  return `skew(${props.data.length === 2 ? '-8deg' : '-12deg'}, 0deg) translateX(-20px)`;
+});
 </script>
 
 <style lang="scss" scoped>
@@ -76,7 +82,7 @@ defineProps<{
   &__card {
     height: 100%;
     transition: background-color 0.3s ease;
-    transform: skew(-12deg, 0deg) translateX(-20px);
+    transform: v-bind(calculatedTransform);
     border-radius: 0 0 $unnnic-spacing-xs 0;
 
     &.first-item {

package/src/components/ChartFunnel/SvgFunnel/ChartFunnelBaseRow.vue

@@ -34,7 +34,7 @@
 
 <script>
 export default {
-  name: 'UnnnicChartFunnelThreeRows',
+  name: 'UnnnicChartFunnelBaseRow',
 
   props: {
     rows: {

package/src/components/ChartFunnel/SvgFunnel/ChartFunnelTwoRows.vue

@@ -0,0 +1,64 @@
+<template>
+  <ChartFunnelBaseRow
+    class="unnnic-chart-funnel-two-rows"
+    :rows="rows"
+    viewBox="0 0 250 148"
+  />
+</template>
+
+<script>
+import ChartFunnelBaseRow from './ChartFunnelBaseRow.vue';
+export default {
+  name: 'UnnnicChartFunnelTwoRows',
+
+  components: {
+    ChartFunnelBaseRow,
+  },
+
+  props: {
+    data: {
+      type: Array,
+      required: true,
+    },
+  },
+
+  computed: {
+    rows() {
+      const { data } = this;
+      return [
+        {
+          pathD:
+            'M362.938 0H12.025C6.30976 0 2.43799 5.81972 4.64626 11.0911L31 74H343.75L370.307 11.1122C372.535 5.83818 368.663 0 362.938 0Z',
+          titleX: '50%',
+          titleY: '32',
+          descriptionX: '50%',
+          descriptionY: '52',
+          title: data[0].title,
+          description: data[0].description,
+        },
+        {
+          pathD: 'M344 74H31L63.4654 148H311.535L344 74Z',
+          titleX: '50%',
+          titleY: '106',
+          descriptionX: '50%',
+          descriptionY: '126',
+          title: data[1].title,
+          description: data[1].description,
+        },
+      ];
+    },
+  },
+};
+</script>
+
+<style lang="scss">
+@use '@/assets/scss/unnnic' as *;
+.unnnic-chart-funnel-two-rows {
+  [class$='row']:nth-child(1) {
+    fill: $unnnic-color-weni-950;
+  }
+  [class$='row']:nth-child(2) {
+    fill: $unnnic-color-weni-800;
+  }
+}
+</style>

package/src/components/DataTable/index.vue

@@ -16,7 +16,7 @@
             {
               'unnnic-data-table__header-cell--clickable': header.isSortable,
               'unnnic-data-table__header-cell--sorting':
-                sortState.header === header.title && sortState.order !== '',
+                sort.header === header.title && sort.order !== '',
             },
           ]"
           @click.stop="handleClickHeader(header)"
@@ -31,12 +31,12 @@
           </template>
           <template v-if="header.isSortable">
             <IconArrowsDefault
-              v-if="sortState.header !== header.title"
+              v-if="sort.header !== header.title"
               class="order-default-icon"
               data-testid="arrow-default-icon"
             />
             <Icon
-              v-else-if="sortState.order === 'asc'"
+              v-else-if="sort.order === 'asc'"
               clickable
               size="ant"
               :icon="'switch_left'"
@@ -44,7 +44,7 @@
               data-testid="arrow-asc-icon"
             />
             <Icon
-              v-else-if="sortState.order === 'desc'"
+              v-else-if="sort.order === 'desc'"
               clickable
               size="ant"
               :icon="'switch_left'"
@@ -183,12 +183,6 @@ type DataTableItem = {
   [key: string]: any;
 };
 
-type SortState = {
-  header: string;
-  itemKey: string;
-  order: string;
-};
-
 interface Props {
   headers: DataTableHeader[];
   items: DataTableItem[];
@@ -204,7 +198,6 @@ interface Props {
   pageTotal?: number;
   pageInterval?: number;
   locale?: string;
-  sort?: SortState;
 }
 
 defineOptions({
@@ -232,7 +225,6 @@ const props = withDefaults(defineProps<Props>(), {
   pageTotal: 0,
   pageInterval: 5,
   locale: 'en',
-  sort: undefined,
 });
 
 const defaultTranslations = {
@@ -259,16 +251,12 @@ const headersItemsKeys: ComputedRef<string[]> = computed(() => {
   return props.headers.map((header) => header.itemKey);
 });
 
-const internalSort = ref({
+const sort = ref({
   header: '',
   itemKey: '',
   order: '',
 });
 
-const sortState = computed(() => {
-  return props.sort !== undefined ? props.sort : internalSort.value;
-});
-
 const getHeaderColumnSize = (header: DataTableHeader): string => {
   return typeof header.size === 'number'
     ? `${header.size || 1}fr`
@@ -283,12 +271,9 @@ const gridTemplateColumns: ComputedRef<string> = computed(() => {
   return columnSizes.join(' ');
 });
 
-const handleSort = (header: SortState, order: string) => {
-  if (props.sort === undefined) {
-    internalSort.value = { ...header, order };
-  }
-
-  emit('update:sort', { ...header, order });
+const handleSort = (header: typeof sort.value, order: string) => {
+  sort.value = { ...header, order };
+  emit('update:sort', sort.value);
 };
 
 const handleClickHeader = (header: DataTableHeader) => {
@@ -301,9 +286,9 @@ const handleClickHeader = (header: DataTableHeader) => {
   };
 
   const nextSort =
-    header.title !== sortState.value.header
+    header.title !== sort.value.header
       ? 'asc'
-      : nextSortOrderMapper[sortState.value.order];
+      : nextSortOrderMapper[sort.value.order];
 
   handleSort(
     nextSort === ''

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