From 9bf01496457b9bb23bcaa8c493d129e8320bcea2 Mon Sep 17 00:00:00 2001 From: nathan Date: Tue, 24 Jan 2023 13:58:38 -0700 Subject: [PATCH] Fix selectbox positioning issue Tracker owner would open down instead of up with fontsize = 14. Updating to shoelace 2.0.0-beta.81 fixes it. Going farther introduces some other issues that I don't want to get into right now --- api/js/etemplate/Et2Select/SearchMixin.ts | 2 +- package-lock.json | 146 ++++++++++++---------- package.json | 2 +- 3 files changed, 83 insertions(+), 67 deletions(-) diff --git a/api/js/etemplate/Et2Select/SearchMixin.ts b/api/js/etemplate/Et2Select/SearchMixin.ts index ba0fc8f2c9..d47509d91a 100644 --- a/api/js/etemplate/Et2Select/SearchMixin.ts +++ b/api/js/etemplate/Et2Select/SearchMixin.ts @@ -664,7 +664,7 @@ export const Et2WithSearchMixin = >(superclass // I haven't found an event or Promise to hook on to window.setTimeout(() => { - if(this.dropdown?.getAttribute("distance") && this.dropdown?.positioner.getAttribute("data-placement") == "top") + if(this.dropdown?.getAttribute("distance") && this.dropdown?.popup?.dataset.currentPlacement == "top") { this.dropdown.setAttribute("distance", 0); this.dropdown.reposition(); diff --git a/package-lock.json b/package-lock.json index a1d2c31973..ec6dd45f96 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19,7 +19,7 @@ "@lion/listbox": "^0.12.0", "@lion/select": "^0.15.0", "@lion/textarea": "^0.14.0", - "@shoelace-style/shoelace": "^2.0.0-beta.79", + "@shoelace-style/shoelace": "2.0.0-beta.81", "blueimp-gallery": "^3.4.0", "colortranslator": "^1.9.2", "lit-flatpickr": "^0.3.0", @@ -545,16 +545,16 @@ } }, "node_modules/@floating-ui/core": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.0.0.tgz", - "integrity": "sha512-sm3nW0hHAxTv3gRDdCH8rNVQxijF+qPFo5gAeXCErRjKC7Qc28lIQ3R9Vd7Gw+KgwfA7RhRydDFuGeI0peGq7A==" + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.1.0.tgz", + "integrity": "sha512-zbsLwtnHo84w1Kc8rScAo5GMk1GdecSlrflIbfnEBJwvTSj1SL6kkOYV+nHraMCPEy+RNZZUaZyL8JosDGCtGQ==" }, "node_modules/@floating-ui/dom": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.0.0.tgz", - "integrity": "sha512-PMqJvY5Fae8HVQgUqM+lidprS6p9LSvB0AUhCdYKqr3YCaV+WaWCeVNBtXPRY2YIdrgcsL2+vd5F07FxgihHUw==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.1.0.tgz", + "integrity": "sha512-TSogMPVxbRe77QCj1dt8NmRiJasPvuc+eT5jnJ6YpLqgOD2zXc5UA3S1qwybN+GVCDNdKfpKy1oj8RpzLJvh6A==", "dependencies": { - "@floating-ui/core": "^1.0.0" + "@floating-ui/core": "^1.0.5" } }, "node_modules/@interactjs/actions": { @@ -907,14 +907,22 @@ } }, "node_modules/@lit-labs/react": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/@lit-labs/react/-/react-1.0.7.tgz", - "integrity": "sha512-ehnOFE5qMPKqApSjclAXyYSqSBWhjuvwF0ZkMJaggmtkGtMvti3gSq/kU5pwBQDgs+71TJWTzWZyQ83hdS8ofw==" + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@lit-labs/react/-/react-1.1.1.tgz", + "integrity": "sha512-9TC+/ZWb6BJlWCyUr14FKFlaGnyKpeEDorufXozQgke/VoVrslUQNaL7nBmrAWdNrmzx5jWgi8lFmWwrxMjnlA==" + }, + "node_modules/@lit-labs/ssr-dom-shim": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@lit-labs/ssr-dom-shim/-/ssr-dom-shim-1.0.0.tgz", + "integrity": "sha512-ic93MBXfApIFTrup4a70M/+ddD8xdt2zxxj9sRwHQzhS9ag/syqkD8JPdTXsc1gUy2K8TTirhlCqyTEM/sifNw==" }, "node_modules/@lit/reactive-element": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/@lit/reactive-element/-/reactive-element-1.3.1.tgz", - "integrity": "sha512-nOJARIr3pReqK3hfFCSW2Zg/kFcFsSAlIE7z4a0C9D2dPrgD/YSn3ZP2ET/rxKB65SXyG7jJbkynBRm+tGlacw==" + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/@lit/reactive-element/-/reactive-element-1.6.1.tgz", + "integrity": "sha512-va15kYZr7KZNNPZdxONGQzpUr+4sxVu7V/VG7a8mRfPPXUyhEYj5RzXCQmGrlP3tAh0L3HHm5AjBMFYRqlM9SA==", + "dependencies": { + "@lit-labs/ssr-dom-shim": "^1.0.0" + } }, "node_modules/@mdn/browser-compat-data": { "version": "4.0.0", @@ -1121,16 +1129,16 @@ } }, "node_modules/@shoelace-style/localize": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/@shoelace-style/localize/-/localize-3.0.1.tgz", - "integrity": "sha512-nmv1syJ3ormbGq29GsuxGRK6BFq7Jhx+kVFyuuozz0Pckkvk1SGk2vpZZcdnj2vRZCETvlVB7KYgakUwgGmn+A==" + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/@shoelace-style/localize/-/localize-3.0.4.tgz", + "integrity": "sha512-HFY90KD+b1Td2otSBryCOpQjBEArIwlV6Tv4J4rC/E/D5wof2eLF6JUVrbiRNn8GRmwATe4YDAEK7NUD08xO1w==" }, "node_modules/@shoelace-style/shoelace": { - "version": "2.0.0-beta.79", - "resolved": "https://registry.npmjs.org/@shoelace-style/shoelace/-/shoelace-2.0.0-beta.79.tgz", - "integrity": "sha512-3ndk87uzHxQk/ZHj4nuoxxWCB7hMkFyGPUx+LpURR7VeV9tvMoOICTiZm4cX+rhBRGGjmQ/+wPRN1Od59Hur8A==", + "version": "2.0.0-beta.81", + "resolved": "https://registry.npmjs.org/@shoelace-style/shoelace/-/shoelace-2.0.0-beta.81.tgz", + "integrity": "sha512-mHxE450EiPnZeDGwJ8Dn0pXUz9U5nkjHJhXZ6REewq4RFeRFadaxlc7j/ic076U7Vdx/0PXWeubZOnWWXrMw4w==", "dependencies": { - "@floating-ui/dom": "^1.0.0", + "@floating-ui/dom": "^1.0.1", "@lit-labs/react": "^1.0.7", "@shoelace-style/animations": "^1.1.0", "@shoelace-style/localize": "^3.0.1", @@ -2536,9 +2544,9 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" }, "node_modules/color-string": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.9.0.tgz", - "integrity": "sha512-9Mrz2AQLefkH1UvASKj6v6hj/7eWgjnT/cVsR8CumieLoT+g900exWeNogqtweI8dxloXN9BDQTYro1oWu/5CQ==", + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.9.1.tgz", + "integrity": "sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==", "dependencies": { "color-name": "^1.0.0", "simple-swizzle": "^0.2.2" @@ -4350,13 +4358,13 @@ "dev": true }, "node_modules/lit": { - "version": "2.2.8", - "resolved": "https://registry.npmjs.org/lit/-/lit-2.2.8.tgz", - "integrity": "sha512-QjeNbi/H9LVIHR+u0OqsL+hs62a16m02JlJHYN48HcBuXyiPYR8JvzsTp5dYYS81l+b9Emp3UaGo82EheV0pog==", + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/lit/-/lit-2.6.1.tgz", + "integrity": "sha512-DT87LD64f8acR7uVp7kZfhLRrHkfC/N4BVzAtnw9Yg8087mbBJ//qedwdwX0kzDbxgPccWRW6mFwGbRQIxy0pw==", "dependencies": { - "@lit/reactive-element": "^1.3.0", + "@lit/reactive-element": "^1.6.0", "lit-element": "^3.2.0", - "lit-html": "^2.2.0" + "lit-html": "^2.6.0" } }, "node_modules/lit-element": { @@ -4379,9 +4387,9 @@ } }, "node_modules/lit-html": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/lit-html/-/lit-html-2.2.2.tgz", - "integrity": "sha512-cJofCRXuizwyaiGt9pJjJOcauezUlSB6t87VBXsPwRhbzF29MgD8GH6fZ0BuZdXAAC02IRONZBd//VPUuU8QbQ==", + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/lit-html/-/lit-html-2.6.1.tgz", + "integrity": "sha512-Z3iw+E+3KKFn9t2YKNjsXNEu/LRLI98mtH/C6lnFg7kvaqPIzPn124Yd4eT/43lyqrejpc5Wb6BHq3fdv4S8Rw==", "dependencies": { "@types/trusted-types": "^2.0.2" } @@ -5584,7 +5592,7 @@ "node_modules/simple-swizzle": { "version": "0.2.2", "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz", - "integrity": "sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=", + "integrity": "sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==", "dependencies": { "is-arrayish": "^0.3.1" } @@ -6688,16 +6696,16 @@ } }, "@floating-ui/core": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.0.0.tgz", - "integrity": "sha512-sm3nW0hHAxTv3gRDdCH8rNVQxijF+qPFo5gAeXCErRjKC7Qc28lIQ3R9Vd7Gw+KgwfA7RhRydDFuGeI0peGq7A==" + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.1.0.tgz", + "integrity": "sha512-zbsLwtnHo84w1Kc8rScAo5GMk1GdecSlrflIbfnEBJwvTSj1SL6kkOYV+nHraMCPEy+RNZZUaZyL8JosDGCtGQ==" }, "@floating-ui/dom": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.0.0.tgz", - "integrity": "sha512-PMqJvY5Fae8HVQgUqM+lidprS6p9LSvB0AUhCdYKqr3YCaV+WaWCeVNBtXPRY2YIdrgcsL2+vd5F07FxgihHUw==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.1.0.tgz", + "integrity": "sha512-TSogMPVxbRe77QCj1dt8NmRiJasPvuc+eT5jnJ6YpLqgOD2zXc5UA3S1qwybN+GVCDNdKfpKy1oj8RpzLJvh6A==", "requires": { - "@floating-ui/core": "^1.0.0" + "@floating-ui/core": "^1.0.5" } }, "@interactjs/actions": { @@ -6996,14 +7004,22 @@ } }, "@lit-labs/react": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/@lit-labs/react/-/react-1.0.7.tgz", - "integrity": "sha512-ehnOFE5qMPKqApSjclAXyYSqSBWhjuvwF0ZkMJaggmtkGtMvti3gSq/kU5pwBQDgs+71TJWTzWZyQ83hdS8ofw==" + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@lit-labs/react/-/react-1.1.1.tgz", + "integrity": "sha512-9TC+/ZWb6BJlWCyUr14FKFlaGnyKpeEDorufXozQgke/VoVrslUQNaL7nBmrAWdNrmzx5jWgi8lFmWwrxMjnlA==" + }, + "@lit-labs/ssr-dom-shim": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@lit-labs/ssr-dom-shim/-/ssr-dom-shim-1.0.0.tgz", + "integrity": "sha512-ic93MBXfApIFTrup4a70M/+ddD8xdt2zxxj9sRwHQzhS9ag/syqkD8JPdTXsc1gUy2K8TTirhlCqyTEM/sifNw==" }, "@lit/reactive-element": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/@lit/reactive-element/-/reactive-element-1.3.1.tgz", - "integrity": "sha512-nOJARIr3pReqK3hfFCSW2Zg/kFcFsSAlIE7z4a0C9D2dPrgD/YSn3ZP2ET/rxKB65SXyG7jJbkynBRm+tGlacw==" + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/@lit/reactive-element/-/reactive-element-1.6.1.tgz", + "integrity": "sha512-va15kYZr7KZNNPZdxONGQzpUr+4sxVu7V/VG7a8mRfPPXUyhEYj5RzXCQmGrlP3tAh0L3HHm5AjBMFYRqlM9SA==", + "requires": { + "@lit-labs/ssr-dom-shim": "^1.0.0" + } }, "@mdn/browser-compat-data": { "version": "4.0.0", @@ -7162,16 +7178,16 @@ "integrity": "sha512-Be+cahtZyI2dPKRm8EZSx3YJQ+jLvEcn3xzRP7tM4tqBnvd/eW/64Xh0iOf0t2w5P8iJKfdBbpVNE9naCaOf2g==" }, "@shoelace-style/localize": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/@shoelace-style/localize/-/localize-3.0.1.tgz", - "integrity": "sha512-nmv1syJ3ormbGq29GsuxGRK6BFq7Jhx+kVFyuuozz0Pckkvk1SGk2vpZZcdnj2vRZCETvlVB7KYgakUwgGmn+A==" + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/@shoelace-style/localize/-/localize-3.0.4.tgz", + "integrity": "sha512-HFY90KD+b1Td2otSBryCOpQjBEArIwlV6Tv4J4rC/E/D5wof2eLF6JUVrbiRNn8GRmwATe4YDAEK7NUD08xO1w==" }, "@shoelace-style/shoelace": { - "version": "2.0.0-beta.79", - "resolved": "https://registry.npmjs.org/@shoelace-style/shoelace/-/shoelace-2.0.0-beta.79.tgz", - "integrity": "sha512-3ndk87uzHxQk/ZHj4nuoxxWCB7hMkFyGPUx+LpURR7VeV9tvMoOICTiZm4cX+rhBRGGjmQ/+wPRN1Od59Hur8A==", + "version": "2.0.0-beta.81", + "resolved": "https://registry.npmjs.org/@shoelace-style/shoelace/-/shoelace-2.0.0-beta.81.tgz", + "integrity": "sha512-mHxE450EiPnZeDGwJ8Dn0pXUz9U5nkjHJhXZ6REewq4RFeRFadaxlc7j/ic076U7Vdx/0PXWeubZOnWWXrMw4w==", "requires": { - "@floating-ui/dom": "^1.0.0", + "@floating-ui/dom": "^1.0.1", "@lit-labs/react": "^1.0.7", "@shoelace-style/animations": "^1.1.0", "@shoelace-style/localize": "^3.0.1", @@ -8295,9 +8311,9 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" }, "color-string": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.9.0.tgz", - "integrity": "sha512-9Mrz2AQLefkH1UvASKj6v6hj/7eWgjnT/cVsR8CumieLoT+g900exWeNogqtweI8dxloXN9BDQTYro1oWu/5CQ==", + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.9.1.tgz", + "integrity": "sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==", "requires": { "color-name": "^1.0.0", "simple-swizzle": "^0.2.2" @@ -9708,13 +9724,13 @@ } }, "lit": { - "version": "2.2.8", - "resolved": "https://registry.npmjs.org/lit/-/lit-2.2.8.tgz", - "integrity": "sha512-QjeNbi/H9LVIHR+u0OqsL+hs62a16m02JlJHYN48HcBuXyiPYR8JvzsTp5dYYS81l+b9Emp3UaGo82EheV0pog==", + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/lit/-/lit-2.6.1.tgz", + "integrity": "sha512-DT87LD64f8acR7uVp7kZfhLRrHkfC/N4BVzAtnw9Yg8087mbBJ//qedwdwX0kzDbxgPccWRW6mFwGbRQIxy0pw==", "requires": { - "@lit/reactive-element": "^1.3.0", + "@lit/reactive-element": "^1.6.0", "lit-element": "^3.2.0", - "lit-html": "^2.2.0" + "lit-html": "^2.6.0" } }, "lit-element": { @@ -9737,9 +9753,9 @@ } }, "lit-html": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/lit-html/-/lit-html-2.2.2.tgz", - "integrity": "sha512-cJofCRXuizwyaiGt9pJjJOcauezUlSB6t87VBXsPwRhbzF29MgD8GH6fZ0BuZdXAAC02IRONZBd//VPUuU8QbQ==", + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/lit-html/-/lit-html-2.6.1.tgz", + "integrity": "sha512-Z3iw+E+3KKFn9t2YKNjsXNEu/LRLI98mtH/C6lnFg7kvaqPIzPn124Yd4eT/43lyqrejpc5Wb6BHq3fdv4S8Rw==", "requires": { "@types/trusted-types": "^2.0.2" } @@ -10655,7 +10671,7 @@ "simple-swizzle": { "version": "0.2.2", "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz", - "integrity": "sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=", + "integrity": "sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==", "requires": { "is-arrayish": "^0.3.1" } diff --git a/package.json b/package.json index 6ed0bc85ab..b9c602866f 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,7 @@ "@lion/listbox": "^0.12.0", "@lion/select": "^0.15.0", "@lion/textarea": "^0.14.0", - "@shoelace-style/shoelace": "^2.0.0-beta.79", + "@shoelace-style/shoelace": "2.0.0-beta.81", "blueimp-gallery": "^3.4.0", "colortranslator": "^1.9.2", "lit-flatpickr": "^0.3.0",