Skip to content

Commit 0c78082

Browse files
committed
react integration and stragglers
1 parent 6299343 commit 0c78082

File tree

77 files changed

+182
-198
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+182
-198
lines changed

packages/react-icons/src/__tests__/createIcon.test.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import React from 'react';
21
import { render, screen } from '@testing-library/react';
32
import { createIcon } from '../createIcon';
43

@@ -29,7 +28,7 @@ test('aria-hidden is true if no title is specified', () => {
2928
expect(screen.getByRole('img', { hidden: true })).toHaveAttribute('aria-hidden', 'true');
3029
});
3130

32-
test('title is not renderd if a title is not passed', () => {
31+
test('title is not rendered if a title is not passed', () => {
3332
render(<SVGIcon />);
3433
expect(screen.queryByRole('img', { hidden: true })?.querySelector('title')).toBeNull();
3534
});

packages/react-icons/src/createIcon.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import * as React from 'react';
1+
import { Component } from 'react';
22

33
export interface IconDefinition {
44
name?: string;
@@ -27,7 +27,7 @@ export function createIcon({
2727
height,
2828
svgPath
2929
}: IconDefinition): React.ComponentClass<SVGIconProps> {
30-
return class SVGIcon extends React.Component<SVGIconProps> {
30+
return class SVGIcon extends Component<SVGIconProps> {
3131
static displayName = name;
3232

3333
id = `icon-title-${currentId++}`;

packages/react-integration/demo-app-ts/src/App.tsx

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import React from 'react';
1+
import { Component, createElement } from 'react';
22
import { BrowserRouter as Router, Route, Link, Routes } from 'react-router-dom';
33
import { Avatar } from '@patternfly/react-core/dist/esm/components/Avatar';
44
import { Brand } from '@patternfly/react-core/dist/esm/components/Brand';
@@ -33,7 +33,7 @@ interface AppState {
3333
isDarkTheme: boolean;
3434
}
3535

36-
class App extends React.Component<{}, AppState> {
36+
class App extends Component<{}, AppState> {
3737
state: AppState = {
3838
activeItem: '',
3939
isNavOpen: true,
@@ -67,9 +67,7 @@ class App extends React.Component<{}, AppState> {
6767
{Demos.map((demo) => (
6868
<Route
6969
path={`/${demo.id}-nav-link`}
70-
element={
71-
<PageSection id={`/${demo.id}-page-section`}>{React.createElement(demo.componentType)}</PageSection>
72-
}
70+
element={<PageSection id={`/${demo.id}-page-section`}>{createElement(demo.componentType)}</PageSection>}
7371
key={demo.id}
7472
/>
7573
))}
@@ -78,7 +76,7 @@ class App extends React.Component<{}, AppState> {
7876
path="/"
7977
element={
8078
<PageSection id={`/${defaultDemo.id}-page-section`}>
81-
{React.createElement(defaultDemo.componentType)}
79+
{createElement(defaultDemo.componentType)}
8280
</PageSection>
8381
}
8482
key={defaultDemo.id}

packages/react-integration/demo-app-ts/src/components/demos/AboutModal/AboutModalDemo.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
import React from 'react';
1+
import { Component } from 'react';
22
import { AboutModal, Button, Content } from '@patternfly/react-core';
33
const brandImg = '../../../assets/images/brandImg.svg';
44

55
interface AboutModalState {
66
isModalOpen: boolean;
77
}
88

9-
export class AboutModalDemo extends React.Component<{}, AboutModalState> {
9+
export class AboutModalDemo extends Component<{}, AboutModalState> {
1010
static displayName = 'AboutModalDemo';
1111
constructor(props: {}) {
1212
super(props);

packages/react-integration/demo-app-ts/src/components/demos/Accordion/AccordionDemo.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import React from 'react';
1+
import { useState } from 'react';
22
import { Accordion, AccordionItem, AccordionContent, AccordionToggle } from '@patternfly/react-core';
33

44
export const AccordionDemo = () => {
5-
const [expanded, setExpanded] = React.useState('');
5+
const [expanded, setExpanded] = useState('');
66

77
const onToggle = (id: string) => {
88
if (id === expanded) {

packages/react-integration/demo-app-ts/src/components/demos/AlertDemo/AlertDemo.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1+
import { Component } from 'react';
12
import { Alert, AlertActionCloseButton } from '@patternfly/react-core';
2-
import React from 'react';
33
import UserIcon from '@patternfly/react-icons/dist/esm/icons/user-icon';
44

55
interface AlertDemoState {
66
alertOneVisible: boolean;
77
alertTwoVisible: boolean;
88
}
99

10-
export class AlertDemo extends React.Component<{}, AlertDemoState> {
10+
export class AlertDemo extends Component<{}, AlertDemoState> {
1111
static displayName = 'AlertDemo';
1212
constructor(props: {}) {
1313
super(props);

packages/react-integration/demo-app-ts/src/components/demos/AlertDemo/AlertTimeoutCloseButtonDemo.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1+
import { Component } from 'react';
12
import { Alert, Button, AlertActionCloseButton } from '@patternfly/react-core';
2-
import React from 'react';
33

44
interface AlertTimeoutCloseButtonDemoState {
55
isOpenAlert: boolean;
66
}
77

8-
export class AlertTimeoutCloseButtonDemo extends React.Component<{}, AlertTimeoutCloseButtonDemoState> {
8+
export class AlertTimeoutCloseButtonDemo extends Component<{}, AlertTimeoutCloseButtonDemoState> {
99
static displayName = 'AlertTimeoutCloseButtonDemo';
1010
constructor(props: {}) {
1111
super(props);

packages/react-integration/demo-app-ts/src/components/demos/AlertGroupDemo/AlertGroupDemo.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import React from 'react';
1+
import { Component } from 'react';
22
import {
33
Alert,
44
AlertGroup,
@@ -21,7 +21,7 @@ interface AlertGroupDemoState {
2121
timer: number;
2222
}
2323

24-
export class AlertGroupDemo extends React.Component<{}, AlertGroupDemoState> {
24+
export class AlertGroupDemo extends Component<{}, AlertGroupDemoState> {
2525
static displayName = 'AlertGroupDemo';
2626
stopAsyncAlerts: () => void;
2727
removeAlert: (key: number | string) => void;

packages/react-integration/demo-app-ts/src/components/demos/AlertGroupDemo/AlertGroupTimeoutFromBottomDemo.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import React from 'react';
1+
import { useState } from 'react';
22
import { Alert, AlertActionLink, AlertGroup, Button } from '@patternfly/react-core';
33

44
export const AlertGroupTimeoutFromBottomDemo: React.FunctionComponent = () => {
5-
const [alerts, setAlerts] = React.useState<React.ReactNode[]>([]);
6-
const [count, setCount] = React.useState(0);
5+
const [alerts, setAlerts] = useState<React.ReactNode[]>([]);
6+
const [count, setCount] = useState(0);
77
const onClick = () => {
88
const timeout = 3000;
99
setAlerts((prevAlerts) => [

packages/react-integration/demo-app-ts/src/components/demos/BreadcrumbDemo/BreadcrumbDemo.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import React from 'react';
1+
import { Component } from 'react';
22
import {
33
Badge,
44
Breadcrumb,
@@ -13,7 +13,7 @@ import {
1313
import AngleLeftIcon from '@patternfly/react-icons/dist/esm/icons/angle-left-icon';
1414
import CaretDownIcon from '@patternfly/react-icons/dist/esm/icons/caret-down-icon';
1515

16-
export class BreadcrumbDemo extends React.Component {
16+
export class BreadcrumbDemo extends Component {
1717
static displayName = 'BreadcrumbDemo';
1818
state = {
1919
isOpen: false

0 commit comments

Comments
 (0)