refactor: replace cx with cn utility in Field and TypeInput components; clean up unused imports in TabHeader and Tablist

This commit is contained in:
faisolavolut 2025-02-11 21:23:56 +07:00
parent d646e14512
commit 13917ad905
5 changed files with 9 additions and 54 deletions

View File

@ -9,6 +9,7 @@ import get from "lodash.get";
import { getNumber } from "@/lib/utils/getNumber"; import { getNumber } from "@/lib/utils/getNumber";
import { useLocal } from "@/lib/utils/use-local"; import { useLocal } from "@/lib/utils/use-local";
import { FieldRadio } from "./field/TypeRadio"; import { FieldRadio } from "./field/TypeRadio";
import { cn } from "@/lib/utils";
export const Field: React.FC<{ export const Field: React.FC<{
fm: any; fm: any;
@ -155,7 +156,7 @@ export const Field: React.FC<{
<></> <></>
)} )}
<div <div
className={cx( className={cn(
error error
? "flex flex-row rounded-md flex-grow border-red-500 border items-center" ? "flex flex-row rounded-md flex-grow border-red-500 border items-center"
: "flex flex-row rounded-md flex-grow items-center", : "flex flex-row rounded-md flex-grow items-center",
@ -338,7 +339,8 @@ export const Field: React.FC<{
padding-right: ${getNumber( padding-right: ${getNumber(
get(suffixRef, "current.clientWidth") get(suffixRef, "current.clientWidth")
) + 10}px; ) + 10}px;
` `,
className
)} )}
/> />
</> </>

View File

@ -9,6 +9,7 @@ import { FaRegEye, FaRegEyeSlash } from "react-icons/fa6";
import { Rating } from "../../ui/ratings"; import { Rating } from "../../ui/ratings";
import { getNumber } from "@/lib/utils/getNumber"; import { getNumber } from "@/lib/utils/getNumber";
import MaskedInput from "../../ui/MaskedInput"; import MaskedInput from "../../ui/MaskedInput";
import { cn } from "@/lib/utils";
export const TypeInput: React.FC<any> = ({ export const TypeInput: React.FC<any> = ({
name, name,
@ -247,7 +248,7 @@ export const TypeInput: React.FC<any> = ({
id={name} id={name}
name={name} name={name}
disabled={disabled} disabled={disabled}
className={cx( className={cn(
"text-sm text-right ", "text-sm text-right ",
error error
? css` ? css`

View File

@ -1,30 +1,6 @@
"use client"; "use client";
import { import React, { useEffect } from "react";
ColumnDef,
ColumnResizeDirection,
ColumnResizeMode,
flexRender,
getCoreRowModel,
getPaginationRowModel,
getSortedRowModel,
SortingState,
useReactTable,
} from "@tanstack/react-table";
import React, { FC, useEffect } from "react";
import {
Breadcrumb,
Button,
Checkbox,
Label,
Modal,
Table,
TextInput,
} from "flowbite-react";
import { FaArrowDownLong, FaArrowUp } from "react-icons/fa6";
import { init_column } from "../tablelist/lib/column";
import { Tabs, TabsContent, TabsList, TabsTrigger } from "../ui/tabs"; import { Tabs, TabsContent, TabsList, TabsTrigger } from "../ui/tabs";
import TabSlider from "../ui/tabslider";
import { useLocal } from "@/lib/utils/use-local"; import { useLocal } from "@/lib/utils/use-local";
export const TabHeader: React.FC<any> = ({ export const TabHeader: React.FC<any> = ({

View File

@ -1,30 +1,6 @@
"use client"; "use client";
import { makeData } from "@/lib/utils/makeData"; import React, { useEffect } from "react";
import {
ColumnDef,
ColumnResizeDirection,
ColumnResizeMode,
flexRender,
getCoreRowModel,
getPaginationRowModel,
getSortedRowModel,
SortingState,
useReactTable,
} from "@tanstack/react-table";
import React, { FC, useEffect } from "react";
import {
Breadcrumb,
Button,
Checkbox,
Label,
Modal,
Table,
TextInput,
} from "flowbite-react";
import { useLocal } from "@/lib/utils/use-local"; import { useLocal } from "@/lib/utils/use-local";
import { FaArrowDownLong, FaArrowUp } from "react-icons/fa6";
import { init_column } from "../tablelist/lib/column";
import { Tabs, TabsContent, TabsList, TabsTrigger } from "../ui/tabs"; import { Tabs, TabsContent, TabsList, TabsTrigger } from "../ui/tabs";
import TabSlider from "../ui/tabslider"; import TabSlider from "../ui/tabslider";

View File

@ -21,7 +21,7 @@ const DialogOverlay = React.forwardRef<
<DialogPrimitive.Overlay <DialogPrimitive.Overlay
ref={ref} ref={ref}
className={cn( className={cn(
"fixed inset-0 z-50 bg-black/80 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0", "fixed inset-0 z-50 bg-gray-100/20 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0",
className className
)} )}
{...props} {...props}