From 0dd5f8b8ff618b241d245cc5a65e3c4f92aad62f Mon Sep 17 00:00:00 2001
From: Kirill <mpak8501@yandex.ru>
Date: Sun, 24 May 2026 19:42:17 +0500
Subject: [PATCH] perf: dynamic import dicebear avatar styles

---
 .../admin-settings/ui/AdminSettingsPage.tsx   |  10 +-
 .../pages/me/ui/sections/AvatarSection.tsx    |  10 +-
 client/src/shared/lib/avatar-styles.ts        | 118 +++++++-----------
 client/src/shared/ui/UserAvatar.tsx           |  32 +++--
 4 files changed, 75 insertions(+), 95 deletions(-)

diff --git a/client/src/pages/admin-settings/ui/AdminSettingsPage.tsx b/client/src/pages/admin-settings/ui/AdminSettingsPage.tsx
index bd805e5..2e59982 100644
--- a/client/src/pages/admin-settings/ui/AdminSettingsPage.tsx
+++ b/client/src/pages/admin-settings/ui/AdminSettingsPage.tsx
@@ -15,7 +15,7 @@ import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
 import { useUnit } from 'effector-react'
 import { useForm } from 'react-hook-form'
 import { apiClient } from '@/shared/api/client'
-import { AVATAR_STYLES, DEFAULT_STYLE_ID, getStyleById } from '@/shared/lib/avatar-styles'
+import { AVATAR_STYLE_LOADERS, DEFAULT_STYLE_ID, loadAvatarStyle } from '@/shared/lib/avatar-styles'
 import { $user, updateProfileFx } from '@/shared/model/auth'
 import type { UpdateProfileParams } from '@/shared/model/auth'
 import { UserAvatar } from '@/shared/ui/UserAvatar'
@@ -165,7 +165,7 @@ export function AdminSettingsPage() {
             <FormControl size="small" sx={{ minWidth: 140 }}>
               <InputLabel>Стиль</InputLabel>
               <Select value={selectedStyle} label="Стиль" onChange={(e) => setSelectedStyle(e.target.value)}>
-                {AVATAR_STYLES.map((s) => (
+                {AVATAR_STYLE_LOADERS.map((s) => (
                   <MenuItem key={s.id} value={s.id}>
                     {s.label}
                   </MenuItem>
@@ -174,10 +174,10 @@ export function AdminSettingsPage() {
             </FormControl>
             <Button
               variant="outlined"
-              onClick={() => {
+              onClick={async () => {
                 const seed = `${String(user.id)}_${Date.now()}`
-                const styleDef = getStyleById(selectedStyle)
-                const avatar = createAvatar(styleDef.style, { seed })
+                const style = await loadAvatarStyle(selectedStyle)
+                const avatar = createAvatar(style, { seed })
                 setPreviewSrc(avatar.toDataUri())
                 setPreviewStyle(selectedStyle)
               }}
diff --git a/client/src/pages/me/ui/sections/AvatarSection.tsx b/client/src/pages/me/ui/sections/AvatarSection.tsx
index 2e4b971..cb891e4 100644
--- a/client/src/pages/me/ui/sections/AvatarSection.tsx
+++ b/client/src/pages/me/ui/sections/AvatarSection.tsx
@@ -9,7 +9,7 @@ import Stack from '@mui/material/Stack'
 import Typography from '@mui/material/Typography'
 import { createAvatar } from '@dicebear/core'
 import { useUnit } from 'effector-react'
-import { AVATAR_STYLES, DEFAULT_STYLE_ID, getStyleById } from '@/shared/lib/avatar-styles'
+import { AVATAR_STYLE_LOADERS, DEFAULT_STYLE_ID, loadAvatarStyle } from '@/shared/lib/avatar-styles'
 import { $user, updateProfileFx } from '@/shared/model/auth'
 import { UserAvatar } from '@/shared/ui/UserAvatar'
 
@@ -72,7 +72,7 @@ export function AvatarSection() {
             label="Стиль"
             onChange={(e) => setSelectedStyle(e.target.value)}
           >
-            {AVATAR_STYLES.map((s) => (
+            {AVATAR_STYLE_LOADERS.map((s) => (
               <MenuItem key={s.id} value={s.id}>
                 {s.label}
               </MenuItem>
@@ -81,10 +81,10 @@ export function AvatarSection() {
         </FormControl>
         <Button
           variant="outlined"
-          onClick={() => {
+          onClick={async () => {
             const seed = `${user.id}_${Date.now()}`
-            const styleDef = getStyleById(selectedStyle)
-            const avatar = createAvatar(styleDef.style, { seed })
+            const style = await loadAvatarStyle(selectedStyle)
+            const avatar = createAvatar(style, { seed })
             setPreviewSrc(avatar.toDataUri())
             setPreviewStyle(selectedStyle)
           }}
diff --git a/client/src/shared/lib/avatar-styles.ts b/client/src/shared/lib/avatar-styles.ts
index ddd0290..8bc48c3 100644
--- a/client/src/shared/lib/avatar-styles.ts
+++ b/client/src/shared/lib/avatar-styles.ts
@@ -1,88 +1,54 @@
-import { create as adventurerCreate, meta as adventurerMeta, schema as adventurerSchema } from '@dicebear/adventurer'
-import { create as avataaarsCreate, meta as avataaarsMeta, schema as avataaarsSchema } from '@dicebear/avataaars'
-import { create as bigEarsCreate, meta as bigEarsMeta, schema as bigEarsSchema } from '@dicebear/big-ears'
-import { create as bigSmileCreate, meta as bigSmileMeta, schema as bigSmileSchema } from '@dicebear/big-smile'
-import { create as botttsCreate, meta as botttsMeta, schema as botttsSchema } from '@dicebear/bottts'
-import { create as croodlesCreate, meta as croodlesMeta, schema as croodlesSchema } from '@dicebear/croodles'
-import { create as funEmojiCreate, meta as funEmojiMeta, schema as funEmojiSchema } from '@dicebear/fun-emoji'
-import { create as identiconCreate, meta as identiconMeta, schema as identiconSchema } from '@dicebear/identicon'
-import { create as initialsCreate, meta as initialsMeta, schema as initialsSchema } from '@dicebear/initials'
-import { create as loreleiCreate, meta as loreleiMeta, schema as loreleiSchema } from '@dicebear/lorelei'
-import { create as micahCreate, meta as micahMeta, schema as micahSchema } from '@dicebear/micah'
-import { create as notionistsCreate, meta as notionistsMeta, schema as notionistsSchema } from '@dicebear/notionists'
-import { create as pixelArtCreate, meta as pixelArtMeta, schema as pixelArtSchema } from '@dicebear/pixel-art'
-import { create as ringsCreate, meta as ringsMeta, schema as ringsSchema } from '@dicebear/rings'
-import { create as shapesCreate, meta as shapesMeta, schema as shapesSchema } from '@dicebear/shapes'
-import { create as thumbsCreate, meta as thumbsMeta, schema as thumbsSchema } from '@dicebear/thumbs'
 import type { Style } from '@dicebear/core'
 
 type StyleDef = {
   id: string
   label: string
-  style: Style<any>
+  loader: () => Promise<{ create: any; meta: any; schema: any }>
 }
 
-export const AVATAR_STYLES: StyleDef[] = [
-  { id: 'bottts', label: 'Роботы', style: { create: botttsCreate, meta: botttsMeta, schema: botttsSchema } },
-  {
-    id: 'identicon',
-    label: 'Узоры',
-    style: { create: identiconCreate, meta: identiconMeta, schema: identiconSchema },
-  },
-  {
-    id: 'avataaars',
-    label: 'Персонажи',
-    style: { create: avataaarsCreate, meta: avataaarsMeta, schema: avataaarsSchema },
-  },
-  {
-    id: 'notionists',
-    label: 'Notion',
-    style: { create: notionistsCreate, meta: notionistsMeta, schema: notionistsSchema },
-  },
-  { id: 'thumbs', label: 'Thumbs', style: { create: thumbsCreate, meta: thumbsMeta, schema: thumbsSchema } },
-  { id: 'lorelei', label: 'Lorelei', style: { create: loreleiCreate, meta: loreleiMeta, schema: loreleiSchema } },
-  { id: 'micah', label: 'Micah', style: { create: micahCreate, meta: micahMeta, schema: micahSchema } },
-  {
-    id: 'pixel-art',
-    label: 'Пиксели',
-    style: { create: pixelArtCreate, meta: pixelArtMeta, schema: pixelArtSchema },
-  },
-  { id: 'rings', label: 'Кольца', style: { create: ringsCreate, meta: ringsMeta, schema: ringsSchema } },
-  { id: 'shapes', label: 'Фигуры', style: { create: shapesCreate, meta: shapesMeta, schema: shapesSchema } },
-  {
-    id: 'initials',
-    label: 'Инициалы',
-    style: { create: initialsCreate, meta: initialsMeta, schema: initialsSchema },
-  },
-  {
-    id: 'adventurer',
-    label: 'Adventurer',
-    style: { create: adventurerCreate, meta: adventurerMeta, schema: adventurerSchema },
-  },
-  {
-    id: 'big-ears',
-    label: 'Big Ears',
-    style: { create: bigEarsCreate, meta: bigEarsMeta, schema: bigEarsSchema },
-  },
-  {
-    id: 'big-smile',
-    label: 'Big Smile',
-    style: { create: bigSmileCreate, meta: bigSmileMeta, schema: bigSmileSchema },
-  },
-  {
-    id: 'croodles',
-    label: 'Croodles',
-    style: { create: croodlesCreate, meta: croodlesMeta, schema: croodlesSchema },
-  },
-  {
-    id: 'fun-emoji',
-    label: 'Fun Emoji',
-    style: { create: funEmojiCreate, meta: funEmojiMeta, schema: funEmojiSchema },
-  },
+export const AVATAR_STYLE_LOADERS: StyleDef[] = [
+  { id: 'bottts', label: 'Роботы', loader: () => import('@dicebear/bottts') },
+  { id: 'identicon', label: 'Узоры', loader: () => import('@dicebear/identicon') },
+  { id: 'avataaars', label: 'Персонажи', loader: () => import('@dicebear/avataaars') },
+  { id: 'notionists', label: 'Notion', loader: () => import('@dicebear/notionists') },
+  { id: 'thumbs', label: 'Thumbs', loader: () => import('@dicebear/thumbs') },
+  { id: 'lorelei', label: 'Lorelei', loader: () => import('@dicebear/lorelei') },
+  { id: 'micah', label: 'Micah', loader: () => import('@dicebear/micah') },
+  { id: 'pixel-art', label: 'Пиксели', loader: () => import('@dicebear/pixel-art') },
+  { id: 'rings', label: 'Кольца', loader: () => import('@dicebear/rings') },
+  { id: 'shapes', label: 'Фигуры', loader: () => import('@dicebear/shapes') },
+  { id: 'initials', label: 'Инициалы', loader: () => import('@dicebear/initials') },
+  { id: 'adventurer', label: 'Adventurer', loader: () => import('@dicebear/adventurer') },
+  { id: 'big-ears', label: 'Big Ears', loader: () => import('@dicebear/big-ears') },
+  { id: 'big-smile', label: 'Big Smile', loader: () => import('@dicebear/big-smile') },
+  { id: 'croodles', label: 'Croodles', loader: () => import('@dicebear/croodles') },
+  { id: 'fun-emoji', label: 'Fun Emoji', loader: () => import('@dicebear/fun-emoji') },
 ]
 
 export const DEFAULT_STYLE_ID = 'avataaars'
 
-export function getStyleById(id: string | null | undefined): StyleDef {
-  return AVATAR_STYLES.find((s) => s.id === id) ?? AVATAR_STYLES[0]
+const styleCache = new Map<string, Style<any>>()
+
+export async function loadAvatarStyle(id: string): Promise<Style<any>> {
+  if (styleCache.has(id)) {
+    return styleCache.get(id)!
+  }
+
+  const loader = AVATAR_STYLE_LOADERS.find((s) => s.id === id)
+  if (!loader) {
+    const fallback = AVATAR_STYLE_LOADERS.find((s) => s.id === DEFAULT_STYLE_ID)!
+    const mod = await fallback.loader()
+    const style = { create: mod.create, meta: mod.meta, schema: mod.schema }
+    styleCache.set(DEFAULT_STYLE_ID, style)
+    return style
+  }
+
+  const mod = await loader.loader()
+  const style = { create: mod.create, meta: mod.meta, schema: mod.schema }
+  styleCache.set(id, style)
+  return style
+}
+
+export function getStyleLabel(id: string): string {
+  return AVATAR_STYLE_LOADERS.find((s) => s.id === id)?.label ?? id
 }
diff --git a/client/src/shared/ui/UserAvatar.tsx b/client/src/shared/ui/UserAvatar.tsx
index 7dd1fbe..cda9ef8 100644
--- a/client/src/shared/ui/UserAvatar.tsx
+++ b/client/src/shared/ui/UserAvatar.tsx
@@ -1,8 +1,8 @@
-import { useMemo } from 'react'
+import { useEffect, useRef, useState } from 'react'
 import Avatar from '@mui/material/Avatar'
 import type { SxProps, Theme } from '@mui/material/styles'
 import { createAvatar } from '@dicebear/core'
-import { DEFAULT_STYLE_ID, getStyleById } from '@/shared/lib/avatar-styles'
+import { DEFAULT_STYLE_ID, loadAvatarStyle } from '@/shared/lib/avatar-styles'
 
 type UserAvatarProps = {
   userId: string
@@ -13,17 +13,31 @@ type UserAvatarProps = {
 }
 
 export function UserAvatar({ userId, avatarUrl, avatarStyle, size = 40, sx }: UserAvatarProps) {
-  const generatedSrc = useMemo(() => {
-    const styleDef = getStyleById(avatarStyle || DEFAULT_STYLE_ID)
-    const avatar = createAvatar(styleDef.style, { seed: userId })
-    return avatar.toDataUri()
-  }, [userId, avatarStyle])
+  const [generatedSrc, setGeneratedSrc] = useState<string | null>(null)
+  const styleId = avatarStyle || DEFAULT_STYLE_ID
+  const styleIdRef = useRef(styleId)
 
-  const src = avatarUrl || generatedSrc
+  useEffect(() => {
+    let cancelled = false
+    styleIdRef.current = styleId
+
+    loadAvatarStyle(styleId).then((style) => {
+      if (!cancelled && styleIdRef.current === styleId) {
+        const avatar = createAvatar(style, { seed: userId })
+        setGeneratedSrc(avatar.toDataUri())
+      }
+    })
+
+    return () => {
+      cancelled = true
+    }
+  }, [userId, styleId])
+
+  const src = avatarUrl || generatedSrc || ''
 
   return (
     <Avatar src={src} sx={{ width: size, height: size, bgcolor: 'primary.main', ...sx }}>
-      ?
+      {!src && '?'}
     </Avatar>
   )
 }