Skip to content

Commit d49f57d

Browse files
committed
fix: untranslated headers in action dropdown
1 parent 9067df6 commit d49f57d

File tree

3 files changed

+19
-10
lines changed

3 files changed

+19
-10
lines changed

src/components/editor/DetailedSelect.tsx

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,11 @@ import { Select2, Select2Props } from '@blueprintjs/select'
44
import { ReactNode } from 'react'
55
import { FCC } from 'types'
66

7-
export type DetailedSelectItem =
8-
| DetailedSelectChoice
9-
| { type: 'header'; header: ReactNode }
7+
export type DetailedSelectItem = DetailedSelectHeader | DetailedSelectChoice
8+
export type DetailedSelectHeader = {
9+
type: 'header'
10+
header: ReactNode | (() => ReactNode)
11+
}
1012
export interface DetailedSelectChoice {
1113
type: 'choice'
1214
icon?: IconName
@@ -34,7 +36,11 @@ export const DetailedSelect: FCC<
3436
if (action.type === 'header') {
3537
return (
3638
<li key={'header_' + action.header} className={Classes.MENU_HEADER}>
37-
<H6>{action.header}</H6>
39+
<H6>
40+
{typeof action.header === 'function'
41+
? action.header()
42+
: action.header}
43+
</H6>
3844
</li>
3945
)
4046
}

src/components/editor/action/EditorActionTypeSelect.tsx

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ export const EditorActionTypeSelect = (
3131

3232
const menuItems = useMemo<DetailedSelectItem[]>(
3333
() =>
34-
Object.entries(groupBy(ACTION_TYPES, 'group')).flatMap(
35-
([group, items]) => [
36-
{ type: 'header' as const, header: group },
37-
...items,
38-
],
39-
),
34+
Object.values(
35+
groupBy(ACTION_TYPES, (item) => item.group.toString()),
36+
).flatMap((items) => [
37+
{ type: 'header' as const, header: items[0].group },
38+
...items,
39+
]),
4040
[],
4141
)
4242
const selectedAction = findActionType(value)

src/i18n/i18n.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,9 @@ function createDeferredProxy(path: string) {
120120
if (Object.prototype.hasOwnProperty.call(target, prop)) {
121121
return target[prop]
122122
}
123+
if (typeof prop === 'symbol') {
124+
return undefined
125+
}
123126
target[prop] = createDeferredProxy(path + '.' + String(prop))
124127
return target[prop]
125128
},

0 commit comments

Comments
 (0)