Skip to content

Commit

Permalink
Merge pull request #1717 from u7630748/fix/1675
Browse files Browse the repository at this point in the history 
Bug/1675: Move the remove(X) button and interchange its position with select box
  • Loading branch information
@nukeop
nukeop authored Oct 15, 2024
2 parents 94d809a + 309d644 commit 833a37b
Show file tree
Hide file tree
Showing 10 changed files with 717 additions and 717 deletions.
130 changes: 65 additions & 65 deletions ...ages/app/app/containers/AlbumViewContainer/__snapshots__/AlbumViewContainer.test.tsx.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,32 @@ exports[`Album view container should display an album 1`] = `
<div
class="track_table_header_row"
role="row"
style="grid-template-columns: 4em 3em minmax(8em, 1fr) 6em 6em auto;"
style="grid-template-columns: 7.5em 4em 3em minmax(8em, 1fr) 6em auto;"
>
<div
class="track_table_header_cell"
colspan="1"
role="columnheader"
>
<div
class="selection_header"
>
<div
class="ui fitted checkbox nuclear checkbox"
style="cursor: pointer;"
>
<input
class="hidden"
readonly=""
tabindex="0"
title="Toggle All Rows Selected"
type="checkbox"
value=""
/>
<label />
</div>
</div>
</div>
<div
class="track_table_header_cell"
colspan="1"
Expand Down Expand Up @@ -189,30 +213,6 @@ exports[`Album view container should display an album 1`] = `
Length
</div>
</div>
<div
class="track_table_header_cell"
colspan="1"
role="columnheader"
>
<div
class="selection_header"
>
<div
class="ui fitted checkbox nuclear checkbox"
style="cursor: pointer;"
>
<input
class="hidden"
readonly=""
tabindex="0"
title="Toggle All Rows Selected"
type="checkbox"
value=""
/>
<label />
</div>
</div>
</div>
</div>
</div>
<div
Expand All @@ -235,9 +235,28 @@ exports[`Album view container should display an album 1`] = `
data-rbd-draggable-id="0"
data-testid="track-table-row"
role="row"
style="position: absolute; left: 0px; top: 0px; height: 42px; width: 100%; grid-template-columns: 4em 3em minmax(8em, 1fr) 6em 6em;"
style="position: absolute; left: 0px; top: 0px; height: 42px; width: 100%; grid-template-columns: 7.5em 4em 3em minmax(8em, 1fr) 6em;"
tabindex="0"
>
<div
class="selection_cell"
role="cell"
>
<div
class="ui fitted checkbox nuclear checkbox"
style="cursor: pointer;"
>
<input
class="hidden"
readonly=""
tabindex="-1"
title="Toggle Row Selected"
type="checkbox"
value=""
/>
<label />
</div>
</div>
<div
class="grid_track_table_cell position_cell"
data-testid="position-cell"
Expand Down Expand Up @@ -316,6 +335,16 @@ exports[`Album view container should display an album 1`] = `
>
02:00
</div>
</div>
<div
class="grid_track_table_row"
data-rbd-draggable-context-id="0"
data-rbd-draggable-id="1"
data-testid="track-table-row"
role="row"
style="position: absolute; left: 0px; top: 42px; height: 42px; width: 100%; grid-template-columns: 7.5em 4em 3em minmax(8em, 1fr) 6em;"
tabindex="1"
>
<div
class="selection_cell"
role="cell"
Expand All @@ -335,16 +364,6 @@ exports[`Album view container should display an album 1`] = `
<label />
</div>
</div>
</div>
<div
class="grid_track_table_row"
data-rbd-draggable-context-id="0"
data-rbd-draggable-id="1"
data-testid="track-table-row"
role="row"
style="position: absolute; left: 0px; top: 42px; height: 42px; width: 100%; grid-template-columns: 4em 3em minmax(8em, 1fr) 6em 6em;"
tabindex="1"
>
<div
class="grid_track_table_cell position_cell"
data-testid="position-cell"
Expand Down Expand Up @@ -423,6 +442,16 @@ exports[`Album view container should display an album 1`] = `
>
01:03
</div>
</div>
<div
class="grid_track_table_row"
data-rbd-draggable-context-id="0"
data-rbd-draggable-id="2"
data-testid="track-table-row"
role="row"
style="position: absolute; left: 0px; top: 84px; height: 42px; width: 100%; grid-template-columns: 7.5em 4em 3em minmax(8em, 1fr) 6em;"
tabindex="2"
>
<div
class="selection_cell"
role="cell"
Expand All @@ -442,16 +471,6 @@ exports[`Album view container should display an album 1`] = `
<label />
</div>
</div>
</div>
<div
class="grid_track_table_row"
data-rbd-draggable-context-id="0"
data-rbd-draggable-id="2"
data-testid="track-table-row"
role="row"
style="position: absolute; left: 0px; top: 84px; height: 42px; width: 100%; grid-template-columns: 4em 3em minmax(8em, 1fr) 6em 6em;"
tabindex="2"
>
<div
class="grid_track_table_cell position_cell"
data-testid="position-cell"
Expand Down Expand Up @@ -530,25 +549,6 @@ exports[`Album view container should display an album 1`] = `
>
00:07
</div>
<div
class="selection_cell"
role="cell"
>
<div
class="ui fitted checkbox nuclear checkbox"
style="cursor: pointer;"
>
<input
class="hidden"
readonly=""
tabindex="-1"
title="Toggle Row Selected"
type="checkbox"
value=""
/>
<label />
</div>
</div>
</div>
</div>
</div>
Expand Down
130 changes: 65 additions & 65 deletions ...es/app/app/containers/ArtistViewContainer/__snapshots__/ArtistViewContainer.test.tsx.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,32 @@ exports[`Artist view container should display an artist 1`] = `
<div
class="track_table_header_row"
role="row"
style="grid-template-columns: 3em 3em minmax(8em, 1fr) 1fr 6em auto;"
style="grid-template-columns: 7.5em 3em 3em minmax(8em, 1fr) 1fr auto;"
>
<div
class="track_table_header_cell"
colspan="1"
role="columnheader"
>
<div
class="selection_header"
>
<div
class="ui fitted checkbox nuclear checkbox"
style="cursor: pointer;"
>
<input
class="hidden"
readonly=""
tabindex="0"
title="Toggle All Rows Selected"
type="checkbox"
value=""
/>
<label />
</div>
</div>
</div>
<div
class="track_table_header_cell"
colspan="1"
Expand Down Expand Up @@ -175,30 +199,6 @@ exports[`Artist view container should display an artist 1`] = `
>
Playcount
</div>
<div
class="track_table_header_cell"
colspan="1"
role="columnheader"
>
<div
class="selection_header"
>
<div
class="ui fitted checkbox nuclear checkbox"
style="cursor: pointer;"
>
<input
class="hidden"
readonly=""
tabindex="0"
title="Toggle All Rows Selected"
type="checkbox"
value=""
/>
<label />
</div>
</div>
</div>
</div>
</div>
<div
Expand All @@ -221,9 +221,28 @@ exports[`Artist view container should display an artist 1`] = `
data-rbd-draggable-id="2"
data-testid="track-table-row"
role="row"
style="position: absolute; left: 0px; top: 0px; height: 42px; width: 100%; grid-template-columns: 3em 3em minmax(8em, 1fr) 1fr 6em;"
style="position: absolute; left: 0px; top: 0px; height: 42px; width: 100%; grid-template-columns: 7.5em 3em 3em minmax(8em, 1fr) 1fr;"
tabindex="2"
>
<div
class="selection_cell"
role="cell"
>
<div
class="ui fitted checkbox nuclear checkbox"
style="cursor: pointer;"
>
<input
class="hidden"
readonly=""
tabindex="-1"
title="Toggle Row Selected"
type="checkbox"
value=""
/>
<label />
</div>
</div>
<div
class="grid_track_table_cell thumbnail_cell"
role="cell"
Expand Down Expand Up @@ -286,6 +305,16 @@ exports[`Artist view container should display an artist 1`] = `
>
6,900,237
</div>
</div>
<div
class="grid_track_table_row"
data-rbd-draggable-context-id="0"
data-rbd-draggable-id="1"
data-testid="track-table-row"
role="row"
style="position: absolute; left: 0px; top: 42px; height: 42px; width: 100%; grid-template-columns: 7.5em 3em 3em minmax(8em, 1fr) 1fr;"
tabindex="1"
>
<div
class="selection_cell"
role="cell"
Expand All @@ -305,16 +334,6 @@ exports[`Artist view container should display an artist 1`] = `
<label />
</div>
</div>
</div>
<div
class="grid_track_table_row"
data-rbd-draggable-context-id="0"
data-rbd-draggable-id="1"
data-testid="track-table-row"
role="row"
style="position: absolute; left: 0px; top: 42px; height: 42px; width: 100%; grid-template-columns: 3em 3em minmax(8em, 1fr) 1fr 6em;"
tabindex="1"
>
<div
class="grid_track_table_cell thumbnail_cell"
role="cell"
Expand Down Expand Up @@ -377,6 +396,16 @@ exports[`Artist view container should display an artist 1`] = `
>
6,969
</div>
</div>
<div
class="grid_track_table_row"
data-rbd-draggable-context-id="0"
data-rbd-draggable-id="0"
data-testid="track-table-row"
role="row"
style="position: absolute; left: 0px; top: 84px; height: 42px; width: 100%; grid-template-columns: 7.5em 3em 3em minmax(8em, 1fr) 1fr;"
tabindex="0"
>
<div
class="selection_cell"
role="cell"
Expand All @@ -396,16 +425,6 @@ exports[`Artist view container should display an artist 1`] = `
<label />
</div>
</div>
</div>
<div
class="grid_track_table_row"
data-rbd-draggable-context-id="0"
data-rbd-draggable-id="0"
data-testid="track-table-row"
role="row"
style="position: absolute; left: 0px; top: 84px; height: 42px; width: 100%; grid-template-columns: 3em 3em minmax(8em, 1fr) 1fr 6em;"
tabindex="0"
>
<div
class="grid_track_table_cell thumbnail_cell"
role="cell"
Expand Down Expand Up @@ -468,25 +487,6 @@ exports[`Artist view container should display an artist 1`] = `
>
1
</div>
<div
class="selection_cell"
role="cell"
>
<div
class="ui fitted checkbox nuclear checkbox"
style="cursor: pointer;"
>
<input
class="hidden"
readonly=""
tabindex="-1"
title="Toggle Row Selected"
type="checkbox"
value=""
/>
<label />
</div>
</div>
</div>
</div>
</div>
Expand Down
Loading

0 comments on commit 833a37b

Please sign in to comment.