diff --git a/package.json b/package.json index dfd9f140c0c..f5391746679 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "prettier": "node node_modules/.bin/prettier --write \"packages/**/*.{js,jsx,ts,tsx}\" \"scripts/**/*.{js,jsx,ts,tsx}\"", "serve:docs": "lerna run serve", "serve:integration": "lerna run serve:demo-app", - "start": "concurrently --kill-others \"yarn build && yarn build:esm --watch\" \"yarn workspace @patternfly/react-docs develop\"", + "start": "concurrently --kill-others \"yarn build && yarn watch\" \"yarn workspace @patternfly/react-docs develop\"", "start:cypress": "lerna run cypress:open", "start:demo-app": "lerna run start:demo-app --stream", "start:pf4": "yarn start", @@ -102,7 +102,8 @@ "test:current": "jest --watch", "test:integration": "yarn workspace @patternfly/react-integration test:integration", "test:watch": "jest --watchAll", - "uninstall": "find . -name node_modules -type d | xargs rm -rf" + "uninstall": "find . -name node_modules -type d | xargs rm -rf", + "watch": "yarn build:esm --watch" }, "config": { "commitizen": { diff --git a/packages/react-catalog-view-extension/package.json b/packages/react-catalog-view-extension/package.json index 4d6d0dbc495..ce3fbe47247 100644 --- a/packages/react-catalog-view-extension/package.json +++ b/packages/react-catalog-view-extension/package.json @@ -35,7 +35,7 @@ "clean": "rimraf dist" }, "dependencies": { - "@patternfly/patternfly": "4.6.0", + "@patternfly/patternfly": "4.8.6", "@patternfly/react-core": "^4.6.2", "@patternfly/react-styles": "^4.1.1", "classnames": "^2.2.5", diff --git a/packages/react-charts/package.json b/packages/react-charts/package.json index 5d2e550a008..e52957f5534 100644 --- a/packages/react-charts/package.json +++ b/packages/react-charts/package.json @@ -29,7 +29,7 @@ }, "homepage": "https://github.com/patternfly/patternfly-react#readme", "dependencies": { - "@patternfly/patternfly": "4.6.0", + "@patternfly/patternfly": "4.8.6", "@patternfly/react-styles": "^4.1.1", "@patternfly/react-tokens": "^4.2.1", "hoist-non-react-statics": "^3.3.0", diff --git a/packages/react-core/package.json b/packages/react-core/package.json index 8a8ae744773..8b427b729dd 100644 --- a/packages/react-core/package.json +++ b/packages/react-core/package.json @@ -44,7 +44,7 @@ "tslib": "^1.11.1" }, "devDependencies": { - "@patternfly/patternfly": "4.6.0", + "@patternfly/patternfly": "4.8.6", "@rollup/plugin-commonjs": "^11.0.2", "@rollup/plugin-node-resolve": "^7.1.1", "@rollup/plugin-replace": "^2.3.1", diff --git a/packages/react-core/src/components/ApplicationLauncher/ApplicationLauncher.tsx b/packages/react-core/src/components/ApplicationLauncher/ApplicationLauncher.tsx index 2b6b2d6d572..028a10c6831 100644 --- a/packages/react-core/src/components/ApplicationLauncher/ApplicationLauncher.tsx +++ b/packages/react-core/src/components/ApplicationLauncher/ApplicationLauncher.tsx @@ -200,9 +200,7 @@ export class ApplicationLauncher extends React.Component
  • -
  • -
  • @@ -712,11 +710,15 @@ exports[`ApplicationLauncher custom icon 1`] = ` className={null} onClick={[Function]} onKeyDown={[Function]} - role="separator" + role="none" > -
    + +
    +
    • @@ -1020,8 +1022,6 @@ exports[`ApplicationLauncher dropup + right aligned 1`] = ` id="pf-toggle-id-3" isActive={false} isDisabled={false} - isFocused={false} - isHovered={false} isOpen={false} isPlain={false} isPrimary={false} @@ -1292,8 +1292,6 @@ exports[`ApplicationLauncher dropup 1`] = ` id="pf-toggle-id-2" isActive={false} isDisabled={false} - isFocused={false} - isHovered={false} isOpen={false} isPlain={false} isPrimary={false} @@ -1602,10 +1600,10 @@ exports[`ApplicationLauncher expanded 1`] = `
  • -
  • -
  • @@ -2092,11 +2088,15 @@ exports[`ApplicationLauncher expanded 1`] = ` className={null} onClick={[Function]} onKeyDown={[Function]} - role="separator" + role="none" > -
    + +
    +
    • @@ -2400,8 +2400,6 @@ exports[`ApplicationLauncher regular 1`] = ` id="pf-toggle-id-0" isActive={false} isDisabled={false} - isFocused={false} - isHovered={false} isOpen={false} isPlain={false} isPrimary={false} @@ -2672,8 +2670,6 @@ exports[`ApplicationLauncher right aligned 1`] = ` id="pf-toggle-id-1" isActive={false} isDisabled={false} - isFocused={false} - isHovered={false} isOpen={false} isPlain={false} isPrimary={false} diff --git a/packages/react-core/src/components/Button/Button.tsx b/packages/react-core/src/components/Button/Button.tsx index 15219bbf8de..a6a520a8a6d 100644 --- a/packages/react-core/src/components/Button/Button.tsx +++ b/packages/react-core/src/components/Button/Button.tsx @@ -32,10 +32,6 @@ export interface ButtonProps extends React.HTMLProps { isBlock?: boolean; /** Disables the button and adds disabled styling */ isDisabled?: boolean; - /** Adds focus styling to the button */ - isFocus?: boolean; - /** Adds hover styling to the button */ - isHover?: boolean; /** Adds inline styling to a link button */ isInline?: boolean; /** Sets button type */ @@ -59,8 +55,6 @@ export const Button: React.FunctionComponent = ({ isActive = false, isBlock = false, isDisabled = false, - isFocus = false, - isHover = false, isInline = false, type = ButtonType.button, variant = ButtonVariant.primary, @@ -84,8 +78,6 @@ export const Button: React.FunctionComponent = ({ isBlock && styles.modifiers.block, isDisabled && !isButtonElement && styles.modifiers.disabled, isActive && styles.modifiers.active, - isFocus && styles.modifiers.focus, - isHover && styles.modifiers.hover, isInline && variant === ButtonVariant.link && styles.modifiers.inline, className )} diff --git a/packages/react-core/src/components/Button/__tests__/Generated/__snapshots__/Button.test.tsx.snap b/packages/react-core/src/components/Button/__tests__/Generated/__snapshots__/Button.test.tsx.snap index bbfce54b702..588c2d23ba0 100644 --- a/packages/react-core/src/components/Button/__tests__/Generated/__snapshots__/Button.test.tsx.snap +++ b/packages/react-core/src/components/Button/__tests__/Generated/__snapshots__/Button.test.tsx.snap @@ -9,6 +9,8 @@ exports[`Button should match snapshot (auto-generated) 1`] = ` data-ouia-component-type="PF4/Button" data-ouia-safe={true} disabled={false} + isFocus={false} + isHover={false} tabIndex={null} type="button" > diff --git a/packages/react-core/src/components/Button/__tests__/__snapshots__/Button.test.tsx.snap b/packages/react-core/src/components/Button/__tests__/__snapshots__/Button.test.tsx.snap index a796cc93051..8177bcc8036 100644 --- a/packages/react-core/src/components/Button/__tests__/__snapshots__/Button.test.tsx.snap +++ b/packages/react-core/src/components/Button/__tests__/__snapshots__/Button.test.tsx.snap @@ -112,11 +112,12 @@ exports[`isFocus 1`] = ` + ); diff --git a/packages/react-core/src/components/ClipboardCopy/ClipboardCopyToggle.tsx b/packages/react-core/src/components/ClipboardCopy/ClipboardCopyToggle.tsx index ab090567ee7..7c41f9f0271 100644 --- a/packages/react-core/src/components/ClipboardCopy/ClipboardCopyToggle.tsx +++ b/packages/react-core/src/components/ClipboardCopy/ClipboardCopyToggle.tsx @@ -1,7 +1,6 @@ import * as React from 'react'; -import styles from '@patternfly/react-styles/css/components/ClipboardCopy/clipboard-copy'; -import { css } from '@patternfly/react-styles'; import AngleRightIcon from '@patternfly/react-icons/dist/js/icons/angle-right-icon'; +import { Button } from '../Button'; export interface ClipboardCopyToggleProps extends React.DetailedHTMLProps, HTMLButtonElement> { @@ -15,23 +14,22 @@ export interface ClipboardCopyToggleProps export const ClipboardCopyToggle: React.FunctionComponent = ({ onClick, - className = '', id, textId, contentId, isExpanded = false, ...props }: ClipboardCopyToggleProps) => ( - +