[TikiWiki-commits] [Git][tikiwiki/tiki][29.x] [BP][UPD] Update npm dependencies (element-plus exclusively)
"Victor Emanouilov \(@kroky\) via TikiWiki-cvs" <[email protected]>
| Newsgroups | gmane.comp.cms.tiki.cvs |
|---|---|
| Message-ID | <699ff52836131_3b18775c78171@gitlab-sidekiq-low-urgency-cpu-bound-v2-84674d4b7d-9nj6d.mail> |
Victor Emanouilov pushed to branch 29.x at Tiki Wiki CMS Groupware / Tiki
Commits:
d650acec by Merci Jacob at 2026-02-26T07:16:38+00:00
[BP][UPD] Update npm dependencies (element-plus exclusively)
---
* [UPD] Update npm dependencies
---
* update patch in regards to the lib update
* [UPD] Update npm dependencies
See merge request tikiwiki/tiki!9599
See merge request tikiwiki/tiki!9619
- - - - -
2 changed files:
- package-lock.json
- src/js/patches/element-plus+2.13.0.patch → src/js/patches/element-plus+2.13.2.patch
Changes:
=====================================
package-lock.json
=====================================
@@ -7279,9 +7279,9 @@
"license": "ISC"
},
"node_modules/element-plus": {
- "version": "2.13.0",
- "resolved": "https://registry.npmjs.org/element-plus/-/element-plus-2.13.0.tgz",
- "integrity": "sha512-qjxS+SBChvqCl6lU6ShiliLMN6WqFHiXQENYbAY3GKNflG+FS3jqn8JmQq0CBZq4koFqsi95NT1M6SL4whZfrA==",
+ "version": "2.13.2",
+ "resolved": "https://registry.npmjs.org/element-plus/-/element-plus-2.13.2.tgz",
+ "integrity": "sha512-Zjzm1NnFXGhV4LYZ6Ze9skPlYi2B4KAmN18FL63A3PZcjhDfroHwhtM6RE8BonlOPHXUnPQynH0BgaoEfvhrGw==",
"dev": true,
"license": "MIT",
"dependencies": {
@@ -7294,8 +7294,8 @@
"@vueuse/core": "^10.11.0",
"async-validator": "^4.2.5",
"dayjs": "^1.11.19",
- "lodash": "^4.17.21",
- "lodash-es": "^4.17.21",
+ "lodash": "^4.17.23",
+ "lodash-es": "^4.17.23",
"lodash-unified": "^1.0.3",
"memoize-one": "^6.0.0",
"normalize-wheel-es": "^1.2.0"
=====================================
src/js/patches/element-plus+2.13.0.patch → src/js/patches/element-plus+2.13.2.patch
=====================================
@@ -1,8 +1,8 @@
-diff --git a/node_modules/element-plus/es/components/tooltip/src/content2.mjs b/node_modules/element-plus/es/components/tooltip/src/content2.mjs
-index 1d274ed..4d67009 100644
---- a/node_modules/element-plus/es/components/tooltip/src/content2.mjs
-+++ b/node_modules/element-plus/es/components/tooltip/src/content2.mjs
-@@ -72,7 +72,7 @@ const _sfc_main = defineComponent({
+diff --git a/node_modules/element-plus/es/components/tooltip/src/content.vue2.mjs b/node_modules/element-plus/es/components/tooltip/src/content.vue2.mjs
+index 13f1c16..87f31ec 100644
+--- a/node_modules/element-plus/es/components/tooltip/src/content.vue2.mjs
++++ b/node_modules/element-plus/es/components/tooltip/src/content.vue2.mjs
+@@ -71,7 +71,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
const ariaHidden = ref(true);
const onTransitionLeave = () => {
onHide();
@@ -11,12 +11,24 @@ index 1d274ed..4d67009 100644
ariaHidden.value = true;
};
const stopWhenControlled = () => {
-@@ -109,7 +109,7 @@ const _sfc_main = defineComponent({
+@@ -107,7 +107,19 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
var _a;
const popperContent = (_a = contentRef.value) == null ? void 0 : _a.popperContentRef;
const activeElement = (event == null ? void 0 : event.relatedTarget) || document.activeElement;
- return popperContent == null ? void 0 : popperContent.contains(activeElement);
-+ return popperContent && ((activeElement.shadowRoot || activeElement).contains(popperContent) || popperContent.contains(activeElement));
++ if (popperContent.dataset?.tikiFocused) {
++ return false;
++ }
++
++ if (popperContent && ((activeElement.shadowRoot || activeElement).contains(popperContent) || popperContent.contains(activeElement))) {
++ popperContent.dataset.tikiFocused = "true";
++ setTimeout(() => {
++ delete popperContent.dataset.tikiFocused;
++ }, 100);
++ return true;
++ }
++
++ return false;
};
watch(
() => unref(open),
View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/d650acec06b2247a720f0d96fa58b3d1bf8018f8
--
View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/d650acec06b2247a720f0d96fa58b3d1bf8018f8
You're receiving this email because of your account on gitlab.com. Manage all notifications: https://gitlab.com/-/profile/notifications | Help: https://gitlab.com/help
_______________________________________________
TikiWiki-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs