@@ -4,7 +4,7 @@ import { sortBy } from 'lodash';
44import { Link } from 'react-router-dom' ;
55import PropTypes from 'prop-types' ;
66import { useTranslation } from 'react-i18next' ;
7- import MenubarMenu from '../../../../components/Menubar/MenubarSubmenu' ;
7+ import MenubarSubmenu from '../../../../components/Menubar/MenubarSubmenu' ;
88import MenubarItem from '../../../../components/Menubar/MenubarItem' ;
99import { availableLanguages , languageKeyToLabel } from '../../../../i18n' ;
1010import getConfig from '../../../../utils/getConfig' ;
@@ -163,7 +163,7 @@ const ProjectMenu = () => {
163163 </ a >
164164 ) }
165165 </ li >
166- < MenubarMenu id = "file" title = { t ( 'Nav.File.Title' ) } >
166+ < MenubarSubmenu id = "file" title = { t ( 'Nav.File.Title' ) } >
167167 < MenubarItem onClick = { newSketch } > { t ( 'Nav.File.New' ) } </ MenubarItem >
168168 < MenubarItem
169169 hideIf = {
@@ -208,8 +208,8 @@ const ProjectMenu = () => {
208208 >
209209 { t ( 'Nav.File.Examples' ) }
210210 </ MenubarItem >
211- </ MenubarMenu >
212- < MenubarMenu id = "edit" title = { t ( 'Nav.Edit.Title' ) } >
211+ </ MenubarSubmenu >
212+ < MenubarSubmenu id = "edit" title = { t ( 'Nav.Edit.Title' ) } >
213213 < MenubarItem onClick = { cmRef . current ?. tidyCode } >
214214 { t ( 'Nav.Edit.TidyCode' ) }
215215 < span className = "nav__keyboard-shortcut" > { metaKeyName } +Shift+F</ span >
@@ -222,8 +222,8 @@ const ProjectMenu = () => {
222222 { t ( 'Nav.Edit.Replace' ) }
223223 < span className = "nav__keyboard-shortcut" > { replaceCommand } </ span >
224224 </ MenubarItem >
225- </ MenubarMenu >
226- < MenubarMenu id = "sketch" title = { t ( 'Nav.Sketch.Title' ) } >
225+ </ MenubarSubmenu >
226+ < MenubarSubmenu id = "sketch" title = { t ( 'Nav.Sketch.Title' ) } >
227227 < MenubarItem onClick = { ( ) => dispatch ( newFile ( rootFile . id ) ) } >
228228 { t ( 'Nav.Sketch.AddFile' ) }
229229 < span className = "nav__keyboard-shortcut" > { newFileCommand } </ span >
@@ -241,16 +241,16 @@ const ProjectMenu = () => {
241241 Shift+{ metaKeyName } +Enter
242242 </ span >
243243 </ MenubarItem >
244- </ MenubarMenu >
245- < MenubarMenu id = "help" title = { t ( 'Nav.Help.Title' ) } >
244+ </ MenubarSubmenu >
245+ < MenubarSubmenu id = "help" title = { t ( 'Nav.Help.Title' ) } >
246246 < MenubarItem onClick = { ( ) => dispatch ( showKeyboardShortcutModal ( ) ) } >
247247 { t ( 'Nav.Help.KeyboardShortcuts' ) }
248248 </ MenubarItem >
249249 < MenubarItem href = "https://p5js.org/reference/" >
250250 { t ( 'Nav.Help.Reference' ) }
251251 </ MenubarItem >
252252 < MenubarItem href = "/about" > { t ( 'Nav.Help.About' ) } </ MenubarItem >
253- </ MenubarMenu >
253+ </ MenubarSubmenu >
254254 { getConfig ( 'TRANSLATIONS_ENABLED' ) && < LanguageMenu /> }
255255 </ ul >
256256 ) ;
@@ -266,14 +266,14 @@ const LanguageMenu = () => {
266266 }
267267
268268 return (
269- < MenubarMenu id = "lang" title = { languageKeyToLabel ( language ) } >
269+ < MenubarSubmenu id = "lang" title = { languageKeyToLabel ( language ) } >
270270 { sortBy ( availableLanguages ) . map ( ( key ) => (
271271 // eslint-disable-next-line react/jsx-no-bind
272272 < MenubarItem key = { key } value = { key } onClick = { handleLangSelection } >
273273 { languageKeyToLabel ( key ) }
274274 </ MenubarItem >
275275 ) ) }
276- </ MenubarMenu >
276+ </ MenubarSubmenu >
277277 ) ;
278278} ;
279279
@@ -310,7 +310,7 @@ const AuthenticatedUserMenu = () => {
310310
311311 return (
312312 < ul className = "nav__items-right" title = "user-menu" >
313- < MenubarMenu
313+ < MenubarSubmenu
314314 id = "account"
315315 title = {
316316 < span >
@@ -334,7 +334,7 @@ const AuthenticatedUserMenu = () => {
334334 < MenubarItem onClick = { ( ) => dispatch ( logoutUser ( ) ) } >
335335 { t ( 'Nav.Auth.LogOut' ) }
336336 </ MenubarItem >
337- </ MenubarMenu >
337+ </ MenubarSubmenu >
338338 </ ul >
339339 ) ;
340340} ;
0 commit comments