diff --git a/packages/components/table/package.json b/packages/components/table/package.json index 7da0dd1e..dd61d997 100644 --- a/packages/components/table/package.json +++ b/packages/components/table/package.json @@ -56,8 +56,7 @@ "@react-stately/table": "^3.11.2", "@react-stately/virtualizer": "^3.6.4", "@react-types/grid": "^3.2.2", - "@react-types/table": "^3.9.0", - "react-feather": "^2.0.10" + "@react-types/table": "^3.9.0" }, "devDependencies": { "@jala-banyu/theme": "workspace: *", diff --git a/packages/components/table/src/table-column-header.tsx b/packages/components/table/src/table-column-header.tsx index a364f140..25b80e02 100644 --- a/packages/components/table/src/table-column-header.tsx +++ b/packages/components/table/src/table-column-header.tsx @@ -8,11 +8,8 @@ import {mergeProps} from "@react-aria/utils"; import {useFocusRing} from "@react-aria/focus"; import {VisuallyHidden} from "@react-aria/visually-hidden"; import {useHover} from "@react-aria/interactions"; -import {SortAscIcon} from "@jala-banyu/shared-icons/src/sort-asc"; -import {SortIcon} from "@jala-banyu/shared-icons/src/sort"; -import {SortDescIcon} from "@jala-banyu/shared-icons/src/sort-desc"; import {Tooltip} from "@jala-banyu/tooltip"; -import {HelpCircle} from "react-feather"; +import {HelpCircleIcon, SortAscIcon, SortDescIcon, SortIcon} from "@jala-banyu/shared-icons"; import {ValuesType} from "./use-table"; @@ -82,7 +79,9 @@ const TableColumnHeader = forwardRef<"th", TableColumnHeaderProps>((props, ref) if (tooltip) { tooltipIndicator = ( - +

+ +

); } diff --git a/packages/core/theme/src/colors/semantic.ts b/packages/core/theme/src/colors/semantic.ts index defe110e..0109cb81 100644 --- a/packages/core/theme/src/colors/semantic.ts +++ b/packages/core/theme/src/colors/semantic.ts @@ -339,7 +339,8 @@ export const themeColorsDark: ThemeColors = { }, }; +// turn off dark mode for now export const semanticColors = { light: themeColorsLight, - dark: themeColorsDark, + dark: themeColorsLight, }; diff --git a/packages/hooks/use-pagination/__tests__/use-pagination.test.tsx b/packages/hooks/use-pagination/__tests__/use-pagination.test.tsx index a4279c55..c70bbe5a 100644 --- a/packages/hooks/use-pagination/__tests__/use-pagination.test.tsx +++ b/packages/hooks/use-pagination/__tests__/use-pagination.test.tsx @@ -13,7 +13,7 @@ describe("usePagination", () => { it("should return correct initial state", () => { const {result} = renderHook(() => usePagination({total: 10})); - expect(result.current.range).toStrictEqual([1, 2, 3, "dots", 10]); + expect(result.current.range).toStrictEqual([1, 2, 3, 4, 5, "dots", 10]); expect(result.current.activePage).toBe(1); }); diff --git a/packages/utilities/shared-icons/src/help-circle.tsx b/packages/utilities/shared-icons/src/help-circle.tsx new file mode 100644 index 00000000..bc1d0980 --- /dev/null +++ b/packages/utilities/shared-icons/src/help-circle.tsx @@ -0,0 +1,22 @@ +import {IconSvgProps} from "./types"; + +export const HelpCircleIcon = (props: IconSvgProps) => ( + +); diff --git a/packages/utilities/shared-icons/src/index.ts b/packages/utilities/shared-icons/src/index.ts index 8827f42a..4f0d8aff 100644 --- a/packages/utilities/shared-icons/src/index.ts +++ b/packages/utilities/shared-icons/src/index.ts @@ -36,6 +36,7 @@ export * from "./arrow-left"; export * from "./link"; export * from "./selector"; export * from "./home"; +export * from "./help-circle"; // sets export * from "./bulk"; diff --git a/packages/utilities/shared-icons/src/search.tsx b/packages/utilities/shared-icons/src/search.tsx index cb9f12e5..500486e6 100644 --- a/packages/utilities/shared-icons/src/search.tsx +++ b/packages/utilities/shared-icons/src/search.tsx @@ -12,18 +12,11 @@ export const SearchIcon = (props: IconSvgProps) => ( {...props} > - ); diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1f0e11e2..a25f6c0f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1700,9 +1700,6 @@ importers: '@react-types/table': specifier: ^3.9.0 version: 3.9.3(react@18.2.0) - react-feather: - specifier: ^2.0.10 - version: 2.0.10(react@18.2.0) devDependencies: '@jala-banyu/button': specifier: workspace:* @@ -11099,6 +11096,7 @@ packages: loose-envify: 1.4.0 object-assign: 4.1.1 dev: true + bundledDependencies: false /create-require@1.1.1: resolution: {integrity: sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==}