Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(link): changed DDSLink usage to BXLink #4884

Merged
merged 3 commits into from
Jan 13, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions packages/web-components/src/components/card/card.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* @license
*
* Copyright IBM Corp. 2019, 2020
* Copyright IBM Corp. 2019, 2021
*
* This source code is licensed under the Apache-2.0 license found in the
* LICENSE file in the root directory of this source tree.
Expand All @@ -10,9 +10,9 @@
import { html, property, internalProperty, customElement, TemplateResult } from 'lit-element';
import settings from 'carbon-components/es/globals/js/settings';
import ddsSettings from '@carbon/ibmdotcom-utilities/es/utilities/settings/settings.js';
import BXLink from 'carbon-web-components/es/components/link/link';
import { BASIC_COLOR_SCHEME } from '../../globals/defs';
import StableSelectorMixin from '../../globals/mixins/stable-selector';
import DDSLink from '../link/link';
import DDSCardFooter from './card-footer';
import styles from './card.scss';
import { PICTOGRAM_PLACEMENT } from './defs';
Expand All @@ -38,7 +38,7 @@ const slotExistencePropertyNames = {
* @slot footer - The footer content.
*/
@customElement(`${ddsPrefix}-card`)
class DDSCard extends StableSelectorMixin(DDSLink) {
class DDSCard extends StableSelectorMixin(BXLink) {
/**
* `true` if there is image content.
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
/**
* @license
*
* Copyright IBM Corp. 2020
* Copyright IBM Corp. 2020, 2021
*
* This source code is licensed under the Apache-2.0 license found in the
* LICENSE file in the root directory of this source tree.
*/

import { html, property, customElement } from 'lit-element';
import BXLink from 'carbon-web-components/es/components/link/link';
import settings from 'carbon-components/es/globals/js/settings';
import ddsSettings from '@carbon/ibmdotcom-utilities/es/utilities/settings/settings.js';
import DDSLink from '../link/link';
import styles from './footer.scss';

const { prefix } = settings;
Expand All @@ -22,7 +22,7 @@ const { stablePrefix: ddsPrefix } = ddsSettings;
* @element dds-footer-nav-item
*/
@customElement(`${ddsPrefix}-footer-nav-item`)
class DDSFooterNavItem extends DDSLink {
class DDSFooterNavItem extends BXLink {
protected _renderInner() {
const { titleText } = this;
return html`
Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
/**
* @license
*
* Copyright IBM Corp. 2020
* Copyright IBM Corp. 2020, 2021
*
* This source code is licensed under the Apache-2.0 license found in the
* LICENSE file in the root directory of this source tree.
*/

import { html, customElement, TemplateResult, property } from 'lit-element';
import BXLink from 'carbon-web-components/es/components/link/link';
import settings from 'carbon-components/es/globals/js/settings.js';
import ddsSettings from '@carbon/ibmdotcom-utilities/es/utilities/settings/settings.js';
import { ICON_PLACEMENT } from '../../globals/defs';
import StableSelectorMixin from '../../globals/mixins/stable-selector';
import DDSLink from '../link/link';
import styles from './link-with-icon.scss';

export { ICON_PLACEMENT };
Expand All @@ -28,7 +28,7 @@ const { stablePrefix: ddsPrefix } = ddsSettings;
* @slot icon-left - The CTA icon to place at the left.
*/
@customElement(`${ddsPrefix}-link-with-icon`)
class DDSLinkWithIcon extends StableSelectorMixin(DDSLink) {
class DDSLinkWithIcon extends StableSelectorMixin(BXLink) {
/**
* Icon placement(right (default) | left)
*/
Expand Down
79 changes: 0 additions & 79 deletions packages/web-components/src/components/link/link.ts

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
/**
* @license
*
* Copyright IBM Corp. 2020
* Copyright IBM Corp. 2020, 2021
*
* This source code is licensed under the Apache-2.0 license found in the
* LICENSE file in the root directory of this source tree.
*/

import { html, property, customElement } from 'lit-element';
import BXLink from 'carbon-web-components/es/components/link/link';
import settings from 'carbon-components/es/globals/js/settings';
import ddsSettings from '@carbon/ibmdotcom-utilities/es/utilities/settings/settings.js';
import DDSLink from '../link/link';
import styles from './locale-modal.scss';

const { prefix } = settings;
Expand All @@ -22,7 +22,7 @@ const { stablePrefix: ddsPrefix } = ddsSettings;
* @element dds-locale-item
*/
@customElement(`${ddsPrefix}-locale-item`)
class DDSLocaleItem extends DDSLink {
class DDSLocaleItem extends BXLink {
/**
* The country.
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* @license
*
* Copyright IBM Corp. 2020
* Copyright IBM Corp. 2020, 2021
*
* This source code is licensed under the Apache-2.0 license found in the
* LICENSE file in the root directory of this source tree.
Expand All @@ -10,11 +10,11 @@
import { html, property, customElement } from 'lit-element';
import settings from 'carbon-components/es/globals/js/settings';
import ArrowRight20 from 'carbon-web-components/es/icons/arrow--right/20.js';
import BXLink from 'carbon-web-components/es/components/link/link';
import Error20 from 'carbon-web-components/es/icons/error/20.js';
import HostListener from 'carbon-web-components/es/globals/decorators/host-listener.js';
import HostListenerMixin from 'carbon-web-components/es/globals/mixins/host-listener.js';
import ddsSettings from '@carbon/ibmdotcom-utilities/es/utilities/settings/settings.js';
import DDSLink from '../link/link';
import styles from './locale-modal.scss';

const { prefix } = settings;
Expand All @@ -26,7 +26,7 @@ const { stablePrefix: ddsPrefix } = ddsSettings;
* @element dds-region-item
*/
@customElement(`${ddsPrefix}-region-item`)
class DDSRegionItem extends HostListenerMixin(DDSLink) {
class DDSRegionItem extends HostListenerMixin(BXLink) {
/**
* Handles 'click' event on this element.
*
Expand Down
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
/**
* @license
*
* Copyright IBM Corp. 2020
* Copyright IBM Corp. 2020, 2021
*
* This source code is licensed under the Apache-2.0 license found in the
* LICENSE file in the root directory of this source tree.
*/

import { html, internalProperty, property, customElement } from 'lit-element';
import BXLink from 'carbon-web-components/es/components/link/link';
import HostListener from 'carbon-web-components/es/globals/decorators/host-listener.js';
import HostListenerMixin from 'carbon-web-components/es/globals/mixins/host-listener.js';
import settings from 'carbon-components/es/globals/js/settings.js';
import ddsSettings from '@carbon/ibmdotcom-utilities/es/utilities/settings/settings.js';
import FocusMixin from 'carbon-web-components/es/globals/mixins/focus.js';
import IBM8BarLogoH23 from '@carbon/ibmdotcom-styles/icons/svg/IBM-8bar-logo--h23.svg';
import DDSLink from '../link/link';
import styles from './masthead.scss';

const { prefix } = settings;
Expand All @@ -26,7 +26,7 @@ const { stablePrefix: ddsPrefix } = ddsSettings;
* @element dds-masthead-logo
*/
@customElement(`${ddsPrefix}-masthead-logo`)
class DDSMastheadLogo extends FocusMixin(HostListenerMixin(DDSLink)) {
class DDSMastheadLogo extends FocusMixin(HostListenerMixin(BXLink)) {
/**
* Search bar opened flag.
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
/**
* @license
*
* Copyright IBM Corp. 2020
* Copyright IBM Corp. 2020, 2021
*
* This source code is licensed under the Apache-2.0 license found in the
* LICENSE file in the root directory of this source tree.
*/

import { html, property, customElement } from 'lit-element';
import BXLink from 'carbon-web-components/es/components/link/link';
import ddsSettings from '@carbon/ibmdotcom-utilities/es/utilities/settings/settings.js';
import DDSLink from '../link/link';
import styles from './masthead.scss';

const { stablePrefix: ddsPrefix } = ddsSettings;
Expand All @@ -20,7 +20,7 @@ const { stablePrefix: ddsPrefix } = ddsSettings;
* @element dds-megamenu-category-link
*/
@customElement(`${ddsPrefix}-megamenu-category-link`)
class DDSMegaMenuCateoryLink extends DDSLink {
class DDSMegaMenuCateoryLink extends BXLink {
/**
* link title.
*/
Expand Down