mirror of
https://github.com/makeplane/plane
synced 2024-06-14 14:31:34 +00:00
feat: Add components required for estimates (#4690)
* Add sortable, radio and typography components * Remove stray css classes * Prevent drag of items from other draggable * Minor cleanup * Update yarn.lock * Remove radio input component as it was build on headless ui v2.0.0 and now we are using v1.7.0 * Fix build errors * Update dependencies in use memo.
This commit is contained in:
parent
77b73dc032
commit
188f8ff83f
@ -14,3 +14,4 @@ export * from "./control-link";
|
|||||||
export * from "./toast";
|
export * from "./toast";
|
||||||
export * from "./drag-handle";
|
export * from "./drag-handle";
|
||||||
export * from "./drop-indicator";
|
export * from "./drop-indicator";
|
||||||
|
export * from "./sortable";
|
||||||
|
62
packages/ui/src/sortable/draggable.tsx
Normal file
62
packages/ui/src/sortable/draggable.tsx
Normal file
@ -0,0 +1,62 @@
|
|||||||
|
import React, { useEffect, useRef, useState } from "react";
|
||||||
|
import { combine } from "@atlaskit/pragmatic-drag-and-drop/combine";
|
||||||
|
import { draggable, dropTargetForElements } from "@atlaskit/pragmatic-drag-and-drop/element/adapter";
|
||||||
|
import { isEqual } from "lodash";
|
||||||
|
import { cn } from "../../helpers";
|
||||||
|
import { attachClosestEdge, extractClosestEdge } from "@atlaskit/pragmatic-drag-and-drop-hitbox/closest-edge";
|
||||||
|
import { DropIndicator } from "../drop-indicator";
|
||||||
|
|
||||||
|
type Props = {
|
||||||
|
children: React.ReactNode;
|
||||||
|
data: any; //@todo make this generic
|
||||||
|
className?: string;
|
||||||
|
};
|
||||||
|
const Draggable = ({ children, data, className }: Props) => {
|
||||||
|
const ref = useRef<HTMLDivElement>(null);
|
||||||
|
const [dragging, setDragging] = useState<boolean>(false); // NEW
|
||||||
|
const [isDraggedOver, setIsDraggedOver] = useState(false);
|
||||||
|
|
||||||
|
const [closestEdge, setClosestEdge] = useState<string | null>(null);
|
||||||
|
useEffect(() => {
|
||||||
|
const el = ref.current;
|
||||||
|
|
||||||
|
if (el) {
|
||||||
|
combine(
|
||||||
|
draggable({
|
||||||
|
element: el,
|
||||||
|
onDragStart: () => setDragging(true), // NEW
|
||||||
|
onDrop: () => setDragging(false), // NEW
|
||||||
|
getInitialData: () => data,
|
||||||
|
}),
|
||||||
|
dropTargetForElements({
|
||||||
|
element: el,
|
||||||
|
onDragEnter: (args) => {
|
||||||
|
setIsDraggedOver(true);
|
||||||
|
setClosestEdge(extractClosestEdge(args.self.data));
|
||||||
|
},
|
||||||
|
onDragLeave: () => setIsDraggedOver(false),
|
||||||
|
onDrop: () => {
|
||||||
|
setIsDraggedOver(false);
|
||||||
|
},
|
||||||
|
canDrop: ({ source }) => !isEqual(source.data, data) && source.data.__uuid__ === data.__uuid__,
|
||||||
|
getData: ({ input, element }) =>
|
||||||
|
attachClosestEdge(data, {
|
||||||
|
input,
|
||||||
|
element,
|
||||||
|
allowedEdges: ["top", "bottom"],
|
||||||
|
}),
|
||||||
|
})
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}, [data]);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div ref={ref} className={cn(dragging && "opacity-25", className)}>
|
||||||
|
{<DropIndicator isVisible={isDraggedOver && closestEdge === "top"} />}
|
||||||
|
{children}
|
||||||
|
{<DropIndicator isVisible={isDraggedOver && closestEdge === "bottom"} />}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
export { Draggable };
|
2
packages/ui/src/sortable/index.ts
Normal file
2
packages/ui/src/sortable/index.ts
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
export * from "./sortable";
|
||||||
|
export * from "./draggable";
|
32
packages/ui/src/sortable/sortable.stories.tsx
Normal file
32
packages/ui/src/sortable/sortable.stories.tsx
Normal file
@ -0,0 +1,32 @@
|
|||||||
|
import type { Meta, StoryObj } from "@storybook/react";
|
||||||
|
import React from "react";
|
||||||
|
import { Draggable } from "./draggable";
|
||||||
|
import { Sortable } from "./sortable";
|
||||||
|
|
||||||
|
const meta: Meta<typeof Sortable> = {
|
||||||
|
title: "Sortable",
|
||||||
|
component: Sortable,
|
||||||
|
};
|
||||||
|
|
||||||
|
export default meta;
|
||||||
|
type Story = StoryObj<typeof Sortable>;
|
||||||
|
|
||||||
|
const data = [
|
||||||
|
{ id: "1", name: "John Doe" },
|
||||||
|
{ id: "2", name: "Jane Doe 2" },
|
||||||
|
{ id: "3", name: "Alice" },
|
||||||
|
{ id: "4", name: "Bob" },
|
||||||
|
{ id: "5", name: "Charlie" },
|
||||||
|
];
|
||||||
|
export const Default: Story = {
|
||||||
|
args: {
|
||||||
|
data,
|
||||||
|
render: (item: any) => (
|
||||||
|
// <Draggable data={item} className="rounded-lg">
|
||||||
|
<div className="border ">{item.name}</div>
|
||||||
|
// </Draggable>
|
||||||
|
),
|
||||||
|
onChange: (data) => console.log(data.map(({ id }) => id)),
|
||||||
|
keyExtractor: (item: any) => item.id,
|
||||||
|
},
|
||||||
|
};
|
79
packages/ui/src/sortable/sortable.tsx
Normal file
79
packages/ui/src/sortable/sortable.tsx
Normal file
@ -0,0 +1,79 @@
|
|||||||
|
import React, { Fragment, useEffect, useMemo } from "react";
|
||||||
|
import { monitorForElements } from "@atlaskit/pragmatic-drag-and-drop/element/adapter";
|
||||||
|
import { Draggable } from "./draggable";
|
||||||
|
|
||||||
|
type Props<T> = {
|
||||||
|
data: T[];
|
||||||
|
render: (item: T, index: number) => React.ReactNode;
|
||||||
|
onChange: (data: T[]) => void;
|
||||||
|
keyExtractor: (item: T, index: number) => string;
|
||||||
|
containerClassName?: string;
|
||||||
|
id: string;
|
||||||
|
};
|
||||||
|
|
||||||
|
const moveItem = <T,>(
|
||||||
|
data: T[],
|
||||||
|
source: T,
|
||||||
|
destination: T & Record<symbol, string>,
|
||||||
|
keyExtractor: (item: T, index: number) => string
|
||||||
|
) => {
|
||||||
|
const sourceIndex = data.indexOf(source);
|
||||||
|
if (sourceIndex === -1) return data;
|
||||||
|
|
||||||
|
const destinationIndex = data.findIndex((item, index) => keyExtractor(item, index) === keyExtractor(destination, 0));
|
||||||
|
|
||||||
|
if (destinationIndex === -1) return data;
|
||||||
|
|
||||||
|
const symbolKey = Reflect.ownKeys(destination).find((key) => key.toString() === "Symbol(closestEdge)");
|
||||||
|
const position = symbolKey ? destination[symbolKey as symbol] : "bottom"; // Add 'as symbol' to cast symbolKey to symbol
|
||||||
|
const newData = [...data];
|
||||||
|
const [movedItem] = newData.splice(sourceIndex, 1);
|
||||||
|
|
||||||
|
let adjustedDestinationIndex = destinationIndex;
|
||||||
|
if (position === "bottom") {
|
||||||
|
adjustedDestinationIndex++;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Prevent moving item out of bounds
|
||||||
|
if (adjustedDestinationIndex > newData.length) {
|
||||||
|
adjustedDestinationIndex = newData.length;
|
||||||
|
}
|
||||||
|
|
||||||
|
newData.splice(adjustedDestinationIndex, 0, movedItem);
|
||||||
|
|
||||||
|
return newData;
|
||||||
|
};
|
||||||
|
|
||||||
|
export const Sortable = <T,>({ data, render, onChange, keyExtractor, containerClassName, id }: Props<T>) => {
|
||||||
|
useEffect(() => {
|
||||||
|
const unsubscribe = monitorForElements({
|
||||||
|
onDrop({ source, location }) {
|
||||||
|
const destination = location?.current?.dropTargets[0];
|
||||||
|
if (!destination) return;
|
||||||
|
onChange(moveItem(data, source.data as T, destination.data as T & { closestEdge: string }, keyExtractor));
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
// Clean up the subscription on unmount
|
||||||
|
return () => {
|
||||||
|
if (unsubscribe) unsubscribe();
|
||||||
|
};
|
||||||
|
}, [data, keyExtractor, onChange]);
|
||||||
|
|
||||||
|
const enhancedData = useMemo(() => {
|
||||||
|
const uuid = id ? id : Math.random().toString(36).substring(7);
|
||||||
|
return data.map((item) => ({ ...item, __uuid__: uuid }));
|
||||||
|
}, [data, id]);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
{enhancedData.map((item, index) => (
|
||||||
|
<Draggable key={keyExtractor(item, index)} data={item} className={containerClassName}>
|
||||||
|
<Fragment>{render(item, index)} </Fragment>
|
||||||
|
</Draggable>
|
||||||
|
))}
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
export default Sortable;
|
1
packages/ui/src/typography/index.tsx
Normal file
1
packages/ui/src/typography/index.tsx
Normal file
@ -0,0 +1 @@
|
|||||||
|
export * from "./sub-heading";
|
15
packages/ui/src/typography/sub-heading.tsx
Normal file
15
packages/ui/src/typography/sub-heading.tsx
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
import React from "react";
|
||||||
|
import { cn } from "../../helpers";
|
||||||
|
|
||||||
|
type Props = {
|
||||||
|
children: React.ReactNode;
|
||||||
|
className?: string;
|
||||||
|
noMargin?: boolean;
|
||||||
|
};
|
||||||
|
const SubHeading = ({ children, className, noMargin }: Props) => (
|
||||||
|
<h3 className={cn("text-xl font-medium text-custom-text-200 block leading-7", !noMargin && "mb-2", className)}>
|
||||||
|
{children}
|
||||||
|
</h3>
|
||||||
|
);
|
||||||
|
|
||||||
|
export { SubHeading };
|
@ -43,8 +43,6 @@ export const AppProvider: FC<IAppProvider> = observer((props) => {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
{/* TODO: Need to handle custom themes for toast */}
|
|
||||||
<Toast theme={resolveGeneralTheme(resolvedTheme)} />
|
|
||||||
<InstanceWrapper>
|
<InstanceWrapper>
|
||||||
<StoreWrapper>
|
<StoreWrapper>
|
||||||
<CrispWrapper user={currentUser}>
|
<CrispWrapper user={currentUser}>
|
||||||
@ -56,6 +54,8 @@ export const AppProvider: FC<IAppProvider> = observer((props) => {
|
|||||||
posthogAPIKey={config?.posthog_api_key || undefined}
|
posthogAPIKey={config?.posthog_api_key || undefined}
|
||||||
posthogHost={config?.posthog_host || undefined}
|
posthogHost={config?.posthog_host || undefined}
|
||||||
>
|
>
|
||||||
|
{/* TODO: Need to handle custom themes for toast */}
|
||||||
|
<Toast theme={resolveGeneralTheme(resolvedTheme)} />
|
||||||
<SWRConfig value={SWR_CONFIG}>{children}</SWRConfig>
|
<SWRConfig value={SWR_CONFIG}>{children}</SWRConfig>
|
||||||
</PostHogProvider>
|
</PostHogProvider>
|
||||||
</CrispWrapper>
|
</CrispWrapper>
|
||||||
|
Loading…
Reference in New Issue
Block a user