Merge pull request #2728 from tugcekucukoglu/menu-spaces

Fixed #2695 - Menu, Menubar, ContextMenu, TieredMenu: Extra spacing w…
primefaces · Jun 28, 2022 · d1a96c3 · d1a96c3
2 parents 110ae5a + 818dcea
commit d1a96c3
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/src/components/contextmenu/ContextMenuSub.vue b/src/components/contextmenu/ContextMenuSub.vue
@@ -7,13 +7,13 @@
                     <template v-if="!template">
                         <router-link v-if="item.to && !disabled(item)" :to="item.to" custom v-slot="{navigate, href, isActive, isExactActive}">
                             <a :href="href" @click="onItemClick($event, item, navigate)" :class="linkClass(item, {isActive, isExactActive})" v-ripple role="menuitem">
-                                <span :class="['p-menuitem-icon', item.icon]"></span>
+                                <span :class="['p-menuitem-icon', item.icon]" v-if="item.icon"></span>
                                 <span class="p-menuitem-text">{{label(item)}}</span>
                             </a>
                         </router-link>
                         <a v-else :href="item.url" :class="linkClass(item)" :target="item.target" @click="onItemClick($event, item)" v-ripple
                             :aria-haspopup="item.items != null" :aria-expanded="item === activeItem" role="menuitem" :tabindex="disabled(item) ? null : '0'">
-                            <span :class="['p-menuitem-icon', item.icon]"></span>
+                            <span :class="['p-menuitem-icon', item.icon]" v-if="item.icon"></span>
                             <span class="p-menuitem-text">{{label(item)}}</span>
                             <span class="p-submenu-icon pi pi-angle-right" v-if="item.items"></span>
                         </a>

diff --git a/src/components/menu/Menuitem.vue b/src/components/menu/Menuitem.vue
@@ -3,12 +3,12 @@
         <template v-if="!template">
             <router-link v-if="item.to && !disabled(item)" :to="item.to" custom v-slot="{navigate, href, isActive, isExactActive}">
                 <a :href="href" @click="onClick($event, navigate)" :class="linkClass(item, {isActive, isExactActive})" v-ripple role="menuitem">
-                    <span :class="['p-menuitem-icon', item.icon]"></span>
+                    <span :class="['p-menuitem-icon', item.icon]" v-if="item.icon"></span>
                     <span class="p-menuitem-text">{{label()}}</span>
                 </a>
             </router-link>
             <a v-else :href="item.url" :class="linkClass(item)" @click="onClick" :target="item.target" role="menuitem" :tabindex="disabled(item) ? null : '0'" v-ripple>
-                <span :class="['p-menuitem-icon', item.icon]"></span>
+                <span :class="['p-menuitem-icon', item.icon]" v-if="item.icon"></span>
                 <span class="p-menuitem-text">{{label()}}</span>
             </a>
         </template>

diff --git a/src/components/menubar/MenubarSub.vue b/src/components/menubar/MenubarSub.vue
@@ -6,13 +6,13 @@
                 <template v-if="!template">
                     <router-link v-if="item.to && !disabled(item)" :to="item.to" custom v-slot="{navigate, href, isActive, isExactActive}">
                         <a :href="href" @click="onItemClick($event, item, navigate)" :class="linkClass(item, {isActive, isExactActive})" v-ripple @keydown="onItemKeyDown($event, item)" role="menuitem">
-                            <span :class="['p-menuitem-icon', item.icon]"></span>
+                            <span :class="['p-menuitem-icon', item.icon]" v-if="item.icon"></span>
                             <span class="p-menuitem-text">{{label(item)}}</span>
                         </a>
                     </router-link>
                     <a v-else :href="item.url" :class="linkClass(item)" :target="item.target" :aria-haspopup="item.items != null" :aria-expanded="item === activeItem"
                         @click="onItemClick($event, item)" @keydown="onItemKeyDown($event, item)" role="menuitem" :tabindex="disabled(item) ? null : '0'" v-ripple>
-                        <span :class="['p-menuitem-icon', item.icon]"></span>
+                        <span :class="['p-menuitem-icon', item.icon]" v-if="item.icon"></span>
                         <span class="p-menuitem-text">{{label(item)}}</span>
                         <span :class="getSubmenuIcon()" v-if="item.items"></span>
                     </a>

diff --git a/src/components/tieredmenu/TieredMenuSub.vue b/src/components/tieredmenu/TieredMenuSub.vue
@@ -6,13 +6,13 @@
                 <template v-if="!template">
                     <router-link v-if="item.to && !disabled(item)" :to="item.to" custom v-slot="{navigate, href, isActive, isExactActive}">
                         <a :href="href" @click="onItemClick($event, item, navigate)" :class="linkClass(item, {isActive, isExactActive})" v-ripple @keydown="onItemKeyDown($event, item)" role="menuitem">
-                            <span :class="['p-menuitem-icon', item.icon]"></span>
+                            <span :class="['p-menuitem-icon', item.icon]" v-if="item.icon"></span>
                             <span class="p-menuitem-text">{{label(item)}}</span>
                         </a>
                     </router-link>
                     <a v-else :href="item.url" :class="linkClass(item)" :target="item.target" :aria-haspopup="item.items != null" :aria-expanded="item === activeItem"
                         @click="onItemClick($event, item)" @keydown="onItemKeyDown($event, item)" role="menuitem" :tabindex="disabled(item) ? null : '0'" v-ripple>
-                        <span :class="['p-menuitem-icon', item.icon]"></span>
+                        <span :class="['p-menuitem-icon', item.icon]" v-if="item.icon"></span>
                         <span class="p-menuitem-text">{{label(item)}}</span>
                         <span class="p-submenu-icon pi pi-angle-right" v-if="item.items"></span>
                     </a>