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

feat(atomic): add heading function for lit components #4861

Open
wants to merge 13 commits into
base: master
Choose a base branch
from
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ import {
defaultCurrencyFormatter,
defaultNumberFormatter,
} from '../../common/formats/format-common';
import {Hidden} from '../../common/hidden';
import {Hidden} from '../../common/stencil-hidden';
import {CommerceBindings} from '../atomic-commerce-interface/atomic-commerce-interface';

type AnyFacetValue =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ import {
import {randomID} from '../../../utils/utils';
import {ResultsPlaceholdersGuard} from '../../common/atomic-result-placeholder/placeholders';
import {Carousel} from '../../common/carousel';
import {Heading} from '../../common/heading';
import {Hidden} from '../../common/hidden';
import {createAppLoadedListener} from '../../common/interface/store';
import {DisplayGrid} from '../../common/item-list/display-grid';
import {DisplayWrapper} from '../../common/item-list/display-wrapper';
Expand All @@ -41,6 +39,8 @@ import {
ItemDisplayImageSize,
getItemListDisplayClasses,
} from '../../common/layout/display-options';
import {Heading} from '../../common/stencil-heading';
import {Hidden} from '../../common/stencil-hidden';
import {CommerceBindings} from '../atomic-commerce-recommendation-interface/atomic-commerce-recommendation-interface';
import {ProductTemplateProvider} from '../product-list/product-template-provider';
import {SelectChildProductEventArgs} from '../product-template-components/atomic-product-children/atomic-product-children';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
ExpandableText,
TruncateAfter,
} from '../../../common/expandable-text/expandable-text';
import {Hidden} from '../../../common/hidden';
import {Hidden} from '../../../common/stencil-hidden';
import {CommerceBindings} from '../../atomic-commerce-interface/atomic-commerce-interface';
import {ProductContext} from '../product-template-decorators';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
ExpandableText,
TruncateAfter,
} from '../../../common/expandable-text/expandable-text';
import {Hidden} from '../../../common/hidden';
import {Hidden} from '../../../common/stencil-hidden';
import {CommerceBindings} from '../../atomic-commerce-interface/atomic-commerce-interface';
import {ProductContext} from '../product-template-decorators';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {Fragment, FunctionalComponent, h} from '@stencil/core';
import {Hidden} from '../hidden';
import {Hidden} from '../stencil-hidden';

interface FacetGuardProps {
hasError: boolean;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import ArrowBottomIcon from '../../../../images/arrow-bottom-rounded.svg';
import ArrowTopIcon from '../../../../images/arrow-top-rounded.svg';
import CloseIcon from '../../../../images/close.svg';
import {Button} from '../../button';
import {Heading} from '../../heading';
import {Heading} from '../../stencil-heading';

export interface FacetHeaderProps {
i18n: i18n;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {getFieldValueCaption} from '../../../utils/field-utils';
import {randomID} from '../../../utils/utils';
import {InsightBindings} from '../../insight/atomic-insight-interface/atomic-insight-interface';
import {Bindings as SearchBindings} from '../../search/atomic-search-interface/atomic-search-interface';
import {Hidden} from '../hidden';
import {Hidden} from '../stencil-hidden';
import {
DateFacet,
DateFacetValue,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import {
Instance as PopperInstance,
} from '@popperjs/core';
import {Component, h, State, Prop, Element, Watch} from '@stencil/core';
import {Heading} from '../../heading';
import {LinkWithItemAnalytics} from '../../item-link/item-link';
import {Heading} from '../../stencil-heading';

/**
* @internal
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import {
SafeStorage,
StorageItems,
} from '../../../utils/local-storage-utils';
import {Heading} from '../heading';
import {AnyBindings} from '../interface/bindings';
import {Heading} from '../stencil-heading';
import {Switch} from '../switch';
import {CopyButton} from './copy-button';
import {FeedbackButton} from './feedback-button';
Expand Down
71 changes: 71 additions & 0 deletions packages/atomic/src/components/common/heading.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
import {within} from '@storybook/test';
import {html, render} from 'lit';
import {heading, HeadingProps} from './heading';

describe('heading', () => {
let container: HTMLElement;

beforeEach(() => {
container = document.createElement('div');
document.body.appendChild(container);
});

afterEach(() => {
document.body.removeChild(container);
});

const renderHeading = (
props: Partial<HeadingProps>,
children?: string
): HTMLElement => {
render(
html`${heading(
{
...props,
level: props.level ?? 1,
},
html`${children}`
)}`,
container
);
return within(container).getByRole(
props.level && props.level > 0 && props.level <= 6 ? 'heading' : 'generic'
) as HTMLElement;
};

it('should render a heading in the document', () => {
const props = {level: 1};
const headingElement = renderHeading(props);
expect(headingElement).toBeInTheDocument();
});

it('should render a heading with the correct level', () => {
const props = {level: 2};
const headingElement = renderHeading(props);
expect(headingElement.tagName.toLowerCase()).toBe('h2');
});

it('should render a div if level is outside the range of 1 to 6', () => {
const props = {level: 0};
const headingElement = renderHeading(props);
expect(headingElement.tagName.toLowerCase()).toBe('div');
});

it('should render a heading with the correct text content', () => {
const props = {level: 1};
const headingElement = renderHeading(props, 'Test Heading');
expect(headingElement.textContent).toContain('Test Heading');
});

it('should apply additional classes', () => {
const props = {level: 1, class: 'test-class'};
const headingElement = renderHeading(props);
expect(headingElement).toHaveClass('test-class');
});

it('should apply part attribute', () => {
const props = {level: 1, part: 'heading-part'};
const headingElement = renderHeading(props);
expect(headingElement.getAttribute('part')).toBe('heading-part');
});
});
31 changes: 31 additions & 0 deletions packages/atomic/src/components/common/heading.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
import {ifDefined} from 'lit-html/directives/if-defined.js';
import {html, literal, unsafeStatic} from 'lit/static-html.js';

export interface HeadingProps {
/**
* The heading level.
*
* A value outside of the range of 1 to 6 will render a div instead of a heading.
*/
level: number;
/**
* Additional classes to add to the heading.
*/
class?: string;
/**
* Additional parts to add to the heading.
*/
part?: string;
}

export const heading = <T>(
{level, class: classname, part}: HeadingProps,
children?: T
) => {
const headingTag =
level > 0 && level <= 6 ? unsafeStatic(`h${level}`) : literal`div`;

return html`<${headingTag} class="${ifDefined(classname)}" part="${ifDefined(part)}">
${children}
</${headingTag}>`;
};
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {FunctionalComponent, h, Fragment} from '@stencil/core';
import {Hidden} from '../hidden';
import {Hidden} from '../stencil-hidden';

export interface PagerGuardProps {
hasError: boolean;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import {h} from '@stencil/core';
import ArrowDown from '../../../../images/arrow-down.svg';
import ArrowRight from '../../../../images/arrow-right.svg';
import {Button} from '../../button';
import {Heading} from '../../heading';
import {Hidden} from '../../hidden';
import {AnyBindings} from '../../interface/bindings';
import {Heading} from '../../stencil-heading';
import {Hidden} from '../../stencil-hidden';

interface SmartSnippetSuggestionProps {
id: string;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import {SmartSnippetState, SmartSnippet} from '@coveo/headless';
import {h} from '@stencil/core';
import {Heading} from '../../heading';
import {Hidden} from '../../hidden';
import {AnyBindings} from '../../interface/bindings';
import {Heading} from '../../stencil-heading';
import {Hidden} from '../../stencil-hidden';
import {SmartSnippetFeedbackBanner} from '../atomic-smart-snippet-feedback-banner';

type FeedBackModalElement =
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,12 @@
import {h, FunctionalComponent} from '@stencil/core';
import {JSXBase} from '@stencil/core/internal';
import {HeadingProps} from './heading';

export interface HeadingProps {
/**
* The heading level.
*
* A value outside of the range of 1 to 6 will render a div instead of a heading.
*/
level: number;
}

/**
* @deprecated Should only be used for Stencil components; for Lit components, use the heading function instead.
*/
export const Heading: FunctionalComponent<
HeadingProps & JSXBase.HTMLAttributes<HTMLHeadingElement>
Pick<HeadingProps, 'level'> & JSXBase.HTMLAttributes<HTMLHeadingElement>
> = ({level, ...htmlProps}, children) => {
const HeadingTag = level > 0 && level <= 6 ? `h${level}` : 'div';
return <HeadingTag {...htmlProps}>{children}</HeadingTag>;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {Fragment, FunctionalComponent, h} from '@stencil/core';
import {shouldDisplayOnCurrentTab} from '../../../utils/tab-utils';
import {Hidden} from '../hidden';
import {Hidden} from '../stencil-hidden';

interface TabGuardProps {
tabsIncluded: string | string[];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ import {
InitializeBindings,
} from '../../../utils/initialization-utils';
import {Button} from '../../common/button';
import {Hidden} from '../../common/hidden';
import {
getClonedFacetElements,
RefineModal,
} from '../../common/refine-modal/modal';
import {Hidden} from '../../common/stencil-hidden';
import {InsightBindings} from '../atomic-insight-interface/atomic-insight-interface';

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ import {
import {randomID} from '../../../../utils/utils';
import {ResultsPlaceholdersGuard} from '../../../common/atomic-result-placeholder/placeholders';
import {Carousel} from '../../../common/carousel';
import {Heading} from '../../../common/heading';
import {createAppLoadedListener} from '../../../common/interface/store';
import {DisplayGrid} from '../../../common/item-list/display-grid';
import {DisplayWrapper} from '../../../common/item-list/display-wrapper';
Expand All @@ -46,6 +45,7 @@ import {
ItemDisplayDensity,
ItemDisplayImageSize,
} from '../../../common/layout/display-options';
import {Heading} from '../../../common/stencil-heading';
import {RecsBindings} from '../../../recommendations/atomic-recs-interface/atomic-recs-interface';

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ import {
InitializeBindings,
} from '../../../utils/initialization-utils';
import {Button} from '../../common/button';
import {Hidden} from '../../common/hidden';
import {
getClonedFacetElements,
RefineModal,
} from '../../common/refine-modal/modal';
import {Hidden} from '../../common/stencil-hidden';
import {Bindings} from '../../search/atomic-search-interface/atomic-search-interface';

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ import {
import {randomID} from '../../../utils/utils';
import {ResultsPlaceholdersGuard} from '../../common/atomic-result-placeholder/placeholders';
import {Carousel} from '../../common/carousel';
import {Heading} from '../../common/heading';
import {createAppLoadedListener} from '../../common/interface/store';
import {DisplayGrid} from '../../common/item-list/display-grid';
import {DisplayWrapper} from '../../common/item-list/display-wrapper';
Expand All @@ -42,6 +41,7 @@ import {
ItemDisplayBasicLayout,
getItemListDisplayClasses,
} from '../../common/layout/display-options';
import {Heading} from '../../common/stencil-heading';
import {RecsBindings} from '../atomic-recs-interface/atomic-recs-interface';

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import {BreadcrumbContent} from '../../common/breadbox/breadcrumb-content';
import {BreadcrumbShowLess} from '../../common/breadbox/breadcrumb-show-less';
import {BreadcrumbShowMore} from '../../common/breadbox/breadcrumb-show-more';
import {Breadcrumb as BreadboxBreadcrumb} from '../../common/breadbox/breadcrumb-types';
import {Hidden} from '../../common/hidden';
import {Hidden} from '../../common/stencil-hidden';
import {Bindings} from '../atomic-search-interface/atomic-search-interface';

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import {
import {ArrayProp} from '../../../utils/props-utils';
import {shouldDisplayOnCurrentTab} from '../../../utils/tab-utils';
import {GeneratedAnswerCommon} from '../../common/generated-answer/generated-answer-common';
import {Hidden} from '../../common/hidden';
import {Hidden} from '../../common/stencil-hidden';
import {Bindings} from '../atomic-search-interface/atomic-search-interface';

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import {
InitializableComponent,
InitializeBindings,
} from '../../../utils/initialization-utils';
import {Heading} from '../../common/heading';
import {Hidden} from '../../common/hidden';
import {Heading} from '../../common/stencil-heading';
import {Hidden} from '../../common/stencil-hidden';
import {Bindings} from '../atomic-search-interface/atomic-search-interface';

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {FacetHeader} from '../../../common/facets/facet-header/facet-header';
import {FacetValueCheckbox} from '../../../common/facets/facet-value-checkbox/facet-value-checkbox';
import {FacetValueLabelHighlight} from '../../../common/facets/facet-value-label-highlight/facet-value-label-highlight';
import {FacetValuesGroup} from '../../../common/facets/facet-values-group/facet-values-group';
import {Hidden} from '../../../common/hidden';
import {Hidden} from '../../../common/stencil-hidden';
import {Bindings} from '../../atomic-search-interface/atomic-search-interface';

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ import {FacetValueBox} from '../../../common/facets/facet-value-box/facet-value-
import {FacetValueLabelHighlight} from '../../../common/facets/facet-value-label-highlight/facet-value-label-highlight';
import {FacetValuesGroup} from '../../../common/facets/facet-values-group/facet-values-group';
import {initializePopover} from '../../../common/facets/popover/popover-type';
import {Hidden} from '../../../common/hidden';
import {Hidden} from '../../../common/stencil-hidden';
import {Bindings} from '../../atomic-search-interface/atomic-search-interface';
import {ColorFacetCheckbox} from '../color-facet-checkbox/color-facet-checkbox';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import {
PopoverChildFacet,
popoverClass,
} from '../../../common/facets/popover/popover-type';
import {Hidden} from '../../../common/hidden';
import {Hidden} from '../../../common/stencil-hidden';
import {Bindings} from '../../atomic-search-interface/atomic-search-interface';

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ import {FacetValueCheckbox} from '../../../common/facets/facet-value-checkbox/fa
import {FacetValueLink} from '../../../common/facets/facet-value-link/facet-value-link';
import {FacetValuesGroup} from '../../../common/facets/facet-values-group/facet-values-group';
import {initializePopover} from '../../../common/facets/popover/popover-type';
import {Hidden} from '../../../common/hidden';
import {Hidden} from '../../../common/stencil-hidden';
import {Bindings} from '../../atomic-search-interface/atomic-search-interface';

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ import {FacetPlaceholder} from '../../../common/facets/facet-placeholder/facet-p
import {FacetValueLink} from '../../../common/facets/facet-value-link/facet-value-link';
import {FacetValuesGroup} from '../../../common/facets/facet-values-group/facet-values-group';
import {initializePopover} from '../../../common/facets/popover/popover-type';
import {Hidden} from '../../../common/hidden';
import {Hidden} from '../../../common/stencil-hidden';
import {Bindings} from '../../atomic-search-interface/atomic-search-interface';

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import {
InitializeBindings,
} from '../../../../utils/initialization-utils';
import {Button} from '../../../common/button';
import {Hidden} from '../../../common/hidden';
import {Hidden} from '../../../common/stencil-hidden';

type ArrowDirection = 'right' | 'left';

Expand Down
Loading
Loading