Skip to content

Fix delete button on sprite tiles #4376

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

Merged
paulkaplan merged 3 commits into from
Jan 17, 2019
Merged

Fix delete button on sprite tiles #4376

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dfc13e2
Fix ordering to allow close button to be clicked.
paulkaplan Jan 17, 2019
8485a47
Add an integration test for using the X button to delete a sprite
paulkaplan Jan 17, 2019
cc81cc7
Fix snapshot tests
paulkaplan Jan 17, 2019
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
14 changes: 7 additions & 7 deletions src/components/sprite-selector-item/sprite-selector-item.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,6 @@ const SpriteSelectorItem = props => (
disable={props.dragging}
id={`${props.name}-${contextMenuId}`}
>
{(props.selected && props.onDeleteButtonClick) ? (
<CloseButton
className={styles.deleteButton}
size={CloseButton.SIZE_SMALL}
onClick={props.onDeleteButtonClick}
/>
) : null }
{typeof props.number === 'undefined' ? null : (
<div className={styles.number}>{props.number}</div>
)}
Expand All @@ -53,6 +46,13 @@ const SpriteSelectorItem = props => (
<div className={styles.spriteDetails}>{props.details}</div>
) : null}
</div>
{(props.selected && props.onDeleteButtonClick) ? (
<CloseButton
className={styles.deleteButton}
size={CloseButton.SIZE_SMALL}
onClick={props.onDeleteButtonClick}
/>
) : null }
{props.onDuplicateButtonClick || props.onDeleteButtonClick || props.onExportButtonClick ? (
<ContextMenu id={`${props.name}-${contextMenuId++}`}>
{props.onDuplicateButtonClick ? (
Expand Down
11 changes: 11 additions & 0 deletions test/integration/sprites.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,17 @@ describe('Working with sprites', () => {
await expect(logs).toEqual([]);
});

test('Deleting by x button on sprite tile', async () => {
await loadUri(uri);
await clickXpath('//button[@title="Try It"]');
await new Promise(resolve => setTimeout(resolve, 1000)); // Wait for scroll animation
await clickXpath('//*[@aria-label="Close"]'); // Only visible close button is on the sprite
// Confirm that the stage has been switched to
await findByText('Stage selected: no motion blocks');
const logs = await getLogs();
await expect(logs).toEqual([]);
});

test('Adding a sprite by uploading a png', async () => {
await loadUri(uri);
await clickXpath('//button[@title="Try It"]');
Expand Down
48 changes: 24 additions & 24 deletions test/unit/components/__snapshots__/sprite-selector-item.test.jsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,6 @@ exports[`SpriteSelectorItemComponent matches snapshot when given a number and de
onTouchEnd={[Function]}
onTouchStart={[Function]}
>
<div
aria-label="Close"
className=""
onClick={[Function]}
role="button"
tabIndex="0"
>
<img
className=""
src="test-file-stub"
/>
</div>
<div
className={undefined}
>
Expand Down Expand Up @@ -57,6 +45,18 @@ exports[`SpriteSelectorItemComponent matches snapshot when given a number and de
480 x 360
</div>
</div>
<div
aria-label="Close"
className=""
onClick={[Function]}
role="button"
tabIndex="0"
>
<img
className=""
src="test-file-stub"
/>
</div>
<nav
className="react-contextmenu"
onContextMenu={[Function]}
Expand Down Expand Up @@ -103,18 +103,6 @@ exports[`SpriteSelectorItemComponent matches snapshot when selected 1`] = `
onTouchEnd={[Function]}
onTouchStart={[Function]}
>
<div
aria-label="Close"
className=""
onClick={[Function]}
role="button"
tabIndex="0"
>
<img
className=""
src="test-file-stub"
/>
</div>
<div
className={undefined}
>
Expand All @@ -137,6 +125,18 @@ exports[`SpriteSelectorItemComponent matches snapshot when selected 1`] = `
Pony sprite
</div>
</div>
<div
aria-label="Close"
className=""
onClick={[Function]}
role="button"
tabIndex="0"
>
<img
className=""
src="test-file-stub"
/>
</div>
<nav
className="react-contextmenu"
onContextMenu={[Function]}
Expand Down