Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
frontend
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Jira
External wiki
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
Container 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
minerva
frontend
Merge requests
!200
Resolve "[
MIN-113
] Show comments on the map"
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Resolve "[
MIN-113
] Show comments on the map"
67-min-113-show-comments-on-the-map
into
development
Overview
5
Commits
8
Pipelines
3
Changes
1
Merged
Piotr Gawron
requested to merge
67-min-113-show-comments-on-the-map
into
development
10 months ago
Overview
5
Commits
8
Pipelines
3
Changes
1
Expand
Closes
#67 (closed)
0
0
Merge request reports
Viewing commit
a63b3880
Prev
Next
Show latest version
1 file
+
26
−
19
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
a63b3880
layout for comment button
· a63b3880
Piotr Gawron
authored
10 months ago
src/components/FunctionalArea/MapNavigation/MapNavigation.component.tsx
+
26
−
19
Options
@@ -46,26 +46,33 @@ export const MapNavigation = (): JSX.Element => {
};
return
(
<
div
className
=
"flex h-10 w-full flex-row flex-nowrap justify-start overflow-y-auto bg-white-pearl text-xs shadow-primary"
>
{
openedMaps
.
map
(
map
=>
(
<
Button
key
=
{
map
.
modelId
}
className
=
{
twMerge
(
'
h-10 whitespace-nowrap
'
,
isActive
(
map
.
modelId
)
?
'
bg-[#EBF4FF]
'
:
'
font-normal
'
,
)
}
variantStyles
=
{
isActive
(
map
.
modelId
)
?
'
secondary
'
:
'
ghost
'
}
onClick
=
{
():
void
=>
onSubmapTabClick
(
map
)
}
>
{
map
.
modelName
}
{
isNotMainMap
(
map
.
modelName
)
&&
(
// eslint-disable-next-line jsx-a11y/click-events-have-key-events, jsx-a11y/no-static-element-interactions
<
div
onClick
=
{
(
event
):
void
=>
onCloseSubmap
(
event
,
map
)
}
data-testid
=
"close-icon"
>
<
Icon
name
=
"close"
className
=
"ml-3 h-5 w-5 fill-font-400"
/>
</
div
>
)
}
<
div
className
=
"flex h-10 w-full flex-row flex-nowrap justify-between overflow-y-auto bg-white-pearl text-xs shadow-primary"
>
<
div
className
=
"flex flex-row items-center justify-start"
>
{
openedMaps
.
map
(
map
=>
(
<
Button
key
=
{
map
.
modelId
}
className
=
{
twMerge
(
'
relative h-10 whitespace-nowrap
'
,
isActive
(
map
.
modelId
)
?
'
bg-[#EBF4FF]
'
:
'
font-normal
'
,
)
}
variantStyles
=
{
isActive
(
map
.
modelId
)
?
'
secondary
'
:
'
ghost
'
}
onClick
=
{
():
void
=>
onSubmapTabClick
(
map
)
}
>
{
map
.
modelName
}
{
isNotMainMap
(
map
.
modelName
)
&&
(
// eslint-disable-next-line jsx-a11y/click-events-have-key-events, jsx-a11y/no-static-element-interactions
<
div
onClick
=
{
(
event
):
void
=>
onCloseSubmap
(
event
,
map
)
}
data-testid
=
"close-icon"
>
<
Icon
name
=
"close"
className
=
"ml-3 h-5 w-5 fill-font-400"
/>
</
div
>
)
}
</
Button
>
))
}
</
div
>
<
div
className
=
"flex items-center"
>
<
Button
className
=
"mx-4 flex-none"
variantStyles
=
"secondary"
>
Comments
</
Button
>
))
}
</
div
>
</
div
>
);
};
Loading