Commit a5bb5ce4 authored by Ezekiel Kigbo's avatar Ezekiel Kigbo

Merge branch 'Replace-shared-tooltip-ab' into 'master'

Replacing shared tooltip on confidential sidebar component

Closes #229013

See merge request gitlab-org/gitlab!42098
parents 1e5901bc 11bcc1b1
<script> <script>
import { mapState } from 'vuex'; import { mapState } from 'vuex';
import { GlIcon } from '@gitlab/ui'; import { GlIcon, GlTooltipDirective } from '@gitlab/ui';
import { __, sprintf } from '~/locale'; import { __, sprintf } from '~/locale';
import tooltip from '~/vue_shared/directives/tooltip';
import eventHub from '~/sidebar/event_hub'; import eventHub from '~/sidebar/event_hub';
import EditForm from './edit_form.vue'; import EditForm from './edit_form.vue';
...@@ -12,7 +11,7 @@ export default { ...@@ -12,7 +11,7 @@ export default {
GlIcon, GlIcon,
}, },
directives: { directives: {
tooltip, GlTooltip: GlTooltipDirective,
}, },
props: { props: {
fullPath: { fullPath: {
...@@ -73,12 +72,9 @@ export default { ...@@ -73,12 +72,9 @@ export default {
<div class="block issuable-sidebar-item confidentiality"> <div class="block issuable-sidebar-item confidentiality">
<div <div
ref="collapseIcon" ref="collapseIcon"
v-tooltip v-gl-tooltip.viewport.left
:title="tooltipLabel" :title="tooltipLabel"
class="sidebar-collapsed-icon" class="sidebar-collapsed-icon"
data-container="body"
data-placement="left"
data-boundary="viewport"
@click="toggleForm" @click="toggleForm"
> >
<gl-icon :name="confidentialityIcon" aria-hidden="true" /> <gl-icon :name="confidentialityIcon" aria-hidden="true" />
......
...@@ -7,11 +7,7 @@ exports[`Confidential Issue Sidebar Block renders for confidential = false and i ...@@ -7,11 +7,7 @@ exports[`Confidential Issue Sidebar Block renders for confidential = false and i
> >
<div <div
class="sidebar-collapsed-icon" class="sidebar-collapsed-icon"
data-boundary="viewport" title="Not confidential"
data-container="body"
data-original-title="Not confidential"
data-placement="left"
title=""
> >
<gl-icon-stub <gl-icon-stub
aria-hidden="true" aria-hidden="true"
...@@ -59,11 +55,7 @@ exports[`Confidential Issue Sidebar Block renders for confidential = false and i ...@@ -59,11 +55,7 @@ exports[`Confidential Issue Sidebar Block renders for confidential = false and i
> >
<div <div
class="sidebar-collapsed-icon" class="sidebar-collapsed-icon"
data-boundary="viewport" title="Not confidential"
data-container="body"
data-original-title="Not confidential"
data-placement="left"
title=""
> >
<gl-icon-stub <gl-icon-stub
aria-hidden="true" aria-hidden="true"
...@@ -119,11 +111,7 @@ exports[`Confidential Issue Sidebar Block renders for confidential = true and is ...@@ -119,11 +111,7 @@ exports[`Confidential Issue Sidebar Block renders for confidential = true and is
> >
<div <div
class="sidebar-collapsed-icon" class="sidebar-collapsed-icon"
data-boundary="viewport" title="Confidential"
data-container="body"
data-original-title="Confidential"
data-placement="left"
title=""
> >
<gl-icon-stub <gl-icon-stub
aria-hidden="true" aria-hidden="true"
...@@ -170,11 +158,7 @@ exports[`Confidential Issue Sidebar Block renders for confidential = true and is ...@@ -170,11 +158,7 @@ exports[`Confidential Issue Sidebar Block renders for confidential = true and is
> >
<div <div
class="sidebar-collapsed-icon" class="sidebar-collapsed-icon"
data-boundary="viewport" title="Confidential"
data-container="body"
data-original-title="Confidential"
data-placement="left"
title=""
> >
<gl-icon-stub <gl-icon-stub
aria-hidden="true" aria-hidden="true"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment