Skip to content

Commit

Permalink
Migrate v-tooltip to floating-vue
Browse files Browse the repository at this point in the history
Signed-off-by: Raimund Schlüßler <raimund.schluessler@mailbox.org>
  • Loading branch information
raimund-schluessler committed Apr 4, 2022
1 parent 3aa72f6 commit 1983476
Show file tree
Hide file tree
Showing 7 changed files with 209 additions and 242 deletions.
128 changes: 69 additions & 59 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
"debounce": "1.2.1",
"emoji-mart-vue-fast": "^10.2.1",
"escape-html": "^1.0.3",
"floating-vue": "^1.0.0-beta.15",
"hammerjs": "^2.0.8",
"linkify-string": "^3.0.2",
"md5": "^2.2.1",
Expand All @@ -58,7 +59,6 @@
"style-loader": "^2.0.0",
"tributejs": "^5.1.3",
"v-click-outside": "^3.0.1",
"v-tooltip": "^2.0.3",
"vue": "^2.6.14",
"vue-color": "^2.7.1",
"vue-material-design-icons": "^5.0.0",
Expand Down
2 changes: 1 addition & 1 deletion src/components/Actions/Actions.vue
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ export default {
:handle-resize="true"
:open.sync="opened"
:placement="placement"
:boundaries-element="boundariesElement"
:boundary="boundariesElement"
:container="container"
@show="openMenu"
@after-show="onOpen"
Expand Down
23 changes: 3 additions & 20 deletions src/components/EmojiPicker/EmojiPicker.vue
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
```vue
<template>
<div>
<EmojiPicker @select="select">
<EmojiPicker @select="select" style="display: inline-block">
<button> Click Me </button>
</EmojiPicker>
<span>selected emoji: {{ emoji }}</span>
Expand Down Expand Up @@ -62,7 +62,8 @@
<EmojiPicker
:close-on-select="false"
:show-preview="true"
@select="select">
@select="select"
style="display: inline-block">
<button> Click Me </button>
</EmojiPicker>
<span>selected emoji: {{ emoji }}</span>
Expand Down Expand Up @@ -90,8 +91,6 @@
<Popover
:open.sync="open"
:container="container"
popover-class="emoji-popover"
popover-inner-class="popover-emoji-picker-inner"
v-bind="$attrs"
v-on="$listeners">
<template #trigger>
Expand Down Expand Up @@ -223,22 +222,6 @@ export default {
<style lang="scss">
@import '~emoji-mart-vue-fast/css/emoji-mart.css';
.emoji-popover {
& .tooltip-arrow,
&[x-placement^='top'] {
margin-left: 0 !important;
}
& .tooltip-arrow,
&[x-placement^='bottom'] {
margin-top: 0 !important;
}
// Remove the extra padding from VTooltip
.popover-emoji-picker-inner {
padding: 0;
}
}
.emoji-mart {
background-color: var(--color-main-background) !important;
border: 0;
Expand Down
Loading

0 comments on commit 1983476

Please sign in to comment.