fix avatar dropdown missing textValue (#66)

Enalmada · Jan 4, 2024 · 3bc9495 · 3bc9495
1 parent b1c72b6
commit 3bc9495
Show file tree

Hide file tree

Showing 13 changed files with 49 additions and 23 deletions.
diff --git a/.changeset/eighty-kings-report.md b/.changeset/eighty-kings-report.md
@@ -0,0 +1,5 @@
+---
+"@enalmada/nextui-admin": patch
+---
+
+configurable sort and page descriptors
diff --git a/.changeset/hot-seahorses-shop.md b/.changeset/hot-seahorses-shop.md
@@ -0,0 +1,5 @@
+---
+"@enalmada/nextui-admin": patch
+---
+
+fix avatar dropdown missing textValue
diff --git a/.gitattributes b/.gitattributes
@@ -1 +1 @@
-bun.lockb binary
+*.lockb binary diff=lockb
diff --git a/build.ts b/build.ts
@@ -1,5 +1,3 @@
-/// <reference types="bun-types" />
-
 import {
   bunBuild,
   getSourceFiles,

diff --git a/bun.lockb b/bun.lockb
diff --git a/dist/index.d.ts b/dist/index.d.ts
@@ -4,6 +4,6 @@ import { type DropdownItemConfig, type UserConfig, type UserDropdownConfig } fro
 import { type AdminNavHeader } from './sidebar/companies-dropdown';
 import { type SidebarSectionConfig } from './sidebar/sidebar';
 import { TableWrapper, type PageDescriptor, type TableColumnProps } from './table/TableWrapper';
-import { useTableWrapper } from './table/useTableWrapper';
+import { useTableWrapper, type UseTableWrapperParams } from './table/useTableWrapper';
 export { Layout, TableWrapper, useTableWrapper };
-export type { SidebarSectionConfig, AdminNavHeader, UserDropdownConfig, DropdownItemConfig, UserConfig, PageDescriptor, SortDescriptor, TableColumnProps, };
+export type { SidebarSectionConfig, AdminNavHeader, UserDropdownConfig, DropdownItemConfig, UserConfig, PageDescriptor, SortDescriptor, TableColumnProps, UseTableWrapperParams };
diff --git a/dist/navbar/user-dropdown.js b/dist/navbar/user-dropdown.js
@@ -35,11 +35,13 @@ var UserDropdown = ({ userDropdownConfig }) => {
       }, item.key, true, undefined, this);
     }
     return jsxDEV(DropdownItem, {
-      color: item.color,
+      color: item.color || "default",
+      textValue: item.label,
       children: item.label
     }, item.key, false, undefined, this);
   });
   dropdownItems.push(jsxDEV(DropdownItem, {
+    textValue: "Dark Mode Switch",
     children: jsxDEV(DarkModeSwitch, {}, undefined, false, undefined, this)
   }, "switch", false, undefined, this));
   return jsxDEV(Dropdown, {

diff --git a/dist/table/useTableWrapper.d.ts b/dist/table/useTableWrapper.d.ts
@@ -1,7 +1,11 @@
 import React from 'react';
 import { type SortDescriptor } from '@nextui-org/react';
 import { type PageDescriptor, type TableWrapperProps } from './TableWrapper';
-export declare function useTableWrapper<T>(): {
+export interface UseTableWrapperParams {
+    defaultSortDescriptor?: SortDescriptor;
+    defaultPageDescriptor?: PageDescriptor;
+}
+export declare function useTableWrapper<T>({ defaultSortDescriptor, defaultPageDescriptor }?: UseTableWrapperParams): {
     TableWrapperComponent: React.FC<TableWrapperProps<T>>;
     sortDescriptor: SortDescriptor;
     setSortDescriptor: React.Dispatch<React.SetStateAction<SortDescriptor>>;

diff --git a/dist/table/useTableWrapper.js b/dist/table/useTableWrapper.js
@@ -1,14 +1,16 @@
 // src/table/useTableWrapper.tsx
 import {useState} from "react";
 import {TableWrapper as TableWrapper2} from "./TableWrapper";
-function useTableWrapper() {
+function useTableWrapper({ defaultSortDescriptor, defaultPageDescriptor } = {}) {
   const [sortDescriptor, setSortDescriptor] = useState({
     column: "id",
-    direction: "descending"
+    direction: "descending",
+    ...defaultSortDescriptor
   });
   const [pageDescriptor, setPageDescriptor] = useState({
     page: 1,
-    pageSize: 50
+    pageSize: 15,
+    ...defaultPageDescriptor
   });
   const TableWrapperComponent = (props) => {
     return jsxDEV(TableWrapper2, {

diff --git a/package.json b/package.json
@@ -21,22 +21,21 @@
     "@changesets/cli": "2.27.1",
     "@enalmada/bun-externals": "0.0.6",
     "@ianvs/prettier-plugin-sort-imports": "4.1.1",
-    "@scaleway/changesets-renovate": "1.3.2",
-    "@types/node": "20.10.5",
-    "@types/react": "18.2.45",
-    "@typescript-eslint/eslint-plugin": "6.15.0",
-    "@typescript-eslint/parser": "6.15.0",
-    "bun-types": "1.0.18",
+    "@scaleway/changesets-renovate": "1.4.0",
+    "@types/node": "20.10.6",
+    "@types/react": "18.2.46",
+    "@typescript-eslint/eslint-plugin": "6.17.0",
+    "@typescript-eslint/parser": "6.17.0",
     "cross-env": "7.0.3",
     "eslint": "8.56.0",
     "eslint-config-prettier": "9.1.0",
-    "eslint-plugin-prettier": "5.1.0",
+    "eslint-plugin-prettier": "5.1.2",
     "fixpack": "4.0.0",
     "husky": "8.0.3",
     "lint-staged": "15.2.0",
     "prettier": "3.1.1",
     "typescript": "5.3.3",
-    "vitest": "1.1.0"
+    "vitest": "1.1.1"
   },
   "peerDependencies": {
     "@nextui-org/react": "^2.1.13",

diff --git a/src/index.ts b/src/index.ts
@@ -9,7 +9,7 @@ import {
 import { type AdminNavHeader } from './sidebar/companies-dropdown';
 import { type SidebarSectionConfig } from './sidebar/sidebar';
 import { TableWrapper, type PageDescriptor, type TableColumnProps } from './table/TableWrapper';
-import { useTableWrapper } from './table/useTableWrapper';
+import { useTableWrapper, type UseTableWrapperParams } from './table/useTableWrapper';
 
 export { Layout, TableWrapper, useTableWrapper };
 
@@ -22,4 +22,5 @@ export type {
   PageDescriptor,
   SortDescriptor,
   TableColumnProps,
+  UseTableWrapperParams,
 };
diff --git a/src/navbar/user-dropdown.tsx b/src/navbar/user-dropdown.tsx
@@ -54,15 +54,15 @@ export const UserDropdown = ({ userDropdownConfig }: Props) => {
       );
     }
     return (
-      <DropdownItem key={item.key} color={item.color}>
+      <DropdownItem key={item.key} color={item.color || 'default'} textValue={item.label}>
         {item.label}
       </DropdownItem>
     );
   });
 
   // Add the DarkModeSwitch as another DropdownItem
   dropdownItems.push(
-    <DropdownItem key="switch">
+    <DropdownItem key="switch" textValue="Dark Mode Switch">
       <DarkModeSwitch />
     </DropdownItem>
   );

diff --git a/src/table/useTableWrapper.tsx b/src/table/useTableWrapper.tsx
@@ -3,15 +3,25 @@ import { type SortDescriptor } from '@nextui-org/react';
 
 import { TableWrapper, type PageDescriptor, type TableWrapperProps } from './TableWrapper';
 
-export function useTableWrapper<T>() {
+export interface UseTableWrapperParams {
+  defaultSortDescriptor?: SortDescriptor;
+  defaultPageDescriptor?: PageDescriptor;
+}
+
+export function useTableWrapper<T>({
+  defaultSortDescriptor,
+  defaultPageDescriptor,
+}: UseTableWrapperParams = {}) {
   const [sortDescriptor, setSortDescriptor] = useState<SortDescriptor>({
     column: 'id',
     direction: 'descending',
+    ...defaultSortDescriptor,
   });
 
   const [pageDescriptor, setPageDescriptor] = useState<PageDescriptor>({
     page: 1,
-    pageSize: 50,
+    pageSize: 15,
+    ...defaultPageDescriptor,
   });
 
   const TableWrapperComponent: React.FC<TableWrapperProps<T>> = (props) => {