From 77705e4d795e14afd798a1e040ff8cb141b65b7e Mon Sep 17 00:00:00 2001 From: Deluan Date: Sun, 31 Jan 2021 18:23:32 -0500 Subject: [PATCH] Upgrade react-jinke-music-player to 4.21.2 Enable fadeIn/fadeOut when pausing/playing and logarithmic volume (fix #668) --- ui/package-lock.json | 65 +++++++++++++++++++++++++----------- ui/package.json | 2 +- ui/src/audioplayer/Player.js | 1 + 3 files changed, 47 insertions(+), 21 deletions(-) diff --git a/ui/package-lock.json b/ui/package-lock.json index 6f8aa7e31..df6c32620 100644 --- a/ui/package-lock.json +++ b/ui/package-lock.json @@ -13023,9 +13023,9 @@ } }, "rc-motion": { - "version": "2.3.4", - "resolved": "https://registry.npmjs.org/rc-motion/-/rc-motion-2.3.4.tgz", - "integrity": "sha512-La9JjfM58Vrwds1wM9OAkRTWsGeVqNnftI1YFti2WtaA2Ernk2vjbVio9hGbzhF0EvGrEvrzS96Mx/6lGT6Z0w==", + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/rc-motion/-/rc-motion-2.4.1.tgz", + "integrity": "sha512-TWLvymfMu8SngPx5MDH8dQ0D2RYbluNTfam4hY/dNNx9RQ3WtGuZ/GXHi2ymLMzH+UNd6EEFYkOuR5JTTtm8Xg==", "requires": { "@babel/runtime": "^7.11.1", "classnames": "^2.2.1", @@ -13048,9 +13048,9 @@ } }, "rc-slider": { - "version": "9.6.1", - "resolved": "https://registry.npmjs.org/rc-slider/-/rc-slider-9.6.1.tgz", - "integrity": "sha512-pUXMLf5Ha3yS45ApwMYksmTNEH3M3+v8+bvm81eCUqO7sGQYHRPOsvmM78VRJyIlHiXp7H/QRcqvoPVrCyvSUw==", + "version": "9.7.1", + "resolved": "https://registry.npmjs.org/rc-slider/-/rc-slider-9.7.1.tgz", + "integrity": "sha512-r9r0dpFA3PEvxBhIfVi1lVzxuSogWxeY+tGvi2AqMM1rPgaOXQ7WbtT+9kVFkJ9K8TntA/vYPgiCCKfN29KTkw==", "requires": { "@babel/runtime": "^7.10.1", "classnames": "^2.2.5", @@ -13100,9 +13100,9 @@ } }, "rc-tooltip": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/rc-tooltip/-/rc-tooltip-5.0.1.tgz", - "integrity": "sha512-3AnxhUS0j74xAV3khrKw8o6rg+Ima3nw09DJBezMPnX3ImQUAnayWsPSlN1mEnihjA43rcFkGM1emiKE+CXyMQ==", + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/rc-tooltip/-/rc-tooltip-5.0.2.tgz", + "integrity": "sha512-A4FejSG56PzYtSNUU4H1pVzfhtkV/+qMT2clK0CsSj+9mbc4USEtpWeX6A/jjVL+goBOMKj8qlH7BCZmZWh/Nw==", "requires": { "@babel/runtime": "^7.11.2", "rc-trigger": "^5.0.0" @@ -13124,9 +13124,9 @@ } }, "rc-trigger": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/rc-trigger/-/rc-trigger-5.1.1.tgz", - "integrity": "sha512-/xQq/iT6M4wE1Az2UG0/sqk2jlZ7+YP7Gqa2FbwqFi3UPNOCFvsCCRZ6lRRWGuaNjfUpinvjK8X22P9t6Pr6hA==", + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/rc-trigger/-/rc-trigger-5.2.1.tgz", + "integrity": "sha512-XZilSlSDnb0L/R3Ff2xo9C0Fho2aBDoAn8u3coM60XdLqTCo24nsOh1bfAMm0uIB1qVjh5eqeyFqnBPmXi8pJg==", "requires": { "@babel/runtime": "^7.11.2", "classnames": "^2.2.6", @@ -13151,12 +13151,28 @@ } }, "rc-util": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/rc-util/-/rc-util-5.5.0.tgz", - "integrity": "sha512-YJB+zZGvCll/bhxXRVLAekr7lOvTgqMlRIhgINoINfUek7wQvi5sft46NOi3yYUYhocpuW4k8+5okW46sBsZAQ==", + "version": "5.7.0", + "resolved": "https://registry.npmjs.org/rc-util/-/rc-util-5.7.0.tgz", + "integrity": "sha512-0hh5XkJ+vBDeMJsHElqT1ijMx+gC3gpClwQ10h/5hccrrgrMx8VUem183KLlH1YrWCfMMPmDXWWNnwsn+p6URw==", "requires": { + "@babel/runtime": "^7.12.5", "react-is": "^16.12.0", "shallowequal": "^1.1.0" + }, + "dependencies": { + "@babel/runtime": { + "version": "7.12.5", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.5.tgz", + "integrity": "sha512-plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg==", + "requires": { + "regenerator-runtime": "^0.13.4" + } + }, + "regenerator-runtime": { + "version": "0.13.7", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz", + "integrity": "sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==" + } } }, "react": { @@ -13595,21 +13611,30 @@ "integrity": "sha512-rPCkf/mWBtKc97aLL9/txD8DZdemK0vkA3JMLShjlJB3Pj3s+lpf1KaBzMfQrAmhMQB0n1cU/SUGgKKBCe837Q==" }, "react-jinke-music-player": { - "version": "4.19.1", - "resolved": "https://registry.npmjs.org/react-jinke-music-player/-/react-jinke-music-player-4.19.1.tgz", - "integrity": "sha512-3eHiHwpyaUAJyIOuLYNEkjJo9EVIvMfUdj7gg7zeu6kmFcrtkLIScqdBbe/bFMdv1sFg9qXQGvetrjJx9CZPdQ==", + "version": "4.21.2", + "resolved": "https://registry.npmjs.org/react-jinke-music-player/-/react-jinke-music-player-4.21.2.tgz", + "integrity": "sha512-KCH7ru8t9Nt1/lCxIZy4ZXYMql5UGvm2PA8e15IlGlleSTiPVCWdTwWMVqBlQsCysroyfoKUXBFkMytaH7NDkQ==", "requires": { "classnames": "^2.2.6", "downloadjs": "^1.4.7", "is-mobile": "^2.2.2", "prop-types": "^15.7.2", - "rc-slider": "^9.6.1", + "rc-slider": "^9.7.1", "rc-switch": "^3.2.2", - "react-drag-listview": "^0.1.7", + "react-drag-listview": "^0.1.8", "react-draggable": "^4.4.3", "react-icons": "^3.11.0" }, "dependencies": { + "react-drag-listview": { + "version": "0.1.8", + "resolved": "https://registry.npmjs.org/react-drag-listview/-/react-drag-listview-0.1.8.tgz", + "integrity": "sha512-ZJnjFEz89RPZ1DzI8f6LngmtsmJbLry/pMz2tEqABxHA+d8cUFRmVPS1DxZdoz/htc+uri9fCdv4dqIiPz0xIA==", + "requires": { + "babel-runtime": "^6.26.0", + "prop-types": "^15.5.8" + } + }, "react-icons": { "version": "3.11.0", "resolved": "https://registry.npmjs.org/react-icons/-/react-icons-3.11.0.tgz", diff --git a/ui/package.json b/ui/package.json index 9dee6a109..42b9dfe57 100644 --- a/ui/package.json +++ b/ui/package.json @@ -21,7 +21,7 @@ "react-hotkeys-hook": "^3.0.1", "react-icons": "^4.1.0", "react-image-lightbox": "^5.1.1", - "react-jinke-music-player": "^4.19.1", + "react-jinke-music-player": "^4.21.2", "react-measure": "^2.5.2", "react-redux": "^7.2.2", "react-scripts": "^3.4.3", diff --git a/ui/src/audioplayer/Player.js b/ui/src/audioplayer/Player.js index fe0259ba7..d7d1dfd2a 100644 --- a/ui/src/audioplayer/Player.js +++ b/ui/src/audioplayer/Player.js @@ -142,6 +142,7 @@ const Player = () => { top: 300, left: 120, }, + volumeFade: { fadeIn: 200, fadeOut: 200 }, renderAudioTitle: (audioInfo, isMobile) => (