diff --git a/components/lib/contextmenu/ContextMenu.d.ts b/components/lib/contextmenu/ContextMenu.d.ts index e23c66909..90b3ee5c1 100755 --- a/components/lib/contextmenu/ContextMenu.d.ts +++ b/components/lib/contextmenu/ContextMenu.d.ts @@ -20,7 +20,7 @@ export declare type ContextMenuPassThroughOptionType = ContextMenuPassThroughAtt export interface ContextMenuPassThroughMethodOptions { props: ContextMenuProps; state: ContextMenuState; - options: ContextMenuOptions; + context: ContextMenuContext; } /** @@ -129,7 +129,7 @@ export interface ContextMenuState { /** * Defines current options in ContextMenu component. */ -export interface ContextMenuOptions { +export interface ContextMenuContext { /** * Current active state of menuitem as a boolean. * @defaultValue false diff --git a/components/lib/contextmenu/ContextMenuSub.vue b/components/lib/contextmenu/ContextMenuSub.vue index d4aab6021..b1fe95df4 100755 --- a/components/lib/contextmenu/ContextMenuSub.vue +++ b/components/lib/contextmenu/ContextMenuSub.vue @@ -149,7 +149,7 @@ export default { }, getPTOptions(processedItem, key) { return this.ptm(key, { - options: { + context: { active: this.isItemActive(processedItem), focused: this.isItemFocused(processedItem) } diff --git a/components/lib/dock/Dock.d.ts b/components/lib/dock/Dock.d.ts index ca2ceb066..2c11c73bb 100644 --- a/components/lib/dock/Dock.d.ts +++ b/components/lib/dock/Dock.d.ts @@ -19,6 +19,7 @@ export declare type DockPassThroughOptionType = DockPassThroughAttributes | ((op export interface DockPassThroughMethodOptions { props: DockProps; state: DockState; + context: DockContext; } /** @@ -88,6 +89,17 @@ export interface DockState { focusedOptionIndex: number; } +/** + * Defines current options in Dock component. + */ +export interface DockContext { + /** + * Current active state of menuitem as a boolean. + * @defaultValue false + */ + active: boolean; +} + /** * Defines tooltip options */ diff --git a/components/lib/dock/DockSub.vue b/components/lib/dock/DockSub.vue index dc2271001..98be1c103 100644 --- a/components/lib/dock/DockSub.vue +++ b/components/lib/dock/DockSub.vue @@ -25,9 +25,9 @@ :aria-disabled="disabled(processedItem)" @click="onItemClick($event, processedItem)" @mouseenter="onItemMouseEnter(index)" - v-bind="ptm('menuitem')" + v-bind="getPTOptions(getItemId(index), 'menuitem')" > -
+