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.

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

Add Table of Contents in Questions edit page #30

Merged
merged 6 commits into from
Aug 24, 2023
Merged
Show file tree
Hide file tree
Changes from 5 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
25 changes: 25 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
- Addresses XXX
- Depends on XXX

## Changes

* Detailed list or prose of changes
* Breaking changes
* Changes to configurations

## This PR doesn't introduce any:

- [ ] temporary files, auto-generated files or secret keys
- [ ] build works
- [ ] eslint issues
- [ ] typescript issues
- [ ] codegen errors
- [ ] `console.log` meant for debugging
- [ ] typos
- [ ] unwanted comments
- [ ] conflict markers

## This PR contains valid:

- [ ] permission checks

4 changes: 4 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@
},
"dependencies": {
"@apollo/client": "^3.7.15",
"@dnd-kit/core": "^6.0.8",
"@dnd-kit/modifiers": "^6.0.1",
"@dnd-kit/sortable": "^7.0.2",
"@dnd-kit/utilities": "^3.2.1",
"@hcaptcha/react-hcaptcha": "^1.8.1",
"@the-deep/deep-ui": "^2.0.3",
"@togglecorp/fujs": "^2.0.0",
Expand Down
4 changes: 2 additions & 2 deletions src/components/Avatar/index.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
height: var(--size);

.image {
border: var(--width-separator-thin) solid var(--color-separator);
border: var(--dui-width-separator-thin) solid var(--dui-color-separator);
border-radius: 50%;
width: 100%;
height: 100%;
Expand All @@ -20,7 +20,7 @@
display: flex;
align-items: center;
justify-content: center;
border: var(--width-separator-thin) solid var(---color-separator);
border: var(--dui-width-separator-thin) solid var(--dui-color-separator);
border-radius: 50%;
width: 100%;
height: 100%;
Expand Down
338 changes: 338 additions & 0 deletions src/components/SortableList/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,338 @@
import React, {
useState,
memo,
useMemo,
useCallback,
} from 'react';
import {
Portal,
ListView,
ListViewProps,
} from '@the-deep/deep-ui';
import {
DragOverlay,
DndContext,
closestCenter,
KeyboardSensor,
PointerSensor,
useSensor,
useSensors,
DragEndEvent,
DragStartEvent,
DraggableSyntheticListeners,
} from '@dnd-kit/core';
import { CSS } from '@dnd-kit/utilities';
import {
restrictToHorizontalAxis,
restrictToVerticalAxis,
} from '@dnd-kit/modifiers';
import {
useSortable,
arrayMove,
SortableContext,
sortableKeyboardCoordinates,
horizontalListSortingStrategy,
verticalListSortingStrategy,
rectSortingStrategy,
} from '@dnd-kit/sortable';
import { listToMap, isDefined } from '@togglecorp/fujs';

export const genericMemo: (<T>(c: T) => T) = memo;

type OptionKey = string | number;
interface GroupCommonProps {
className?: string;
children: React.ReactNode;
}

export type Listeners = DraggableSyntheticListeners;
export type NodeRef = (node: HTMLElement | null) => void;

export interface Attributes {
role: string;
tabIndex: number;
'aria-pressed': boolean | undefined;
'aria-roledescription': string;
'aria-describedby': string;
}

interface SortableItemProps<
D,
P,
K extends OptionKey,
ItemContainerParams,
> {
keySelector: (data: D) => K;
datum: D;
renderer: (props: P & {
listeners?: Listeners;
attributes?: Attributes;
}) => JSX.Element;
rendererParams: P;
itemContainerParams?: ItemContainerParams;
}

// eslint-disable-next-line react-refresh/only-export-components
function SortableItem<
D,
P,
K extends OptionKey,
ItemContainerParams,
>(props: SortableItemProps<D, P, K, ItemContainerParams>) {
const {
keySelector,
renderer: Renderer,
datum,
rendererParams,
itemContainerParams,
} = props;

const {
attributes,
listeners,
setNodeRef,
transform,
transition,
} = useSortable({ id: String(keySelector(datum)) });

const style: React.CSSProperties = useMemo(() => ({
transform: CSS.Transform.toString({
x: transform?.x ?? 0,
y: transform?.y ?? 0,
scaleX: 1,
scaleY: 1,
}),
transition: transition ?? undefined,
}), [transition, transform]);

return (
<div
ref={setNodeRef}
style={style}
// eslint-disable-next-line react/jsx-props-no-spreading
{...itemContainerParams ?? {}}
>
<Renderer
attributes={attributes}
listeners={listeners}
// eslint-disable-next-line react/jsx-props-no-spreading
{...rendererParams}
/>
</div>
);
}

// eslint-disable-next-line react-refresh/only-export-components
const MemoizedSortableItem = genericMemo(SortableItem);

export type Props<
N extends string,
D,
P,
K extends OptionKey,
GP extends GroupCommonProps,
GK extends OptionKey,
ItemContainerParams,
> = Omit<ListViewProps<D, P, K, GP, GK>, 'keySelector' | 'renderer' | 'direction' | 'pending' | 'filtered' | 'errored'> & {
name: N;
keySelector: (val: D) => K;
renderer: (props: P & {
listeners?: Listeners;
attributes?: Attributes;
setNodeRef?: NodeRef;
style?: React.CSSProperties;
}) => JSX.Element;
onChange?: (newList: D[], name: N) => void;
direction: 'vertical' | 'horizontal' | 'rect';
showDragOverlay?: boolean;
itemContainerParams?: (key: K, datum: D, index: number, data: D[]) => ItemContainerParams;
pending?: boolean;
filtered?: boolean;
errored?: boolean;
}

// eslint-disable-next-line react-refresh/only-export-components
function SortableList<
N extends string,
D,
P,
K extends OptionKey,
GP extends GroupCommonProps,
GK extends OptionKey,
ItemContainerParams,
>(props: Props<N, D, P, K, GP, GK, ItemContainerParams>) {
const {
className,
name,
onChange,
data,
keySelector,
rendererParams,
renderer: Renderer,
direction,
showDragOverlay,
itemContainerParams,
pending = false,
filtered = false,
errored = false,
...otherProps
} = props;
const [activeId, setActiveId] = useState<string | undefined>();

const sensors = useSensors(
useSensor(PointerSensor),
useSensor(KeyboardSensor, {
coordinateGetter: sortableKeyboardCoordinates,
}),
);

// NOTE: Sortable context requires list of items
const items = useMemo(() => (
data?.map((d) => String(keySelector(d))) ?? []
), [data, keySelector]);

const handleDragStart = useCallback((event: DragStartEvent) => {
const { active } = event;
setActiveId(active.id.toString());
}, []);

const handleDragEnd = useCallback((event: DragEndEvent) => {
const { active, over } = event;
setActiveId(undefined);

if (active.id && over?.id && active.id !== over?.id && items && onChange) {
const oldIndex = items.indexOf(active.id.toString());
const newIndex = items.indexOf(over.id.toString());

const newItems = arrayMove(items, oldIndex, newIndex);
const dataMap = listToMap(
data ?? [],
(d) => String(keySelector(d)),
(d) => d,
);
const newData = newItems.map((item) => dataMap[item]).filter(isDefined);
onChange(newData, name);
}
}, [keySelector, items, data, onChange, name]);

const DragItem = useMemo(() => {
if (!activeId || !data || !showDragOverlay) {
return null;
}
const activeIndex = data.findIndex(
(d) => String(keySelector(d)) === activeId,
);
if (!activeIndex) {
return null;
}
const params = rendererParams(
keySelector(data[activeIndex]),
data[activeIndex],
activeIndex,
data,
);
if (!params) {
return null;
}
return (
<Renderer
// eslint-disable-next-line react/jsx-props-no-spreading
{...params}
/>
);
}, [
activeId,
Renderer,
keySelector,
rendererParams,
data,
showDragOverlay,
]);

const modifiedRendererParams = useCallback((
_: K,
datum: D,
index: number,
dataFromArgs: D[],
) => {
const params = rendererParams(
keySelector(datum),
datum,
index,
dataFromArgs,
);

const containerParams = itemContainerParams && itemContainerParams(
keySelector(datum),
datum,
index,
dataFromArgs,
);

return ({
rendererParams: params,
itemContainerParams: containerParams,
datum,
keySelector,
renderer: Renderer,
});
}, [keySelector, rendererParams, Renderer, itemContainerParams]);

const sortingStrategy = useMemo(() => {
if (direction === 'rect') {
return rectSortingStrategy;
}
if (direction === 'vertical') {
return verticalListSortingStrategy;
}
return horizontalListSortingStrategy;
}, [direction]);

const modifiers = useMemo(() => {
if (direction === 'rect') {
return undefined;
}
return [
direction === 'horizontal' ? restrictToHorizontalAxis : restrictToVerticalAxis,
];
}, [direction]);

return (
<DndContext
sensors={sensors}
collisionDetection={closestCenter}
onDragStart={handleDragStart}
onDragEnd={handleDragEnd}
modifiers={modifiers}
>
<SortableContext
items={items}
strategy={sortingStrategy}
>
<ListView
// eslint-disable-next-line react/jsx-props-no-spreading
{...otherProps}
className={className}
data={data}
keySelector={keySelector}
renderer={MemoizedSortableItem}
rendererParams={modifiedRendererParams}
pending={pending}
filtered={filtered}
errored={errored}
grouped={false}
/>
</SortableContext>
{showDragOverlay && (
<Portal>
<DragOverlay>
{DragItem}
</DragOverlay>
</Portal>
)}
</DndContext>
);
}

// eslint-disable-next-line react-refresh/only-export-components
export default genericMemo(SortableList);
Loading
Loading