Skip to content
Merged
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
18 changes: 18 additions & 0 deletions apps/react-17-tests-v9/src/issues.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,19 @@ import type {
type AppSplitButtonSlots = {
root: NonNullable<Slot<'div'>>;
menuButton: NonNullable<Slot<AppMenuButtonSlot>>;
// @ts-expect-error - Slot type mismatch
menu: NonNullable<Slot<ContextualMenuSlotType>>;
};
type ValidAppSplitButtonSlots = {
root: NonNullable<Slot<'div'>>;
menuButton: NonNullable<Slot<AppMenuButtonProps>>;
menu: NonNullable<
Slot<
Pick<JSX.IntrinsicElements['div'], 'children'> &
(typeof AppContextualMenu extends React.ComponentType<infer Props> ? Props : {})
>
>;
};
type AppSplitButtonProps = ComponentProps<Partial<AppSplitButtonSlots>> &
Omit<SplitButtonProps, 'root' | 'menuButton' | 'primaryActionButton'>;

Expand All @@ -61,6 +72,7 @@ import type {
);

const props = { menuButton: {}, menu: {} } as AppSplitButtonProps;
const propsOk = { menuButton: {}, menu: {} } as ValidAppSplitButtonSlots;

const defaultMenuProps = useGetMenuProps();

Expand All @@ -73,6 +85,12 @@ import type {
};

slot.always(props.menuButton, {
defaultProps: menuButtonDefaultProps,
// @ts-expect-error - Slot type mismatch
elementType: AppSplitButtonMenuButton,
});

slot.always(propsOk.menuButton, {
defaultProps: menuButtonDefaultProps,
elementType: AppSplitButtonMenuButton,
});
Expand Down
18 changes: 18 additions & 0 deletions apps/react-18-tests-v9/src/issues.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,17 @@ import type {
menuButton: NonNullable<Slot<AppMenuButtonSlot>>;
menu: NonNullable<Slot<ContextualMenuSlotType>>;
};

type ValidAppSplitButtonSlots = {
root: NonNullable<Slot<'div'>>;
menuButton: NonNullable<Slot<AppMenuButtonProps>>;
menu: NonNullable<
Slot<
Pick<JSX.IntrinsicElements['div'], 'children'> &
(typeof AppContextualMenu extends React.ComponentType<infer Props> ? Props : {})
>
>;
};
type AppSplitButtonProps = ComponentProps<Partial<AppSplitButtonSlots>> &
Omit<SplitButtonProps, 'root' | 'menuButton' | 'primaryActionButton'>;

Expand All @@ -61,6 +72,7 @@ import type {
);

const props = { menuButton: {}, menu: {} } as AppSplitButtonProps;
const propsOk = { menuButton: {}, menu: {} } as ValidAppSplitButtonSlots;

const defaultMenuProps = useGetMenuProps();

Expand All @@ -72,11 +84,17 @@ import type {
...defaultMenuProps,
};

// @ts-expect-error - Type 'string' is not assignable to type '((instance: HTMLButtonElement | null) => void) | RefObject<HTMLButtonElement> | null | undefined'. caused by React.RefAttribute and Slot ref mismatch
slot.always(props.menuButton, {
defaultProps: menuButtonDefaultProps,
elementType: AppSplitButtonMenuButton,
});

slot.always(propsOk.menuButton, {
defaultProps: menuButtonDefaultProps,
elementType: AppSplitButtonMenuButton,
});

slot.always(props.menu, {
defaultProps: appContextualMenuProps,
elementType: AppContextualMenu,
Expand Down
2 changes: 1 addition & 1 deletion apps/react-18-tests-v9/tsconfig.react-18.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"isolatedModules": true,
"importHelpers": true,
"jsx": "react",
"noUnusedLocals": true,
"noUnusedLocals": false,
"preserveConstEnums": true,
"skipLibCheck": true,
"typeRoots": ["./node_modules/@types"],
Expand Down
Loading