From 4a28b1bcd719ecca7b7275a016627f6637328481 Mon Sep 17 00:00:00 2001 From: nathan Date: Mon, 2 Dec 2024 14:52:04 -0700 Subject: [PATCH] Update shoelace 2.16.0 -> 2.18.0 --- api/js/etemplate/Et2Select/Et2Select.ts | 11 +++++++++-- .../etemplate/Et2Select/test/EditableTag.test.ts | 1 - package-lock.json | 15 +++++++++------ package.json | 2 +- 4 files changed, 19 insertions(+), 10 deletions(-) diff --git a/api/js/etemplate/Et2Select/Et2Select.ts b/api/js/etemplate/Et2Select/Et2Select.ts index ba6602796b..980647a7c8 100644 --- a/api/js/etemplate/Et2Select/Et2Select.ts +++ b/api/js/etemplate/Et2Select/Et2Select.ts @@ -356,6 +356,13 @@ export class Et2Select extends Et2WithSearchMixin(Et2WidgetWithSelect) this.removeEventListener("sl-change", this._triggerChange); } + async getUpdateComplete() + { + const more = await super.getUpdateComplete(); + await this.select.updateComplete; + return more; + } + _triggerChange(e) { if(super._triggerChange(e)) @@ -1063,8 +1070,8 @@ export class Et2Select extends Et2WithSearchMixin(Et2WidgetWithSelect) placement=${this.placement} tabindex="0" .getTag=${this._tagTemplate} - .maxOptionsVisible=${0} - .value=${value} + maxOptionsVisible=${0} + value=${Array.isArray(value) ? value.join(" ") : value} @sl-change=${this.handleValueChange} @mouseenter=${this._handleMouseEnter} @mouseup=${this.handleOptionClick} diff --git a/api/js/etemplate/Et2Select/test/EditableTag.test.ts b/api/js/etemplate/Et2Select/test/EditableTag.test.ts index 2054eefdb8..c6521e4aac 100644 --- a/api/js/etemplate/Et2Select/test/EditableTag.test.ts +++ b/api/js/etemplate/Et2Select/test/EditableTag.test.ts @@ -149,7 +149,6 @@ describe("Select is not editable", () => it("Does not have edit button when not editable", async() => { - debugger; let tag = element.select.combobox.querySelectorAll(tag_name); assert.isAbove(tag.length, 0, "No tags found"); diff --git a/package-lock.json b/package-lock.json index 30f26303e0..19e2934d15 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,17 +1,17 @@ { "name": "EGroupware", - "version": "23.1.20241111", + "version": "23.1.20241128", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "EGroupware", - "version": "23.1.20241111", + "version": "23.1.20241128", "license": "GPL-2.0", "dependencies": { "@bundled-es-modules/pdfjs-dist": "^2.5.207-rc1", "@rollup/plugin-commonjs": "^24.0.1", - "@shoelace-style/shoelace": "2.16.0", + "@shoelace-style/shoelace": "2.18.0", "@types/jquery": "^3.5.29", "blueimp-gallery": "^3.4.0", "bootstrap-icons": "^1.11.3", @@ -3723,9 +3723,9 @@ "integrity": "sha512-Hf45HeO+vdQblabpyZOTxJ4ZeZsmIUYXXPmoYrrR4OJ5OKxL+bhMz5mK8JXgl7HsoEowfz7+e248UGi861de9Q==" }, "node_modules/@shoelace-style/shoelace": { - "version": "2.16.0", - "resolved": "https://registry.npmjs.org/@shoelace-style/shoelace/-/shoelace-2.16.0.tgz", - "integrity": "sha512-OV4XYAAZv0OfOR4RlpxCYOn7pH8ETIL8Pkh5hFvIrL+BN4/vlBLoeESYDU2tB/f9iichu4cfwdPquJITmKdY1w==", + "version": "2.18.0", + "resolved": "https://registry.npmjs.org/@shoelace-style/shoelace/-/shoelace-2.18.0.tgz", + "integrity": "sha512-uzpL0+8Qm8aE2ArcXBcKHkaPc6l7ymuVaN6xJM0yd2o3talcoXpuP+gRBsgggSZKuuJEa+JkEuLDdzzFnE/+jw==", "license": "MIT", "dependencies": { "@ctrl/tinycolor": "^4.0.2", @@ -4183,6 +4183,7 @@ "version": "15.7.13", "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.13.tgz", "integrity": "sha512-hCZTSvwbzWGvhqxp/RqVqwU999pBf2vp7hzIjiYOsl8wqOmUxkQ6ddw1cV3l8811+kdUFus/q4d1Y3E3SyEifA==", + "license": "MIT", "peer": true }, "node_modules/@types/qs": { @@ -4201,6 +4202,7 @@ "version": "18.3.12", "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.12.tgz", "integrity": "sha512-D2wOSq/d6Agt28q7rSI3jhU7G6aiuzljDGZ2hTZHIkrTLUI+AF3WMeKkEZ9nN2fkBAlcktT6vcZjDFiIhMYEQw==", + "license": "MIT", "peer": true, "dependencies": { "@types/prop-types": "*", @@ -6909,6 +6911,7 @@ "version": "3.1.3", "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz", "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==", + "license": "MIT", "peer": true }, "node_modules/custom-element-jet-brains-integration": { diff --git a/package.json b/package.json index c51678c10f..46d5478c62 100644 --- a/package.json +++ b/package.json @@ -82,7 +82,7 @@ "dependencies": { "@bundled-es-modules/pdfjs-dist": "^2.5.207-rc1", "@rollup/plugin-commonjs": "^24.0.1", - "@shoelace-style/shoelace": "2.16.0", + "@shoelace-style/shoelace": "2.18.0", "@types/jquery": "^3.5.29", "blueimp-gallery": "^3.4.0", "bootstrap-icons": "^1.11.3",