Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changeset/ninety-mails-yell.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@nextui-org/menu": patch
"@nextui-org/theme": patch
---

Fix should not export list item internal variables type
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,15 @@ import * as Components from "@nextui-org/react";
import * as intlDateUtils from "@internationalized/date";
import * as reactAriaI18n from "@react-aria/i18n";
import * as reactHookForm from "react-hook-form";
import {SandpackFiles} from "@codesandbox/sandpack-react/types";

import {BgGridContainer} from "@/components/bg-grid-container";
import {GradientBox, GradientBoxProps} from "@/components/gradient-box";
import {CopyButton} from "@/components/copy-button";

export interface ReactLiveDemoProps {
code: string;
files: string[];
files: SandpackFiles;
noInline?: boolean;
height?: string | number;
isCentered?: boolean;
Expand Down Expand Up @@ -47,7 +48,7 @@ export const ReactLiveDemo: React.FC<ReactLiveDemoProps> = ({
<div className="absolute top-[-28px] right-[-8px]">
<CopyButton
className="opacity-0 group-hover/code-demo:opacity-100 transition-opacity text-zinc-400"
value={files?.[DEFAULT_FILE]}
value={files?.[DEFAULT_FILE] as string}
/>
</div>
)}
Expand Down
7 changes: 5 additions & 2 deletions packages/components/listbox/src/use-listbox-item.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import type {ListboxItemBaseProps} from "./base/listbox-item-base";

import {useMemo, useRef, useCallback, Fragment} from "react";
import {listboxItem} from "@nextui-org/theme";
import {listboxItem, MenuItemVariantProps} from "@nextui-org/theme";
import {
HTMLNextUIProps,
mapPropsVariants,
Expand Down Expand Up @@ -29,7 +29,10 @@ export type UseListboxItemProps<T extends object> = Props<T> &
export function useListboxItem<T extends object>(originalProps: UseListboxItemProps<T>) {
const globalContext = useProviderContext();

const [props, variantProps] = mapPropsVariants(originalProps, listboxItem.variantKeys);
const [props, variantProps] = mapPropsVariants(
originalProps,
listboxItem.variantKeys as (keyof MenuItemVariantProps)[],
);

const {
as,
Expand Down
5 changes: 1 addition & 4 deletions packages/components/menu/src/menu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,7 @@ function Menu<T extends object>(props: Props<T>, ref: ForwardedRef<HTMLUListElem
);
}

export type MenuProps<T extends object = object> = Omit<
Props<T>,
"hasChildItems" | "hasTitleTextChild" | "hasDescriptionTextChild"
> & {ref?: Ref<HTMLElement>};
export type MenuProps<T extends object = object> = Props<T> & {ref?: Ref<HTMLElement>};

// forwardRef doesn't support generic parameters, so cast the result to the correct type
export default forwardRef(Menu) as <T extends object>(props: MenuProps<T>) => ReactElement;
Expand Down
7 changes: 5 additions & 2 deletions packages/components/menu/src/use-menu-item.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import type {MenuItemBaseProps} from "./base/menu-item-base";
import type {Node} from "@react-types/shared";

import {useMemo, useRef, useCallback, Fragment} from "react";
import {menuItem} from "@nextui-org/theme";
import {menuItem, MenuItemVariantProps} from "@nextui-org/theme";
import {
HTMLNextUIProps,
mapPropsVariants,
Expand All @@ -29,7 +29,10 @@ export type UseMenuItemProps<T extends object> = Props<T> &
export function useMenuItem<T extends object>(originalProps: UseMenuItemProps<T>) {
const globalContext = useProviderContext();

const [props, variantProps] = mapPropsVariants(originalProps, menuItem.variantKeys);
const [props, variantProps] = mapPropsVariants(
originalProps,
menuItem.variantKeys as (keyof MenuItemVariantProps)[],
);

const {
as,
Expand Down
5 changes: 4 additions & 1 deletion packages/core/theme/src/components/menu.ts
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,10 @@ export type MenuVariantProps = VariantProps<typeof menu>;
export type MenuSlots = keyof ReturnType<typeof menu>;
export type MenuSectionVariantProps = VariantProps<typeof menuSection>;
export type MenuSectionSlots = keyof ReturnType<typeof menuSection>;
export type MenuItemVariantProps = VariantProps<typeof menuItem>;
export type MenuItemVariantProps = Omit<
VariantProps<typeof menuItem>,
"hasDescriptionTextChild" | "hasTitleTextChild"
>;
export type MenuItemSlots = keyof ReturnType<typeof menuItem>;

export {menu, menuItem, menuSection};