From cf692140a90a8d8faf7b4dd9295d35241e708853 Mon Sep 17 00:00:00 2001 From: Deluan Date: Fri, 19 Jun 2020 16:30:57 -0400 Subject: [PATCH] Revert "Upgrade to React Player 4.15.1" This reverts commit de693b8206ca53e066a4d8d055893beb3674b348. (+1 squashed commit) Squashed commits: [cc80cb8] Revert "Simplify handle" This reverts commit 83b8fa14c6ed0351689eee3c596ed8903c437b07. --- ui/package-lock.json | 129 +++++++++++++---------------------- ui/package.json | 2 +- ui/src/audioplayer/Player.js | 10 ++- 3 files changed, 52 insertions(+), 89 deletions(-) diff --git a/ui/package-lock.json b/ui/package-lock.json index ebf08a3ee..4af0a6cf9 100644 --- a/ui/package-lock.json +++ b/ui/package-lock.json @@ -2499,6 +2499,14 @@ "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-6.2.0.tgz", "integrity": "sha512-7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA==" }, + "add-dom-event-listener": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/add-dom-event-listener/-/add-dom-event-listener-1.1.0.tgz", + "integrity": "sha512-WCxx1ixHT0GQU9hb0KI/mhgRQhnU+U3GvwY6ZvVjYq8rsihIGoaIOUbY0yMPBxLH5MDtr0kz3fisWGNcbWW7Jw==", + "requires": { + "object-assign": "4.x" + } + }, "address": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/address/-/address-1.1.2.tgz", @@ -4941,9 +4949,9 @@ "dev": true }, "dom-align": { - "version": "1.12.0", - "resolved": "https://registry.npmjs.org/dom-align/-/dom-align-1.12.0.tgz", - "integrity": "sha512-YkoezQuhp3SLFGdOlr5xkqZ640iXrnHAwVYcDg8ZKRUtO7mSzSC2BA5V0VuyAwPSJA4CLIc6EDDJh4bEsD2+zA==" + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/dom-align/-/dom-align-1.11.1.tgz", + "integrity": "sha512-hN42DmUgtweBx0iBjDLO4WtKOMcK8yBmPx/fgdsgQadLuzPu/8co3oLdK5yMmeM/vnUd3yDyV6qV8/NzxBexQg==" }, "dom-converter": { "version": "0.2.0", @@ -13128,68 +13136,38 @@ } }, "rc-align": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/rc-align/-/rc-align-4.0.1.tgz", - "integrity": "sha512-RQ5Fhxl0LW+zsxbY8dxAcpXdaHkHH2jzRSSpvBTS7G9LMK3T+WRcn4ovjg/eqAESM6TdTx0hfqWF2S1pO75jxQ==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/rc-align/-/rc-align-3.0.0.tgz", + "integrity": "sha512-/T/4LOlKJLFe8EwsORuc3pFWOJ8caUpj2vtKIHWea4PhakoleM7KDQsx0n1WDQENIeSfrP9P1FowVxAdvhjsvw==", "requires": { - "@babel/runtime": "^7.10.1", "classnames": "2.x", "dom-align": "^1.7.0", - "rc-util": "^5.0.1", + "rc-util": "^4.12.0", "resize-observer-polyfill": "^1.5.1" - }, - "dependencies": { - "@babel/runtime": { - "version": "7.10.2", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.10.2.tgz", - "integrity": "sha512-6sF3uQw2ivImfVIl62RZ7MXhO2tap69WeWK57vAaimT6AZbE4FbqjdEJIN1UqoD6wI6B+1n9UiagafH1sxjOtg==", - "requires": { - "regenerator-runtime": "^0.13.4" - } - }, - "regenerator-runtime": { - "version": "0.13.5", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz", - "integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==" - } } }, "rc-animate": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/rc-animate/-/rc-animate-3.1.0.tgz", - "integrity": "sha512-8FsM+3B1H+0AyTyGggY6JyVldHTs1CyYT8CfTmG/nGHHXlecvSLeICJhcKgRLjUiQlctNnRtB1rwz79cvBVmrw==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/rc-animate/-/rc-animate-3.0.0.tgz", + "integrity": "sha512-+ANeyCei4lWSJHWTcocywdYAy6lpRdBva/7Fs3nBBiAngW/W+Gmx+gQEcsmcgQBqziWUYnR91Bk12ltR3GBHPA==", "requires": { "@ant-design/css-animation": "^1.7.2", "classnames": "^2.2.6", "raf": "^3.4.0", - "rc-util": "^5.0.1" + "rc-util": "^4.15.3" } }, "rc-slider": { - "version": "9.3.1", - "resolved": "https://registry.npmjs.org/rc-slider/-/rc-slider-9.3.1.tgz", - "integrity": "sha512-c52PWPyrfJWh28K6dixAm0906L3/4MUIxqrNQA4TLnC/Z+cBNycWJUZoJerpwSOE1HdM3XDwixCsmtFc/7aWlQ==", + "version": "9.2.4", + "resolved": "https://registry.npmjs.org/rc-slider/-/rc-slider-9.2.4.tgz", + "integrity": "sha512-wSr7vz+WtzzGqsGU2rTQ4mmLz9fkuIDMPYMYm8ygYFvxQ2Rh4uRhOWHYI0R8krNK5k1bGycckYxmQqUIvLAh3w==", "requires": { - "@babel/runtime": "^7.10.1", + "babel-runtime": "6.x", "classnames": "^2.2.5", "rc-tooltip": "^4.0.0", - "rc-util": "^5.0.0", - "shallowequal": "^1.1.0" - }, - "dependencies": { - "@babel/runtime": { - "version": "7.10.2", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.10.2.tgz", - "integrity": "sha512-6sF3uQw2ivImfVIl62RZ7MXhO2tap69WeWK57vAaimT6AZbE4FbqjdEJIN1UqoD6wI6B+1n9UiagafH1sxjOtg==", - "requires": { - "regenerator-runtime": "^0.13.4" - } - }, - "regenerator-runtime": { - "version": "0.13.5", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz", - "integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==" - } + "rc-util": "^4.0.4", + "shallowequal": "^1.1.0", + "warning": "^4.0.3" } }, "rc-switch": { @@ -13203,47 +13181,34 @@ } }, "rc-tooltip": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/rc-tooltip/-/rc-tooltip-4.2.1.tgz", - "integrity": "sha512-oykuaGsHg7RFvPUaxUpxo7ScEqtH61C66x4JUmjlFlSS8gSx2L8JFtfwM1D68SLBxUqGqJObtxj4TED75gQTiA==", + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/rc-tooltip/-/rc-tooltip-4.0.3.tgz", + "integrity": "sha512-HNyBh9/fPdds0DXja8JQX0XTIHmZapB3lLzbdn74aNSxXG1KUkt+GK4X1aOTRY5X9mqm4uUKdeFrn7j273H8gw==", "requires": { - "rc-trigger": "^4.2.1" + "rc-trigger": "^4.0.0" } }, "rc-trigger": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/rc-trigger/-/rc-trigger-4.3.0.tgz", - "integrity": "sha512-jnGNzosXmDdivMBjPCYe/AfOXTpJU2/xQ9XukgoXDQEoZq/9lcI1r7eUIfq70WlWpLxlUEqQktiV3hwyy6Nw9g==", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/rc-trigger/-/rc-trigger-4.2.1.tgz", + "integrity": "sha512-iFQ+/FbzDvYDrTS3jXbdk4MgVNU0R/A8UAAQkspXSr4Q6jTcR6p+lfNhSS0JJgJuXtfjoInC0+8jXK8HUShQ0g==", "requires": { - "@babel/runtime": "^7.10.1", "classnames": "^2.2.6", "raf": "^3.4.1", - "rc-align": "^4.0.0", + "rc-align": "^3.0.0", "rc-animate": "^3.0.0", - "rc-util": "^5.0.1" - }, - "dependencies": { - "@babel/runtime": { - "version": "7.10.2", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.10.2.tgz", - "integrity": "sha512-6sF3uQw2ivImfVIl62RZ7MXhO2tap69WeWK57vAaimT6AZbE4FbqjdEJIN1UqoD6wI6B+1n9UiagafH1sxjOtg==", - "requires": { - "regenerator-runtime": "^0.13.4" - } - }, - "regenerator-runtime": { - "version": "0.13.5", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz", - "integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==" - } + "rc-util": "^4.20.0" } }, "rc-util": { - "version": "5.0.4", - "resolved": "https://registry.npmjs.org/rc-util/-/rc-util-5.0.4.tgz", - "integrity": "sha512-cd19RCrE0DJH6UcJ9+V3eaXA/5sNWyVKOKkWl8ZM2OqgNzVb8fv0obf/TkuvSN43tmTsgqY8k7OqpFYHhmef8g==", + "version": "4.20.5", + "resolved": "https://registry.npmjs.org/rc-util/-/rc-util-4.20.5.tgz", + "integrity": "sha512-f67s4Dt1quBYhrVPq5QMKmK3eS2hN1NNIAyhaiG0HmvqiGYAXMQ7SP2AlGqv750vnzhJs38JklbkWT1/wjhFPg==", "requires": { + "add-dom-event-listener": "^1.1.0", + "prop-types": "^15.5.10", "react-is": "^16.12.0", + "react-lifecycles-compat": "^3.0.4", "shallowequal": "^1.1.0" } }, @@ -13568,9 +13533,9 @@ } }, "react-draggable": { - "version": "4.4.3", - "resolved": "https://registry.npmjs.org/react-draggable/-/react-draggable-4.4.3.tgz", - "integrity": "sha512-jV4TE59MBuWm7gb6Ns3Q1mxX8Azffb7oTtDtBgFkxRvhDp38YAARmRplrj0+XGkhOJB5XziArX+4HUUABtyZ0w==", + "version": "4.4.2", + "resolved": "https://registry.npmjs.org/react-draggable/-/react-draggable-4.4.2.tgz", + "integrity": "sha512-zLQs4R4bnBCGnCVTZiD8hPsHtkiJxgMpGDlRESM+EHQo8ysXhKJ2GKdJ8UxxLJdRVceX1j19jy+hQS2wHislPQ==", "requires": { "classnames": "^2.2.5", "prop-types": "^15.6.0" @@ -13643,9 +13608,9 @@ "integrity": "sha512-rPCkf/mWBtKc97aLL9/txD8DZdemK0vkA3JMLShjlJB3Pj3s+lpf1KaBzMfQrAmhMQB0n1cU/SUGgKKBCe837Q==" }, "react-jinke-music-player": { - "version": "4.15.1", - "resolved": "https://registry.npmjs.org/react-jinke-music-player/-/react-jinke-music-player-4.15.1.tgz", - "integrity": "sha512-UJNTYnNo04ylrRlGvOFkTmQDqIuU7wtnKTDFt+NEQoMSEBDzuV8JAOncnLAXetALQtSU4xKSm67dKUElJlbRCQ==", + "version": "4.13.1", + "resolved": "https://registry.npmjs.org/react-jinke-music-player/-/react-jinke-music-player-4.13.1.tgz", + "integrity": "sha512-WTX0a5mSo2gAHSfAYWj97QazoIw6F9y3r7jaC5cSjwJAGW3Ud8Qh7rIrAKf/17bjo8RjwyFiJFhG9R2CiXdihQ==", "requires": { "classnames": "^2.2.6", "downloadjs": "^1.4.7", diff --git a/ui/package.json b/ui/package.json index 0c71e908f..e76c3dd8f 100644 --- a/ui/package.json +++ b/ui/package.json @@ -16,7 +16,7 @@ "react-admin": "^3.6.0", "react-dom": "^16.13.1", "react-drag-listview": "^0.1.6", - "react-jinke-music-player": "^4.15.1", + "react-jinke-music-player": "^4.13.1", "react-measure": "^2.3.0", "react-redux": "^7.2.0", "react-scripts": "^3.4.1" diff --git a/ui/src/audioplayer/Player.js b/ui/src/audioplayer/Player.js index e6eac9f43..b648edd85 100644 --- a/ui/src/audioplayer/Player.js +++ b/ui/src/audioplayer/Player.js @@ -1,4 +1,4 @@ -import React, { useState } from 'react' +import React from 'react' import { useDispatch, useSelector } from 'react-redux' import { Link } from 'react-router-dom' import { useAuthState, useDataProvider, useTranslate } from 'react-admin' @@ -17,7 +17,6 @@ const useStyle = makeStyles((theme) => ({ })) const Player = () => { - const [playIndex, setPlayIndex] = useState(0) const classes = useStyle() const translate = useTranslate() const currentTheme = useSelector((state) => state.theme) @@ -29,7 +28,7 @@ const Player = () => { to={`/album/${audioInfo.albumId}/show`} className={classes.audioTitle} > - {audioInfo.name ? `${audioInfo.name} - ${audioInfo.singer}` : ''} + {`${audioInfo.name} - ${audioInfo.singer}`} ) @@ -37,8 +36,7 @@ const Player = () => { theme: playerTheme, bounds: 'body', mode: 'full', - autoPlay: true, - playIndex, + autoPlay: false, preload: true, autoPlayInitLoadPlayList: true, loadAudioErrorPlayNext: false, @@ -85,6 +83,7 @@ const Player = () => { const addQueueToOptions = (queue) => { return { ...defaultOptions, + autoPlay: false, clearPriorAudioLists: queue.clear, audioLists: queue.queue.map((item) => item), } @@ -142,7 +141,6 @@ const Player = () => { onAudioPlay={OnAudioPlay} onAudioPause={onAudioPause} onAudioEnded={onAudioEnded} - onPlayIndexChange={setPlayIndex} /> ) }