Skip to content

Use KDropdownMenu to render content nodes menus #4485

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 7 commits into
base: unstable
Choose a base branch
from
Open

Use KDropdownMenu to render content nodes menus #4485

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2422248
Replace contentNodeOPtions with KDropdown
AlexVelezLl Mar 25, 2024
42f0c0d
Move moveModal and clean COntentNodeOptions
AlexVelezLl Mar 25, 2024
7b8fd08
use KDropdownMenu as context menu
AlexVelezLl Mar 25, 2024
b5629e6
Lint files
AlexVelezLl Mar 25, 2024
fc6f1aa
Update yarn lock file
AlexVelezLl Mar 25, 2024
78ec861
Fix StudioTree
AlexVelezLl Mar 25, 2024
effd79d
Update kds reference
AlexVelezLl May 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 0 additions & 60 deletions contentcuration/contentcuration/frontend/channelEdit/components/ContentNodeContextMenu.vue
View file
Open in desktop

This file was deleted.

43 changes: 16 additions & 27 deletions contentcuration/contentcuration/frontend/channelEdit/components/ContentNodeEditListItem.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,30 +49,28 @@
<template #actions-end>
<VListTileAction class="action-icon px-1" @click.stop>
<transition name="fade">
<IconButton
<KIconButton
icon="rename"
size="small"
:text="$tr('editTooltip')"
:tooltip="$tr('editTooltip')"
:disabled="copying"
@click.stop
@click="editTitleDescription()"
/>
</transition>
</VListTileAction>
<VListTileAction :aria-hidden="!active" class="action-icon px-1">
<Menu v-model="activated">
<template #activator="{ on }">
<IconButton
icon="optionsVertical"
:text="$tr('optionsTooltip')"
size="small"
:disabled="copying"
v-on="on"
@click.stop
/>
<KIconButton
icon="optionsVertical"
size="small"
:tooltip="$tr('optionsTooltip')"
:disabled="copying"
@click.stop
>
<template #menu>
<ContentNodeOptions v-if="!copying" :nodeId="nodeId" />
</template>
<ContentNodeOptions v-if="!copying && activated" :nodeId="nodeId" />
</Menu>
</KIconButton>
</VListTileAction>
</template>

Expand All @@ -92,11 +90,9 @@
/>
</template>

<template #context-menu="{ showContextMenu, positionX, positionY }">
<ContentNodeContextMenu
:show="showContextMenu"
:positionX="positionX"
:positionY="positionY"
<template #context-menu>
<ContentNodeOptions
isContextMenu
:nodeId="nodeId"
/>
</template>
Expand All @@ -113,7 +109,6 @@

import ContentNodeListItem from './ContentNodeListItem';
import ContentNodeOptions from './ContentNodeOptions';
import ContentNodeContextMenu from './ContentNodeContextMenu';
import Checkbox from 'shared/views/form/Checkbox';
import IconButton from 'shared/views/IconButton';
import DraggableItem from 'shared/views/draggable/DraggableItem';
Expand All @@ -129,7 +124,6 @@
DraggableItem,
ContentNodeListItem,
ContentNodeOptions,
ContentNodeContextMenu,
Checkbox,
IconButton,
},
Expand Down Expand Up @@ -164,11 +158,6 @@
default: false,
},
},
data() {
return {
activated: false,
};
},
computed: {
...mapGetters('currentChannel', ['canEdit']),
...mapGetters('contentNode', [
Expand All @@ -186,7 +175,7 @@
},
},
active() {
return this.selected || this.activated || this.previewing;
return this.selected || this.previewing;
},
contentNode() {
return this.getContentNode(this.nodeId);
Expand Down
Loading