Refactor #4739 - For Dock

pull/4763/head
tugcekucukoglu 2023-11-08 15:48:23 +03:00
parent 661048609e
commit 97d3b4561b
5 changed files with 3 additions and 54 deletions

View File

@ -14,10 +14,6 @@ export default {
class: null, class: null,
style: null, style: null,
tooltipOptions: null, tooltipOptions: null,
exact: {
type: Boolean,
default: true
},
menuId: { menuId: {
type: String, type: String,
default: null default: null

View File

@ -188,6 +188,7 @@ export interface DockProps {
style?: any; style?: any;
/** /**
* Whether to apply 'router-link-active-exact' class if route exactly matches the item path. * Whether to apply 'router-link-active-exact' class if route exactly matches the item path.
* @deprecated since v3.40.0.
* @defaultValue true * @defaultValue true
*/ */
exact?: boolean | undefined; exact?: boolean | undefined;

View File

@ -1,18 +1,6 @@
<template> <template>
<div :class="containerClass" :style="style" v-bind="ptm('root')" data-pc-name="dock"> <div :class="containerClass" :style="style" v-bind="ptm('root')" data-pc-name="dock">
<DockSub <DockSub :model="model" :templates="$slots" :tooltipOptions="tooltipOptions" :position="position" :menuId="menuId" :aria-label="ariaLabel" :aria-labelledby="ariaLabelledby" :tabindex="tabindex" :pt="pt" :unstyled="unstyled"></DockSub>
:model="model"
:templates="$slots"
:exact="exact"
:tooltipOptions="tooltipOptions"
:position="position"
:menuId="menuId"
:aria-label="ariaLabel"
:aria-labelledby="ariaLabelledby"
:tabindex="tabindex"
:pt="pt"
:unstyled="unstyled"
></DockSub>
</div> </div>
</template> </template>
@ -23,11 +11,6 @@ import DockSub from './DockSub.vue';
export default { export default {
name: 'Dock', name: 'Dock',
extends: BaseDock, extends: BaseDock,
beforeMount() {
if (!this.$slots.item) {
console.warn('In future versions, vue-router support will be removed. Item templating should be used.');
}
},
computed: { computed: {
containerClass() { containerClass() {
return [this.class, this.cx('root')]; return [this.class, this.cx('root')];

View File

@ -31,25 +31,7 @@
> >
<div :class="cx('content')" v-bind="getPTOptions('content', processedItem, index)"> <div :class="cx('content')" v-bind="getPTOptions('content', processedItem, index)">
<template v-if="!templates['item']"> <template v-if="!templates['item']">
<router-link v-if="processedItem.to && !disabled(processedItem)" v-slot="{ navigate, href, isActive, isExactActive }" :to="processedItem.to" custom>
<a
v-tooltip:[tooltipOptions]="{ value: processedItem.label, disabled: !tooltipOptions }"
:href="href"
:class="cx('action', { isActive, isExactActive })"
:target="processedItem.target"
tabindex="-1"
aria-hidden="true"
@click="onItemActionClick($event, processedItem, navigate)"
v-bind="getPTOptions('action', processedItem, index)"
>
<template v-if="!templates['icon']">
<span v-ripple :class="[cx('icon'), processedItem.icon]" v-bind="getPTOptions('icon', processedItem, index)"></span>
</template>
<component v-else :is="templates['icon']" :item="processedItem" :class="cx('icon')"></component>
</a>
</router-link>
<a <a
v-else
v-tooltip:[tooltipOptions]="{ value: processedItem.label, disabled: !tooltipOptions }" v-tooltip:[tooltipOptions]="{ value: processedItem.label, disabled: !tooltipOptions }"
:href="processedItem.url" :href="processedItem.url"
:class="cx('action')" :class="cx('action')"
@ -97,10 +79,6 @@ export default {
type: null, type: null,
default: null default: null
}, },
exact: {
type: Boolean,
default: true
},
tooltipOptions: null, tooltipOptions: null,
menuId: { menuId: {
type: String, type: String,
@ -163,9 +141,6 @@ export default {
onItemMouseEnter(index) { onItemMouseEnter(index) {
this.currentIndex = index; this.currentIndex = index;
}, },
onItemActionClick(event, navigate) {
navigate && navigate(event);
},
onItemClick(event, processedItem) { onItemClick(event, processedItem) {
if (this.isSameMenuItem(event)) { if (this.isSameMenuItem(event)) {
const command = this.getItemProp(processedItem, 'command'); const command = this.getItemProp(processedItem, 'command');

View File

@ -127,13 +127,7 @@ const classes = {
} }
], ],
content: 'p-menuitem-content', content: 'p-menuitem-content',
action: ({ props, isActive, isExactActive }) => [ action: 'p-dock-link',
'p-dock-link',
{
'router-link-active': isActive,
'router-link-active-exact': props.exact && isExactActive
}
],
icon: 'p-dock-icon' icon: 'p-dock-icon'
}; };