From 051d51bcd92530e5aff0c3e47f26b26695af7843 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Thu, 17 Mar 2022 09:28:19 +0200 Subject: [PATCH] fix suggest not working --- package.json | 2 +- src/boot/after_store.js | 11 ++++++++--- src/components/emoji_input/emoji_input.js | 1 + yarn.lock | 10 +++++----- 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index 4f494324..4bcd4853 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ "portal-vue": "2.1.7", "punycode.js": "2.1.0", "ruffle-mirror": "2021.4.11", - "v-click-outside": "2.1.5", + "click-outside-vue3": "4.0.1", "vue": "^3.1.0", "@vue/compat": "^3.1.0", "vue-i18n": "9.1.9", diff --git a/src/boot/after_store.js b/src/boot/after_store.js index e0d7aa0f..5ddc7465 100644 --- a/src/boot/after_store.js +++ b/src/boot/after_store.js @@ -1,6 +1,6 @@ -import { createApp } from 'vue' +import { createApp, configureCompat } from 'vue' import { createRouter, createWebHistory } from 'vue-router' -import VueClickOutside from 'v-click-outside' +import vClickOutside from 'click-outside-vue3' import { FontAwesomeIcon, FontAwesomeLayers } from '@fortawesome/vue-fontawesome' @@ -15,6 +15,11 @@ import { CURRENT_VERSION } from '../services/theme_data/theme_data.service.js' import { applyTheme } from '../services/style_setter/style_setter.js' import FaviconService from '../services/favicon_service/favicon_service.js' +// disable compat for certain features +configureCompat({ + COMPONENT_V_MODEL: false +}) + let staticInitialResults = null const parsedInitialResults = () => { @@ -390,7 +395,7 @@ const afterStoreSetup = async ({ store, i18n }) => { app.use(store) app.use(i18n) - app.use(VueClickOutside) + app.use(vClickOutside) app.use(VBodyScrollLock) app.component('FAIcon', FontAwesomeIcon) diff --git a/src/components/emoji_input/emoji_input.js b/src/components/emoji_input/emoji_input.js index c836317a..5b51da18 100644 --- a/src/components/emoji_input/emoji_input.js +++ b/src/components/emoji_input/emoji_input.js @@ -31,6 +31,7 @@ library.add( */ const EmojiInput = { + emits: ['update:modelValue'], props: { suggest: { /** diff --git a/yarn.lock b/yarn.lock index bcd8d06f..4af18daa 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2731,6 +2731,11 @@ cli-width@^2.0.0: version "2.2.0" resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639" +click-outside-vue3@4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/click-outside-vue3/-/click-outside-vue3-4.0.1.tgz#81a6ac01696b301764b42db6fdbdf28e7cd8ef95" + integrity sha512-sbplNecrup5oGqA3o4bo8XmvHRT6q9fvw21Z67aDbTqB9M6LF7CuYLTlLvNtOgKU6W3zst5H5zJuEh4auqA34g== + cliui@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/cliui/-/cliui-6.0.0.tgz#511d702c0c4e41ca156d7d0e96021f23e13225b1" @@ -9639,11 +9644,6 @@ uuid@^3.3.2: version "3.3.2" resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131" -v-click-outside@2.1.5: - version "2.1.5" - resolved "https://registry.yarnpkg.com/v-click-outside/-/v-click-outside-2.1.5.tgz#aa69172fb41fcc79b26b9a4bc72a30ccf03f7a3c" - integrity sha512-VPNCOTZK6WZy73lcWc+R7IW1uaBFEO3/Csrs5CzWVOdvE30V8Y1+BE/BtTlcEmeDGx0eqdE7bSCg55Jj37PMJg== - v8-compile-cache@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.1.1.tgz#54bc3cdd43317bca91e35dcaf305b1a7237de745"