@@ -4,7 +4,7 @@ import { sortBy } from 'lodash';
4
4
import { Link } from 'react-router-dom' ;
5
5
import PropTypes from 'prop-types' ;
6
6
import { useTranslation } from 'react-i18next' ;
7
- import MenubarMenu from '../../../../components/Menubar/MenubarSubmenu' ;
7
+ import MenubarSubmenu from '../../../../components/Menubar/MenubarSubmenu' ;
8
8
import MenubarItem from '../../../../components/Menubar/MenubarItem' ;
9
9
import { availableLanguages , languageKeyToLabel } from '../../../../i18n' ;
10
10
import getConfig from '../../../../utils/getConfig' ;
@@ -163,7 +163,7 @@ const ProjectMenu = () => {
163
163
</ a >
164
164
) }
165
165
</ li >
166
- < MenubarMenu id = "file" title = { t ( 'Nav.File.Title' ) } >
166
+ < MenubarSubmenu id = "file" title = { t ( 'Nav.File.Title' ) } >
167
167
< MenubarItem onClick = { newSketch } > { t ( 'Nav.File.New' ) } </ MenubarItem >
168
168
< MenubarItem
169
169
hideIf = {
@@ -208,8 +208,8 @@ const ProjectMenu = () => {
208
208
>
209
209
{ t ( 'Nav.File.Examples' ) }
210
210
</ MenubarItem >
211
- </ MenubarMenu >
212
- < MenubarMenu id = "edit" title = { t ( 'Nav.Edit.Title' ) } >
211
+ </ MenubarSubmenu >
212
+ < MenubarSubmenu id = "edit" title = { t ( 'Nav.Edit.Title' ) } >
213
213
< MenubarItem onClick = { cmRef . current ?. tidyCode } >
214
214
{ t ( 'Nav.Edit.TidyCode' ) }
215
215
< span className = "nav__keyboard-shortcut" > { metaKeyName } +Shift+F</ span >
@@ -222,8 +222,8 @@ const ProjectMenu = () => {
222
222
{ t ( 'Nav.Edit.Replace' ) }
223
223
< span className = "nav__keyboard-shortcut" > { replaceCommand } </ span >
224
224
</ MenubarItem >
225
- </ MenubarMenu >
226
- < MenubarMenu id = "sketch" title = { t ( 'Nav.Sketch.Title' ) } >
225
+ </ MenubarSubmenu >
226
+ < MenubarSubmenu id = "sketch" title = { t ( 'Nav.Sketch.Title' ) } >
227
227
< MenubarItem onClick = { ( ) => dispatch ( newFile ( rootFile . id ) ) } >
228
228
{ t ( 'Nav.Sketch.AddFile' ) }
229
229
< span className = "nav__keyboard-shortcut" > { newFileCommand } </ span >
@@ -241,16 +241,16 @@ const ProjectMenu = () => {
241
241
Shift+{ metaKeyName } +Enter
242
242
</ span >
243
243
</ MenubarItem >
244
- </ MenubarMenu >
245
- < MenubarMenu id = "help" title = { t ( 'Nav.Help.Title' ) } >
244
+ </ MenubarSubmenu >
245
+ < MenubarSubmenu id = "help" title = { t ( 'Nav.Help.Title' ) } >
246
246
< MenubarItem onClick = { ( ) => dispatch ( showKeyboardShortcutModal ( ) ) } >
247
247
{ t ( 'Nav.Help.KeyboardShortcuts' ) }
248
248
</ MenubarItem >
249
249
< MenubarItem href = "https://p5js.org/reference/" >
250
250
{ t ( 'Nav.Help.Reference' ) }
251
251
</ MenubarItem >
252
252
< MenubarItem href = "/about" > { t ( 'Nav.Help.About' ) } </ MenubarItem >
253
- </ MenubarMenu >
253
+ </ MenubarSubmenu >
254
254
{ getConfig ( 'TRANSLATIONS_ENABLED' ) && < LanguageMenu /> }
255
255
</ ul >
256
256
) ;
@@ -266,14 +266,14 @@ const LanguageMenu = () => {
266
266
}
267
267
268
268
return (
269
- < MenubarMenu id = "lang" title = { languageKeyToLabel ( language ) } >
269
+ < MenubarSubmenu id = "lang" title = { languageKeyToLabel ( language ) } >
270
270
{ sortBy ( availableLanguages ) . map ( ( key ) => (
271
271
// eslint-disable-next-line react/jsx-no-bind
272
272
< MenubarItem key = { key } value = { key } onClick = { handleLangSelection } >
273
273
{ languageKeyToLabel ( key ) }
274
274
</ MenubarItem >
275
275
) ) }
276
- </ MenubarMenu >
276
+ </ MenubarSubmenu >
277
277
) ;
278
278
} ;
279
279
@@ -310,7 +310,7 @@ const AuthenticatedUserMenu = () => {
310
310
311
311
return (
312
312
< ul className = "nav__items-right" title = "user-menu" >
313
- < MenubarMenu
313
+ < MenubarSubmenu
314
314
id = "account"
315
315
title = {
316
316
< span >
@@ -334,7 +334,7 @@ const AuthenticatedUserMenu = () => {
334
334
< MenubarItem onClick = { ( ) => dispatch ( logoutUser ( ) ) } >
335
335
{ t ( 'Nav.Auth.LogOut' ) }
336
336
</ MenubarItem >
337
- </ MenubarMenu >
337
+ </ MenubarSubmenu >
338
338
</ ul >
339
339
) ;
340
340
} ;
0 commit comments