Skip to content
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
2 changes: 1 addition & 1 deletion packages/react-core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"tslib": "^2.5.0"
},
"devDependencies": {
"@patternfly/patternfly": "5.0.0-alpha.46",
"@patternfly/patternfly": "5.0.0-alpha.53",
"@rollup/plugin-commonjs": "^24.1.0",
"@rollup/plugin-node-resolve": "^15.0.2",
"@rollup/plugin-replace": "^5.0.2",
Expand Down
14 changes: 7 additions & 7 deletions packages/react-core/src/components/AboutModal/AboutModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { AboutModalBox } from './AboutModalBox';
import { Modal, ModalVariant } from '../Modal';
import { GenerateId } from '../../helpers/GenerateId/GenerateId';
// eslint-disable-next-line camelcase
import c_about_modal_box_BackgroundImage from '@patternfly/react-tokens/dist/esm/c_about_modal_box_BackgroundImage';
// import c_about_modal_box_BackgroundImage from '@patternfly/react-tokens/dist/esm/c_about_modal_box_BackgroundImage';

export interface AboutModalProps extends React.HTMLProps<HTMLDivElement> {
/** Content rendered inside the about modal */
Expand Down Expand Up @@ -48,7 +48,7 @@ export const AboutModal: React.FunctionComponent<AboutModalProps> = ({
onClose = (_e): any => undefined,
productName,
trademark,
backgroundImageSrc,
// backgroundImageSrc,
brandImageSrc,
brandImageAlt,
hasNoContentContainer = false,
Expand Down Expand Up @@ -89,13 +89,13 @@ export const AboutModal: React.FunctionComponent<AboutModalProps> = ({
hasNoBodyWrapper
>
<AboutModalBox
style={
// style={
/* eslint-disable camelcase */
backgroundImageSrc
? { [c_about_modal_box_BackgroundImage.name as string]: `url(${backgroundImageSrc})` }
: {}
// backgroundImageSrc
// ? { [c_about_modal_box_BackgroundImage.name as string]: `url(${backgroundImageSrc})` }
// : {}
/* eslint-enable camelcase */
}
// }
className={css(className)}
>
<AboutModalBoxBrand src={brandImageSrc} alt={brandImageAlt} />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import * as React from 'react';
import { css } from '@patternfly/react-styles';
import styles from '@patternfly/react-styles/css/components/BackgroundImage/background-image';
// eslint-disable-next-line camelcase
import c_background_image_BackgroundImage from '@patternfly/react-tokens/dist/esm/c_background_image_BackgroundImage';
// import c_background_image_BackgroundImage from '@patternfly/react-tokens/dist/esm/c_background_image_BackgroundImage';

export interface BackgroundImageProps extends Omit<React.HTMLProps<HTMLDivElement>, 'src'> {
/** Additional classes added to the background image. */
Expand All @@ -13,14 +13,14 @@ export interface BackgroundImageProps extends Omit<React.HTMLProps<HTMLDivElemen

export const BackgroundImage: React.FunctionComponent<BackgroundImageProps> = ({
className,
src,
// src,
...props
}: BackgroundImageProps) => (
<div
className={css(styles.backgroundImage, className)}
/* eslint-disable camelcase */
style={{
[c_background_image_BackgroundImage.name as string]: `url(${src})`
// [c_background_image_BackgroundImage.name as string]: `url(${src})`
}}
/* eslint-enable camelcase */
{...props}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ exports[`BackgroundImage 1`] = `
<DocumentFragment>
<div
class="pf-v5-c-background-image"
style="--pf-v5-c-background-image--BackgroundImage: url([object Object]);"
src="[object Object]"
/>
</DocumentFragment>
`;
Expand All @@ -13,7 +13,7 @@ exports[`allows passing in a single string as the image src 1`] = `
<DocumentFragment>
<div
class="pf-v5-c-background-image"
style="--pf-v5-c-background-image--BackgroundImage: url(/assets/images/pfbg_1200.jpg);"
src="/assets/images/pfbg_1200.jpg"
/>
</DocumentFragment>
`;
2 changes: 1 addition & 1 deletion packages/react-core/src/components/Chip/ChipGroup.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
import styles from '@patternfly/react-styles/css/components/ChipGroup/chip-group';
import styles from '@patternfly/react-styles/css/components/Chip/chip-group';
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Had to update this because of this change: patternfly/patternfly#5559

import { css } from '@patternfly/react-styles';
import { Button } from '../Button';
import { Chip } from './Chip';
Expand Down
2 changes: 1 addition & 1 deletion packages/react-core/src/components/Label/Label.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as React from 'react';
import { useState } from 'react';
import styles from '@patternfly/react-styles/css/components/Label/label';
import labelGrpStyles from '@patternfly/react-styles/css/components/LabelGroup/label-group';
import labelGrpStyles from '@patternfly/react-styles/css/components/Label/label-group';
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

update based on pf core change

import { Button } from '../Button';
import { Tooltip, TooltipPosition } from '../Tooltip';
import { css } from '@patternfly/react-styles';
Expand Down
2 changes: 1 addition & 1 deletion packages/react-core/src/components/Label/LabelGroup.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
import styles from '@patternfly/react-styles/css/components/LabelGroup/label-group';
import styles from '@patternfly/react-styles/css/components/Label/label-group';
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

update based on pf core change

import labelStyles from '@patternfly/react-styles/css/components/Label/label';
import { css } from '@patternfly/react-styles';
import { Button } from '../Button';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ exports[`check loginpage example against snapshot 1`] = `
<DocumentFragment>
<div
class="pf-v5-c-background-image"
style="--pf-v5-c-background-image--BackgroundImage: url(Background src);"
src="Background src"
/>
<div
class="pf-v5-c-login"
Expand Down
2 changes: 1 addition & 1 deletion packages/react-docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"test:a11y": "patternfly-a11y --config patternfly-a11y.config"
},
"dependencies": {
"@patternfly/patternfly": "5.0.0-alpha.46",
"@patternfly/patternfly": "5.0.0-alpha.53",
"@patternfly/react-charts": "^7.0.0-alpha.24",
"@patternfly/react-code-editor": "^5.0.0-alpha.97",
"@patternfly/react-core": "^5.0.0-alpha.96",
Expand Down
2 changes: 1 addition & 1 deletion packages/react-icons/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"@fortawesome/free-brands-svg-icons": "^5.14.0",
"@fortawesome/free-regular-svg-icons": "^5.14.0",
"@fortawesome/free-solid-svg-icons": "^5.14.0",
"@patternfly/patternfly": "5.0.0-alpha.46",
"@patternfly/patternfly": "5.0.0-alpha.53",
"fs-extra": "^11.1.1",
"glob": "^7.1.2",
"rimraf": "^2.6.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/react-icons/scripts/icons/patternflyIcons.mjs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { pfIcons } from '@patternfly/patternfly/icons/pf-icons.mjs';
import { pfIcons } from '@patternfly/patternfly/icons/pficons.mjs';
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

update based on pf core change


const renaming = {
save: 'save-alt',
Expand Down
2 changes: 1 addition & 1 deletion packages/react-styles/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"clean": "rimraf dist css"
},
"devDependencies": {
"@patternfly/patternfly": "5.0.0-alpha.46",
"@patternfly/patternfly": "5.0.0-alpha.53",
"camel-case": "^3.0.0",
"css": "^2.2.3",
"fs-extra": "^11.1.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/react-tokens/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"clean": "rimraf dist"
},
"devDependencies": {
"@patternfly/patternfly": "5.0.0-alpha.46",
"@patternfly/patternfly": "5.0.0-alpha.53",
"css": "^2.2.3",
"fs-extra": "^11.1.1",
"glob": "^7.1.2",
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4103,10 +4103,10 @@
puppeteer-cluster "^0.23.0"
xmldoc "^1.1.2"

"@patternfly/patternfly@5.0.0-alpha.46":
version "5.0.0-alpha.46"
resolved "https://registry.yarnpkg.com/@patternfly/patternfly/-/patternfly-5.0.0-alpha.46.tgz#08d4102019bf97e923067198d1032304db5a3c7c"
integrity sha512-170dUkmqQOeO7TAv/GT14fTMV1zKwe/vcCkP29XEGsmJT/WshCvcd6LjfZ4esFgckZMcc5G4IlHCRZRuA///OA==
"@patternfly/patternfly@5.0.0-alpha.53":
version "5.0.0-alpha.53"
resolved "https://registry.yarnpkg.com/@patternfly/patternfly/-/patternfly-5.0.0-alpha.53.tgz#9eda25100680107c13793b98b6d4f56d947551fb"
integrity sha512-sy9lk98PLVGjFuJ6li9uIwKc/IXXhjv8Ow0Q/MDOCFrhnj2gWLjMr4uB4d0393mAGfD1vk8KkqF+7tfEDIBjpQ==

"@phenomnomnominal/tsquery@4.1.1":
version "4.1.1"
Expand Down