next-helios-fe 1.7.13 → 1.7.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "next-helios-fe",
-  "version": "1.7.13",
+  "version": "1.7.15",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/components/button/index.tsx

@@ -47,10 +47,10 @@ export const Button: React.FC<ButtonProps> = ({
   const width = options?.width === "fit" ? "w-fit" : "w-full";
   const height =
     options?.height === "short"
-      ? "py-1 gap-2"
+      ? "h-[35px] gap-2"
       : options?.height === "high"
-      ? "py-2 gap-4"
-      : "py-1.5 gap-2";
+      ? "h-[43px] gap-4"
+      : "h-[39px] gap-2";
   const position =
     options?.position === "center"
       ? "justify-center"
@@ -68,7 +68,12 @@ export const Button: React.FC<ButtonProps> = ({
       {...rest}
     >
       {loading ? (
-        <Icon icon="mingcute:loading-fill" className="text-2xl animate-spin" />
+        <Icon
+          icon="mingcute:loading-fill"
+          className={`animate-spin ${
+            options?.height === "high" ? "text-2xl" : "text-xl"
+          }`}
+        />
       ) : (
         children
       )}

package/src/components/table/index.tsx

@@ -64,6 +64,7 @@ interface TableProps {
       }[]
     ) => void;
   };
+  loading?: boolean;
   actionColumn?: (e?: any) => React.ReactNode;
 }
 
@@ -77,6 +78,7 @@ export const Table: TableComponentProps = ({
   data,
   options,
   checkbox,
+  loading,
   actionColumn,
 }) => {
   const paginationRef = useRef<HTMLDivElement>(null);
@@ -709,12 +711,19 @@ export const Table: TableComponentProps = ({
             </tr>
           </thead>
           <tbody className="divide-y">
-            {filteredData && filteredData.length !== 0 && dataArr}
+            {!loading && filteredData && filteredData.length !== 0 && dataArr}
           </tbody>
         </table>
-        {(!filteredData || filteredData.length === 0) && (
+        {(loading || !filteredData || filteredData.length === 0) && (
           <div className="flex justify-center items-center px-4 py-1.5 h-full bg-secondary-bg text-center whitespace-nowrap">
-            <span>No data found</span>
+            {loading ? (
+              <Icon
+                icon="mingcute:loading-fill"
+                className="text-3xl text-primary animate-spin"
+              />
+            ) : (
+              <span>No data found</span>
+            )}
           </div>
         )}
       </div>