From 17c2da24267ba5e9edffc7bbe8abcc4bb29d0221 Mon Sep 17 00:00:00 2001 From: Vinicius Reis Date: Tue, 27 Sep 2022 12:23:26 -0300 Subject: [PATCH 1/4] =?UTF-8?q?=F0=9F=90=9B=20(#2842):=20use=20menu=20bar?= =?UTF-8?q?=20as=20container=20for=20emoji=20and=20list=20actions?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Vinicius Reis --- src/components/Menu/ActionList.vue | 4 +++- src/components/Menu/EmojiPickerAction.vue | 7 ++++--- src/components/Menu/MenuBar.provider.js | 12 ++++++++++++ src/components/Menu/MenuBar.vue | 16 +++++++++++++++- 4 files changed, 34 insertions(+), 5 deletions(-) create mode 100644 src/components/Menu/MenuBar.provider.js diff --git a/src/components/Menu/ActionList.vue b/src/components/Menu/ActionList.vue index 662bd2fbf72..1724047309f 100644 --- a/src/components/Menu/ActionList.vue +++ b/src/components/Menu/ActionList.vue @@ -25,6 +25,7 @@ class="entry-list-action entry-action" role="menu" v-bind="state" + :container="menuIDSelector" :aria-label="actionEntry.label" :title="actionEntry.label" :data-text-action-entry="actionEntry.key" @@ -48,12 +49,13 @@ import ActionSingle from './ActionSingle.vue' import { getIsActive } from './utils.js' import { useOutlineStateMixin } from '../Editor/Wrapper.provider.js' import useStore from '../../mixins/store.js' +import { useMenuIDMixin } from './MenuBar.provider.js' export default { name: 'ActionList', components: { NcActions, ActionSingle }, extends: BaseActionEntry, - mixins: [useStore, useOutlineStateMixin], + mixins: [useStore, useOutlineStateMixin, useMenuIDMixin], computed: { currentChild() { const { diff --git a/src/components/Menu/EmojiPickerAction.vue b/src/components/Menu/EmojiPickerAction.vue index d39e16e7d29..7a48560b7dd 100644 --- a/src/components/Menu/EmojiPickerAction.vue +++ b/src/components/Menu/EmojiPickerAction.vue @@ -22,6 +22,7 @@