wca-designsystem 1.0.89 → 1.0.91

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.89",
+  "version": "1.0.91",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",

package/src/components/molecules/TabelaHeader/index.tsx

@@ -1,4 +1,4 @@
-import React, { useCallback } from 'react'
+import React, { useCallback, useMemo } from 'react'
 import * as S from './styles'
 import InputDeTexto from '../../atomos/InputDeTexto'
 import SelectCustomizado from '../../atomos/Select'
@@ -54,6 +54,18 @@ const TabelaHeader = <T extends { id: string | number; children?: Array<T> }>({
     })
     setFormatedColumns(columnsFormated)
   }, [])
+  
+  const defaultOrderData = [
+    { value: 'Maior', label: 'Ordenar por: Decrescente' },
+    { value: 'Menor', label: 'Ordenar por: Crescente' },
+  ];
+
+  const orderData = useMemo(() => {
+    if (!ordenarPor) return defaultOrderData;
+    return defaultOrderData.map((opt) =>
+      opt.value === ordenarPor.value ? { ...opt, label: ordenarPor.label } : opt
+    );
+  }, [ordenarPor]);
 
   const columnsToHide = ['expand', 'select', 'acoes']
   return (
@@ -70,10 +82,7 @@ const TabelaHeader = <T extends { id: string | number; children?: Array<T> }>({
       {hasOrder && (
         <SelectCustomizado
           tipo="table"
-          data={[
-            { value: 'Maior', label: 'Ordenar por: Decrescente' },
-            { value: 'Menor', label: 'Ordenar por: Crescente' },
-          ]}
+          data={orderData}
           onChange={(_value, option) => setOrdenarPor!(option)}
           allowDeselect={false}
           value={ordenarPor ? ordenarPor.value : 'Maior'}

package/src/components/organismos/Tabela/Tabela.stories.tsx

@@ -301,6 +301,6 @@ TabelaProps.args = {
   setGlobalFilter: () => console.log('aqui'),
   setPagination: () => console.log('aqui'),
   quantidadeDeRegistros: 10,
-  tamanhoPaginacao: 97,
+  tamanhoPaginacao: 12,
   setSimples: () => console.log('aqui'),
 }

package/src/components/organismos/Tabela/pagination.tsx

@@ -28,10 +28,10 @@ const Paginacao = ({
   quantidadeRegistros,
   qtdRegistrosPagina,
 }: PaginacaoProps) => {
+
   function nextPage() {
-    if (tabelaPaginacao.pageIndex + 1 > tabelaPaginacao.pageSize) {
-      return;
-    }
+    if (tabelaPaginacao.pageIndex >= tamanhoPaginacao!) return;
+
     setPagination({
       pageIndex: tabelaPaginacao.pageIndex + 1,
       pageSize: tabelaPaginacao.pageSize ?? 10,
@@ -39,18 +39,17 @@ const Paginacao = ({
   }
 
   function previousPage() {
-    if (tabelaPaginacao.pageIndex <= 0) {
-      return;
-    }
+    if (tabelaPaginacao.pageIndex <= 1) return;
+
     setPagination({
       pageIndex: tabelaPaginacao.pageIndex - 1,
       pageSize: tabelaPaginacao.pageSize ?? 10,
     });
   }
 
-  function changePage(e: number) {
+  function changePage(pagina: number) {
     setPagination({
-      pageIndex: e,
+      pageIndex: pagina,
       pageSize: tabelaPaginacao.pageSize ?? 10,
     });
   }