diff --git a/packages/web-components/src/components/masthead/__stories__/links.ts b/packages/web-components/src/components/masthead/__stories__/links.ts index ea523f1aaf7..e8ac7664cc7 100644 --- a/packages/web-components/src/components/masthead/__stories__/links.ts +++ b/packages/web-components/src/components/masthead/__stories__/links.ts @@ -88,7 +88,7 @@ const mastheadL1Data: MastheadL1 = { submenu: { columns: 2, announcement: - 'Lorem ipsum: Full announcement may be linked or only a portion as an inline link', + 'Lorem ipsum: Full announcement may be linked or only a portion as an inline link', footer: { title: 'View all lorem ipsum (B)', url: 'https://example.com', @@ -145,7 +145,7 @@ const mastheadL1Data: MastheadL1 = { submenu: { columns: 3, announcement: - 'Lorem ipsum: Full announcement may be linked or only a portion as an inline link', + 'Lorem ipsum: Full announcement may be linked or only a portion as an inline link', menuSections: [ { span: 1, @@ -236,7 +236,7 @@ const mastheadL1Data: MastheadL1 = { submenu: { columns: 3, announcement: - 'Lorem ipsum: Full announcement may be linked or only a portion as an inline link', + 'Lorem ipsum: Full announcement may be linked or only a portion as an inline link', menuSections: [ { span: 1, @@ -407,7 +407,7 @@ const mastheadL1Data: MastheadL1 = { submenu: { columns: 2, announcement: - 'Lorem ipsum: Full announcement may be linked or only a portion as an inline link', + 'Lorem ipsum: Full announcement may be linked or only a portion as an inline link', footer: { title: 'View all lorem ipsum (E)', url: 'https://example.com', diff --git a/packages/web-components/src/components/masthead/masthead-cart.ts b/packages/web-components/src/components/masthead/masthead-cart.ts index 07dbbd0e3b5..11bd201a9c5 100644 --- a/packages/web-components/src/components/masthead/masthead-cart.ts +++ b/packages/web-components/src/components/masthead/masthead-cart.ts @@ -11,7 +11,7 @@ import StableSelectorMixin from '../../globals/mixins/stable-selector'; import { html, LitElement } from 'lit'; import { property, state } from 'lit/decorators.js'; import settings from '@carbon/ibmdotcom-utilities/es/utilities/settings/settings.js'; -import { carbonElement as customElement } from '@carbon/web-components/es/globals/decorators/carbon-element'; +import { carbonElement as customElement } from '@carbon/web-components/es/globals/decorators/carbon-element.js'; import ShoppingCart20 from '@carbon/web-components/es/icons/shopping--cart/20.js'; import styles from './masthead.scss'; import LocaleAPI from '@carbon/ibmdotcom-services/es/services/Locale/Locale.js'; diff --git a/packages/web-components/src/components/masthead/masthead-l1.ts b/packages/web-components/src/components/masthead/masthead-l1.ts index 17c6c8247a5..5d0f1a891e3 100644 --- a/packages/web-components/src/components/masthead/masthead-l1.ts +++ b/packages/web-components/src/components/masthead/masthead-l1.ts @@ -933,9 +933,19 @@ class C4DMastheadL1 extends StableSelectorMixin(LitElement) { } // Fall back to automated selection based on URL. else { - this.selectedElements = allLinks.filter( - (el) => el.href === currentUrlPath - ); + this.selectedElements = allLinks.filter((el) => { + try { + const elURL = new URL(el.href); + const currURL = new URL(currentUrlPath || ''); + + // Compare url without query params. + return ( + elURL.host === currURL.host && elURL.pathname === currURL.pathname + ); + } catch (_error) { + return false; + } + }); } if (this.selectedElements.length) { diff --git a/packages/web-components/src/components/structured-list/structured-list-cell.ts b/packages/web-components/src/components/structured-list/structured-list-cell.ts index 3f463b656cf..3e86f57ed1d 100644 --- a/packages/web-components/src/components/structured-list/structured-list-cell.ts +++ b/packages/web-components/src/components/structured-list/structured-list-cell.ts @@ -10,7 +10,7 @@ import CDSStructuredListCell from '@carbon/web-components/es/components/structured-list/structured-list-cell.js'; import { html } from 'lit'; import { property } from 'lit/decorators.js'; -import { ifDefined } from 'lit/directives/if-defined'; +import { ifDefined } from 'lit/directives/if-defined.js'; import Info16 from '@carbon/web-components/es/icons/information/16.js'; import Checkmark20 from '@carbon/web-components/es/icons/checkmark/20.js'; import Error20 from '@carbon/web-components/es/icons/error/20.js'; diff --git a/packages/web-components/src/components/tile/tile-group.ts b/packages/web-components/src/components/tile/tile-group.ts index b0916530bd7..aa0bd8e77cc 100644 --- a/packages/web-components/src/components/tile/tile-group.ts +++ b/packages/web-components/src/components/tile/tile-group.ts @@ -8,7 +8,7 @@ */ import { LitElement, html } from 'lit'; -import { carbonElement as customElement } from '@carbon/web-components/es/globals/decorators/carbon-element'; +import { carbonElement as customElement } from '@carbon/web-components/es/globals/decorators/carbon-element.js'; import settings from '@carbon/ibmdotcom-utilities/es/utilities/settings/settings.js'; import styles from './tile.scss'; diff --git a/packages/web-components/src/components/tile/tile.ts b/packages/web-components/src/components/tile/tile.ts index 4bdbb52e04a..a496420bf40 100644 --- a/packages/web-components/src/components/tile/tile.ts +++ b/packages/web-components/src/components/tile/tile.ts @@ -8,11 +8,11 @@ */ import { LitElement, html } from 'lit'; -import { property, state, query } from 'lit/decorators'; -import { classMap } from 'lit/directives/class-map'; -import { carbonElement as customElement } from '@carbon/web-components/es/globals/decorators/carbon-element'; +import { property, state, query } from 'lit/decorators.js'; +import { classMap } from 'lit/directives/class-map.js'; +import { carbonElement as customElement } from '@carbon/web-components/es/globals/decorators/carbon-element.js'; import settings from '@carbon/ibmdotcom-utilities/es/utilities/settings/settings.js'; -import { ifDefined } from 'lit/directives/if-defined'; +import { ifDefined } from 'lit/directives/if-defined.js'; import CTAMixin from '../../component-mixins/cta/cta'; import VideoCTAMixin from '../../component-mixins/cta/video'; import { CTA_TYPE } from '../cta/defs'; diff --git a/packages/web-components/src/globals/mixins/throttled-input.ts b/packages/web-components/src/globals/mixins/throttled-input.ts index e0b7ed57cf4..364fdb72aaf 100644 --- a/packages/web-components/src/globals/mixins/throttled-input.ts +++ b/packages/web-components/src/globals/mixins/throttled-input.ts @@ -72,7 +72,7 @@ const ThrottledInputMixin = >(Base: T) => { /** * The throttle timeout to run query upon user input. */ - inputTimeout = 200; + abstract inputTimeout: number; connectedCallback() { // TS seems to miss `HTMLElement.prototype.connectedCallback()` definition