From f355f759f393d661730e77e95476c2216b489c88 Mon Sep 17 00:00:00 2001 From: Dmitry Misharov Date: Thu, 19 Sep 2019 15:02:36 +0200 Subject: [PATCH] Added OUIA compatibility to Breadcrumb component --- .../components/Breadcrumb/Breadcrumb.test.tsx | 10 +- .../src/components/Breadcrumb/Breadcrumb.tsx | 20 +- .../__snapshots__/Breadcrumb.test.tsx.snap | 256 +++++-- .../Page/__snapshots__/Page.test.tsx.snap | 642 ++++++++++-------- 4 files changed, 599 insertions(+), 329 deletions(-) diff --git a/packages/patternfly-4/react-core/src/components/Breadcrumb/Breadcrumb.test.tsx b/packages/patternfly-4/react-core/src/components/Breadcrumb/Breadcrumb.test.tsx index 2238d20575c..ffbf3764b98 100644 --- a/packages/patternfly-4/react-core/src/components/Breadcrumb/Breadcrumb.test.tsx +++ b/packages/patternfly-4/react-core/src/components/Breadcrumb/Breadcrumb.test.tsx @@ -1,26 +1,26 @@ import * as React from 'react'; import { Breadcrumb } from './Breadcrumb'; import { BreadcrumbItem } from './BreadcrumbItem'; -import { shallow } from 'enzyme'; +import { mount } from 'enzyme'; describe('Breadcrumb component', () => { test('should render default breadcrumb', () => { - const view = shallow(); + const view = mount(); expect(view).toMatchSnapshot(); }); test('should render breadcrumb with className', () => { - const view = shallow(); + const view = mount(); expect(view).toMatchSnapshot(); }); test('should render breadcrumb with aria-label', () => { - const view = shallow(); + const view = mount(); expect(view).toMatchSnapshot(); }); test('should render breadcrumb with children', () => { - const view = shallow( + const view = mount( Item 1 Item 1 diff --git a/packages/patternfly-4/react-core/src/components/Breadcrumb/Breadcrumb.tsx b/packages/patternfly-4/react-core/src/components/Breadcrumb/Breadcrumb.tsx index c42c81c287d..455ef52f1a0 100644 --- a/packages/patternfly-4/react-core/src/components/Breadcrumb/Breadcrumb.tsx +++ b/packages/patternfly-4/react-core/src/components/Breadcrumb/Breadcrumb.tsx @@ -1,6 +1,7 @@ import * as React from 'react'; import styles from '@patternfly/react-styles/css/components/Breadcrumb/breadcrumb'; import { css } from '@patternfly/react-styles'; +import { InjectedOuiaProps, withOuiaContext } from '../withOuia'; export interface BreadcrumbProps extends React.HTMLProps { /** Children nodes be rendered to the BreadCrumb. Should be of type BreadCrumbItem. */ @@ -11,13 +12,26 @@ export interface BreadcrumbProps extends React.HTMLProps { 'aria-label'?: string; } -export const Breadcrumb: React.FunctionComponent = ({ +const Breadcrumb: React.FunctionComponent = ({ children = null, className = '', 'aria-label': ariaLabel = 'Breadcrumb', + ouiaContext = null, + ouiaId = null, ...props -}: BreadcrumbProps) => ( - + + @@ -653,159 +692,198 @@ exports[`Check page to verify skip to content points to main content region 1`] className="pf-c-page__main-breadcrumb" > - +
  • + + Section Landing + +
  • +
    + + +
    +