Dockery/Homarr
1
0
Fork 0
mirror of https://github.com/ajnart/homarr.git synced 2025-11-11 16:05:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

🐛 Fix categories and wrapper position issues

Browse Source 
Co-authored-by: Bjorn Lammers <walkxnl@gmail.com>
This commit is contained in:
Manuel Ruwe
2023-01-10 21:21:05 +01:00
parent bbf1255b8b
commit 681944f7c5
2 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/components/Dashboard/Wrappers/Category/useCategoryActions.tsx
View File

@@ -46,13 +46,13 @@ export const useCategoryActions = (configName: string | undefined, category: Cat
...aboveCategories,
category,
// Move categories below down
...belowCategories.map((x) => ({ ...x, position: x.position + 2 })),
...belowCategories.map((x) => ({ ...x, position: x.position + 1 })),
],
wrappers: [
...aboveWrappers,
newWrapper,
// Move wrappers below down
...belowWrappers.map((x) => ({ ...x, position: x.position + 2 })),
...belowWrappers.map((x) => ({ ...x, position: x.position + 1 })),
],
};
},
@@ -127,12 +127,12 @@ export const useCategoryActions = (configName: string | undefined, category: Cat
const currentItem = previous.categories.find((x) => x.id === category.id);
if (!currentItem) return previous;
const upperItem = previous.categories.find((x) => x.position === currentItem.position - 2);
const upperItem = previous.categories.find((x) => x.position === currentItem.position - 1);
if (!upperItem) return previous;
currentItem.position -= 2;
upperItem.position += 2;
currentItem.position -= 1;
upperItem.position += 1;
return {
...previous,
@@ -156,12 +156,12 @@ export const useCategoryActions = (configName: string | undefined, category: Cat
const currentItem = previous.categories.find((x) => x.id === category.id);
if (!currentItem) return previous;
const belowItem = previous.categories.find((x) => x.position === currentItem.position + 2);
const belowItem = previous.categories.find((x) => x.position === currentItem.position + 1);
if (!belowItem) return previous;
currentItem.position += 2;
belowItem.position -= 2;
currentItem.position += 1;
belowItem.position -= 1;
return {
...previous,
@@ -196,6 +196,15 @@ export const useCategoryActions = (configName: string | undefined, category: Cat
x.area = { type: 'wrapper', properties: { id: mainWrapper?.id ?? 'default' } };
});
const widgetsToMove = previous.widgets.filter(
(x) => x.area && x.area.type === 'category' && x.area.properties.id === currentItem.id
);
widgetsToMove.forEach((x) => {
// eslint-disable-next-line no-param-reassign
x.area = { type: 'wrapper', properties: { id: mainWrapper?.id ?? 'default' } };
});
return {
...previous,
apps: previous.apps,