diff --git a/README.md b/README.md index 7d59b3a31..be472d400 100644 --- a/README.md +++ b/README.md @@ -171,7 +171,7 @@ Since Scoped Elements changes tagnames under the hood, a tagname querySelector s like this: ```js -this.querySelector(getTagName('lion-input', this.constructor.scopedElements)); +this.querySelector(this.constructor.getScopedTagName('lion-input')); ``` ### CSS selectors @@ -218,12 +218,12 @@ connectedCallback() { In a less complex case, we might just want to add a child node to the dom. ```js -import { ScopedElementsMixin, LitElement, getScopedTagNamegetScopedTagName } from '@lion/core'; +import { ScopedElementsMixin, LitElement } from '@lion/core'; ... __getLightDomNode() { - return document.createElement(getScopedTagName('lion-input', this.constructor.scopedElements)); + return document.createElement(this.constructor.getScopedTagName('lion-input')); } ``` diff --git a/packages/core/index.js b/packages/core/index.js index cdac6f16b..0985137e7 100644 --- a/packages/core/index.js +++ b/packages/core/index.js @@ -52,7 +52,7 @@ export { unsafeHTML } from 'lit-html/directives/unsafe-html.js'; export { until } from 'lit-html/directives/until.js'; export { render as renderShady } from 'lit-html/lib/shady-render.js'; // open-wc -export { ScopedElementsMixin, getScopedTagName } from '@open-wc/scoped-elements'; +export { ScopedElementsMixin } from '@open-wc/scoped-elements'; export { dedupeMixin } from '@open-wc/dedupe-mixin'; // ours export { DelegateMixin } from './src/DelegateMixin.js'; diff --git a/packages/core/package.json b/packages/core/package.json index c6b36a98c..ba17fc908 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -34,7 +34,7 @@ ], "dependencies": { "@open-wc/dedupe-mixin": "^1.2.1", - "@open-wc/scoped-elements": "^0.5.0", + "@open-wc/scoped-elements": "^1.0.3", "lit-element": "^2.2.1", "lit-html": "^1.0.0" }, diff --git a/packages/input-datepicker/package.json b/packages/input-datepicker/package.json index 3845848c4..81581c462 100644 --- a/packages/input-datepicker/package.json +++ b/packages/input-datepicker/package.json @@ -44,8 +44,7 @@ "@lion/input-date": "0.5.20", "@lion/localize": "0.8.10", "@lion/overlays": "0.12.6", - "@lion/validate": "0.8.0", - "@open-wc/scoped-elements": "^0.5.0" + "@lion/validate": "0.8.0" }, "devDependencies": { "@open-wc/demoing-storybook": "^1.10.4", diff --git a/packages/select-rich/src/LionSelectRich.js b/packages/select-rich/src/LionSelectRich.js index 02be21dd1..02c2bfc96 100644 --- a/packages/select-rich/src/LionSelectRich.js +++ b/packages/select-rich/src/LionSelectRich.js @@ -1,12 +1,5 @@ import { ChoiceGroupMixin } from '@lion/choice-input'; -import { - css, - getScopedTagName, - html, - LitElement, - ScopedElementsMixin, - SlotMixin, -} from '@lion/core'; +import { css, html, LitElement, ScopedElementsMixin, SlotMixin } from '@lion/core'; import { FormControlMixin, FormRegistrarMixin, InteractionStateMixin } from '@lion/field'; import { formRegistrarManager } from '@lion/field/src/registration/formRegistrarManager.js'; import { OverlayMixin, withDropdownConfig } from '@lion/overlays'; @@ -107,9 +100,7 @@ export class LionSelectRich extends ScopedElementsMixin( return { ...super.slots, invoker: () => - document.createElement( - getScopedTagName('lion-select-invoker', this.constructor.scopedElements), - ), + document.createElement(this.constructor.getScopedTagName('lion-select-invoker')), }; } diff --git a/packages/switch/src/LionSwitch.js b/packages/switch/src/LionSwitch.js index cace5d869..6d64c535b 100644 --- a/packages/switch/src/LionSwitch.js +++ b/packages/switch/src/LionSwitch.js @@ -1,4 +1,4 @@ -import { html, css, ScopedElementsMixin, getScopedTagName } from '@lion/core'; +import { html, css, ScopedElementsMixin } from '@lion/core'; import { LionField } from '@lion/field'; import { ChoiceInputMixin } from '@lion/choice-input'; import { LionSwitchButton } from './LionSwitchButton.js'; @@ -25,10 +25,7 @@ export class LionSwitch extends ScopedElementsMixin(ChoiceInputMixin(LionField)) get slots() { return { ...super.slots, - input: () => - document.createElement( - getScopedTagName('lion-switch-button', this.constructor.scopedElements), - ), + input: () => document.createElement(this.constructor.getScopedTagName('lion-switch-button')), }; } diff --git a/packages/validate/package.json b/packages/validate/package.json index 22777a2ed..ddb712b1f 100644 --- a/packages/validate/package.json +++ b/packages/validate/package.json @@ -37,8 +37,7 @@ ], "dependencies": { "@lion/core": "0.4.5", - "@lion/localize": "0.8.10", - "@open-wc/scoped-elements": "^0.5.0" + "@lion/localize": "0.8.10" }, "devDependencies": { "@open-wc/demoing-storybook": "^1.10.4", diff --git a/packages/validate/src/ValidateMixin.js b/packages/validate/src/ValidateMixin.js index 79899d3f8..08144d29b 100644 --- a/packages/validate/src/ValidateMixin.js +++ b/packages/validate/src/ValidateMixin.js @@ -1,6 +1,6 @@ /* eslint-disable class-methods-use-this, camelcase, no-param-reassign, max-classes-per-file */ -import { dedupeMixin, SlotMixin, ScopedElementsMixin, getScopedTagName } from '@lion/core'; +import { dedupeMixin, SlotMixin, ScopedElementsMixin } from '@lion/core'; import { localize } from '@lion/localize'; import { LionValidationFeedback } from './LionValidationFeedback.js'; import { ResultValidator } from './ResultValidator.js'; @@ -25,7 +25,7 @@ function arrayDiff(array1 = [], array2 = []) { export const ValidateMixin = dedupeMixin( superclass => // eslint-disable-next-line no-unused-vars, no-shadow - class ValidateMixin extends ScopedElementsMixin(SyncUpdatableMixin(SlotMixin(superclass))) { + class ValidateMixin extends SyncUpdatableMixin(SlotMixin(ScopedElementsMixin(superclass))) { static get scopedElements() { return { ...super.scopedElements, @@ -117,9 +117,7 @@ export const ValidateMixin = dedupeMixin( return { ...super.slots, feedback: () => - document.createElement( - getScopedTagName('lion-validation-feedback', this.constructor.scopedElements), - ), + document.createElement(this.constructor.getScopedTagName('lion-validation-feedback')), }; } diff --git a/yarn.lock b/yarn.lock index d56f990c7..31186de7e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2261,15 +2261,10 @@ "@open-wc/semantic-dom-diff" "^0.13.16" "@types/chai" "^4.1.7" -"@open-wc/dedupe-mixin@^1.1.1": - version "1.1.1" - resolved "https://registry.yarnpkg.com/@open-wc/dedupe-mixin/-/dedupe-mixin-1.1.1.tgz#3ac8e498422ef316276bbe4aa687e35bd10c6871" - integrity sha512-Y1+h5nQjJnDHP+8OceZB47I4D7iOiYnM0jXYLGEi96IusR93et30BIyEEQAJ4AvYfbuIrdbf0L5vQWfszU6/Jg== - -"@open-wc/dedupe-mixin@^1.2.1": - version "1.2.10" - resolved "https://registry.yarnpkg.com/@open-wc/dedupe-mixin/-/dedupe-mixin-1.2.10.tgz#4992874e98b8c49ed71e7e17d2adc7538d62260b" - integrity sha512-I3/aKV8OJ5LkZLOvTiGRgKs+o7VVz3EUozbc7yeKJo7x8+j+NHWhVvtNHE8GXAXbN3s4KmMWQt1mXWCEZwNg7g== +"@open-wc/dedupe-mixin@^1.2.1", "@open-wc/dedupe-mixin@^1.2.12": + version "1.2.12" + resolved "https://registry.yarnpkg.com/@open-wc/dedupe-mixin/-/dedupe-mixin-1.2.12.tgz#5fd2e562bf37e66a98d4a51402d03cb2afffbd0e" + integrity sha512-a18Md4Utj1nRHaIix5tfd52t2kfN0zghcen5VGb70bwtvI0HuRfoum9vmbCr+XugpnRc4Tql7HJAbNBW0Y7Gvw== "@open-wc/demoing-storybook@^1.10.4": version "1.10.5" @@ -2330,13 +2325,13 @@ eslint-config-prettier "^3.3.0" prettier "^1.19.1" -"@open-wc/scoped-elements@^0.5.0": - version "0.5.0" - resolved "https://registry.yarnpkg.com/@open-wc/scoped-elements/-/scoped-elements-0.5.0.tgz#485b0e530acb3530933198af66f5dbef1e64a277" - integrity sha512-SVMzFDBjXPAD+5sgbZ/SaGSfEoIVgcmYzbeXRvR5afdkikKdQcXONb4nsA5QqotpDci3eWxT4UClMax+44C8sA== +"@open-wc/scoped-elements@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@open-wc/scoped-elements/-/scoped-elements-1.0.3.tgz#f8d6a7b2d0c5fc5a72a657d1bdb2b9ec9d016a4c" + integrity sha512-+oFcWdWrNYi5pW6c2Ds5BxaaD5oXINEHtN3ktAa9UuSXW2it5C3YSoFQiZoN0thyp/neHMMo1XktT+ZsruYkhg== dependencies: - "@open-wc/dedupe-mixin" "^1.1.1" - lit-element "^2.0.1" + "@open-wc/dedupe-mixin" "^1.2.12" + lit-element "^2.2.1" "@open-wc/semantic-dom-diff@^0.13.16": version "0.13.21"