OSSForks/daedalOS
1
0
Fork 0
mirror of https://github.com/DustinBrett/daedalOS.git synced 2025-12-06 00:20:05 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Tweak icon position when empty
Some checks are pending
Tests / tests (push) Waiting to run
Details

Browse Source
This commit is contained in:
Dustin Brett 2025-02-16 20:11:19 -08:00
parent 4c82b829c2
commit ac9b34f4f0
1 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
utils/functions.ts
View File

@ -522,8 +522,8 @@ export const updateIconPositionsIfEmpty = (
const { x, y, height, width } = gridEntry.getBoundingClientRect();
newIconPositions[entryUrl] = calcGridDropPosition(gridElement, {
x: x - width,
y: y + height,
x: x + width / 2,
y: y + height / 2,
});
} else {
const position = index + 1;
@ -632,14 +632,14 @@ export const updateIconPositions = (
): void => {
if (!gridElement || draggedEntries.length === 0) return;
const currentIconPositions = updateIconPositionsIfEmpty(
const updatedIconPositions = updateIconPositionsIfEmpty(
directory,
gridElement,
iconPositions,
sortOrders
);
const gridDropPosition = calcGridDropPosition(gridElement, dragPosition);
const conflictingIcon = Object.entries(currentIconPositions).find(
const conflictingIcon = Object.entries(updatedIconPositions).find(
([, { gridColumnStart, gridRowStart }]) =>
gridColumnStart === gridDropPosition.gridColumnStart &&
gridRowStart === gridDropPosition.gridRowStart
@ -654,7 +654,7 @@ export const updateIconPositions = (
targetFile,
...draggedEntries.filter((entry) => entry !== targetFile),
];
const newIconPositions = Object.fromEntries(
const adjustIconPositions = Object.fromEntries(
adjustDraggedEntries
.map<[string, IconPosition]>((entryFile) => {
const url = join(directory, entryFile);
@ -666,7 +666,7 @@ export const updateIconPositions = (
: calcGridPositionOffset(
url,
targetUrl,
currentIconPositions,
updatedIconPositions,
gridDropPosition,
adjustDraggedEntries,
gridElement
@ -678,23 +678,21 @@ export const updateIconPositions = (
gridColumnStart >= 1 && gridRowStart >= 1
)
);
const newIconPositions = Object.fromEntries(
Object.entries(adjustIconPositions).filter(
([, { gridColumnStart, gridRowStart }]) =>
!Object.values(updatedIconPositions).some(
({
gridColumnStart: currentGridColumnStart,
gridRowStart: currentRowColumnStart,
}) =>
gridColumnStart === currentGridColumnStart &&
gridRowStart === currentRowColumnStart
)
)
);
setIconPositions({
...currentIconPositions,
...Object.fromEntries(
Object.entries(newIconPositions).filter(
([, { gridColumnStart, gridRowStart }]) =>
!Object.values(currentIconPositions).some(
({
gridColumnStart: currentGridColumnStart,
gridRowStart: currentRowColumnStart,
}) =>
gridColumnStart === currentGridColumnStart &&
gridRowStart === currentRowColumnStart
)
)
),
});
setIconPositions({ ...updatedIconPositions, ...newIconPositions });
};
if (conflictingIcon) {
@ -702,7 +700,7 @@ export const updateIconPositions = (
exists(conflictingIconPath).then((pathExists) => {
if (!pathExists) {
delete currentIconPositions[conflictingIconPath];
delete updatedIconPositions[conflictingIconPath];
processIconMove();
}
});