-
-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix(array-x): upgrade sortable related function & fix array-items
- Loading branch information
Showing
11 changed files
with
476 additions
and
218 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,143 @@ | ||
| import { DndContext, DragEndEvent, DragStartEvent } from "@dnd-kit/core"; | ||
| import { | ||
| SortableContext, | ||
| useSortable, | ||
| verticalListSortingStrategy, | ||
| } from "@dnd-kit/sortable"; | ||
| import { ReactFC } from "@formily/reactive-react"; | ||
| import React, { createContext, useContext, useMemo } from "react"; | ||
|
|
||
| export interface ISortableContainerProps { | ||
| list: any[]; | ||
| start?: number; | ||
| accessibility?: { | ||
| container?: Element; | ||
| }; | ||
| onSortStart?: (event: DragStartEvent) => void; | ||
| onSortEnd?: (event: { oldIndex: number; newIndex: number }) => void; | ||
| } | ||
|
|
||
| export function SortableContainer<T extends React.HTMLAttributes<HTMLElement>>( | ||
| Component: ReactFC<T> | ||
| ): ReactFC<ISortableContainerProps & T> { | ||
| return ({ | ||
| list, | ||
| start = 0, | ||
| accessibility, | ||
| onSortStart, | ||
| onSortEnd, | ||
| ...props | ||
| }) => { | ||
| const _onSortEnd = (event: DragEndEvent) => { | ||
| const { active, over } = event; | ||
| const oldIndex = (active.id as number) - 1; | ||
| const newIndex = (over?.id as number) - 1; | ||
| onSortEnd?.({ | ||
| oldIndex, | ||
| newIndex, | ||
| }); | ||
| }; | ||
|
|
||
| return ( | ||
| <DndContext | ||
| accessibility={accessibility} | ||
| onDragStart={onSortStart} | ||
| onDragEnd={_onSortEnd} | ||
| > | ||
| <SortableContext | ||
| items={list.map((_, index) => index + start + 1)} | ||
| strategy={verticalListSortingStrategy} | ||
| > | ||
| <Component {...(props as unknown as T)}>{props.children}</Component> | ||
| </SortableContext> | ||
| </DndContext> | ||
| ); | ||
| }; | ||
| } | ||
|
|
||
| export const useSortableItem = () => { | ||
| return useContext(SortableItemContext); | ||
| }; | ||
|
|
||
| export const SortableItemContext = createContext< | ||
| Partial<ReturnType<typeof useSortable>> | ||
| >({}); | ||
|
|
||
| export interface ISortableElementProps { | ||
| index?: number; | ||
| lockAxis?: "x" | "y"; | ||
| } | ||
|
|
||
| export function SortableElement<T extends React.HTMLAttributes<HTMLElement>>( | ||
| Component: ReactFC<T> | ||
| ): ReactFC<T & ISortableElementProps> { | ||
| return ({ index = 0, lockAxis, ...props }) => { | ||
| const sortable = useSortable({ | ||
| id: index + 1, | ||
| }); | ||
| const { setNodeRef, transform, transition, isDragging } = sortable; | ||
| if (transform) { | ||
| switch (lockAxis) { | ||
| case "x": | ||
| transform.y = 0; | ||
| break; | ||
| case "y": | ||
| transform.x = 0; | ||
| break; | ||
| default: | ||
| break; | ||
| } | ||
| } | ||
|
|
||
| const style = useMemo(() => { | ||
| const itemStyle: React.CSSProperties = { | ||
| position: "relative", | ||
| touchAction: "none", | ||
| zIndex: 1, | ||
| transform: `translate3d(${transform?.x || 0}px, ${ | ||
| transform?.y || 0 | ||
| }px, 0)`, | ||
| transition: `${transform ? "all 200ms ease" : ""}`, | ||
| }; | ||
| const dragStyle: React.CSSProperties = { | ||
| transition, | ||
| opacity: "0.8", | ||
| transform: `translate3d(${transform?.x || 0}px, ${ | ||
| transform?.y || 0 | ||
| }px, 0)`, | ||
| }; | ||
|
|
||
| const computedStyle = isDragging | ||
| ? { | ||
| ...itemStyle, | ||
| ...dragStyle, | ||
| ...props.style, | ||
| } | ||
| : { | ||
| ...itemStyle, | ||
| ...props.style, | ||
| }; | ||
|
|
||
| return computedStyle; | ||
| }, [isDragging, transform, transition, props.style]); | ||
|
|
||
| return ( | ||
| <SortableItemContext.Provider value={sortable}> | ||
| {Component({ | ||
| ...props, | ||
| style, | ||
| ref: setNodeRef, | ||
| } as unknown as T)} | ||
| </SortableItemContext.Provider> | ||
| ); | ||
| }; | ||
| } | ||
|
|
||
| export function SortableHandle<T extends React.HTMLAttributes<HTMLElement>>( | ||
| Component: ReactFC<T> | ||
| ): ReactFC<T> { | ||
| return (props: T) => { | ||
| const { attributes, listeners } = useSortableItem(); | ||
| return <Component {...props} {...attributes} {...listeners} />; | ||
| }; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.