feat: rework bookmarks widget (#6666)
This commit is contained in:
1 parent
19760e5722
commit
e97fe7861d
17 files changed
+1091
-713
No files matched your search
@@ -16,7 +16,7 @@ export interface CommonWidgetInputProps<TKey extends WidgetOptionType> {
|
||||
boardId?: string;
|
||||
}
|
||||
|
||||
type UseWidgetInputTranslationReturnType = (key: "label" | "description" | "placeholder") => string;
|
||||
type UseWidgetInputTranslationReturnType = (key: "label" | "description" | "placeholder" | "remove") => string;
|
||||
|
||||
/**
|
||||
* Short description why as and unknown convertions are used below:
|
||||
|
||||
@@ -96,6 +96,28 @@ export const WidgetSortedItemListInput = <TItem, TOptionValue extends UniqueIden
|
||||
updateItems((currentValues) => [...currentValues, options.uniqueIdentifier(item) as TOptionValue]);
|
||||
};
|
||||
|
||||
const migrateItems = useCallback(
|
||||
(items: TItem[], optionsPatch: Record<string, unknown>) => {
|
||||
const migratedEntries = items.map((item) => [options.uniqueIdentifier(item) as TOptionValue, item] as const);
|
||||
setTempMap((previous) => {
|
||||
const next = new Map(previous);
|
||||
for (const [value, item] of migratedEntries) next.set(value, item);
|
||||
return next;
|
||||
});
|
||||
form.setFieldValue("options", (currentOptions) => {
|
||||
const currentItems = Array.isArray(currentOptions[property])
|
||||
? (currentOptions[property] as TOptionValue[])
|
||||
: options.defaultValue;
|
||||
const nextItems = [...currentItems];
|
||||
for (const [value] of migratedEntries) {
|
||||
if (!nextItems.includes(value)) nextItems.push(value);
|
||||
}
|
||||
return { ...currentOptions, ...optionsPatch, [property]: nextItems };
|
||||
});
|
||||
},
|
||||
[form, options, property],
|
||||
);
|
||||
|
||||
const removeItem = useCallback(
|
||||
(value: TOptionValue) => {
|
||||
updateItems((currentValues) => currentValues.filter((candidate) => candidate !== value));
|
||||
@@ -112,7 +134,13 @@ export const WidgetSortedItemListInput = <TItem, TOptionValue extends UniqueIden
|
||||
return (
|
||||
<Fieldset legend={t("label")}>
|
||||
<Stack>
|
||||
<options.addButton addItem={addItem} removeItem={removeItem} values={values} />
|
||||
<options.addButton
|
||||
addItem={addItem}
|
||||
migrateItems={migrateItems}
|
||||
removeItem={removeItem}
|
||||
values={values}
|
||||
initialOptions={initialOptions}
|
||||
/>
|
||||
|
||||
<DndContext
|
||||
sensors={sensors}
|
||||
@@ -153,6 +181,7 @@ export const WidgetSortedItemListInput = <TItem, TOptionValue extends UniqueIden
|
||||
index={index}
|
||||
item={item}
|
||||
removeItem={() => removeItem(value)}
|
||||
removeLabel={t("remove")}
|
||||
options={options}
|
||||
/>
|
||||
);
|
||||
@@ -177,6 +206,7 @@ interface ItemProps<TItem, TOptionValue extends UniqueIdentifier> {
|
||||
item: TItem;
|
||||
index: number;
|
||||
removeItem: () => void;
|
||||
removeLabel: string;
|
||||
options: CommonWidgetInputProps<"sortableItemList">["options"];
|
||||
}
|
||||
|
||||
@@ -185,6 +215,7 @@ const Item = <TItem, TOptionValue extends UniqueIdentifier>({
|
||||
index,
|
||||
item,
|
||||
removeItem,
|
||||
removeLabel,
|
||||
options,
|
||||
}: ItemProps<TItem, TOptionValue>) => {
|
||||
const { attributes, isDragging, listeners, setNodeRef, setActivatorNodeRef, transform, transition } = useSortable({
|
||||
@@ -220,6 +251,7 @@ const Item = <TItem, TOptionValue extends UniqueIdentifier>({
|
||||
key={index}
|
||||
item={item}
|
||||
removeItem={removeItem}
|
||||
removeLabel={removeLabel}
|
||||
rootAttributes={attributes}
|
||||
handle={
|
||||
<ActionIcon
|
||||
|
||||
Reference in new issue
Block a user