diff --git a/package-lock.json b/package-lock.json index 77afe151..9371289c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13626,11 +13626,6 @@ "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==", "dev": true }, - "uuid": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.0.tgz", - "integrity": "sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==" - }, "v8-compile-cache-lib": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz", diff --git a/package.json b/package.json index b96958f7..ffdfb796 100644 --- a/package.json +++ b/package.json @@ -254,8 +254,7 @@ "tailwind-scrollbar-hide": "^1.1.7", "tailwindcss-scoped-groups": "^2.0.0", "use-delayed-state": "^1.2.0", - "use-double-click": "^1.0.5", - "uuid": "^9.0.0" + "use-double-click": "^1.0.5" }, "devEngines": { "node": ">=14.x", diff --git a/src/renderer/components/maps-mangement-components/map-item.component.tsx b/src/renderer/components/maps-mangement-components/map-item.component.tsx index 6a4aaf5e..e7806fb7 100644 --- a/src/renderer/components/maps-mangement-components/map-item.component.tsx +++ b/src/renderer/components/maps-mangement-components/map-item.component.tsx @@ -12,7 +12,6 @@ import { AudioPlayerService } from "renderer/services/audio-player.service"; import { useObservable } from "renderer/hooks/use-observable.hook"; import { map } from "rxjs/operators"; import useDelayedState from "use-delayed-state"; -import { v4 as uuidv4 } from 'uuid'; import equal from "fast-deep-equal/es6"; import { getMapZipUrlFromHash } from "renderer/helpers/maps-utils"; import { BsmBasicSpinner } from "../shared/bsm-basic-spinner/bsm-basic-spinner.component"; @@ -129,7 +128,7 @@ export const MapItem = memo(({hash, title, autor, songAutor, coverUrl, songUrl, } if(diffSets.length > 1){ return diffSets.map(([diffType, diffSet]) => ( - + {diffSet.length} @@ -144,7 +143,7 @@ export const MapItem = memo(({hash, title, autor, songAutor, coverUrl, songUrl, {(diffsPanelHovered || bottomBarHovered) && ( {Array.from(diffs.entries()).map(([charac, diffSet]) => ( -
    +
      {diffSet.map(({type, name, stars}) => (
    1. diff --git a/src/renderer/components/shared/bsm-dropdown-button.component.tsx b/src/renderer/components/shared/bsm-dropdown-button.component.tsx index 8942417b..63b0c750 100644 --- a/src/renderer/components/shared/bsm-dropdown-button.component.tsx +++ b/src/renderer/components/shared/bsm-dropdown-button.component.tsx @@ -3,7 +3,6 @@ import { BsmIconType, BsmIcon } from "../svgs/bsm-icon.component" import { BsmButton } from "./bsm-button.component" import { useTranslation } from "renderer/hooks/use-translation.hook" import { AnimatePresence } from "framer-motion" -import { v4 as uuidv4 } from 'uuid'; import { useClickOutside } from "renderer/hooks/use-click-outside.hook" export interface DropDownItem {text: string, icon?: BsmIconType, onClick?: () => void} @@ -46,7 +45,7 @@ export function BsmDropdownButton({className, items, align, withBar = true, icon setExpanded(!expanded)} className={buttonClassName ?? defaultButtonClassName} icon={icon} active={expanded} onClickOutside={handleClickOutside} withBar={withBar} text={text}/>
      { items?.map((i) => ( -
      i.onClick?.()} className="flex w-full px-3 py-2 hover:backdrop-brightness-150"> +
      i.onClick?.()} className="flex w-full px-3 py-2 hover:backdrop-brightness-150"> {i.icon && } {t(i.text)}
      diff --git a/src/renderer/services/notification.service.ts b/src/renderer/services/notification.service.ts index eb406f31..3da31c79 100644 --- a/src/renderer/services/notification.service.ts +++ b/src/renderer/services/notification.service.ts @@ -1,5 +1,4 @@ import { BehaviorSubject } from "rxjs"; -import { v4 as uuidv4 } from 'uuid'; export class NotificationService{ @@ -17,7 +16,7 @@ export class NotificationService{ } public notify(notification: Notification): Promise{ - const resovableNotification: ResolvableNotification = {id: uuidv4(), notification, resolver: null }; + const resovableNotification: ResolvableNotification = {id: crypto.randomUUID(), notification, resolver: null }; const promise = new Promise(resolve => { resovableNotification.resolver = resolve; setTimeout(() => resolve(NotificationResult.NO_CHOICE), notification.duration || 7000);