Mirrors/webamp
1
0
Fork 0
mirror of https://github.com/captbaritone/webamp.git synced 2026-07-28 20:40:39 +00:00
Code Issues Projects Releases Wiki Activity

Change nesting to preserve playlist styling

Browse source 
The `#playlist-window` div is a flex container so it needs to be the direct parent.
This commit is contained in:
Jordan Eldredge 2019-05-02 16:52:43 -07:00
parent 0f97529a39
commit 8a4a594dd0
2 changed files with 26 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

32
js/components/PlaylistWindow/__snapshots__/index.test.js.snap
View file

@ -2,32 +2,32 @@
exports[`PlaylistWindow renders to snapshot 1`] = `
<div
className="window draggable"
id="playlist-window"
onDragEnter={[Function]}
onDragOver={[Function]}
onDragStart={[Function]}
onDrop={[Function]}
onWheel={[Function]}
onFocus={[Function]}
style={
Object {
"backgroundColor": "#000000",
"color": "#00FF00",
"fontFamily": "Arial, Arial, sans-serif",
"height": "116px",
"width": "275px",
"height": "100%",
"width": "100%",
}
}
tabIndex={-1}
>
<div
onFocus={[Function]}
className="window draggable"
id="playlist-window"
onDragEnter={[Function]}
onDragOver={[Function]}
onDragStart={[Function]}
onDrop={[Function]}
onWheel={[Function]}
style={
Object {
"height": "100%",
"width": "100%",
"backgroundColor": "#000000",
"color": "#00FF00",
"fontFamily": "Arial, Arial, sans-serif",
"height": "116px",
"width": "275px",
}
}
tabIndex={-1}
>
<div
className="playlist-top draggable"

20
js/components/PlaylistWindow/index.tsx
View file

@ -103,14 +103,14 @@ class PlaylistWindow extends React.Component<Props> {
const showSpacers = playlistSize[0] % 2 === 0;
return (
<DropTarget
id="playlist-window"
className={classes}
style={style}
handleDrop={this._handleDrop}
onWheel={this.props.scrollVolume}
>
<FocusTarget windowId={WINDOWS.PLAYLIST}>
<FocusTarget windowId={WINDOWS.PLAYLIST}>
<DropTarget
id="playlist-window"
className={classes}
style={style}
handleDrop={this._handleDrop}
onWheel={this.props.scrollVolume}
>
<div className="playlist-top draggable" onDoubleClick={toggleShade}>
<div className="playlist-top-left draggable" />
{showSpacers && (
@ -170,8 +170,8 @@ class PlaylistWindow extends React.Component<Props> {
<PlaylistResizeTarget />
</div>
</div>
</FocusTarget>
</DropTarget>
</DropTarget>
</FocusTarget>
);
}
}