From 5a6b94e837ec369698dde8375e92967f867c4555 Mon Sep 17 00:00:00 2001 From: Christoph Reiter <reiter.christoph@gmail.com> Date: Thu, 29 Apr 2021 10:36:33 +0200 Subject: [PATCH] scoped-elements: port away from static getScopedTagName() In newer versions there is now a normal method for this which also supports dynamically added components. The static version is deprecated and removed in 2.0, so we need to port here. --- packages/app-shell/package.json | 2 +- packages/auth/package.json | 2 +- packages/check-in-place-select/package.json | 2 +- packages/common/dbp-common-demo.js | 2 +- packages/common/package.json | 2 +- packages/data-table-view/package.json | 2 +- packages/file-handling/package.json | 2 +- packages/file-handling/src/dbp-file-handling-clipboard.js | 2 +- packages/file-handling/src/dbp-nextcloud-file-picker.js | 2 +- packages/knowledge-base-web-page-element-view/package.json | 2 +- packages/language-select/package.json | 2 +- packages/matomo/package.json | 2 +- packages/notification/package.json | 2 +- packages/organization-select/package.json | 2 +- packages/person-profile/package.json | 2 +- packages/person-profile/src/dbp-person-profile-demo.js | 2 +- packages/person-select/package.json | 2 +- packages/provider/package.json | 2 +- toolkit-showcase/package.json | 2 +- yarn.lock | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/packages/app-shell/package.json b/packages/app-shell/package.json index 2e033125..e37960fe 100644 --- a/packages/app-shell/package.json +++ b/packages/app-shell/package.json @@ -40,7 +40,7 @@ "@dbp-toolkit/matomo": "^0.2.2", "@dbp-toolkit/notification": "^0.2.2", "@dbp-toolkit/person-profile": "^0.2.2", - "@open-wc/scoped-elements": "^1.3.2", + "@open-wc/scoped-elements": "^1.3.3", "i18next": "^20.0.0", "lit-element": "^2.4.0", "lit-html": "^1.3.0", diff --git a/packages/auth/package.json b/packages/auth/package.json index c45d239b..d9337a22 100644 --- a/packages/auth/package.json +++ b/packages/auth/package.json @@ -38,7 +38,7 @@ }, "dependencies": { "@dbp-toolkit/common": "^0.2.2", - "@open-wc/scoped-elements": "^1.3.2", + "@open-wc/scoped-elements": "^1.3.3", "event-target-shim": "^6.0.0", "lit-element": "^2.4.0" }, diff --git a/packages/check-in-place-select/package.json b/packages/check-in-place-select/package.json index c8728355..ad7ad84b 100644 --- a/packages/check-in-place-select/package.json +++ b/packages/check-in-place-select/package.json @@ -37,7 +37,7 @@ "dependencies": { "@dbp-toolkit/auth": "^0.2.2", "@dbp-toolkit/common": "^0.2.2", - "@open-wc/scoped-elements": "^1.3.2", + "@open-wc/scoped-elements": "^1.3.3", "jquery": "^3.4.1", "lit-element": "^2.4.0", "select2": "^4.0.10" diff --git a/packages/common/dbp-common-demo.js b/packages/common/dbp-common-demo.js index b022a31d..3b610ffa 100644 --- a/packages/common/dbp-common-demo.js +++ b/packages/common/dbp-common-demo.js @@ -89,7 +89,7 @@ export class DbpCommonDemo extends ScopedElementsMixin(LitElement) { buttonClickHandler() { setTimeout(() => { - const scopedTagName = this.constructor.getScopedTagName('dbp-button'); + const scopedTagName = this.getScopedTagName('dbp-button'); this.shadowRoot.querySelector(scopedTagName).stop(); }, 1000); } diff --git a/packages/common/package.json b/packages/common/package.json index 5f5331ff..2fb2689b 100644 --- a/packages/common/package.json +++ b/packages/common/package.json @@ -36,7 +36,7 @@ "lint": "eslint ." }, "dependencies": { - "@open-wc/scoped-elements": "^1.3.2", + "@open-wc/scoped-elements": "^1.3.3", "@sentry/browser": "^6.0.0", "i18next": "^20.0.0", "lit-element": "^2.4.0" diff --git a/packages/data-table-view/package.json b/packages/data-table-view/package.json index 08b0e6fc..33dd2192 100644 --- a/packages/data-table-view/package.json +++ b/packages/data-table-view/package.json @@ -36,7 +36,7 @@ "dependencies": { "@dbp-toolkit/auth": "^0.2.2", "@dbp-toolkit/common": "^0.2.2", - "@open-wc/scoped-elements": "^1.3.2", + "@open-wc/scoped-elements": "^1.3.3", "datatables.net-buttons": "^1.6.1", "datatables.net-buttons-dt": "^1.6.1", "datatables.net-dt": "^1.10.20", diff --git a/packages/file-handling/package.json b/packages/file-handling/package.json index 9975a4a1..f2c9195f 100644 --- a/packages/file-handling/package.json +++ b/packages/file-handling/package.json @@ -34,7 +34,7 @@ }, "dependencies": { "@dbp-toolkit/common": "^0.2.2", - "@open-wc/scoped-elements": "^1.3.2", + "@open-wc/scoped-elements": "^1.3.3", "file-saver": "^2.0.2", "i18next": "^20.0.0", "jszip": "^3.5.0", diff --git a/packages/file-handling/src/dbp-file-handling-clipboard.js b/packages/file-handling/src/dbp-file-handling-clipboard.js index 2aa25b81..7afd6339 100644 --- a/packages/file-handling/src/dbp-file-handling-clipboard.js +++ b/packages/file-handling/src/dbp-file-handling-clipboard.js @@ -117,7 +117,7 @@ export class FileHandlingClipboard extends ScopedElementsMixin(DBPLitElement) { width: 50, responsive: 1, formatter: (cell, formatterParams, onRendered) => { - const icon_tag = that.constructor.getScopedTagName("dbp-icon"); + const icon_tag = that.getScopedTagName("dbp-icon"); let icon = `<${icon_tag} name="empty-file" class="nextcloud-picker-icon"></${icon_tag}>`; return icon; } diff --git a/packages/file-handling/src/dbp-nextcloud-file-picker.js b/packages/file-handling/src/dbp-nextcloud-file-picker.js index 5ddb0ed6..4c4af48a 100644 --- a/packages/file-handling/src/dbp-nextcloud-file-picker.js +++ b/packages/file-handling/src/dbp-nextcloud-file-picker.js @@ -127,7 +127,7 @@ export class NextcloudFilePicker extends ScopedElementsMixin(DBPLitElement) { resizableColumns:false, columns: [ {title: "", field: "type", align:"center", headerSort:false, width:50, responsive:1, formatter: (cell, formatterParams, onRendered) => { - const icon_tag = that.constructor.getScopedTagName("dbp-icon"); + const icon_tag = that.getScopedTagName("dbp-icon"); let disabled = this.directoriesOnly ? "nextcloud-picker-icon-disabled" : ""; let icon = `<${icon_tag} name="empty-file" class="nextcloud-picker-icon ` + disabled + `"></${icon_tag}>`; return (cell.getValue() === "directory") ? `<${icon_tag} name="folder" class="nextcloud-picker-icon"></${icon_tag}>` : icon; diff --git a/packages/knowledge-base-web-page-element-view/package.json b/packages/knowledge-base-web-page-element-view/package.json index cc7087b4..e447dbcf 100644 --- a/packages/knowledge-base-web-page-element-view/package.json +++ b/packages/knowledge-base-web-page-element-view/package.json @@ -35,7 +35,7 @@ "dependencies": { "@dbp-toolkit/auth": "^0.2.2", "@dbp-toolkit/common": "^0.2.2", - "@open-wc/scoped-elements": "^1.3.2", + "@open-wc/scoped-elements": "^1.3.3", "i18next": "^20.0.0", "lit-element": "^2.4.0", "lit-html": "^1.3.0", diff --git a/packages/language-select/package.json b/packages/language-select/package.json index c8b50613..99a7dfee 100644 --- a/packages/language-select/package.json +++ b/packages/language-select/package.json @@ -34,7 +34,7 @@ }, "dependencies": { "@dbp-toolkit/common": "^0.2.2", - "@open-wc/scoped-elements": "^1.3.2", + "@open-wc/scoped-elements": "^1.3.3", "lit-element": "^2.4.0" }, "scripts": { diff --git a/packages/matomo/package.json b/packages/matomo/package.json index e8ca14bd..3b11934b 100644 --- a/packages/matomo/package.json +++ b/packages/matomo/package.json @@ -36,7 +36,7 @@ "dependencies": { "@dbp-toolkit/auth": "^0.2.2", "@dbp-toolkit/common": "^0.2.2", - "@open-wc/scoped-elements": "^1.3.2", + "@open-wc/scoped-elements": "^1.3.3", "lit-element": "^2.4.0" }, "scripts": { diff --git a/packages/notification/package.json b/packages/notification/package.json index 8e0fa2aa..48b6471a 100644 --- a/packages/notification/package.json +++ b/packages/notification/package.json @@ -35,7 +35,7 @@ }, "dependencies": { "@dbp-toolkit/common": "^0.2.2", - "@open-wc/scoped-elements": "^1.3.2", + "@open-wc/scoped-elements": "^1.3.3", "lit-element": "^2.4.0" }, "scripts": { diff --git a/packages/organization-select/package.json b/packages/organization-select/package.json index 6b88622b..4343fabe 100644 --- a/packages/organization-select/package.json +++ b/packages/organization-select/package.json @@ -37,7 +37,7 @@ "dependencies": { "@dbp-toolkit/auth": "^0.2.2", "@dbp-toolkit/common": "^0.2.2", - "@open-wc/scoped-elements": "^1.3.2", + "@open-wc/scoped-elements": "^1.3.3", "jquery": "^3.4.1", "lit-element": "^2.4.0", "select2": "^4.0.10" diff --git a/packages/person-profile/package.json b/packages/person-profile/package.json index 735df51c..894724f8 100644 --- a/packages/person-profile/package.json +++ b/packages/person-profile/package.json @@ -37,7 +37,7 @@ "@dbp-toolkit/auth": "^0.2.2", "@dbp-toolkit/common": "^0.2.2", "@dbp-toolkit/person-select": "^0.2.2", - "@open-wc/scoped-elements": "^1.3.2", + "@open-wc/scoped-elements": "^1.3.3", "jquery": "^3.4.1", "lit-element": "^2.4.0" }, diff --git a/packages/person-profile/src/dbp-person-profile-demo.js b/packages/person-profile/src/dbp-person-profile-demo.js index d696cfdc..25269ea1 100644 --- a/packages/person-profile/src/dbp-person-profile-demo.js +++ b/packages/person-profile/src/dbp-person-profile-demo.js @@ -65,7 +65,7 @@ export class PersonProfileDemo extends ScopedElementsMixin(DBPLitElement) { const that = this; this.updateComplete.then(()=>{ - const personSelect = that._(this.constructor.getScopedTagName('dbp-person-select')); + const personSelect = that._(this.getScopedTagName('dbp-person-select')); personSelect.onchange = function () { that.selectedPerson = $(this).data("object").identifier; }; diff --git a/packages/person-select/package.json b/packages/person-select/package.json index 10052897..49f217ac 100644 --- a/packages/person-select/package.json +++ b/packages/person-select/package.json @@ -37,7 +37,7 @@ "dependencies": { "@dbp-toolkit/auth": "^0.2.2", "@dbp-toolkit/common": "^0.2.2", - "@open-wc/scoped-elements": "^1.3.2", + "@open-wc/scoped-elements": "^1.3.3", "jquery": "^3.4.1", "lit-element": "^2.4.0", "select2": "^4.0.10" diff --git a/packages/provider/package.json b/packages/provider/package.json index 06d28bc1..79896c4c 100644 --- a/packages/provider/package.json +++ b/packages/provider/package.json @@ -37,7 +37,7 @@ "dependencies": { "@dbp-toolkit/auth": "^0.2.2", "@dbp-toolkit/common": "^0.2.2", - "@open-wc/scoped-elements": "^1.1.1", + "@open-wc/scoped-elements": "^1.3.3", "lit-element": "^2.4.0" }, "scripts": { diff --git a/toolkit-showcase/package.json b/toolkit-showcase/package.json index 109c9ee2..a3f2d10a 100644 --- a/toolkit-showcase/package.json +++ b/toolkit-showcase/package.json @@ -50,7 +50,7 @@ "@dbp-toolkit/person-profile": "^0.2.0", "@dbp-toolkit/person-select": "^0.2.0", "@dbp-toolkit/organization-select": "^0.2.0", - "@open-wc/scoped-elements": "^1.1.1", + "@open-wc/scoped-elements": "^1.3.3", "fabric": "^4.2.0", "file-saver": "^2.0.2", "highlight.js": "^10.1.2", diff --git a/yarn.lock b/yarn.lock index df294651..8e6a8a07 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1760,7 +1760,7 @@ resolved "https://registry.yarnpkg.com/@open-wc/dedupe-mixin/-/dedupe-mixin-1.3.0.tgz#0df5d438285fc3482838786ee81895318f0ff778" integrity sha512-UfdK1MPnR6T7f3svzzYBfu3qBkkZ/KsPhcpc3JYhsUY4hbpwNF9wEQtD4Z+/mRqMTJrKg++YSxIxE0FBhY3RIw== -"@open-wc/scoped-elements@^1.1.1", "@open-wc/scoped-elements@^1.3.2", "@open-wc/scoped-elements@^1.3.3": +"@open-wc/scoped-elements@^1.3.3": version "1.3.3" resolved "https://registry.yarnpkg.com/@open-wc/scoped-elements/-/scoped-elements-1.3.3.tgz#fe008aef4d74fb00c553c900602960638fc1c7b0" integrity sha512-vFIQVYYjFw67odUE4JzZOpctnF7S/2DX+S+clrL3bQPql7HvEnV0wMFwOWUavQTuCJi0rfU8GTcNMiUybio+Yg== -- GitLab