Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
L
logging-scratch-gui
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
David Goessmann
logging-scratch-gui
Commits
b30d3ed2
Commit
b30d3ed2
authored
6 years ago
by
Ray Schamp
Browse files
Options
Downloads
Patches
Plain Diff
Consolidate coming soon tooltips into a component
Mostly to remove the repeated props
parent
defd8b0b
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/components/menu-bar/menu-bar.jsx
+34
-48
34 additions, 48 deletions
src/components/menu-bar/menu-bar.jsx
with
34 additions
and
48 deletions
src/components/menu-bar/menu-bar.jsx
+
34
−
48
View file @
b30d3ed2
...
...
@@ -23,12 +23,25 @@ import communityIcon from './icon--see-community.svg';
import
dropdownCaret
from
'
../language-selector/dropdown-caret.svg
'
;
import
scratchLogo
from
'
./scratch-logo.svg
'
;
const
MenuBar
=
props
=>
(
<
Box
className
=
{
classNames
({
[
styles
.
menuBar
]:
true
})
}
const
MenuBarItemTooltip
=
({
id
,
place
=
"
bottom
"
,
children
})
=>
(
<
ComingSoonTooltip
className
=
{
styles
.
comingSoon
}
place
=
{
place
}
tooltipClassName
=
{
styles
.
comingSoonTooltip
}
tooltipId
=
{
id
}
>
{
children
}
</
ComingSoonTooltip
>
);
MenuBarItemTooltip
.
propTypes
=
{
children
:
PropTypes
.
node
,
id
:
PropTypes
.
string
,
place
:
PropTypes
.
oneOf
([
'
top
'
,
'
bottom
'
,
'
left
'
,
'
right
'
])
};
const
MenuBar
=
props
=>
(
<
Box
className
=
{
styles
.
menuBar
}
>
<
div
className
=
{
styles
.
mainMenu
}
>
<
div
className
=
{
styles
.
fileGroup
}
>
<
div
className
=
{
classNames
(
styles
.
logoWrapper
,
styles
.
menuBarItem
)
}
>
...
...
@@ -40,14 +53,12 @@ const MenuBar = props => (
/>
</
div
>
<
div
className
=
{
classNames
(
styles
.
menuBarItem
)
}
>
<
ComingSoon
Tooltip
className
=
{
styles
.
comingSoon
}
<
MenuBarItem
Tooltip
id
=
"menubar-selector"
place
=
"right"
tooltipClassName
=
{
styles
.
comingSoonTooltip
}
tooltipId
=
"menubar-selector"
>
<
LanguageSelector
/>
</
ComingSoon
Tooltip
>
</
MenuBarItem
Tooltip
>
</
div
>
<
div
className
=
{
classNames
(
styles
.
menuBarItem
)
}
...
...
@@ -67,38 +78,23 @@ const MenuBar = props => (
</
Menu
>
</
div
>
<
div
className
=
{
classNames
(
styles
.
menuBarItem
)
}
>
<
ComingSoonTooltip
className
=
{
styles
.
comingSoon
}
place
=
"bottom"
tooltipClassName
=
{
styles
.
comingSoonTooltip
}
tooltipId
=
"edit-menu"
>
<
MenuBarItemTooltip
id
=
"edit-menu"
>
<
div
className
=
{
classNames
(
styles
.
editMenu
)
}
>
Edit
</
div
>
</
ComingSoon
Tooltip
>
</
MenuBarItem
Tooltip
>
</
div
>
</
div
>
<
div
className
=
{
classNames
(
styles
.
divider
)
}
/>
<
div
className
=
{
classNames
(
styles
.
menuBarItem
)
}
>
<
ComingSoonTooltip
className
=
{
styles
.
comingSoon
}
place
=
"bottom"
tooltipClassName
=
{
styles
.
comingSoonTooltip
}
tooltipId
=
"title-field"
>
<
MenuBarItemTooltip
id
=
"title-field"
>
<
input
disabled
className
=
{
classNames
(
styles
.
titleField
)
}
placeholder
=
"Untitled-1"
/>
</
ComingSoon
Tooltip
>
</
MenuBarItem
Tooltip
>
</
div
>
<
div
className
=
{
classNames
(
styles
.
menuBarItem
)
}
>
<
ComingSoonTooltip
className
=
{
styles
.
comingSoon
}
place
=
"bottom"
tooltipClassName
=
{
styles
.
comingSoonTooltip
}
tooltipId
=
"share-button"
>
<
MenuBarItemTooltip
id
=
"share-button"
>
<
Button
className
=
{
classNames
(
styles
.
shareButton
)
}
>
<
FormattedMessage
defaultMessage
=
"Share"
...
...
@@ -106,15 +102,10 @@ const MenuBar = props => (
id
=
"gui.menuBar.share"
/>
</
Button
>
</
ComingSoon
Tooltip
>
</
MenuBarItem
Tooltip
>
</
div
>
<
div
className
=
{
classNames
(
styles
.
menuBarItem
,
styles
.
communityButtonWrapper
)
}
>
<
ComingSoonTooltip
className
=
{
styles
.
comingSoon
}
place
=
"bottom"
tooltipClassName
=
{
styles
.
comingSoonTooltip
}
tooltipId
=
"community-button"
>
<
MenuBarItemTooltip
id
=
"community-button"
>
<
Button
className
=
{
classNames
(
styles
.
communityButton
)
}
iconClassName
=
{
styles
.
communityButtonIcon
}
...
...
@@ -126,7 +117,7 @@ const MenuBar = props => (
id
=
"gui.menuBar.seeCommunity"
/>
</
Button
>
</
ComingSoon
Tooltip
>
</
MenuBarItem
Tooltip
>
</
div
>
</
div
>
<
div
className
=
{
classNames
(
styles
.
menuBarItem
,
styles
.
feedbackButtonWrapper
)
}
>
...
...
@@ -143,22 +134,17 @@ const MenuBar = props => (
</
Button
>
</
div
>
<
div
className
=
{
styles
.
accountInfoWrapper
}
>
<
ComingSoonTooltip
className
=
{
styles
.
comingSoon
}
place
=
"bottom"
tooltipId
=
"mystuff"
>
<
MenuBarItemTooltip
id
=
"mystuff"
>
<
div
className
=
{
styles
.
mystuffButton
}
>
<
img
className
=
{
styles
.
mystuffIcon
}
src
=
{
mystuffIcon
}
/>
</
div
>
</
ComingSoon
Tooltip
>
<
ComingSoon
Tooltip
className
=
{
styles
.
comingSoon
}
</
MenuBarItem
Tooltip
>
<
MenuBarItem
Tooltip
id
=
"account-nav"
place
=
"left"
tooltipId
=
"account-nav"
>
<
div
className
=
{
styles
.
accountNavMenu
}
>
<
img
...
...
@@ -171,7 +157,7 @@ const MenuBar = props => (
src
=
{
dropdownCaret
}
/>
</
div
>
</
ComingSoon
Tooltip
>
</
MenuBarItem
Tooltip
>
</
div
>
</
Box
>
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment