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.

Sign up for GitHub

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

Crearting 'View Trash' option in Musicblocks #4191

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Crearting 'View Trash' option in Musicblocks #4191

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c392fae
Creating View Trash option
subhas-pramanik-09 Dec 27, 2024
47d7edb
creating view trash option
subhas-pramanik-09 Dec 30, 2024
8ffce6c
creating view trash option
subhas-pramanik-09 Dec 31, 2024
9d125e7
Creating view trash list and more restore options
subhas-pramanik-09 Dec 31, 2024
b1f1453
Creating view trash list and more restore options
subhas-pramanik-09 Dec 31, 2024
8c0b5a3
Creating view trash and more restore options
subhas-pramanik-09 Jan 1, 2025
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
9 changes: 9 additions & 0 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -780,6 +780,15 @@
>
<a style="color: transparent;">space&nbsp;&nbsp;&nbsp;</a>
</li>
<li>
<a
id="trashContainer"
>
<i class="material-icons md-48">visibility</i>
</a>
<div id="trashList"></div>
</li>

<li>
<a
id="restoreIcon"
Expand Down
171 changes: 171 additions & 0 deletions js/activity.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3433,6 +3433,177 @@ class Activity {
this.refreshCanvas();
};

this._restoreTrashById = (blockId) => {
const blockIndex = this.blocks.trashStacks.indexOf(blockId);
if (blockIndex === -1) return; // Block not found in trash

this.blocks.trashStacks.splice(blockIndex, 1); // Remove from trash

for (const name in this.palettes.dict) {
this.palettes.dict[name].hideMenu(true);
}

this.blocks.activeBlock = null;
this.refreshCanvas();

subhas-pramanik-09 marked this conversation as resolved.
Show resolved Hide resolved
const dx = 0;
const dy = -this.cellSize * 3; // Reposition

// Restore drag group
this.blocks.findDragGroup(blockId);
for (let b = 0; b < this.blocks.dragGroup.length; b++) {
const blk = this.blocks.dragGroup[b];
this.blocks.blockList[blk].trash = false;
this.blocks.moveBlockRelative(blk, dx, dy);
this.blocks.blockList[blk].show();
}

this.blocks.raiseStackToTop(blockId);
const restoredBlock = this.blocks.blockList[blockId];

if (restoredBlock.name === 'start' || restoredBlock.name === 'drum') {
const turtle = restoredBlock.value;
this.turtles.turtleList[turtle].inTrash = false;
this.turtles.turtleList[turtle].container.visible = true;
} else if (restoredBlock.name === 'action') {
const actionArg = this.blocks.blockList[restoredBlock.connections[1]];
if (actionArg !== null) {
let label;
const oldName = actionArg.value;
restoredBlock.trash = true;
const uniqueName = this.blocks.findUniqueActionName(oldName);
restoredBlock.trash = false;

if (uniqueName !== actionArg) {
actionArg.value = uniqueName;
label = uniqueName.length > 8 ? uniqueName.substr(0, 7) + '...' : uniqueName;
actionArg.text.text = label;

if (actionArg.label !== null) {
actionArg.label.value = uniqueName;
}
actionArg.container.updateCache();
for (let b = 0; b < this.blocks.dragGroup.length; b++) {
const me = this.blocks.blockList[this.blocks.dragGroup[b]];
if (
["nameddo", "nameddoArg", "namedcalc", "namedcalcArg"].includes(
me.name
) &&
me.privateData === oldName
) {
me.privateData = uniqueName;
me.value = uniqueName;
label = uniqueName.length > 8 ? uniqueName.substr(0, 7) + '...' : uniqueName;
me.text.text = label;
me.overrideName = label;
me.regenerateArtwork();
me.container.updateCache();
}
}
}
}
}

this.refreshCanvas();
};

// Add event listener for trash icon click
document.getElementById('trashContainer').addEventListener('click', () => {
this._renderTrashView();
});

// function to hide trashView from canvas
function handleClickOutsideTrashView(trashView) {
let firstClick = true;
document.addEventListener('click', (event) => {
if (firstClick) {
firstClick = false;
return;
}
if (!trashView.contains(event.target) && event.target !== trashView) {
trashView.style.display = 'none';
}
});
}

this._renderTrashView = () => {
const trashList = document.getElementById('trashList');
const trashView = document.createElement('div');
trashView.id = 'trashView';
trashView.classList.add('trash-view');

trashView.style.position = 'relative';
trashView.style.backgroundColor = 'rgba(255, 255, 255, 1)';
trashView.style.maxWidth = '396px';
trashView.style.maxHeight = '200px';
trashView.style.overflowY = 'auto';
trashView.style.fontSize = '16px';
trashView.style.color = 'black';
trashView.style.border = '2px solid #87cefa';
trashView.style.listStyleType = 'none';
trashView.style.margin = '10px';
trashView.style.padding = '10px';
trashView.style.textAlign = 'left';
trashView.innerHTML = '';

// Iterate over trash stack and render each item
this.blocks.trashStacks.forEach((blockId) => {
const block = this.blocks.blockList[blockId];
// Create container for each block
const listItem = document.createElement('div');
listItem.classList.add('trash-item');
listItem.style.padding = '2px 12px';
listItem.style.margin = '1px 0';
listItem.style.borderRadius = '4px';
listItem.style.transition = 'background-color 0.3s';

const svgData = block.artwork;
const encodedData = 'data:image/svg+xml;utf8,' + encodeURIComponent(svgData);

const img = document.createElement('img');
img.src = encodedData;
img.alt = 'Block Icon';
img.style.width = '30px';
img.style.height = '30px';
img.style.marginRight = '10px';
img.style.verticalAlign = 'middle';

const textNode = document.createTextNode(block.name);

// Append image and name to the list item
listItem.appendChild(img);
listItem.appendChild(textNode);
listItem.dataset.blockId = blockId;

listItem.addEventListener('mouseover', () => {
listItem.style.backgroundColor = '#d9d9d9';
});
listItem.addEventListener('mouseout', () => {
listItem.style.backgroundColor = '';
});
// Restore item on click
listItem.addEventListener('click', () => {
this._restoreTrashById(blockId);
activity.textMsg(
_("Item restored from the trash"),
3000
);
trashView.style.display = 'none';
});
handleClickOutsideTrashView(trashView);

trashView.appendChild(listItem);
});

// Append or replace the view in the container
const existingView = document.getElementById('trashView');
if (existingView) {
trashList.replaceChild(trashView, existingView);
} else {
trashList.appendChild(trashView);
}
};

this.handleKeyDown = (event) => {

if (event.ctrlKey && event.key === "z") {
Expand Down
Loading