From 3b0dfb7d7565dc110e6b3f5963cf18c1e173d48d Mon Sep 17 00:00:00 2001 From: spelkey-ucd Date: Fri, 8 Oct 2021 11:41:48 -0400 Subject: [PATCH] #38 --- .../ucd-theme-header/ucd-theme-header.js | 4 +- .../ucd-theme-pagination.js | 10 ++-- .../ucd-theme-primary-nav.js | 31 +++++------ .../ucd-theme-quick-links.js | 4 +- .../ucd-theme-subnav/ucd-theme-subnav.js | 2 +- elements/package-lock.json | 36 ++++++------- elements/package.json | 2 +- .../ucdlib-branding-bar.js | 2 +- .../ucdlib/ucdlib-iconset/ucdlib-iconset.js | 2 +- .../utils/{ => controllers}/break-points.js | 17 +++---- elements/utils/controllers/index.js | 4 +- elements/utils/index.js | 10 ---- elements/utils/mixins/index.js | 8 +++ .../utils/{ => mixins}/main-dom-element.js | 0 elements/utils/{ => mixins}/mixin.js | 0 elements/utils/{ => mixins}/nav-element.js | 0 elements/utils/mutation-observer.js | 51 ------------------- test-app/package-lock.json | 38 +++++++------- test-app/package.json | 2 +- test-app/pages/page-brand-colors.js | 2 +- test-app/pages/page-infographics.js | 2 +- test-app/pages/page-overview.js | 2 +- test-app/pages/page-ucd-theme-collapse.js | 2 +- test-app/pages/page-ucd-theme-header.js | 2 +- .../pages/page-ucd-theme-list-accordion.js | 2 +- test-app/pages/page-ucd-theme-pagination.js | 2 +- test-app/pages/page-ucd-theme-primary-nav.js | 2 +- test-app/pages/page-ucd-theme-quick-links.js | 2 +- test-app/pages/page-ucd-theme-search-form.js | 2 +- test-app/pages/page-ucd-theme-search-popup.js | 2 +- test-app/pages/page-ucd-theme-slim-select.js | 2 +- test-app/pages/page-ucd-theme-subnav.js | 2 +- test-app/pages/page-ucdlib-branding-bar.js | 2 +- test-app/pages/page-ucdlib-icon.js | 2 +- test-app/pages/page-ucdlib-icons.js | 2 +- test-app/pages/page-ucdlib-iconset.js | 2 +- test-app/pages/page-ucdlib-pages.js | 2 +- test-app/ucdlib-theme-test-app.js | 2 +- test-app/ucdlib-theme-test-app.tpl.js | 2 +- 39 files changed, 104 insertions(+), 159 deletions(-) rename elements/utils/{ => controllers}/break-points.js (55%) delete mode 100644 elements/utils/index.js rename elements/utils/{ => mixins}/main-dom-element.js (100%) rename elements/utils/{ => mixins}/mixin.js (100%) rename elements/utils/{ => mixins}/nav-element.js (100%) delete mode 100644 elements/utils/mutation-observer.js diff --git a/elements/brand/ucd-theme-header/ucd-theme-header.js b/elements/brand/ucd-theme-header/ucd-theme-header.js index 5b1ad00..742d46c 100644 --- a/elements/brand/ucd-theme-header/ucd-theme-header.js +++ b/elements/brand/ucd-theme-header/ucd-theme-header.js @@ -1,7 +1,6 @@ import { LitElement } from 'lit'; import {render, styles} from "./ucd-theme-header.tpl.js"; -import { Mixin, BreakPoints } from "../../utils/index.js"; import { MutationObserverController, WaitController } from '../../utils/controllers'; /** @@ -36,8 +35,7 @@ import { MutationObserverController, WaitController } from '../../utils/controll * * */ -export default class UcdThemeHeader extends Mixin(LitElement) - .with(BreakPoints) { +export default class UcdThemeHeader extends LitElement { mutationObserver = new MutationObserverController(this); wait = new WaitController(this); diff --git a/elements/brand/ucd-theme-pagination/ucd-theme-pagination.js b/elements/brand/ucd-theme-pagination/ucd-theme-pagination.js index 6cb1bf9..b495f3c 100644 --- a/elements/brand/ucd-theme-pagination/ucd-theme-pagination.js +++ b/elements/brand/ucd-theme-pagination/ucd-theme-pagination.js @@ -1,7 +1,8 @@ import { LitElement, html } from 'lit'; //import { Page } from 'puppeteer'; import {render, styles} from "./ucd-theme-pagination.tpl.js"; -import { Mixin, BreakPoints } from "../../utils/index.js"; + +import { BreakPointsController } from '../../utils/controllers'; /** * @class UcdThemePagination @@ -33,8 +34,8 @@ import { Mixin, BreakPoints } from "../../utils/index.js"; * * */ -export default class UcdThemePagination extends Mixin(LitElement) - .with(BreakPoints) { +export default class UcdThemePagination extends LitElement { + breakPoints = new BreakPointsController(this); static get properties() { return { @@ -101,8 +102,7 @@ export default class UcdThemePagination extends Mixin(LitElement) this.xs_screen = false; this.size = ''; - this.screen_check = (window.innerWidth <= this._mobileBreakPoint) ? true : false; - console.log(this.screen_check); + this.screen_check = (window.innerWidth <= this.breakPoints.mobileBreakPoint) ? true : false; this.render = render.bind(this); } diff --git a/elements/brand/ucd-theme-primary-nav/ucd-theme-primary-nav.js b/elements/brand/ucd-theme-primary-nav/ucd-theme-primary-nav.js index f0d2b9d..78bc6d0 100644 --- a/elements/brand/ucd-theme-primary-nav/ucd-theme-primary-nav.js +++ b/elements/brand/ucd-theme-primary-nav/ucd-theme-primary-nav.js @@ -4,8 +4,8 @@ import { styleMap } from 'lit/directives/style-map.js'; import { classMap } from 'lit/directives/class-map.js'; import { ifDefined } from 'lit/directives/if-defined.js'; -import { Mixin, BreakPoints, NavElement } from "../../utils/index.js"; -import { MutationObserverController } from '../../utils/controllers'; +import { Mixin, NavElement } from "../../utils/mixins"; +import { MutationObserverController, BreakPointsController } from '../../utils/controllers'; /** * @class UcdThemePrimaryNav @@ -34,9 +34,10 @@ import { MutationObserverController } from '../../utils/controllers'; * */ export default class UcdThemePrimaryNav extends Mixin(LitElement) - .with(NavElement, BreakPoints) { + .with(NavElement) { mutationObserver = new MutationObserverController(this, {subtree: true, childList: true}); + breakPoints = new BreakPointsController(this); static get properties() { return { @@ -100,7 +101,7 @@ export default class UcdThemePrimaryNav extends Mixin(LitElement) if ( !navItem ) return; // Open on mobile - if ( this.isMobile() ) { + if ( this.breakPoints.isMobile() ) { let nav = this.renderRoot.getElementById(`nav--${navLocation.join("-")}`); if ( !nav ) return; let ul = nav.querySelector('ul'); @@ -163,7 +164,7 @@ export default class UcdThemePrimaryNav extends Mixin(LitElement) if ( !navItem ) return; // close on mobile - if ( this.isMobile() ) { + if ( this.breakPoints.isMobile() ) { let nav = this.renderRoot.getElementById(`nav--${navLocation.join("-")}`); if ( !nav ) return; let ul = nav.querySelector('ul'); @@ -348,7 +349,7 @@ export default class UcdThemePrimaryNav extends Mixin(LitElement) this.isMegaMenu() && depth > 0 && !this._megaIsOpen && - this.isDesktop() + this.breakPoints.isDesktop() ) i = -1; return i; @@ -378,7 +379,7 @@ export default class UcdThemePrimaryNav extends Mixin(LitElement) * @param {Array} navLocation - Array coordinates of corresponding nav item */ async _toggleMobileMenu(navLocation){ - if ( this.isDesktop() ) return; + if ( this.breakPoints.isDesktop() ) return; let navItem = this.getNavItem(navLocation); if ( navItem.isOpen ) { this.closeSubNav(navLocation); @@ -394,7 +395,7 @@ export default class UcdThemePrimaryNav extends Mixin(LitElement) */ _onNavMouseenter(){ if ( - this.isMobile() || + this.breakPoints.isMobile() || !this.isMegaMenu() ) return; @@ -411,7 +412,7 @@ export default class UcdThemePrimaryNav extends Mixin(LitElement) */ _onNavMouseleave(){ if ( - this.isMobile() || + this.breakPoints.isMobile() || !this.isMegaMenu() ) return; @@ -429,7 +430,7 @@ export default class UcdThemePrimaryNav extends Mixin(LitElement) */ _onNavFocusin(){ if ( - this.isMobile() || + this.breakPoints.isMobile() || !this.isMegaMenu() ) return; @@ -450,7 +451,7 @@ export default class UcdThemePrimaryNav extends Mixin(LitElement) * @param {Event} e */ _onItemMouseenter(e){ - if ( this.isMobile() ) return; + if ( this.breakPoints.isMobile() ) return; this.openSubNav(e.target.key); } @@ -461,7 +462,7 @@ export default class UcdThemePrimaryNav extends Mixin(LitElement) * @param {Event} e */ _onItemFocus(e){ - if ( this.isMobile() ) return; + if ( this.breakPoints.isMobile() ) return; const LI = e.target.parentElement.parentElement; if (LI.hasnav) { @@ -514,7 +515,7 @@ export default class UcdThemePrimaryNav extends Mixin(LitElement) * @param {Event} e */ _onItemMouseleave(e){ - if ( this.isMobile() || this.isMegaMenu() ) return; + if ( this.breakPoints.isMobile() || this.isMegaMenu() ) return; this.closeSubNav(e.target.key); } @@ -524,7 +525,7 @@ export default class UcdThemePrimaryNav extends Mixin(LitElement) * @description Attached to the top-level nav element. Closes subnav if it doesn't contain focused link. */ _onNavFocusout(){ - if ( this.isMobile() ) return; + if ( this.breakPoints.isMobile() ) return; if ( this.isMegaMenu() ) { if ( this._megaTimeout ) clearTimeout(this._megaTimeout); requestAnimationFrame(() => { @@ -577,7 +578,7 @@ export default class UcdThemePrimaryNav extends Mixin(LitElement) * @returns {Object} - Style map */ _getItemMobileStyles(location) { - if ( this.isDesktop() ) return {}; + if ( this.breakPoints.isDesktop() ) return {}; let navItem = this.getNavItem(location); if ( !navItem.inlineStyles ) return {}; return navItem.inlineStyles; diff --git a/elements/brand/ucd-theme-quick-links/ucd-theme-quick-links.js b/elements/brand/ucd-theme-quick-links/ucd-theme-quick-links.js index c5239e9..32ff637 100644 --- a/elements/brand/ucd-theme-quick-links/ucd-theme-quick-links.js +++ b/elements/brand/ucd-theme-quick-links/ucd-theme-quick-links.js @@ -1,7 +1,6 @@ import { LitElement, html } from 'lit'; import {render, styles} from "./ucd-theme-quick-links.tpl.js"; -import { Mixin, BreakPoints } from "../../utils/index.js"; import { MutationObserverController, WaitController } from '../../utils/controllers'; /** @@ -18,8 +17,7 @@ import { MutationObserverController, WaitController } from '../../utils/controll * @property {Boolean} opened - Menu is open * @property {Number} animationDuration - Length of animation when opening/closing menu */ -export default class UcdThemeQuickLinks extends Mixin(LitElement) - .with(BreakPoints) { +export default class UcdThemeQuickLinks extends LitElement { mutationObserver = new MutationObserverController(this); wait = new WaitController(this); diff --git a/elements/brand/ucd-theme-subnav/ucd-theme-subnav.js b/elements/brand/ucd-theme-subnav/ucd-theme-subnav.js index 43ad48a..3ad40a2 100644 --- a/elements/brand/ucd-theme-subnav/ucd-theme-subnav.js +++ b/elements/brand/ucd-theme-subnav/ucd-theme-subnav.js @@ -4,7 +4,7 @@ import { ifDefined } from 'lit/directives/if-defined.js'; import { styleMap } from 'lit/directives/style-map.js'; -import {Mixin, NavElement} from "../../utils"; +import {Mixin, NavElement} from "../../utils/mixins"; import { MutationObserverController, WaitController } from '../../utils/controllers'; /** diff --git a/elements/package-lock.json b/elements/package-lock.json index c4c7a11..770f0d2 100644 --- a/elements/package-lock.json +++ b/elements/package-lock.json @@ -1,13 +1,13 @@ { "name": "@ucd-lib/theme-elements", - "version": "0.0.3", + "version": "0.0.4", "lockfileVersion": 1, "requires": true, "dependencies": { "@lit/reactive-element": { - "version": "1.0.0-rc.4", - "resolved": "https://registry.npmjs.org/@lit/reactive-element/-/reactive-element-1.0.0-rc.4.tgz", - "integrity": "sha512-dJMha+4NFYdpnUJzRrWTFV5Hdp9QHWFuPnaoqonrKl4lGJVnYez9mu8ev9F/5KM47tjAjh22DuRHrdFDHfOijA==" + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@lit/reactive-element/-/reactive-element-1.0.1.tgz", + "integrity": "sha512-nSD5AA2AZkKuXuvGs8IK7K5ZczLAogfDd26zT9l6S7WzvqALdVWcW5vMUiTnZyj5SPcNwNNANj0koeV1ieqTFQ==" }, "@types/trusted-types": { "version": "2.0.2", @@ -23,28 +23,28 @@ } }, "lit": { - "version": "2.0.0-rc.4", - "resolved": "https://registry.npmjs.org/lit/-/lit-2.0.0-rc.4.tgz", - "integrity": "sha512-HPJrSvK377a1E5eSAUG+eTJWIOJFGNtnfbGPHY4vbc0Ud9GTFSwMEbeAOIJnA+5q92cafR38F1bWOyo4a2ncag==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/lit/-/lit-2.0.2.tgz", + "integrity": "sha512-hKA/1YaSB+P+DvKWuR2q1Xzy/iayhNrJ3aveD0OQ9CKn6wUjsdnF/7LavDOJsKP/K5jzW/kXsuduPgRvTFrFJw==", "requires": { - "@lit/reactive-element": "^1.0.0-rc.2", - "lit-element": "^3.0.0-rc.2", - "lit-html": "^2.0.0-rc.4" + "@lit/reactive-element": "^1.0.0", + "lit-element": "^3.0.0", + "lit-html": "^2.0.0" } }, "lit-element": { - "version": "3.0.0-rc.4", - "resolved": "https://registry.npmjs.org/lit-element/-/lit-element-3.0.0-rc.4.tgz", - "integrity": "sha512-6X7RCHTNhAWetVSr8VccALnRcn3W3VDqOfjY5cAfyfGq8Y9IbWnyBP8/ihpRg2atHbM2NsGL6pjDrFL9dRdIKg==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/lit-element/-/lit-element-3.0.1.tgz", + "integrity": "sha512-vs9uybH9ORyK49CFjoNGN85HM9h5bmisU4TQ63phe/+GYlwvY/3SIFYKdjV6xNvzz8v2MnVC+9+QOkPqh+Q3Ew==", "requires": { - "@lit/reactive-element": "^1.0.0-rc.2", - "lit-html": "^2.0.0-rc.4" + "@lit/reactive-element": "^1.0.0", + "lit-html": "^2.0.0" } }, "lit-html": { - "version": "2.0.0-rc.5", - "resolved": "https://registry.npmjs.org/lit-html/-/lit-html-2.0.0-rc.5.tgz", - "integrity": "sha512-vFnjzqwQijC9By5F50c3sjI5PXPYoIvbGfpbbDOv+8BBRYdMR+FDYyMeCC3T3iIZx8EE6aIow2aTaG+HS5SV4A==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/lit-html/-/lit-html-2.0.1.tgz", + "integrity": "sha512-KF5znvFdXbxTYM/GjpdOOnMsjgRcFGusTnB54ixnCTya5zUR0XqrDRj29ybuLS+jLXv1jji6Y8+g4W7WP8uL4w==", "requires": { "@types/trusted-types": "^2.0.2" } diff --git a/elements/package.json b/elements/package.json index 56351cf..47474f0 100644 --- a/elements/package.json +++ b/elements/package.json @@ -10,7 +10,7 @@ "license": "MIT", "dependencies": { "@ucd-lib/theme-sass": "^5.0.11", - "lit": "^2.0.0-rc.4", + "lit": "^2.0.2", "photoswipe": "^4.1.3", "slim-select": "^1.26.2" } diff --git a/elements/ucdlib/ucdlib-branding-bar/ucdlib-branding-bar.js b/elements/ucdlib/ucdlib-branding-bar/ucdlib-branding-bar.js index d77cffc..d26a867 100644 --- a/elements/ucdlib/ucdlib-branding-bar/ucdlib-branding-bar.js +++ b/elements/ucdlib/ucdlib-branding-bar/ucdlib-branding-bar.js @@ -1,7 +1,7 @@ import { LitElement, svg } from 'lit'; import {render, styles} from "./ucdlib-branding-bar.tpl.js"; -import {Mixin, NavElement} from "../../utils"; +import {Mixin, NavElement} from "../../utils/mixins"; import { MutationObserverController } from '../../utils/controllers'; import logo from "./logo.js"; import bookLogo from "./book.js"; diff --git a/elements/ucdlib/ucdlib-iconset/ucdlib-iconset.js b/elements/ucdlib/ucdlib-iconset/ucdlib-iconset.js index 18f6c09..981759b 100644 --- a/elements/ucdlib/ucdlib-iconset/ucdlib-iconset.js +++ b/elements/ucdlib/ucdlib-iconset/ucdlib-iconset.js @@ -1,5 +1,5 @@ import { LitElement } from 'lit'; -import { Mixin, MainDomElement} from "../../utils"; +import { Mixin, MainDomElement} from "../../utils/mixins"; import { MutationObserverController } from '../../utils/controllers'; diff --git a/elements/utils/break-points.js b/elements/utils/controllers/break-points.js similarity index 55% rename from elements/utils/break-points.js rename to elements/utils/controllers/break-points.js index f4972bb..55f08b5 100644 --- a/elements/utils/break-points.js +++ b/elements/utils/controllers/break-points.js @@ -1,8 +1,9 @@ -const BreakPoints = (superClass) => class extends superClass { +export class BreakPointsController{ - constructor() { - super(); - this._mobileBreakPoint = 992; + mobileBreakPoint = 992; + + constructor(host){ + (this.host = host).addController(this); } /** @@ -10,8 +11,8 @@ const BreakPoints = (superClass) => class extends superClass { * @description Is the desktop view currently active? * @returns {Boolean} */ - isDesktop(){ - return window.innerWidth >= this._mobileBreakPoint; + isDesktop(){ + return window.innerWidth >= this.mobileBreakPoint; } /** @@ -22,6 +23,4 @@ const BreakPoints = (superClass) => class extends superClass { isMobile(){ return !this.isDesktop(); } -}; - -export {BreakPoints}; \ No newline at end of file +} \ No newline at end of file diff --git a/elements/utils/controllers/index.js b/elements/utils/controllers/index.js index a33c2a8..d2e0da3 100644 --- a/elements/utils/controllers/index.js +++ b/elements/utils/controllers/index.js @@ -1,7 +1,9 @@ import { MutationObserverController } from "./mutation-observer"; import { WaitController } from "./wait"; +import { BreakPointsController } from "./break-points"; export { MutationObserverController, - WaitController + WaitController, + BreakPointsController }; \ No newline at end of file diff --git a/elements/utils/index.js b/elements/utils/index.js deleted file mode 100644 index 1f888f3..0000000 --- a/elements/utils/index.js +++ /dev/null @@ -1,10 +0,0 @@ -import Mixin from './mixin.js'; -import { MainDomElement } from './main-dom-element.js'; -import { BreakPoints } from './break-points.js'; -import { NavElement } from './nav-element.js'; - -export { - Mixin, - MainDomElement, - BreakPoints, - NavElement}; \ No newline at end of file diff --git a/elements/utils/mixins/index.js b/elements/utils/mixins/index.js index e69de29..61397fc 100644 --- a/elements/utils/mixins/index.js +++ b/elements/utils/mixins/index.js @@ -0,0 +1,8 @@ +import Mixin from './mixin.js'; +import { MainDomElement } from './main-dom-element.js'; +import { NavElement } from './nav-element.js'; + +export { + Mixin, + MainDomElement, + NavElement}; \ No newline at end of file diff --git a/elements/utils/main-dom-element.js b/elements/utils/mixins/main-dom-element.js similarity index 100% rename from elements/utils/main-dom-element.js rename to elements/utils/mixins/main-dom-element.js diff --git a/elements/utils/mixin.js b/elements/utils/mixins/mixin.js similarity index 100% rename from elements/utils/mixin.js rename to elements/utils/mixins/mixin.js diff --git a/elements/utils/nav-element.js b/elements/utils/mixins/nav-element.js similarity index 100% rename from elements/utils/nav-element.js rename to elements/utils/mixins/nav-element.js diff --git a/elements/utils/mutation-observer.js b/elements/utils/mutation-observer.js deleted file mode 100644 index f0b6e4a..0000000 --- a/elements/utils/mutation-observer.js +++ /dev/null @@ -1,51 +0,0 @@ -/** - * @function MutationObserverElement - * @param {Class} superClass - LitElement or child class. - * @description add default functionality for mutation observer - * - * @returns {Class} LitElement with mutation observer attached. - */ -const MutationObserverElement = (superClass) => class extends superClass { - - constructor() { - super(); - this._childListObserver = null; - } - - /** - * @method firstUpdated - * @description called on first DOM render. Call the _onChildListMutation method - * - * @param {Set} props - */ - firstUpdated(props) { - super.firstUpdated(props); - this._onChildListMutation(); - } - - /** - * @method connectedCallback - * @description Native lifecycle method called when element is connected - */ - connectedCallback(){ - super.connectedCallback(); - this._childListObserver = new MutationObserver( - (mutationsList, observer) => this._onChildListMutation(mutationsList, observer)); - this._childListObserver.observe(this, {childList: true}); - } - - /** - * @method disconnectedCallback - * @description Native lifecycle method called when element is disconnected - */ - disconnectedCallback(){ - this._childListObserver.disconnect(); - super.disconnectedCallback(); - } - - _onChildListMutation(){ - console.warn("You must create a '_onChildListMutation' method in your element to use the MutationObserverElement mixin"); - } -}; - -export {MutationObserverElement}; \ No newline at end of file diff --git a/test-app/package-lock.json b/test-app/package-lock.json index 1930e17..59f0e3f 100644 --- a/test-app/package-lock.json +++ b/test-app/package-lock.json @@ -1072,9 +1072,9 @@ "integrity": "sha512-eYm8vijH/hpzr/6/1CJ/V/Eb1xQFW2nnUKArb3z+yUWv7HTwj6M7SP957oMjfZjAHU6qpoNc2wQvIxBLWYa/Jg==" }, "@lit/reactive-element": { - "version": "1.0.0-rc.4", - "resolved": "https://registry.npmjs.org/@lit/reactive-element/-/reactive-element-1.0.0-rc.4.tgz", - "integrity": "sha512-dJMha+4NFYdpnUJzRrWTFV5Hdp9QHWFuPnaoqonrKl4lGJVnYez9mu8ev9F/5KM47tjAjh22DuRHrdFDHfOijA==" + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@lit/reactive-element/-/reactive-element-1.0.1.tgz", + "integrity": "sha512-nSD5AA2AZkKuXuvGs8IK7K5ZczLAogfDd26zT9l6S7WzvqALdVWcW5vMUiTnZyj5SPcNwNNANj0koeV1ieqTFQ==" }, "@types/eslint": { "version": "7.28.0", @@ -1400,8 +1400,8 @@ "@ucd-lib/theme-elements": { "version": "file:../elements", "requires": { - "@ucd-lib/theme-sass": "^5.0.10", - "lit": "^2.0.0-rc.4", + "@ucd-lib/theme-sass": "^5.0.11", + "lit": "^2.0.2", "photoswipe": "^4.1.3", "slim-select": "^1.26.2" }, @@ -5397,28 +5397,28 @@ "dev": true }, "lit": { - "version": "2.0.0-rc.4", - "resolved": "https://registry.npmjs.org/lit/-/lit-2.0.0-rc.4.tgz", - "integrity": "sha512-HPJrSvK377a1E5eSAUG+eTJWIOJFGNtnfbGPHY4vbc0Ud9GTFSwMEbeAOIJnA+5q92cafR38F1bWOyo4a2ncag==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/lit/-/lit-2.0.2.tgz", + "integrity": "sha512-hKA/1YaSB+P+DvKWuR2q1Xzy/iayhNrJ3aveD0OQ9CKn6wUjsdnF/7LavDOJsKP/K5jzW/kXsuduPgRvTFrFJw==", "requires": { - "@lit/reactive-element": "^1.0.0-rc.2", - "lit-element": "^3.0.0-rc.2", - "lit-html": "^2.0.0-rc.4" + "@lit/reactive-element": "^1.0.0", + "lit-element": "^3.0.0", + "lit-html": "^2.0.0" } }, "lit-element": { - "version": "3.0.0-rc.4", - "resolved": "https://registry.npmjs.org/lit-element/-/lit-element-3.0.0-rc.4.tgz", - "integrity": "sha512-6X7RCHTNhAWetVSr8VccALnRcn3W3VDqOfjY5cAfyfGq8Y9IbWnyBP8/ihpRg2atHbM2NsGL6pjDrFL9dRdIKg==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/lit-element/-/lit-element-3.0.1.tgz", + "integrity": "sha512-vs9uybH9ORyK49CFjoNGN85HM9h5bmisU4TQ63phe/+GYlwvY/3SIFYKdjV6xNvzz8v2MnVC+9+QOkPqh+Q3Ew==", "requires": { - "@lit/reactive-element": "^1.0.0-rc.2", - "lit-html": "^2.0.0-rc.4" + "@lit/reactive-element": "^1.0.0", + "lit-html": "^2.0.0" } }, "lit-html": { - "version": "2.0.0-rc.5", - "resolved": "https://registry.npmjs.org/lit-html/-/lit-html-2.0.0-rc.5.tgz", - "integrity": "sha512-vFnjzqwQijC9By5F50c3sjI5PXPYoIvbGfpbbDOv+8BBRYdMR+FDYyMeCC3T3iIZx8EE6aIow2aTaG+HS5SV4A==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/lit-html/-/lit-html-2.0.1.tgz", + "integrity": "sha512-KF5znvFdXbxTYM/GjpdOOnMsjgRcFGusTnB54ixnCTya5zUR0XqrDRj29ybuLS+jLXv1jji6Y8+g4W7WP8uL4w==", "requires": { "@types/trusted-types": "^2.0.2" } diff --git a/test-app/package.json b/test-app/package.json index 5b0c8ba..bb3bc3a 100644 --- a/test-app/package.json +++ b/test-app/package.json @@ -30,7 +30,7 @@ "@ucd-lib/theme-sass": "^5.0.11", "express": "^4.17.1", "fs-extra": "^10.0.0", - "lit": "^2.0.0-rc.4", + "lit": "^2.0.2", "marked": "^2.1.3", "photoswipe": "^4.1.3", "prismjs": "^1.24.1", diff --git a/test-app/pages/page-brand-colors.js b/test-app/pages/page-brand-colors.js index 245226f..87ce35a 100644 --- a/test-app/pages/page-brand-colors.js +++ b/test-app/pages/page-brand-colors.js @@ -1,7 +1,7 @@ import { LitElement } from 'lit'; import {render, styles} from "./page-brand-colors.tpl.js"; -import {Mixin, MainDomElement} from '../../elements/utils/index.js'; +import {Mixin, MainDomElement} from '../../elements/utils/mixins'; import {BrandedPageElement } from "../utils/index.js"; diff --git a/test-app/pages/page-infographics.js b/test-app/pages/page-infographics.js index a897431..6e31731 100644 --- a/test-app/pages/page-infographics.js +++ b/test-app/pages/page-infographics.js @@ -1,7 +1,7 @@ import { html, LitElement } from 'lit'; import {render, styles} from "./page-infographics.tpl.js"; -import {Mixin, MainDomElement} from '../../elements/utils/index.js'; +import {Mixin, MainDomElement} from '../../elements/utils/mixins'; import {BrandedPageElement} from "../utils/index.js"; import "../../elements/ucdlib/ucdlib-iconset/ucdlib-iconset"; diff --git a/test-app/pages/page-overview.js b/test-app/pages/page-overview.js index e284740..a83838b 100644 --- a/test-app/pages/page-overview.js +++ b/test-app/pages/page-overview.js @@ -1,7 +1,7 @@ import { LitElement } from 'lit'; import {render, styles} from "./page-overview.tpl.js"; -import {Mixin, MainDomElement} from '../../elements/utils/index.js'; +import {Mixin, MainDomElement} from '../../elements/utils/mixins'; import {BrandedPageElement } from "../utils/index.js"; export default class PageOverview extends Mixin(LitElement) diff --git a/test-app/pages/page-ucd-theme-collapse.js b/test-app/pages/page-ucd-theme-collapse.js index ee14b24..4d44274 100644 --- a/test-app/pages/page-ucd-theme-collapse.js +++ b/test-app/pages/page-ucd-theme-collapse.js @@ -1,6 +1,6 @@ import { LitElement } from 'lit'; import { render, styles } from './page-ucd-theme-collapse.tpl.js'; -import { Mixin, MainDomElement } from '../../elements/utils/index.js'; +import { Mixin, MainDomElement } from '../../elements/utils/mixins'; import { BrandedPageElement, MdElement } from '../utils/index.js'; import '../../elements/brand/ucd-theme-collapse/ucd-theme-collapse.js'; diff --git a/test-app/pages/page-ucd-theme-header.js b/test-app/pages/page-ucd-theme-header.js index 199d2ef..1bebba2 100644 --- a/test-app/pages/page-ucd-theme-header.js +++ b/test-app/pages/page-ucd-theme-header.js @@ -1,7 +1,7 @@ import { LitElement } from 'lit'; import {render, styles} from "./page-ucd-theme-header.tpl.js"; -import {Mixin, MainDomElement} from '../../elements/utils/index.js'; +import {Mixin, MainDomElement} from '../../elements/utils/mixins'; import {BrandedPageElement, MdElement} from "../utils/index.js"; import "../../elements/brand/ucd-theme-header/ucd-theme-header.js"; diff --git a/test-app/pages/page-ucd-theme-list-accordion.js b/test-app/pages/page-ucd-theme-list-accordion.js index b642f40..a80d005 100644 --- a/test-app/pages/page-ucd-theme-list-accordion.js +++ b/test-app/pages/page-ucd-theme-list-accordion.js @@ -1,6 +1,6 @@ import { LitElement } from 'lit'; import { render, styles } from './page-ucd-theme-list-accordion.tpl.js'; -import { Mixin, MainDomElement } from '../../elements/utils/index.js'; +import { Mixin, MainDomElement } from '../../elements/utils/mixins'; import { BrandedPageElement, MdElement } from '../utils/index.js'; import '../../elements/brand/ucd-theme-list-accordion/ucd-theme-list-accordion.js'; diff --git a/test-app/pages/page-ucd-theme-pagination.js b/test-app/pages/page-ucd-theme-pagination.js index bb6624d..3a39dc8 100644 --- a/test-app/pages/page-ucd-theme-pagination.js +++ b/test-app/pages/page-ucd-theme-pagination.js @@ -1,6 +1,6 @@ import { LitElement } from 'lit'; import {render, styles} from "./page-ucd-theme-pagination.tpl.js"; -import {Mixin, MainDomElement} from '../../elements/utils/index.js'; +import {Mixin, MainDomElement} from '../../elements/utils/mixins'; import {BrandedPageElement, MdElement} from "../utils/index.js"; import "../../elements/brand/ucd-theme-pagination/ucd-theme-pagination.js"; diff --git a/test-app/pages/page-ucd-theme-primary-nav.js b/test-app/pages/page-ucd-theme-primary-nav.js index 58e634b..f0edebb 100644 --- a/test-app/pages/page-ucd-theme-primary-nav.js +++ b/test-app/pages/page-ucd-theme-primary-nav.js @@ -1,6 +1,6 @@ import { LitElement, html } from 'lit'; import {render, styles} from "./page-ucd-theme-primary-nav.tpl.js"; -import {Mixin, MainDomElement} from '../../elements/utils/index.js'; +import {Mixin, MainDomElement} from '../../elements/utils/mixins'; import {BrandedPageElement, MdElement} from "../utils/index.js"; import "../../elements/brand/ucd-theme-primary-nav/ucd-theme-primary-nav.js"; diff --git a/test-app/pages/page-ucd-theme-quick-links.js b/test-app/pages/page-ucd-theme-quick-links.js index 5a3ab62..f4a6a42 100644 --- a/test-app/pages/page-ucd-theme-quick-links.js +++ b/test-app/pages/page-ucd-theme-quick-links.js @@ -1,7 +1,7 @@ import { LitElement } from 'lit'; import {render, styles} from "./page-ucd-theme-quick-links.tpl.js"; -import {Mixin, MainDomElement} from '../../elements/utils/index.js'; +import {Mixin, MainDomElement} from '../../elements/utils/mixins'; import {BrandedPageElement, MdElement} from "../utils/index.js"; import "../../elements/brand/ucd-theme-quick-links/ucd-theme-quick-links"; diff --git a/test-app/pages/page-ucd-theme-search-form.js b/test-app/pages/page-ucd-theme-search-form.js index aeeefd4..256d7a6 100644 --- a/test-app/pages/page-ucd-theme-search-form.js +++ b/test-app/pages/page-ucd-theme-search-form.js @@ -1,7 +1,7 @@ import { LitElement } from 'lit'; import {render, styles} from "./page-ucd-theme-search-form.tpl.js"; -import {Mixin, MainDomElement} from '../../elements/utils/index.js'; +import {Mixin, MainDomElement} from '../../elements/utils/mixins'; import {BrandedPageElement, MdElement} from "../utils/index.js"; import "../../elements/brand/ucd-theme-search-form/ucd-theme-search-form.js"; diff --git a/test-app/pages/page-ucd-theme-search-popup.js b/test-app/pages/page-ucd-theme-search-popup.js index e7b50bb..0918b50 100644 --- a/test-app/pages/page-ucd-theme-search-popup.js +++ b/test-app/pages/page-ucd-theme-search-popup.js @@ -1,7 +1,7 @@ import { LitElement } from 'lit'; import {render, styles} from "./page-ucd-theme-search-popup.tpl.js"; -import {Mixin, MainDomElement} from '../../elements/utils/index.js'; +import {Mixin, MainDomElement} from '../../elements/utils/mixins'; import {BrandedPageElement, MdElement} from "../utils/index.js"; import "../../elements/brand/ucd-theme-search-popup/ucd-theme-search-popup.js"; diff --git a/test-app/pages/page-ucd-theme-slim-select.js b/test-app/pages/page-ucd-theme-slim-select.js index 9ab8cc0..307c2a9 100644 --- a/test-app/pages/page-ucd-theme-slim-select.js +++ b/test-app/pages/page-ucd-theme-slim-select.js @@ -1,7 +1,7 @@ import { LitElement } from 'lit'; import {render, styles} from "./page-ucd-theme-slim-select.tpl.js"; -import {Mixin, MainDomElement} from '../../elements/utils/index.js'; +import {Mixin, MainDomElement} from '../../elements/utils/mixins'; import {BrandedPageElement, MdElement} from "../utils/index.js"; import "../../elements/brand/ucd-theme-slim-select/ucd-theme-slim-select"; diff --git a/test-app/pages/page-ucd-theme-subnav.js b/test-app/pages/page-ucd-theme-subnav.js index 78b7ca2..c5091f2 100644 --- a/test-app/pages/page-ucd-theme-subnav.js +++ b/test-app/pages/page-ucd-theme-subnav.js @@ -1,7 +1,7 @@ import { LitElement } from 'lit'; import {render, styles} from "./page-ucd-theme-subnav.tpl.js"; -import {Mixin, MainDomElement} from '../../elements/utils/index.js'; +import {Mixin, MainDomElement} from '../../elements/utils/mixins'; import {BrandedPageElement, MdElement} from "../utils/index.js"; import "../../elements/brand/ucd-theme-subnav/ucd-theme-subnav"; diff --git a/test-app/pages/page-ucdlib-branding-bar.js b/test-app/pages/page-ucdlib-branding-bar.js index ba60683..5acb3ec 100644 --- a/test-app/pages/page-ucdlib-branding-bar.js +++ b/test-app/pages/page-ucdlib-branding-bar.js @@ -1,7 +1,7 @@ import { LitElement } from 'lit'; import {render, styles} from "./page-ucdlib-branding-bar.tpl.js"; -import {Mixin, MainDomElement} from '../../elements/utils/index.js'; +import {Mixin, MainDomElement} from '../../elements/utils/mixins'; import {BrandedPageElement, MdElement} from "../utils/index.js"; import "../../elements/ucdlib/ucdlib-branding-bar/ucdlib-branding-bar"; diff --git a/test-app/pages/page-ucdlib-icon.js b/test-app/pages/page-ucdlib-icon.js index 6f195b1..85edfbe 100644 --- a/test-app/pages/page-ucdlib-icon.js +++ b/test-app/pages/page-ucdlib-icon.js @@ -1,7 +1,7 @@ import { LitElement } from 'lit'; import {render, styles} from "./page-ucdlib-icon.tpl.js"; -import {Mixin, MainDomElement} from '../../elements/utils/index.js'; +import {Mixin, MainDomElement} from '../../elements/utils/mixins'; import {BrandedPageElement, MdElement} from "../utils/index.js"; import "../../elements/ucdlib/ucdlib-iconset/ucdlib-iconset"; diff --git a/test-app/pages/page-ucdlib-icons.js b/test-app/pages/page-ucdlib-icons.js index f7f6ee7..5f4a99d 100644 --- a/test-app/pages/page-ucdlib-icons.js +++ b/test-app/pages/page-ucdlib-icons.js @@ -1,6 +1,6 @@ import { LitElement } from 'lit'; import {render, styles} from "./page-ucdlib-icons.tpl.js"; -import {Mixin, MainDomElement} from '../../elements/utils/index.js'; +import {Mixin, MainDomElement} from '../../elements/utils/mixins'; import {BrandedPageElement} from "../utils/index.js"; import "../../elements/ucdlib/ucdlib-icon/ucdlib-icon"; diff --git a/test-app/pages/page-ucdlib-iconset.js b/test-app/pages/page-ucdlib-iconset.js index 742bec8..fab53b0 100644 --- a/test-app/pages/page-ucdlib-iconset.js +++ b/test-app/pages/page-ucdlib-iconset.js @@ -1,7 +1,7 @@ import { LitElement } from 'lit'; import {render, styles} from "./page-ucdlib-iconset.tpl.js"; -import {Mixin, MainDomElement} from '../../elements/utils/index.js'; +import {Mixin, MainDomElement} from '../../elements/utils/mixins'; import {BrandedPageElement, MdElement} from "../utils/index.js"; import "../../elements/ucdlib/ucdlib-iconset/ucdlib-iconset"; diff --git a/test-app/pages/page-ucdlib-pages.js b/test-app/pages/page-ucdlib-pages.js index 712433f..9caa0a6 100644 --- a/test-app/pages/page-ucdlib-pages.js +++ b/test-app/pages/page-ucdlib-pages.js @@ -1,7 +1,7 @@ import { LitElement } from 'lit'; import {render, styles} from "./page-ucdlib-pages.tpl.js"; -import {Mixin, MainDomElement} from '../../elements/utils/index.js'; +import {Mixin, MainDomElement} from '../../elements/utils/mixins'; import {BrandedPageElement, MdElement} from "../utils/index.js"; import "../../elements/ucdlib/ucdlib-pages/ucdlib-pages"; diff --git a/test-app/ucdlib-theme-test-app.js b/test-app/ucdlib-theme-test-app.js index 15aa249..3579666 100644 --- a/test-app/ucdlib-theme-test-app.js +++ b/test-app/ucdlib-theme-test-app.js @@ -1,6 +1,6 @@ import { LitElement } from 'lit'; import {render, styles} from "./ucdlib-theme-test-app.tpl.js"; -import {Mixin, MainDomElement} from '../elements/utils/index.js'; +import {Mixin, MainDomElement} from '../elements/utils/mixins'; import "../elements/ucdlib/ucdlib-pages/ucdlib-pages.js"; import "../elements/brand/ucd-theme-header/ucd-theme-header"; diff --git a/test-app/ucdlib-theme-test-app.tpl.js b/test-app/ucdlib-theme-test-app.tpl.js index 6314bd9..7cf1204 100644 --- a/test-app/ucdlib-theme-test-app.tpl.js +++ b/test-app/ucdlib-theme-test-app.tpl.js @@ -82,7 +82,7 @@ return html`
  • Pages
    • -