From e5327c090328f24c6ac3710c8c05c7b859360027 Mon Sep 17 00:00:00 2001 From: Paul Bottein Date: Mon, 9 Sep 2024 17:15:53 +0200 Subject: [PATCH] Update patch for sortablejs 1.15.3 (#21934) Update sortablejs patch --- ...=> sortablejs-npm-1.15.3-3235a8f83b.patch} | 23 ++++--------------- package.json | 2 +- yarn.lock | 7 ++++++ 3 files changed, 13 insertions(+), 19 deletions(-) rename .yarn/patches/{sortablejs-npm-1.15.2-73347ae85a.patch => sortablejs-npm-1.15.3-3235a8f83b.patch} (74%) diff --git a/.yarn/patches/sortablejs-npm-1.15.2-73347ae85a.patch b/.yarn/patches/sortablejs-npm-1.15.3-3235a8f83b.patch similarity index 74% rename from .yarn/patches/sortablejs-npm-1.15.2-73347ae85a.patch rename to .yarn/patches/sortablejs-npm-1.15.3-3235a8f83b.patch index bef3450d02..9719035ede 100644 --- a/.yarn/patches/sortablejs-npm-1.15.2-73347ae85a.patch +++ b/.yarn/patches/sortablejs-npm-1.15.3-3235a8f83b.patch @@ -1,16 +1,7 @@ diff --git a/modular/sortable.core.esm.js b/modular/sortable.core.esm.js -index 93ba17509e2e8583ab241fea6845fbe714c584a2..de0651ddb5dced30d36f7d764da0dd0b441f523f 100644 +index 8b5e49b011713c8859c669069fbe85ce53974e1d..6a0afc92787157b8a31c38cc5f67dfa526090a00 100644 --- a/modular/sortable.core.esm.js +++ b/modular/sortable.core.esm.js -@@ -1461,7 +1461,7 @@ Sortable.prototype = /** @lends Sortable.prototype */{ - } - target = parent; // store last element - } -- /* jshint boss:true */ while (parent = parent.parentNode); -+ /* jshint boss:true */ while (parent = parent.parentNode || parent.getRootNode().host); - } - _unhideGhostForTarget(); - } @@ -1781,11 +1781,16 @@ Sortable.prototype = /** @lends Sortable.prototype */{ } if (_onMove(rootEl, el, dragEl, dragRect, target, targetRect, evt, !!target) !== false) { @@ -33,7 +24,7 @@ index 93ba17509e2e8583ab241fea6845fbe714c584a2..de0651ddb5dced30d36f7d764da0dd0b } parentEl = el; // actualization -@@ -1802,7 +1807,13 @@ Sortable.prototype = /** @lends Sortable.prototype */{ +@@ -1802,7 +1807,12 @@ Sortable.prototype = /** @lends Sortable.prototype */{ targetRect = getRect(target); if (_onMove(rootEl, el, dragEl, dragRect, target, targetRect, evt, false) !== false) { capture(); @@ -44,11 +35,10 @@ index 93ba17509e2e8583ab241fea6845fbe714c584a2..de0651ddb5dced30d36f7d764da0dd0b + catch(err) { + return completed(false); + } -+ parentEl = el; // actualization changed(); -@@ -1849,12 +1860,17 @@ Sortable.prototype = /** @lends Sortable.prototype */{ +@@ -1849,10 +1859,15 @@ Sortable.prototype = /** @lends Sortable.prototype */{ _silent = true; setTimeout(_unsilent, 30); capture(); @@ -56,8 +46,6 @@ index 93ba17509e2e8583ab241fea6845fbe714c584a2..de0651ddb5dced30d36f7d764da0dd0b - el.appendChild(dragEl); - } else { - target.parentNode.insertBefore(dragEl, after ? nextSibling : target); -- } - + try { + if (after && !nextSibling) { + el.appendChild(dragEl); @@ -67,7 +55,6 @@ index 93ba17509e2e8583ab241fea6845fbe714c584a2..de0651ddb5dced30d36f7d764da0dd0b + } + catch(err) { + return completed(false); -+ } + } + // Undo chrome's scroll adjustment (has no effect on other browsers) - if (scrolledPastTop) { - scrollBy(scrolledPastTop, 0, scrollBefore - scrolledPastTop.scrollTop); diff --git a/package.json b/package.json index 75f61c7f8e..4803d96bf9 100644 --- a/package.json +++ b/package.json @@ -255,7 +255,7 @@ "clean-css": "5.3.3", "@lit/reactive-element": "1.6.3", "@fullcalendar/daygrid": "6.1.15", - "sortablejs@1.15.2": "patch:sortablejs@npm%3A1.15.2#~/.yarn/patches/sortablejs-npm-1.15.2-73347ae85a.patch", + "sortablejs@1.15.3": "patch:sortablejs@npm%3A1.15.3#~/.yarn/patches/sortablejs-npm-1.15.3-3235a8f83b.patch", "leaflet-draw@1.0.4": "patch:leaflet-draw@npm%3A1.0.4#./.yarn/patches/leaflet-draw-npm-1.0.4-0ca0ebcf65.patch" }, "packageManager": "yarn@4.4.1" diff --git a/yarn.lock b/yarn.lock index 060ee74695..4491b40389 100644 --- a/yarn.lock +++ b/yarn.lock @@ -13207,6 +13207,13 @@ __metadata: languageName: node linkType: hard +"sortablejs@patch:sortablejs@npm%3A1.15.3#~/.yarn/patches/sortablejs-npm-1.15.3-3235a8f83b.patch": + version: 1.15.3 + resolution: "sortablejs@patch:sortablejs@npm%3A1.15.3#~/.yarn/patches/sortablejs-npm-1.15.3-3235a8f83b.patch::version=1.15.3&hash=fba0ad" + checksum: 10/249f4cfd2b4a811f4e1505b25d4d67a97521afabdabd2f5482f985da20785d995c2899d442ad79075c7ba547e477aef81f09b0028f12d1de468cbca4f2b8c043 + languageName: node + linkType: hard + "source-list-map@npm:^2.0.1": version: 2.0.1 resolution: "source-list-map@npm:2.0.1"