Skip to content

[6.x] Prevent nested Bard Sets from being dropped outside their instance #13851

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
o1y wants to merge 1 commit into
base: 6.x
Choose a base branch
from
Open

[6.x] Prevent nested Bard Sets from being dropped outside their instance #13851

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 13 additions & 6 deletions resources/js/components/fieldtypes/bard/Set.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,13 @@ export const Set = Node.create({
addProseMirrorPlugins() {
const bard = this.options.bard;
const type = this.type;
const sliceHasSetNodes = (slice) => {
let found = false;
slice.content.forEach((node) => {
if (node.type === type) found = true;
});
return found;
};
return [
new Plugin({
key: new PluginKey('setSelectionDecorator'),
Expand Down Expand Up @@ -106,13 +113,13 @@ export const Set = Node.create({
new Plugin({
key: new PluginKey('setPastedTransformer'),
props: {
handlePaste: (view, event, slice) => {
let hasSetNodes = false;
slice.content.forEach((node) => {
if (node.type === type) hasSetNodes = true;
});
handleDrop: (view, event, slice, moved) => {
if (moved || !slice) return false;

if (!hasSetNodes) return false;
return sliceHasSetNodes(slice);
},
handlePaste: (view, event, slice) => {
if (!sliceHasSetNodes(slice)) return false;

(async () => {
const content = [];
Expand Down