@weni/unnnic-system 3.3.0 → 3.3.1-alpha.3

package/src/components/Button/Button.vue

@@ -6,20 +6,16 @@
     :class="[
       'unnnic-button',
       `unnnic-button--size-${size}`,
-      `unnnic-button--${type}`,
+      `unnnic-button--${buttonType}`,
       iconCenter ? `unnnic-button--icon-on-center` : null,
       float ? `unnnic-button--float` : null,
     ]"
   >
-    <UnnnicIcon
+    <UnnnicIconLoading
       v-if="loading"
-      icon="loading-circle-1"
       :scheme="iconScheme"
       :size="iconSize"
-      :filled="iconsFilled"
       :style="{ position: 'absolute' }"
-      class="rotation"
-      :next="next"
       data-testid="icon-loading"
     />
 
@@ -72,6 +68,7 @@
 <script setup lang="ts">
 import { computed, watch, useSlots } from 'vue';
 import UnnnicIcon from '../Icon.vue';
+import UnnnicIconLoading from '../IconLoading/IconLoading.vue';
 import type { ButtonProps, ButtonSize, ButtonType } from './types';
 import type { SchemeColor } from '@/types/scheme-colors';
 
@@ -102,8 +99,8 @@ const buttonDisabled = computed(() => {
 });
 
 const iconSize = computed(() => {
-  if (props.size === 'small') return 'sm';
-  return 'md';
+  if (props.size === 'extra-large') return 'lg';
+  return 'ant';
 });
 
 const hasText = computed(() => {
@@ -120,12 +117,11 @@ const iconScheme = computed((): SchemeColor => {
     primary: 'neutral-white',
     secondary: 'neutral-dark',
     tertiary: 'neutral-dark',
-    alternative: 'neutral-white',
     warning: 'neutral-white',
     attention: 'neutral-white',
   };
 
-  return typeToSchemeMap[props.type] || 'neutral-white';
+  return typeToSchemeMap[buttonType.value] || 'neutral-white';
 });
 
 const isSizePropValid = computed(() => {
@@ -136,16 +132,23 @@ const isSizePropValid = computed(() => {
   );
 });
 
+const buttonType = computed(() => {
+  return (
+    {
+      alternative: 'tertiary',
+    }[props.type] || props.type
+  );
+});
+
 const isTypePropValid = computed(() => {
   const validTypes: ButtonType[] = [
     'primary',
     'secondary',
     'tertiary',
-    'alternative',
     'warning',
     'attention',
   ];
-  return validTypes.includes(props.type);
+  return validTypes.includes(buttonType.value);
 });
 
 const validateProps = () => {
@@ -159,6 +162,8 @@ const validateProps = () => {
 
     if (!isTypePropValid.value) {
       errorMessage += ' Invalid type prop.';
+      errorMessage +=
+        ' Please provide one of the following types: primary, secondary, tertiary, warning, attention. Alternative is discontinued and it was forced renamed to tertiary.';
     }
 
     throw new Error(errorMessage);
@@ -196,13 +201,12 @@ watch(
   display: inline-flex;
   align-items: center;
   justify-content: center;
-  border-radius: $unnnic-border-radius-sm;
+  border-radius: $unnnic-radius-2;
   border: 0;
   outline: none;
   overflow: hidden;
   white-space: nowrap;
-  font-weight: $unnnic-font-weight-regular;
-  font-family: $unnnic-font-family-secondary;
+  font: $unnnic-font-action;
   cursor: pointer;
   position: relative;
 
@@ -216,129 +220,91 @@ watch(
     }
   }
 
+  &--primary,
+  &--warning,
+  &--attention {
+    color: $unnnic-color-fg-inverted;
+  }
+
+  &--secondary,
+  &--tertiary {
+    color: $unnnic-color-fg-emphasized;
+  }
+
   &--primary {
-    background-color: $unnnic-color-weni-600;
-    color: $unnnic-color-neutral-white;
+    background-color: $unnnic-color-bg-active;
 
     &:hover:enabled {
-      background-color: $unnnic-color-weni-700;
+      background-color: $unnnic-color-teal-700;
     }
 
     &:active:enabled {
-      background-color: $unnnic-color-weni-800;
+      background-color: $unnnic-color-teal-800;
     }
   }
 
   &--secondary {
-    background-color: $unnnic-color-neutral-white;
-    color: $unnnic-color-neutral-dark;
+    background-color: $unnnic-color-bg-base;
     box-shadow: inset 0 0 0 $unnnic-border-width-thinner
-      $unnnic-color-neutral-cleanest;
+      $unnnic-color-border-base;
 
     &:hover:enabled {
-      background-color: $unnnic-color-neutral-light;
-    }
-
-    &:disabled {
-      box-shadow: none;
+      background-color: $unnnic-color-gray-50;
     }
 
     &:active:enabled {
-      background-color: $unnnic-color-neutral-soft;
-    }
-  }
-
-  &--tertiary {
-    background-color: transparent;
-    color: $unnnic-color-neutral-dark;
-
-    &:hover:enabled {
-      background-color: $unnnic-color-neutral-light;
+      background-color: $unnnic-color-gray-100;
     }
 
     &:disabled {
-      color: $unnnic-color-neutral-clean;
-      cursor: not-allowed;
-    }
-
-    &:active:enabled {
-      background-color: $unnnic-color-neutral-soft;
+      box-shadow: none;
     }
   }
 
-  &--alternative {
-    background-color: $unnnic-color-weni-50;
-    color: $unnnic-color-weni-800;
-
-    :deep(svg .primary) {
-      fill: $unnnic-color-weni-800;
-    }
-
-    :deep(svg .primary-stroke) {
-      stroke: $unnnic-color-weni-800;
-    }
+  &--tertiary {
+    background-color: transparent;
 
     &:hover:enabled {
-      background-color: $unnnic-color-weni-100;
-    }
-
-    &:disabled {
-      :deep(svg .primary) {
-        fill: $unnnic-color-neutral-clean;
-      }
-
-      :deep(svg .primary-stroke) {
-        stroke: $unnnic-color-neutral-clean;
-      }
+      background-color: rgba($unnnic-color-gray-400, 0.1);
     }
 
     &:active:enabled {
-      background-color: $unnnic-color-weni-200;
-      color: $unnnic-color-weni-900;
-
-      :deep(svg .primary) {
-        fill: $unnnic-color-weni-900;
-      }
-
-      :deep(svg .primary-stroke) {
-        stroke: $unnnic-color-weni-900;
-      }
+      background-color: rgba($unnnic-color-gray-400, 0.2);
     }
   }
 
   &--warning {
-    background-color: $unnnic-color-aux-red-500;
+    background-color: $unnnic-color-red-500;
     color: $unnnic-color-neutral-white;
 
     &:hover:enabled {
-      background-color: $unnnic-color-aux-red-700;
+      background-color: $unnnic-color-red-600;
     }
 
     &:active:enabled {
-      background-color: $unnnic-color-aux-red-900;
+      background-color: $unnnic-color-red-700;
     }
   }
 
   &--attention {
-    background-color: $unnnic-color-aux-yellow-500;
-    color: $unnnic-color-neutral-white;
+    background-color: $unnnic-color-yellow-500;
 
     &:hover:enabled {
-      background-color: $unnnic-color-aux-yellow-700;
+      background-color: $unnnic-color-yellow-600;
     }
 
     &:active:enabled {
-      background-color: $unnnic-color-aux-yellow-900;
+      background-color: $unnnic-color-yellow-700;
     }
   }
 
   &--primary:disabled,
   &--secondary:disabled,
-  &--alternative:disabled,
+  &--tertiary:disabled,
   &--warning:disabled,
   &--attention:disabled {
-    background-color: $unnnic-color-neutral-soft;
-    color: $unnnic-color-neutral-clean;
+    background-color: $unnnic-color-bg-muted;
+    color: $unnnic-color-fg-muted;
     cursor: not-allowed;
   }
 
@@ -351,26 +317,12 @@ watch(
     box-shadow: $unnnic-shadow-level-near;
   }
 
-  &--size {
-    &-extra-large,
-    &-large,
-    &-small {
-      padding: $unnnic-squish-xs;
-      font-size: $unnnic-font-size-body-gt;
-      line-height: ($unnnic-font-size-body-gt + $unnnic-line-height-medium);
-    }
-
-    &-extra-large {
-      height: 58px;
-    }
-
-    &-large {
-      height: 46px;
-    }
+  &--size-large {
+    padding: $unnnic-space-3 $unnnic-space-4;
+  }
 
-    &-small {
-      height: 38px;
-    }
+  &--size-small {
+    padding: $unnnic-space-2 $unnnic-space-4;
   }
 }
 </style>
@@ -388,8 +340,8 @@ watch(
     }
 
     &-large {
-      height: 46px;
-      width: 46px;
+      height: 45px;
+      width: 45px;
     }
 
     &-large,
@@ -404,8 +356,8 @@ watch(
 
     &-small {
       padding: $unnnic-inset-nano;
-      height: 38px;
-      width: 38px;
+      height: 37px;
+      width: 37px;
 
       .unnnic-icon {
         width: $unnnic-icon-size-ant;

package/src/components/Button/types.ts

@@ -4,7 +4,6 @@ export type ButtonType =
   | 'primary'
   | 'secondary'
   | 'tertiary'
-  | 'alternative'
   | 'warning'
   | 'attention';
 

package/src/components/DataTable/index.vue

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

package/src/components/FormElement/FormElement.vue

@@ -17,52 +17,31 @@
 
     <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: {
       type: String,
@@ -70,28 +49,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,
-  },
-
-  data() {
-    return {};
-  },
+    message: { type: String, default: '' },
 
-  computed: {
-    shouldShowErrorSection() {
-      return this.error && (this.error !== true || !!this.$slots.rightMessage);
-    },
+    disabled: { type: Boolean, default: false },
   },
   methods: {
     fullySanitize,
@@ -102,75 +71,66 @@ 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;
+    justify-content: space-between;
+    margin-top: $unnnic-space-1;
+    font: $unnnic-font-caption-2;
+    color: $unnnic-color-fg-base;
   }
 
-  &__right-message {
-    margin-left: auto;
-  }
-
-  &__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>