diff --git a/package.json b/package.json index af746a7..a10becc 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,6 @@ "@types/chrome": "^0.0.268", "@types/md5": "^2.3.5", "@types/react": "^18.3.2", - "@types/react-beautiful-dnd": "^13.1.8", "@types/react-dom": "^18.3.0", "@types/uuid": "^9.0.8", "@typescript-eslint/eslint-plugin": "^7.9.0", @@ -72,6 +71,7 @@ "@fontsource/roboto": "^5.0.13", "@fortawesome/fontawesome-free": "^6.5.2", "@fortawesome/free-brands-svg-icons": "^6.5.2", + "@hello-pangea/dnd": "^16.6.0", "@mui/icons-material": "^5.15.17", "@mui/lab": "^5.0.0-alpha.170", "@mui/material": "^5.15.17", @@ -104,7 +104,6 @@ "path-browserify": "^1.0.1", "prop-types": "^15.8.1", "react": "^18.3.1", - "react-beautiful-dnd": "^13.1.1", "react-click-n-hold": "^1.0.7", "react-contexify": "^6.0.0", "react-dom": "^18.3.1", diff --git a/src/components/Playlist/SongList/SongListDraggable.tsx b/src/components/Playlist/SongList/SongListDraggable.tsx index 4bff103..87d510e 100644 --- a/src/components/Playlist/SongList/SongListDraggable.tsx +++ b/src/components/Playlist/SongList/SongListDraggable.tsx @@ -4,7 +4,7 @@ import { Droppable, Draggable, DropResult, -} from 'react-beautiful-dnd'; +} from '@hello-pangea/dnd'; import TableBody from '@mui/material/TableBody'; import { styled } from '@mui/material/styles'; import TableRow from '@mui/material/TableRow'; diff --git a/src/components/Playlists/PlaylistsList/PlaylistList.tsx b/src/components/Playlists/PlaylistsList/PlaylistList.tsx index e34f877..c5ed289 100644 --- a/src/components/Playlists/PlaylistsList/PlaylistList.tsx +++ b/src/components/Playlists/PlaylistsList/PlaylistList.tsx @@ -5,7 +5,7 @@ import { Droppable, Draggable, DropResult, -} from 'react-beautiful-dnd'; +} from '@hello-pangea/dnd'; import { useNoxSetting } from '@APM/stores/useApp'; import { AddFavDialog, NewFavDialog } from '@components/dialogs/AddFavDialog'; diff --git a/src/hooks/usePlaylistCRUD.ts b/src/hooks/usePlaylistCRUD.ts index 0d8ebdb..49eae5b 100644 --- a/src/hooks/usePlaylistCRUD.ts +++ b/src/hooks/usePlaylistCRUD.ts @@ -1,7 +1,7 @@ import { useState } from 'react'; import { useConfirm } from 'material-ui-confirm'; import { useSnackbar } from 'notistack'; -import { DropResult } from 'react-beautiful-dnd'; +import { DropResult } from '@hello-pangea/dnd'; import { useNoxSetting } from '@APM/stores/useApp'; import { dummyPlaylist } from '@APM/objects/Playlist'; diff --git a/yarn.lock b/yarn.lock index 455dfaf..cd694ad 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1597,7 +1597,16 @@ __metadata: languageName: node linkType: hard -"@babel/runtime@npm:^7.15.4, @babel/runtime@npm:^7.23.2, @babel/runtime@npm:^7.3.1, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.8.3, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.9.2": +"@babel/runtime@npm:^7.12.1, @babel/runtime@npm:^7.24.1": + version: 7.24.5 + resolution: "@babel/runtime@npm:7.24.5" + dependencies: + regenerator-runtime: "npm:^0.14.0" + checksum: 10c0/05730e43e8ba6550eae9fd4fb5e7d9d3cb91140379425abcb2a1ff9cebad518a280d82c4c4b0f57ada26a863106ac54a748d90c775790c0e2cd0ddd85ccdf346 + languageName: node + linkType: hard + +"@babel/runtime@npm:^7.23.2, @babel/runtime@npm:^7.3.1, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.8.3, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.9.2": version: 7.23.5 resolution: "@babel/runtime@npm:7.23.5" dependencies: @@ -2021,6 +2030,24 @@ __metadata: languageName: node linkType: hard +"@hello-pangea/dnd@npm:^16.6.0": + version: 16.6.0 + resolution: "@hello-pangea/dnd@npm:16.6.0" + dependencies: + "@babel/runtime": "npm:^7.24.1" + css-box-model: "npm:^1.2.1" + memoize-one: "npm:^6.0.0" + raf-schd: "npm:^4.0.3" + react-redux: "npm:^8.1.3" + redux: "npm:^4.2.1" + use-memo-one: "npm:^1.1.3" + peerDependencies: + react: ^16.8.5 || ^17.0.0 || ^18.0.0 + react-dom: ^16.8.5 || ^17.0.0 || ^18.0.0 + checksum: 10c0/ef43ba21f063f6497f399b457452d45be456b1f28405b148d9683d2ca65e5f77e2685a0b7e9998aaca4f8676b1642ba2c277fc78643ea59fd6b9f71a56ffc5e0 + languageName: node + linkType: hard + "@humanwhocodes/config-array@npm:^0.13.0": version: 0.13.0 resolution: "@humanwhocodes/config-array@npm:0.13.0" @@ -2990,7 +3017,7 @@ __metadata: languageName: node linkType: hard -"@types/hoist-non-react-statics@npm:^3.3.0": +"@types/hoist-non-react-statics@npm:^3.3.1": version: 3.3.5 resolution: "@types/hoist-non-react-statics@npm:3.3.5" dependencies: @@ -3125,15 +3152,6 @@ __metadata: languageName: node linkType: hard -"@types/react-beautiful-dnd@npm:^13.1.8": - version: 13.1.8 - resolution: "@types/react-beautiful-dnd@npm:13.1.8" - dependencies: - "@types/react": "npm:*" - checksum: 10c0/ccdd4b2aa9e35cba4e51f3c673c2caa5bb67b6dee562d4b07ac3d3547cd68fd1ee9f21b95d55972087bdd4bdb340e256cccedb20f7129c273f24214f334708aa - languageName: node - linkType: hard - "@types/react-dom@npm:^18.3.0": version: 18.3.0 resolution: "@types/react-dom@npm:18.3.0" @@ -3143,18 +3161,6 @@ __metadata: languageName: node linkType: hard -"@types/react-redux@npm:^7.1.20": - version: 7.1.31 - resolution: "@types/react-redux@npm:7.1.31" - dependencies: - "@types/hoist-non-react-statics": "npm:^3.3.0" - "@types/react": "npm:*" - hoist-non-react-statics: "npm:^3.3.0" - redux: "npm:^4.0.0" - checksum: 10c0/74853be2e4d2189356b658fd926b5045211863c209d1a0608a40951e68643821eea0e2538911370ee38a974ba0f07222ee8cf1a389056c2c379dae7eb73cb2e3 - languageName: node - linkType: hard - "@types/react-transition-group@npm:^4.4.10": version: 4.4.10 resolution: "@types/react-transition-group@npm:4.4.10" @@ -3238,6 +3244,13 @@ __metadata: languageName: node linkType: hard +"@types/use-sync-external-store@npm:^0.0.3": + version: 0.0.3 + resolution: "@types/use-sync-external-store@npm:0.0.3" + checksum: 10c0/82824c1051ba40a00e3d47964cdf4546a224e95f172e15a9c62aa3f118acee1c7518b627a34f3aa87298a2039f982e8509f92bfcc18bea7c255c189c293ba547 + languageName: node + linkType: hard + "@types/uuid@npm:^9.0.8": version: 9.0.8 resolution: "@types/uuid@npm:9.0.8" @@ -5204,7 +5217,7 @@ __metadata: languageName: node linkType: hard -"css-box-model@npm:^1.2.0": +"css-box-model@npm:^1.2.1": version: 1.2.1 resolution: "css-box-model@npm:1.2.1" dependencies: @@ -8955,13 +8968,20 @@ __metadata: languageName: node linkType: hard -"memoize-one@npm:>=3.1.1 <6, memoize-one@npm:^5.1.1": +"memoize-one@npm:>=3.1.1 <6": version: 5.2.1 resolution: "memoize-one@npm:5.2.1" checksum: 10c0/fd22dbe9a978a2b4f30d6a491fc02fb90792432ad0dab840dc96c1734d2bd7c9cdeb6a26130ec60507eb43230559523615873168bcbe8fafab221c30b11d54c1 languageName: node linkType: hard +"memoize-one@npm:^6.0.0": + version: 6.0.0 + resolution: "memoize-one@npm:6.0.0" + checksum: 10c0/45c88e064fd715166619af72e8cf8a7a17224d6edf61f7a8633d740ed8c8c0558a4373876c9b8ffc5518c2b65a960266adf403cc215cb1e90f7e262b58991f54 + languageName: node + linkType: hard + "memory-fs@npm:^0.2.0": version: 0.2.0 resolution: "memory-fs@npm:0.2.0" @@ -9573,6 +9593,7 @@ __metadata: "@fontsource/roboto": "npm:^5.0.13" "@fortawesome/fontawesome-free": "npm:^6.5.2" "@fortawesome/free-brands-svg-icons": "npm:^6.5.2" + "@hello-pangea/dnd": "npm:^16.6.0" "@mui/icons-material": "npm:^5.15.17" "@mui/lab": "npm:^5.0.0-alpha.170" "@mui/material": "npm:^5.15.17" @@ -9581,7 +9602,6 @@ __metadata: "@types/chrome": "npm:^0.0.268" "@types/md5": "npm:^2.3.5" "@types/react": "npm:^18.3.2" - "@types/react-beautiful-dnd": "npm:^13.1.8" "@types/react-dom": "npm:^18.3.0" "@types/uuid": "npm:^9.0.8" "@typescript-eslint/eslint-plugin": "npm:^7.9.0" @@ -9636,7 +9656,6 @@ __metadata: progress-bar-webpack-plugin: "npm:^2.1.0" prop-types: "npm:^15.8.1" react: "npm:^18.3.1" - react-beautiful-dnd: "npm:^13.1.1" react-click-n-hold: "npm:^1.0.7" react-contexify: "npm:^6.0.0" react-dom: "npm:^18.3.1" @@ -10493,7 +10512,7 @@ __metadata: languageName: node linkType: hard -"raf-schd@npm:^4.0.2": +"raf-schd@npm:^4.0.3": version: 4.0.3 resolution: "raf-schd@npm:4.0.3" checksum: 10c0/ecabf0957c05fad059779bddcd992f1a9d3a35dfea439a6f0935c382fcf4f7f7fa60489e467b4c2db357a3665167d2a379782586b59712bb36c766e02824709b @@ -10641,24 +10660,6 @@ __metadata: languageName: node linkType: hard -"react-beautiful-dnd@npm:^13.1.1": - version: 13.1.1 - resolution: "react-beautiful-dnd@npm:13.1.1" - dependencies: - "@babel/runtime": "npm:^7.9.2" - css-box-model: "npm:^1.2.0" - memoize-one: "npm:^5.1.1" - raf-schd: "npm:^4.0.2" - react-redux: "npm:^7.2.0" - redux: "npm:^4.0.4" - use-memo-one: "npm:^1.1.1" - peerDependencies: - react: ^16.8.5 || ^17.0.0 || ^18.0.0 - react-dom: ^16.8.5 || ^17.0.0 || ^18.0.0 - checksum: 10c0/5bc04f6dcfededc6e5c90e696cda07816a018eada52f7438ded839f03786e3f319aa8a0bc7b14b86fb26a12c0e5ba53e8c5a4bf3832a8f827dd70f1410675525 - languageName: node - linkType: hard - "react-click-n-hold@npm:^1.0.7": version: 1.0.7 resolution: "react-click-n-hold@npm:1.0.7" @@ -10750,10 +10751,10 @@ __metadata: languageName: node linkType: hard -"react-is@npm:^17.0.2": - version: 17.0.2 - resolution: "react-is@npm:17.0.2" - checksum: 10c0/2bdb6b93fbb1820b024b496042cce405c57e2f85e777c9aabd55f9b26d145408f9f74f5934676ffdc46f3dcff656d78413a6e43968e7b3f92eea35b3052e9053 +"react-is@npm:^18.0.0": + version: 18.3.1 + resolution: "react-is@npm:18.3.1" + checksum: 10c0/f2f1e60010c683479e74c63f96b09fb41603527cd131a9959e2aee1e5a8b0caf270b365e5ca77d4a6b18aae659b60a86150bb3979073528877029b35aecd2072 languageName: node linkType: hard @@ -10807,24 +10808,35 @@ __metadata: languageName: node linkType: hard -"react-redux@npm:^7.2.0": - version: 7.2.9 - resolution: "react-redux@npm:7.2.9" +"react-redux@npm:^8.1.3": + version: 8.1.3 + resolution: "react-redux@npm:8.1.3" dependencies: - "@babel/runtime": "npm:^7.15.4" - "@types/react-redux": "npm:^7.1.20" + "@babel/runtime": "npm:^7.12.1" + "@types/hoist-non-react-statics": "npm:^3.3.1" + "@types/use-sync-external-store": "npm:^0.0.3" hoist-non-react-statics: "npm:^3.3.2" - loose-envify: "npm:^1.4.0" - prop-types: "npm:^15.7.2" - react-is: "npm:^17.0.2" - peerDependencies: - react: ^16.8.3 || ^17 || ^18 + react-is: "npm:^18.0.0" + use-sync-external-store: "npm:^1.0.0" + peerDependencies: + "@types/react": ^16.8 || ^17.0 || ^18.0 + "@types/react-dom": ^16.8 || ^17.0 || ^18.0 + react: ^16.8 || ^17.0 || ^18.0 + react-dom: ^16.8 || ^17.0 || ^18.0 + react-native: ">=0.59" + redux: ^4 || ^5.0.0-beta.0 peerDependenciesMeta: + "@types/react": + optional: true + "@types/react-dom": + optional: true react-dom: optional: true react-native: optional: true - checksum: 10c0/904fac7f493942585ed7ebbd693b4f6b5c09c292366b4550e887ba1a2e83a92c55f0ddc35161d4ba87e3fadb6c681a59003f58df6335e5d2ddd72b06a557851d + redux: + optional: true + checksum: 10c0/64c8be2765568dc66a3c442a41dd0ed74fe048d5ceb7a4fe72e5bac3d3687996a7115f57b5156af7406521087065a0e60f9194318c8ca99c55e9ce48558980ce languageName: node linkType: hard @@ -10997,7 +11009,7 @@ __metadata: languageName: node linkType: hard -"redux@npm:^4.0.0, redux@npm:^4.0.4": +"redux@npm:^4.2.1": version: 4.2.1 resolution: "redux@npm:4.2.1" dependencies: @@ -12732,7 +12744,7 @@ __metadata: languageName: node linkType: hard -"use-memo-one@npm:^1.1.1": +"use-memo-one@npm:^1.1.3": version: 1.1.3 resolution: "use-memo-one@npm:1.1.3" peerDependencies: @@ -12750,6 +12762,15 @@ __metadata: languageName: node linkType: hard +"use-sync-external-store@npm:^1.0.0": + version: 1.2.2 + resolution: "use-sync-external-store@npm:1.2.2" + peerDependencies: + react: ^16.8.0 || ^17.0.0 || ^18.0.0 + checksum: 10c0/23b1597c10adf15b26ade9e8c318d8cc0abc9ec0ab5fc7ca7338da92e89c2536abd150a5891bf076836c352fdfa104fc7231fb48f806fd9960e0cbe03601abaf + languageName: node + linkType: hard + "util-deprecate@npm:^1.0.1, util-deprecate@npm:^1.0.2, util-deprecate@npm:~1.0.1": version: 1.0.2 resolution: "util-deprecate@npm:1.0.2"