Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[PB-3458]:fix/breadcrumbs types #42

Merged
merged 1 commit into from
Jan 27, 2025
Merged

[PB-3458]:fix/breadcrumbs types #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@internxt/ui",
"version": "0.0.13",
"version": "0.0.14",
"description": "Library of Internxt components",
"repository": {
"type": "git",
Expand Down
14 changes: 7 additions & 7 deletions src/components/breadcrumbs/Breadcrumbs.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ import { forwardRef, FunctionComponent, ReactNode, SVGProps } from 'react';
import { Dispatch } from 'redux';
import Dropdown from '../dropdown/Dropdown';
import BreadcrumbsItem, { BreadcrumbItemData, BreadcrumbsMenuProps } from './BreadcrumbsItem';
import { useDrop } from 'react-dnd';
import { DropTargetMonitor, useDrop } from 'react-dnd';

export interface BreadcrumbsProps<T extends Dispatch> {
export interface BreadcrumbsProps<T extends Dispatch, U> {
items: BreadcrumbItemData[];
rootBreadcrumbItemDataCy?: string;
menu?: (props: BreadcrumbsMenuProps) => JSX.Element;
Expand All @@ -14,18 +14,18 @@ export interface BreadcrumbsProps<T extends Dispatch> {
uuid: string;
}[];
isSomeItemSelected: boolean;
selectedItems: [];
selectedItems: U[];
onItemDropped: (
item: BreadcrumbItemData,
namePath: {
name: string;
uuid: string;
}[],
isSomeItemSelected: boolean,
selectedItems: [],
selectedItems: U[],
dispatch: T,
) => (draggedItem: unknown, monitor: unknown) => Promise<void>;
canItemDrop: (item: BreadcrumbItemData) => (draggedItem: unknown, monitor: unknown) => boolean;
) => (draggedItem: U, monitor: DropTargetMonitor) => Promise<void>;
canItemDrop: (item: BreadcrumbItemData) => (draggedItem: U, monitor: DropTargetMonitor) => boolean;
itemComponent?: FunctionComponent<SVGProps<SVGSVGElement>>;
acceptedTypes: string[];
dispatch: T;
Expand Down Expand Up @@ -74,7 +74,7 @@ export interface BreadcrumbsProps<T extends Dispatch> {
* - Hook for dnd.
*/

const Breadcrumbs = <T extends Dispatch>(props: Readonly<BreadcrumbsProps<T>>): JSX.Element => {
const Breadcrumbs = <T extends Dispatch, U>(props: Readonly<BreadcrumbsProps<T, U>>): JSX.Element => {
const MenuItem = forwardRef<HTMLDivElement, { children: ReactNode }>((props, ref) => {
return (
<div
Expand Down
14 changes: 6 additions & 8 deletions src/components/breadcrumbs/BreadcrumbsItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ export interface BreadcrumbsMenuProps {
* - Hook for dnd.
*/

export interface BreadcrumbsItemProps<T extends Dispatch> {
export interface BreadcrumbsItemProps<T extends Dispatch, U> {
item: BreadcrumbItemData;
totalBreadcrumbsLength: number;
isHiddenInList?: boolean;
Expand All @@ -79,27 +79,25 @@ export interface BreadcrumbsItemProps<T extends Dispatch> {
uuid: string;
}[];
isSomeItemSelected: boolean;
selectedItems: [];
selectedItems: U[];
onItemDropped: (
item: BreadcrumbItemData,
namePath: {
name: string;
uuid: string;
}[],
isSomeItemSelected: boolean,
selectedItems: [],
selectedItems: U[],
dispatch: T,
) => (draggedItem: unknown, monitor: DropTargetMonitor) => Promise<void>;
canItemDrop: (
item: BreadcrumbItemData,
) => (draggedItem: unknown, monitor: DropTargetMonitor<unknown, unknown>) => boolean;
) => (draggedItem: U, monitor: DropTargetMonitor) => Promise<void>;
canItemDrop: (item: BreadcrumbItemData) => (draggedItem: U, monitor: DropTargetMonitor<unknown, unknown>) => boolean;
itemComponent?: FunctionComponent<SVGProps<SVGSVGElement>>;
acceptedTypes: string[];
dispatch: T;
useDrop: typeof useDrop;
}

const BreadcrumbsItem = <T extends Dispatch>(props: BreadcrumbsItemProps<T>): JSX.Element => {
const BreadcrumbsItem = <T extends Dispatch, U>(props: BreadcrumbsItemProps<T, U>): JSX.Element => {
const [{ isOver, canDrop }, drop] = props.useDrop(
() => ({
accept: props.acceptedTypes,
Expand Down
2 changes: 1 addition & 1 deletion src/stories/components/breadcrumbs/breadcrumbs.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ const menuBreadcrumbs = (props: BreadcrumbsMenuProps): JSX.Element => {
);
};

const defaultBreadcrumbsProps: BreadcrumbsProps<Dispatch> = {
const defaultBreadcrumbsProps: BreadcrumbsProps<Dispatch, unknown> = {
items: breadcrumbItems,
namePath: [
{ name: 'Home', uuid: '1' },
Expand Down
Loading