fix(ui): align space options and stabilize the icon picker

Upgrade @usememos/ui to 26.11.21 to align SVG and non-SVG space icons. Keep picker placement and height stable across tabs, search results and default action visibility. Move the default action into the header and cover layout stability and keyboard behavior in browser tests.
This commit is contained in:
boojack
2026-11-15 14:45:06 +08:00
parent bbd0d35a25
commit abe2a05c5e
57 changed files with 347 additions and 144 deletions
+1 -1
View File
@@ -29,7 +29,7 @@
"@tanstack/react-query-devtools": "^5.100.9",
"@usememos/canvas": "26.11.3",
"@usememos/editor": "26.11.5",
"@usememos/ui": "26.11.20",
"@usememos/ui": "26.11.21",
"class-variance-authority": "^0.7.1",
"clsx": "^2.1.1",
"copy-to-clipboard": "^4.0.2",
+5 -5
View File
@@ -45,8 +45,8 @@ importers:
specifier: 26.11.5
version: 26.11.5(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
'@usememos/ui':
specifier: 26.11.20
version: 26.11.20(@base-ui/react@1.9.0(@types/react@19.2.14)(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(lucide-react@1.34.0(react@19.2.6))(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
specifier: 26.11.21
version: 26.11.21(@base-ui/react@1.9.0(@types/react@19.2.14)(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(lucide-react@1.34.0(react@19.2.6))(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
class-variance-authority:
specifier: ^0.7.1
version: 0.7.1
@@ -981,8 +981,8 @@ packages:
react-dom:
optional: true
'@usememos/ui@26.11.20':
resolution: {integrity: sha512-jm2Il+Xa1/o381n2JJo/X3nozPunKMXsfWudnYNkqWfKSrOMitJNPcvgL6S8+/3+DM8beKssLdRz17o7CdVNqw==}
'@usememos/ui@26.11.21':
resolution: {integrity: sha512-HFLA+raEM7u3yj4M5SsJ3z1XhVhVj+Yu0pR/MAPO7+3rFKaWoyRgzQSiWTV9+BKN3OHk5YQzdVi/fs8wrgPEeA==}
peerDependencies:
'@base-ui/react': 1.9.0
lucide-react: '>=1.0.0'
@@ -2414,7 +2414,7 @@ snapshots:
react: 19.2.6
react-dom: 19.2.6(react@19.2.6)
'@usememos/ui@26.11.20(@base-ui/react@1.9.0(@types/react@19.2.14)(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(lucide-react@1.34.0(react@19.2.6))(react-dom@19.2.6(react@19.2.6))(react@19.2.6)':
'@usememos/ui@26.11.21(@base-ui/react@1.9.0(@types/react@19.2.14)(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(lucide-react@1.34.0(react@19.2.6))(react-dom@19.2.6(react@19.2.6))(react@19.2.6)':
dependencies:
'@base-ui/react': 1.9.0(@types/react@19.2.14)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
lucide-react: 1.34.0(react@19.2.6)
+85 -78
View File
@@ -1,10 +1,11 @@
import { Button, Combobox, Popover, Toggle, ToggleGroup } from "@usememos/ui";
import { AstroidIcon, type LucideIcon, RotateCcwIcon } from "lucide-react";
import { Button, Combobox, Popover, Tabs } from "@usememos/ui";
import { AstroidIcon, type LucideIcon } from "lucide-react";
import { useRef, useState } from "react";
import CustomIcon from "@/components/CustomIcon";
import type { CustomIconValue } from "@/lib/custom-icons";
import { CUSTOM_SYMBOLS, customIconsEqual } from "@/lib/custom-icons";
import { SPACE_EMOJI } from "@/lib/space-emoji";
import { cn } from "@/lib/utils";
import { useTranslate } from "@/utils/i18n";
import { FULLY_QUALIFIED_EMOJI } from "@/utils/tag-unicode-data";
@@ -95,83 +96,89 @@ function CustomIconPicker({ value, onChange, disabled, label, fallback = Astroid
}
/>
<Popover.Popup align="start" className="w-[306px] max-w-[calc(100vw-2rem)]" aria-label={label} initialFocus={searchRef}>
<ToggleGroup
size="sm"
aria-label={t("space.icon.kind")}
value={[tab]}
onValueChange={([next]: string[]) => next && changeTab(next)}
>
{(["icons", "emoji"] as const).map((name) => (
<Toggle key={name} value={name}>
{t(`space.icon.${name}`)}
</Toggle>
))}
</ToggleGroup>
<div>
{/* The rows are filtered here (labels and the glyph itself, plus a pasted emoji), so the
combobox's own filter is off and it only drives the 2-D highlight and Enter. */}
<Combobox.Root
items={options}
filter={null}
inline
grid
autoHighlight
value={value ? { label: "", icon: value } : null}
isItemEqualToValue={(item: IconOption, current: IconOption) => customIconsEqual(item.icon, current.icon)}
itemToStringLabel={(item: IconOption) => item.label}
onValueChange={(item: IconOption | null) => {
if (item) select(item.icon);
}}
inputValue={query}
onInputValueChange={(next, { reason }) => {
// Picking a cell would write its label into the search; the popup closes instead.
if (reason === "input-change" || reason === "input-clear") setQuery(next);
}}
onOpenChange={(next, { reason }) => {
if (!next && reason === "escape-key") setOpen(false);
}}
>
<Combobox.Input
ref={searchRef}
className="mb-1"
aria-label={t(tab === "icons" ? "space.icon.search-icons" : "space.icon.search-emoji")}
placeholder={t(tab === "icons" ? "space.icon.search-icons" : "space.icon.search-emoji")}
/>
<Combobox.Empty>{t("space.icon.no-results")}</Combobox.Empty>
{/* The list's own padding keeps highlighted cells clear of its scroll edge; the negative
margin lines the cells up with the search box as before. */}
<Combobox.List aria-label={t(`space.icon.${tab === "icons" ? "icons" : "emoji"}`)} className="-mx-1">
{rows.map((row) => (
<Combobox.Row key={`${row[0].icon.value.case}:${row[0].icon.value.value}`}>
{row.map((option) => (
<Combobox.Item
key={`${option.icon.value.case}:${option.icon.value.value}`}
value={option}
aria-label={option.label}
title={option.label}
>
<CustomIcon icon={option.icon} className={tab === "emoji" ? "size-5 text-xl" : undefined} />
</Combobox.Item>
))}
</Combobox.Row>
<Tabs.Root value={tab} onValueChange={changeTab}>
<div className="flex items-center justify-between gap-2">
<Tabs.List aria-label={t("space.icon.kind")} activateOnFocus className="shrink-0">
{(["icons", "emoji"] as const).map((name) => (
<Tabs.Tab key={name} value={name}>
{t(`space.icon.${name}`)}
</Tabs.Tab>
))}
</Combobox.List>
</Combobox.Root>
{tab === "emoji" && <p className="px-1 pt-2 mu-caption text-mu-text-secondary">{t("space.icon.emoji-help")}</p>}
</div>
<div className="mt-2 border-t pt-1.5">
<Button
type="button"
variant="ghost"
size="sm"
className="w-full justify-start"
disabled={!value}
onClick={() => select()}
icon={<RotateCcwIcon aria-hidden />}
>
{t("space.icon.reset")}
</Button>
</div>
</Tabs.List>
<Button
type="button"
variant="ghost"
size="sm"
className={cn("min-w-0", !value && "invisible")}
aria-hidden={!value || undefined}
disabled={!value}
title={t("space.icon.reset")}
onClick={() => select()}
>
{t("space.icon.reset")}
</Button>
</div>
{(["icons", "emoji"] as const).map((name) => (
<Tabs.Panel
key={name}
value={name}
tabIndex={-1}
className="-mx-px flex h-72 max-h-[calc(100dvh-12rem)] min-h-0 flex-col gap-2"
>
{/* The rows are filtered here (labels and the glyph itself, plus a pasted emoji), so the
combobox's own filter is off and it only drives the 2-D highlight and Enter. */}
<Combobox.Root
items={options}
filter={null}
inline
grid
autoHighlight
value={value ? { label: "", icon: value } : null}
isItemEqualToValue={(item: IconOption, current: IconOption) => customIconsEqual(item.icon, current.icon)}
itemToStringLabel={(item: IconOption) => item.label}
onValueChange={(item: IconOption | null) => {
if (item) select(item.icon);
}}
inputValue={query}
onInputValueChange={(next, { reason }) => {
// Picking a cell would write its label into the search; the popup closes instead.
if (reason === "input-change" || reason === "input-clear") setQuery(next);
}}
onOpenChange={(next, { reason }) => {
if (!next && reason === "escape-key") setOpen(false);
}}
>
<Combobox.Input
ref={searchRef}
aria-label={t(tab === "icons" ? "space.icon.search-icons" : "space.icon.search-emoji")}
placeholder={t(tab === "icons" ? "space.icon.search-icons" : "space.icon.search-emoji")}
/>
<div className="-mx-1 min-h-0 flex-1 overflow-hidden">
<Combobox.Empty>{t("space.icon.no-results")}</Combobox.Empty>
{/* The list's own padding keeps highlighted cells clear of its scroll edge; the negative
margin lines the cells up with the search box. */}
<Combobox.List aria-label={t(`space.icon.${tab === "icons" ? "icons" : "emoji"}`)} className="h-full max-h-full">
{rows.map((row) => (
<Combobox.Row key={`${row[0].icon.value.case}:${row[0].icon.value.value}`}>
{row.map((option) => (
<Combobox.Item
key={`${option.icon.value.case}:${option.icon.value.value}`}
value={option}
aria-label={option.label}
title={option.label}
>
<CustomIcon icon={option.icon} className={tab === "emoji" ? "size-5 text-xl" : undefined} />
</Combobox.Item>
))}
</Combobox.Row>
))}
</Combobox.List>
</div>
</Combobox.Root>
<p className={cn("mu-caption text-mu-text-secondary", name === "icons" && "invisible")}>{t("space.icon.emoji-help")}</p>
</Tabs.Panel>
))}
</Tabs.Root>
</Popover.Popup>
</Popover.Root>
);
+2 -10
View File
@@ -1,6 +1,5 @@
import { Select } from "@usememos/ui";
import SpaceMark from "@/components/SpaceMark";
import { cn } from "@/lib/utils";
import type { Space_Icon } from "@/types/proto/api/space_service_pb";
interface Props {
@@ -11,15 +10,8 @@ interface Props {
}
const SpaceSelectItem = ({ value, label, icon, className }: Props) => (
<Select.Item
value={value}
title={label}
className={cn("[&>div:first-child]:min-w-0 [&>div:first-child]:flex-1 [&>div:first-child]:shrink", className)}
>
<span className="flex min-w-0 items-center gap-2">
<SpaceMark icon={icon} size="sm" />
<span className="truncate">{label}</span>
</span>
<Select.Item value={value} title={label} className={className} icon={<SpaceMark icon={icon} size="sm" />}>
{label}
</Select.Item>
);
+1 -1
View File
@@ -1306,7 +1306,7 @@
"search-emoji": "البحث عن الرموز التعبيرية أو لصقها...",
"no-results": "لا توجد نتائج",
"emoji-help": "اختر رمزًا تعبيريًا شائعًا أو الصق رمزك الخاص.",
"reset": "إعادة التعيين إلى الإعدادات الافتراضية",
"reset": "استخدام الأيقونة الافتراضية",
"use-emoji": "استخدام {{emoji}}"
},
"unavailable": "هذه المساحة غير موجودة أو ليس لديك صلاحية الوصول إليها.",
+1 -1
View File
@@ -1297,7 +1297,7 @@
"search-emoji": "Emoji axtar və ya yapışdır…",
"no-results": "Uyğun nəticə yoxdur",
"emoji-help": "Emoji seçin və ya öz emojinizi yapışdırın.",
"reset": "Standarta qaytar",
"reset": "Standart ikonadan istifadə et",
"use-emoji": "{{emoji}} istifadə et"
},
"unavailable": "Bu sahə mövcud deyil və ya ona giriş icazəniz yoxdur.",
+1 -1
View File
@@ -1302,7 +1302,7 @@
"search-emoji": "Търсене или поставяне на емоджи…",
"no-results": "Няма съвпадения",
"emoji-help": "Изберете често срещано емоджи или поставете свое собствено.",
"reset": "Възстановяване към настройките по подразбиране",
"reset": "Използвай иконата по подразбиране",
"use-emoji": "Използване {{emoji}}"
},
"unavailable": "Това пространство не съществува или нямате достъп до него.",
+1 -1
View File
@@ -1303,7 +1303,7 @@
"search-emoji": "Cerca o enganxa emoji…",
"no-results": "No hi ha coincidències",
"emoji-help": "Tria un emoji comú o enganxa'n un.",
"reset": "Restableix els valors per defecte",
"reset": "Utilitza la icona per defecte",
"use-emoji": "Utilitza {{emoji}}"
},
"unavailable": "Aquest espai no existeix o no hi tens accés.",
+1 -1
View File
@@ -1305,7 +1305,7 @@
"search-emoji": "Vyhledat nebo vložit emoji…",
"no-results": "Žádné shody",
"emoji-help": "Vyberte běžný emoji nebo vložte svůj vlastní.",
"reset": "Obnovit na výchozí nastavení",
"reset": "Použít výchozí ikonu",
"use-emoji": "Použít {{emoji}}"
},
"unavailable": "Tento prostor neexistuje nebo k němu nemáte přístup.",
+1 -1
View File
@@ -1302,7 +1302,7 @@
"search-emoji": "Søg eller indsæt emoji…",
"no-results": "Ingen match",
"emoji-help": "Vælg en almindelig emoji, eller indsæt din egen.",
"reset": "Nulstil til standard",
"reset": "Brug standardikon",
"use-emoji": "Brug {{emoji}}"
},
"unavailable": "Dette rum findes ikke, eller du har ikke adgang til det.",
+1 -1
View File
@@ -1302,7 +1302,7 @@
"search-emoji": "Emoji suchen oder einfügen…",
"no-results": "Keine Treffer",
"emoji-help": "Wählen Sie ein gängiges Emoji oder fügen Sie Ihr eigenes ein.",
"reset": "Auf Standard zurücksetzen",
"reset": "Standardsymbol verwenden",
"use-emoji": "{{emoji}} verwenden"
},
"unavailable": "Dieser Bereich existiert nicht oder Sie haben keinen Zugriff darauf.",
+1 -1
View File
@@ -1302,7 +1302,7 @@
"search-emoji": "Αναζήτηση ή επικόλληση emoji…",
"no-results": "Δεν υπάρχουν αντιστοιχίες",
"emoji-help": "Επιλέξτε ένα κοινό emoji ή επικολλήστε το δικό σας.",
"reset": "Επαναφορά στις προεπιλογές",
"reset": "Χρήση προεπιλεγμένου εικονιδίου",
"use-emoji": "Χρήση {{emoji}}"
},
"unavailable": "Αυτός ο χώρος δεν υπάρχει ή δεν έχετε πρόσβαση σε αυτόν.",
+1 -1
View File
@@ -1302,7 +1302,7 @@
"search-emoji": "Search or paste emoji…",
"no-results": "No matches",
"emoji-help": "Choose a common emoji or paste your own.",
"reset": "Reset to default",
"reset": "Use default icon",
"use-emoji": "Use {{emoji}}"
},
"unavailable": "This space does not exist or you don’t have access to it.",
+1 -1
View File
@@ -1297,7 +1297,7 @@
"search-emoji": "Search or paste emoji…",
"no-results": "No matches",
"emoji-help": "Choose a common emoji or paste your own.",
"reset": "Reset to default",
"reset": "Use default icon",
"use-emoji": "Use {{emoji}}"
},
"unavailable": "This space does not exist or you don’t have access to it.",
+1 -1
View File
@@ -1303,7 +1303,7 @@
"search-emoji": "Buscar o pegar emojis…",
"no-results": "No se encontraron coincidencias",
"emoji-help": "Elige un emoji común o pega el tuyo.",
"reset": "Restablecer valores predeterminados",
"reset": "Usar icono predeterminado",
"use-emoji": "Usar {{emoji}}"
},
"unavailable": "Este espacio no existe o no tienes acceso a él.",
+1 -1
View File
@@ -1302,7 +1302,7 @@
"search-emoji": "Otsi või kleebi emotikone…",
"no-results": "Vasteid pole",
"emoji-help": "Vali tavaline emotikon või kleebi oma.",
"reset": "Lähtesta vaikeseadetele",
"reset": "Kasuta vaikeikooni",
"use-emoji": "Kasuta {{emoji}}"
},
"unavailable": "Seda ruumi pole olemas või sul pole sellele juurdepääsu.",
+1 -1
View File
@@ -1302,7 +1302,7 @@
"search-emoji": "جستجو یا چسباندن ایموجی…",
"no-results": "بدون تطابق",
"emoji-help": "یک ایموجی رایج انتخاب کنید یا ایموجی خودتان را بچسبانید.",
"reset": "تنظیم مجدد به پیش‌فرض",
"reset": "استفاده از نماد پیش‌فرض",
"use-emoji": "استفاده از {{emoji}}"
},
"unavailable": "این فضا وجود ندارد یا شما به آن دسترسی ندارید.",
+1 -1
View File
@@ -1302,7 +1302,7 @@
"search-emoji": "Hae tai liitä emoji…",
"no-results": "Ei osumia",
"emoji-help": "Valitse yleinen emoji tai liitä omasi.",
"reset": "Palauta oletusarvoihin",
"reset": "Käytä oletuskuvaketta",
"use-emoji": "Käytä {{emoji}}"
},
"unavailable": "Tätä tilaa ei ole olemassa tai sinulla ei ole siihen pääsyä.",
+1 -1
View File
@@ -1303,7 +1303,7 @@
"search-emoji": "Rechercher ou coller des émojis…",
"no-results": "Aucun résultat",
"emoji-help": "Choisissez un émoji courant ou collez le vôtre.",
"reset": "Réinitialiser par défaut",
"reset": "Utiliser l’icône par défaut",
"use-emoji": "Utiliser {{emoji}}"
},
"unavailable": "Cet espace n'existe pas ou vous n'y avez pas accès.",
+1 -1
View File
@@ -1302,7 +1302,7 @@
"search-emoji": "Buscar ou pegar emoji…",
"no-results": "Sen coincidencias",
"emoji-help": "Escolle un emoji común ou pega o teu propio.",
"reset": "Restablecer aos valores predeterminados",
"reset": "Usar a icona predeterminada",
"use-emoji": "Usar {{emoji}}"
},
"unavailable": "Este espazo non existe ou non tes acceso a el.",
+1 -1
View File
@@ -1302,7 +1302,7 @@
"search-emoji": "חיפוש או הדבקת אימוג'י…",
"no-results": "אין התאמות",
"emoji-help": "בחר אימוג'י נפוץ או הדבק משלך.",
"reset": "איפוס לברירת מחדל",
"reset": "שימוש בסמל ברירת המחדל",
"use-emoji": "שימוש ב-{{emoji}}"
},
"unavailable": "מרחב זה אינו קיים או שאין לך גישה אליו.",
+1 -1
View File
@@ -1302,7 +1302,7 @@
"search-emoji": "इमोजी सर्च करें या पेस्ट करें…",
"no-results": "कोई मैच नहीं",
"emoji-help": "कोई कॉमन इमोजी चुनें या अपना खुद का पेस्ट करें.",
"reset": "डिफ़ॉल्ट पर रीसेट करें",
"reset": "डिफ़ॉल्ट आइकन इस्तेमाल करें",
"use-emoji": "इस्तेमाल करें {{emoji}}"
},
"unavailable": "यह स्पेस मौजूद नहीं है या आपके पास इसका एक्सेस नहीं है.",
+1 -1
View File
@@ -1303,7 +1303,7 @@
"search-emoji": "Pretraži ili zalijepi emoji…",
"no-results": "Nema podudaranja",
"emoji-help": "Odaberite uobičajeni emoji ili zalijepite svoj.",
"reset": "Vrati na zadano",
"reset": "Koristi zadanu ikonu",
"use-emoji": "Koristi {{emoji}}"
},
"unavailable": "Ovaj prostor ne postoji ili mu nemate pristup.",
+1 -1
View File
@@ -1302,7 +1302,7 @@
"search-emoji": "Emoji keresése vagy beillesztése…",
"no-results": "Nincs találat",
"emoji-help": "Válassz egy gyakori emojit, vagy illeszd be a sajátodat.",
"reset": "Alapértelmezett visszaállítás",
"reset": "Alapértelmezett ikon használata",
"use-emoji": "{{emoji}} használata"
},
"unavailable": "Ez a tér nem létezik, vagy nincs hozzáférésed hozzá.",
+1 -1
View File
@@ -1302,7 +1302,7 @@
"search-emoji": "Cari atau tempel emoji…",
"no-results": "Tidak ada kecocokan",
"emoji-help": "Pilih emoji umum atau tempel emoji Anda sendiri.",
"reset": "Atur ulang ke default",
"reset": "Gunakan ikon bawaan",
"use-emoji": "Gunakan {{emoji}}"
},
"unavailable": "Ruang ini tidak ada atau Anda tidak memiliki akses ke ruang ini.",
+1 -1
View File
@@ -1303,7 +1303,7 @@
"search-emoji": "Cerca o incolla emoji…",
"no-results": "Nessuna corrispondenza",
"emoji-help": "Scegli un'emoji comune o incolla la tua.",
"reset": "Ripristina le impostazioni predefinite",
"reset": "Usa icona predefinita",
"use-emoji": "Usa {{emoji}}"
},
"unavailable": "Questo spazio non esiste o non hai accesso ad esso.",
+1 -1
View File
@@ -1302,7 +1302,7 @@
"search-emoji": "絵文字の検索または貼り付け…",
"no-results": "一致するアイコンが見つかりません",
"emoji-help": "よく使われる絵文字を選択するか、独自の絵文字を貼り付けてください。",
"reset": "デフォルトに戻す",
"reset": "デフォルトのアイコンを使う",
"use-emoji": "{{emoji}} を使用する"
},
"unavailable": "このスペースは存在しないか、アクセス権がありません。",
+1 -1
View File
@@ -1302,7 +1302,7 @@
"search-emoji": "ემოჯის ძიება ან ჩასმა…",
"no-results": "დამთხვევები არ არის",
"emoji-help": "აირჩიეთ საერთო ემოჯი ან ჩასვით თქვენი საკუთარი.",
"reset": "ნაგულისხმევ პარამეტრებზე დაბრუნება",
"reset": "ნაგულისხმევი ხატულის გამოყენება",
"use-emoji": "გამოიყენეთ {{emoji}}"
},
"unavailable": "ეს სივრცე არ არსებობს ან თქვენ არ გაქვთ მასზე წვდომა.",
+1 -1
View File
@@ -1302,7 +1302,7 @@
"search-emoji": "이모지 검색 또는 붙여넣기…",
"no-results": "일치하는 항목 없음",
"emoji-help": "일반적인 이모지를 선택하거나 직접 붙여넣으세요.",
"reset": "기본값으로 재설정",
"reset": "기본 아이콘 사용",
"use-emoji": "{{emoji}} 사용"
},
"unavailable": "이 공간이 없거나 접근 권한이 없습니다.",
+1 -1
View File
@@ -1304,7 +1304,7 @@
"search-emoji": "Ieškoti arba įklijuoti jaustukų…",
"no-results": "Nėra atitikmenų",
"emoji-help": "Pasirinkite įprastą jaustuką arba įklijuokite savo.",
"reset": "Atkurti numatytuosius nustatymus",
"reset": "Naudoti numatytąją piktogramą",
"use-emoji": "Naudoti {{emoji}}"
},
"unavailable": "Šios erdvės nėra arba jūs neturite prieigos prie jos.",
+1 -1
View File
@@ -1303,7 +1303,7 @@
"search-emoji": "Meklēt vai ielīmēt emocijzīmes…",
"no-results": "Nav atbilstību",
"emoji-help": "Izvēlieties bieži lietotu emocijzīmi vai ielīmējiet savu.",
"reset": "Atiestatīt uz noklusējuma vērtību",
"reset": "Izmantot noklusējuma ikonu",
"use-emoji": "Izmantot {{emoji}}"
},
"unavailable": "Šī telpa neeksistē vai jums nav piekļuves tai.",
+1 -1
View File
@@ -1302,7 +1302,7 @@
"search-emoji": "इमोजी शोधा किंवा पेस्ट करा…",
"no-results": "जुळणारे काही नाही",
"emoji-help": "एक सामान्य इमोजी निवडा किंवा तुमचा स्वतःचा पेस्ट करा.",
"reset": "डीफॉल्टवर रीसेट करा",
"reset": "डीफॉल्ट चिन्ह वापरा",
"use-emoji": "{{emoji}} वापरा"
},
"unavailable": "ही जागा अस्तित्वात नाही किंवा तुम्हाला तिचा ॲक्सेस नाही.",
+1 -1
View File
@@ -1302,7 +1302,7 @@
"search-emoji": "Søk eller lim inn emoji…",
"no-results": "Ingen treff",
"emoji-help": "Velg en vanlig emoji eller lim inn din egen.",
"reset": "Tilbakestill til standard",
"reset": "Bruk standardikon",
"use-emoji": "Bruk {{emoji}}"
},
"unavailable": "Dette rommet finnes ikke, eller du har ikke tilgang til det.",
+1 -1
View File
@@ -1302,7 +1302,7 @@
"search-emoji": "Emoji zoeken of plakken…",
"no-results": "Geen overeenkomsten",
"emoji-help": "Kies een veelgebruikte emoji of plak je eigen emoji.",
"reset": "Terugzetten naar standaardinstellingen",
"reset": "Standaardpictogram gebruiken",
"use-emoji": "Gebruik {{emoji}}"
},
"unavailable": "Deze ruimte bestaat niet of je hebt er geen toegang toe.",
+1 -1
View File
@@ -1307,7 +1307,7 @@
"icons": "Ikon",
"kind": "Ikontype",
"no-results": "Ingen treff",
"reset": "Still attende til standard",
"reset": "Bruk standardikon",
"search-emoji": "Søk etter eller lim inn emoji…",
"search-icons": "Søk etter ikon…",
"use-emoji": "Nytt {{emoji}}"
+1 -1
View File
@@ -1304,7 +1304,7 @@
"search-emoji": "Szukaj lub wklej emoji…",
"no-results": "Brak wyników",
"emoji-help": "Wybierz popularny emoji lub wklej własny.",
"reset": "Przywróć domyślne",
"reset": "Użyj domyślnej ikony",
"use-emoji": "Użyj {{emoji}}"
},
"unavailable": "Ta przestrzeń nie istnieje lub nie masz do niej dostępu.",
+1 -1
View File
@@ -1303,7 +1303,7 @@
"search-emoji": "Pesquisar ou colar emoji…",
"no-results": "Nenhuma correspondência",
"emoji-help": "Escolha um emoji comum ou cole o seu.",
"reset": "Redefinir para o padrão",
"reset": "Usar ícone padrão",
"use-emoji": "Usar {{emoji}}"
},
"unavailable": "Este espaço não existe ou você não tem acesso a ele.",
+1 -1
View File
@@ -1303,7 +1303,7 @@
"search-emoji": "Pesquisar ou colar emoji…",
"no-results": "Nenhum resultado encontrado",
"emoji-help": "Escolha um emoji comum ou cole o seu.",
"reset": "Restaurar para o padrão",
"reset": "Usar ícone predefinido",
"use-emoji": "Utilizar {{emoji}}"
},
"unavailable": "Este espaço não existe ou não tem acesso a ele.",
+1 -1
View File
@@ -1303,7 +1303,7 @@
"search-emoji": "Caută sau lipește emoji…",
"no-results": "Nicio potrivire",
"emoji-help": "Alege un emoji comun sau lipește-ți propriul.",
"reset": "Resetează la valorile implicite",
"reset": "Folosește pictograma implicită",
"use-emoji": "Folosește {{emoji}}"
},
"unavailable": "Acest spațiu nu există sau nu ai acces la el.",
+1 -1
View File
@@ -1304,7 +1304,7 @@
"search-emoji": "Поиск или вставка эмодзи…",
"no-results": "Нет совпадений",
"emoji-help": "Выберите распространенный эмодзи или вставьте свой собственный.",
"reset": "Сбросить до значений по умолчанию",
"reset": "Использовать значок по умолчанию",
"use-emoji": "Использовать {{emoji}}"
},
"unavailable": "Это пространство не существует или у вас нет к нему доступа.",
+1 -1
View File
@@ -1304,7 +1304,7 @@
"search-emoji": "Vyhľadávanie alebo vkladanie emoji…",
"no-results": "Žiadne zhody",
"emoji-help": "Vyberte bežný emoji alebo vložte svoj vlastný.",
"reset": "Obnoviť na predvolené hodnoty",
"reset": "Použiť predvolenú ikonu",
"use-emoji": "Použiť {{emoji}}"
},
"unavailable": "Tento priestor neexistuje alebo k nemu nemáte prístup.",
+1 -1
View File
@@ -1304,7 +1304,7 @@
"search-emoji": "Išči ali prilepi emoji…",
"no-results": "Ni zadetkov",
"emoji-help": "Izberite pogost emoji ali prilepite svojega.",
"reset": "Ponastavi na privzeto",
"reset": "Uporabi privzeto ikono",
"use-emoji": "Uporabi {{emoji}}"
},
"unavailable": "Ta prostor ne obstaja ali pa do njega nimate dostopa.",
+1 -1
View File
@@ -1303,7 +1303,7 @@
"search-emoji": "Претражи или налепи емоџи…",
"no-results": "Нема подударања",
"emoji-help": "Изаберите уобичајени емоџи или налепите свој.",
"reset": "Врати на подразумевано",
"reset": "Користи подразумевану икону",
"use-emoji": "Користи {{emoji}}"
},
"unavailable": "Овај простор не постоји или му немате приступ.",
+1 -1
View File
@@ -1302,7 +1302,7 @@
"search-emoji": "Sök eller klistra in emoji…",
"no-results": "Inga träffar",
"emoji-help": "Välj en vanlig emoji eller klistra in din egen.",
"reset": "Återställ till standard",
"reset": "Använd standardikon",
"use-emoji": "Använd {{emoji}}"
},
"unavailable": "Detta utrymme finns inte eller så har du inte åtkomst till det.",
+1 -1
View File
@@ -1302,7 +1302,7 @@
"search-emoji": "ค้นหาหรือวางอีโมจิ…",
"no-results": "ไม่พบรายการที่ตรงกัน",
"emoji-help": "เลือกอีโมจิทั่วไปหรือวางอีโมจิของคุณเอง",
"reset": "รีเซ็ตเป็นค่าเริ่มต้น",
"reset": "ใช้ไอคอนเริ่มต้น",
"use-emoji": "ใช้ {{emoji}}"
},
"unavailable": "พื้นที่นี้ไม่มีอยู่หรือคุณไม่มีสิทธิ์เข้าถึง",
+1 -1
View File
@@ -1226,7 +1226,7 @@
"search-emoji": "Emoji arayın ya da yapıştırın…",
"no-results": "Eşleşme yok",
"emoji-help": "Yaygın bir emoji seçin ya da kendinizinkini yapıştırın.",
"reset": "Varsayılana sıfırla",
"reset": "Varsayılan simgeyi kullan",
"use-emoji": "{{emoji}} kullan"
},
"unavailable": "Bu alan mevcut değil ya da erişiminiz yok.",
+1 -1
View File
@@ -1304,7 +1304,7 @@
"search-emoji": "Пошук або вставка емодзі…",
"no-results": "Збігів немає",
"emoji-help": "Виберіть поширений емодзі або вставте свій власний.",
"reset": "Скинути до налаштувань за замовчуванням",
"reset": "Використати типову піктограму",
"use-emoji": "Використати {{emoji}}"
},
"unavailable": "Цього простору не існує, або у вас немає до нього доступу.",
+1 -1
View File
@@ -1302,7 +1302,7 @@
"search-emoji": "Tìm kiếm hoặc dán biểu tượng cảm xúc…",
"no-results": "Không tìm thấy kết quả phù hợp",
"emoji-help": "Chọn một biểu tượng cảm xúc phổ biến hoặc dán biểu tượng cảm xúc của riêng bạn.",
"reset": "Đặt lại về mặc định",
"reset": "Dùng biểu tượng mặc định",
"use-emoji": "Sử dụng {{emoji}}"
},
"unavailable": "Không gian này không tồn tại hoặc bạn không có quyền truy cập vào nó.",
+1 -1
View File
@@ -1288,7 +1288,7 @@
"search-emoji": "搜索或粘贴表情…",
"no-results": "没有匹配项",
"emoji-help": "选择常用表情,或粘贴你喜欢的表情。",
"reset": "恢复默认",
"reset": "使用默认图标",
"use-emoji": "使用 {{emoji}}"
},
"unavailable": "空间不存在或你没有访问权限。",
+1 -1
View File
@@ -1280,7 +1280,7 @@
"search-emoji": "搜尋或貼上表情符號…",
"no-results": "沒有符合項",
"emoji-help": "選擇一個常用表情符號或貼上您自己的表情符號。",
"reset": "重設為預設值",
"reset": "使用預設圖示",
"use-emoji": "使用 {{emoji}}"
}
},
+21
View File
@@ -0,0 +1,21 @@
import { resolve } from "node:path";
import { defineConfig } from "@playwright/test";
export default defineConfig({
testDir: ".",
testMatch: "icon-picker.spec.ts",
workers: 2,
reporter: "list",
outputDir: "../../node_modules/.cache/icon-picker-browser-results",
use: { baseURL: "http://localhost:3076", reducedMotion: "reduce", trace: "retain-on-failure" },
projects: [
{ name: "desktop", use: { browserName: "chromium", viewport: { width: 1280, height: 900 } } },
{ name: "phone", use: { browserName: "chromium", viewport: { width: 360, height: 780 }, isMobile: true, hasTouch: true } },
],
webServer: {
cwd: resolve(__dirname, "../.."),
command: "pnpm exec vite --config tests/browser/icon-picker.vite.config.mts",
url: "http://localhost:3076/tests/browser/icon-picker.html",
reuseExistingServer: false,
},
});
+11
View File
@@ -0,0 +1,11 @@
<!doctype html>
<html lang="en" data-theme="light">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
</head>
<body>
<div id="root"></div>
<script type="module" src="/tests/browser/icon-picker.tsx"></script>
</body>
</html>
+75
View File
@@ -0,0 +1,75 @@
import { expect, type Locator, test } from "@playwright/test";
import type {} from "./icon-picker";
const geometry = (popup: Locator) =>
popup.evaluate((element) => ({
popup: element.getBoundingClientRect().toJSON(),
tabs: element.querySelector('[role="tablist"]')!.getBoundingClientRect().toJSON(),
search: element.querySelector('[role="combobox"]')!.getBoundingClientRect().toJSON(),
}));
for (const [locale, label] of [
["en", "Use default icon"],
["zh-Hans", "使用默认图标"],
["de", "Standardsymbol verwenden"],
]) {
for (const theme of ["light", "dark"]) {
test(`${locale} ${theme}: the default action and tabs keep the picker stable`, async ({ page }, testInfo) => {
const errors: string[] = [];
page.on("pageerror", (error) => errors.push(error.message));
await page.goto("/tests/browser/icon-picker.html");
await page.waitForFunction(() => window.iconPickerTest !== undefined);
await page.evaluate(
async ({ locale, theme }) => {
await window.iconPickerTest.setLocale(locale);
document.documentElement.dataset.theme = theme;
},
{ locale, theme },
);
const trigger = page.locator(".mu-popover-trigger");
await trigger.click();
const popup = page.locator(".mu-popover-popup");
const action = popup.getByRole("button", { name: label, exact: true });
await expect(popup.getByRole("combobox")).toBeFocused();
await expect(action).toHaveCount(0);
const initial = await geometry(popup);
await popup.getByRole("tab").nth(1).click();
await expect.poll(() => geometry(popup)).toEqual(initial);
await page.evaluate(() => window.iconPickerTest.setCustom(true));
await expect(action).toBeVisible();
await expect.poll(() => geometry(popup)).toEqual(initial);
const actionBox = (await action.boundingBox())!;
expect(actionBox.x).toBeGreaterThanOrEqual(initial.tabs.right);
expect(actionBox.y).toBeGreaterThanOrEqual(initial.tabs.top);
expect(actionBox.y + actionBox.height).toBeLessThanOrEqual(initial.tabs.bottom);
await page.evaluate(() => window.iconPickerTest.setCustom(false));
await expect(action).toHaveCount(0);
await expect.poll(() => geometry(popup)).toEqual(initial);
await page.evaluate(() => window.iconPickerTest.setCustom(true));
await expect(action).toBeVisible();
await popup.getByRole("tab").first().click();
await expect.poll(() => geometry(popup)).toEqual(initial);
await popup.getByRole("combobox").fill("no-matching-icon");
await expect(popup.getByRole("gridcell")).toHaveCount(0);
await expect.poll(() => geometry(popup)).toEqual(initial);
await popup.screenshot({ path: testInfo.outputPath("default-action.png") });
await popup.getByRole("combobox").press("Shift+Tab");
await expect(action).toBeFocused();
await action.press("Enter");
await expect(popup).toBeHidden();
await expect(trigger).toBeFocused();
expect(await page.evaluate(() => window.iconPickerTest.changes)).toEqual([null]);
await expect(trigger.locator(".lucide-astroid")).toBeVisible();
await trigger.click();
await expect(popup.getByRole("combobox")).toBeFocused();
await expect(action).toHaveCount(0);
await expect.poll(() => geometry(popup)).toEqual(initial);
expect(errors).toEqual([]);
});
}
}
+51
View File
@@ -0,0 +1,51 @@
import { create } from "@bufbuild/protobuf";
import { Suspense, useEffect, useState } from "react";
import { createRoot } from "react-dom/client";
import SpaceIconPicker from "@/components/SpaceIconPicker";
import i18n from "@/i18n";
import { type Space_Icon, Space_IconSchema } from "@/types/proto/api/space_service_pb";
import "@/index.css";
declare global {
interface Window {
iconPickerTest: {
setCustom: (custom: boolean) => void;
setLocale: (locale: string) => Promise<void>;
changes: (string | null)[];
};
}
}
const changes: (string | null)[] = [];
function Harness() {
const [value, setValue] = useState<Space_Icon>();
useEffect(() => {
window.iconPickerTest = {
setCustom: (custom) => setValue(custom ? create(Space_IconSchema, { value: { case: "lucide", value: "leaf" } }) : undefined),
setLocale: async (locale) => {
await i18n.changeLanguage(locale);
document.documentElement.lang = locale;
},
changes,
};
}, []);
return (
<main className="flex justify-center pt-24">
<SpaceIconPicker
value={value}
onChange={(next) => {
changes.push(next?.value.value ?? null);
setValue(next);
}}
/>
</main>
);
}
createRoot(document.getElementById("root")!).render(
<Suspense>
<Harness />
</Suspense>,
);
@@ -0,0 +1,7 @@
import config from "../../vite.config.mjs";
export default {
...config,
cacheDir: "node_modules/.vite-icon-picker-test",
server: { ...config.server, port: 3076, strictPort: true, hmr: false },
};
+2 -1
View File
@@ -75,7 +75,8 @@ describe("CreateSpaceDialog", () => {
view.rerender(<CreateSpaceDialog open={false} onOpenChange={mocks.onOpenChange} />);
view.rerender(<CreateSpaceDialog open onOpenChange={mocks.onOpenChange} />);
fireEvent.click(screen.getByRole("button", { name: "space.icon.change" }));
expect(await screen.findByRole("button", { name: "space.icon.reset" })).toBeDisabled();
await screen.findByRole("combobox", { name: "space.icon.search-icons" });
expect(screen.queryByRole("button", { name: "space.icon.reset" })).not.toBeInTheDocument();
});
it("allows a valid custom Space UID and explains invalid values", async () => {
+41 -3
View File
@@ -51,7 +51,7 @@ describe("SpaceIconPicker", () => {
const onChange = vi.fn();
render(<Harness onChange={onChange} />);
fireEvent.click(screen.getByRole("button", { name: "space.icon.change" }));
fireEvent.click(await screen.findByRole("button", { name: "space.icon.emoji" }));
fireEvent.click(await screen.findByRole("tab", { name: "space.icon.emoji" }));
const search = screen.getByRole("combobox", { name: "space.icon.search-emoji" });
search.focus();
type(search, "👩🏽‍🌾", "insertFromPaste");
@@ -59,9 +59,14 @@ describe("SpaceIconPicker", () => {
fireEvent.keyDown(search, { key: "Enter" });
expect(onChange).toHaveBeenLastCalledWith(icon("👩🏽‍🌾", "emoji"));
fireEvent.click(screen.getByRole("button", { name: "space.icon.change" }));
expect(await screen.findByRole("button", { name: "space.icon.emoji" })).toHaveAttribute("aria-pressed", "true");
expect(await screen.findByRole("tab", { name: "space.icon.emoji" })).toHaveAttribute("aria-selected", "true");
fireEvent.click(screen.getByRole("button", { name: "space.icon.reset" }));
expect(onChange).toHaveBeenLastCalledWith(undefined);
await waitFor(() => expect(screen.queryByRole("combobox")).not.toBeInTheDocument());
expect(screen.getByRole("button", { name: "space.icon.change" })).toHaveFocus();
fireEvent.click(screen.getByRole("button", { name: "space.icon.change" }));
await screen.findByRole("combobox", { name: "space.icon.search-icons" });
expect(screen.queryByRole("button", { name: "space.icon.reset" })).not.toBeInTheDocument();
});
it("keeps the selection unchanged when dismissed or when Enter completes IME composition", async () => {
@@ -82,7 +87,7 @@ describe("SpaceIconPicker", () => {
const onChange = vi.fn();
render(<Harness onChange={onChange} />);
fireEvent.click(screen.getByRole("button", { name: "space.icon.change" }));
fireEvent.click(await screen.findByRole("button", { name: "space.icon.emoji" }));
fireEvent.click(await screen.findByRole("tab", { name: "space.icon.emoji" }));
const search = screen.getByRole("combobox", { name: "space.icon.search-emoji" });
type(search, "🌱🌱");
expect(screen.getByRole("status")).toHaveTextContent("space.icon.no-results");
@@ -96,6 +101,39 @@ describe("SpaceIconPicker", () => {
expect(screen.getByRole("button", { name: "space.icon.change" })).toBeDisabled();
});
it("shows the default action only while a custom icon is set, on either tab", async () => {
const onChange = vi.fn();
const view = render(<SpaceIconPicker onChange={onChange} />);
fireEvent.click(screen.getByRole("button", { name: "space.icon.change" }));
await screen.findByRole("combobox", { name: "space.icon.search-icons" });
expect(screen.queryByRole("button", { name: "space.icon.reset" })).not.toBeInTheDocument();
view.rerender(<SpaceIconPicker value={icon("leaf")} onChange={onChange} />);
expect(screen.getByRole("button", { name: "space.icon.reset" })).toBeEnabled();
fireEvent.click(screen.getByRole("tab", { name: "space.icon.emoji" }));
expect(screen.getByRole("button", { name: "space.icon.reset" })).toBeEnabled();
view.rerender(<SpaceIconPicker onChange={onChange} />);
expect(screen.queryByRole("button", { name: "space.icon.reset" })).not.toBeInTheDocument();
expect(onChange).not.toHaveBeenCalled();
});
it("switches named content panels without selecting an icon", async () => {
const onChange = vi.fn();
render(<Harness onChange={onChange} />);
fireEvent.click(screen.getByRole("button", { name: "space.icon.change" }));
const icons = await screen.findByRole("tab", { name: "space.icon.icons" });
const emoji = screen.getByRole("tab", { name: "space.icon.emoji" });
expect(screen.getByRole("tabpanel", { name: "space.icon.icons" })).toBeInTheDocument();
icons.focus();
fireEvent.keyDown(icons, { key: "ArrowRight" });
await waitFor(() => expect(emoji).toHaveAttribute("aria-selected", "true"));
expect(screen.getByRole("tabpanel", { name: "space.icon.emoji" })).toBeInTheDocument();
expect(screen.queryByRole("tabpanel", { name: "space.icon.icons" })).not.toBeInTheDocument();
expect(emoji).toHaveFocus();
expect(onChange).not.toHaveBeenCalled();
});
it("offers only emoji accepted by the shared Unicode catalog", () => {
for (const [emoji] of SPACE_EMOJI) expect(FULLY_QUALIFIED_EMOJI).toContain(emoji);
});