From 8bb26a215cce26fa91443bcc08c8e483a1820009 Mon Sep 17 00:00:00 2001 From: Dana Gutride Date: Wed, 24 Apr 2019 16:07:42 -0400 Subject: [PATCH] feat(clipboard): remove textarea from clipboard copy (#1840) --- .../patternfly-4/react-charts/package.json | 2 +- packages/patternfly-4/react-core/package.json | 2 +- .../ClipboardCopy/ClipboardCopy.d.ts | 5 +- .../components/ClipboardCopy/ClipboardCopy.js | 6 +-- .../ClipboardCopy/ExpandedContent.d.ts | 11 ---- .../ClipboardCopy/ExpandedContent.js | 29 ++++++---- .../ClipboardCopy/ToggleButton.d.ts | 15 ------ .../ExpandedContent.test.js.snap | 16 ++---- packages/patternfly-4/react-docs/package.json | 2 +- .../react-inline-edit-extension/package.json | 2 +- .../react-styled-system/package.json | 2 +- .../patternfly-4/react-table/package.json | 2 +- .../patternfly-4/react-tokens/package.json | 2 +- packages/react-icons/package.json | 2 +- yarn.lock | 54 ++----------------- 15 files changed, 42 insertions(+), 110 deletions(-) delete mode 100644 packages/patternfly-4/react-core/src/components/ClipboardCopy/ExpandedContent.d.ts delete mode 100644 packages/patternfly-4/react-core/src/components/ClipboardCopy/ToggleButton.d.ts diff --git a/packages/patternfly-4/react-charts/package.json b/packages/patternfly-4/react-charts/package.json index f3f1eb2354a..8eb67a3b34d 100644 --- a/packages/patternfly-4/react-charts/package.json +++ b/packages/patternfly-4/react-charts/package.json @@ -46,7 +46,7 @@ "victory-core": "^31.1.0" }, "devDependencies": { - "@patternfly/patternfly": "2.5.0", + "@patternfly/patternfly": "2.6.1", "@patternfly/react-tokens": "^2.3.4", "css": "^2.2.3", "fs-extra": "^6.0.1", diff --git a/packages/patternfly-4/react-core/package.json b/packages/patternfly-4/react-core/package.json index dea70ff940b..92e1b0b41a2 100644 --- a/packages/patternfly-4/react-core/package.json +++ b/packages/patternfly-4/react-core/package.json @@ -59,7 +59,7 @@ "@babel/plugin-transform-typescript": "^7.0.0", "@babel/preset-env": "^7.0.0", "@babel/preset-react": "^7.0.0", - "@patternfly/patternfly": "2.5.0", + "@patternfly/patternfly": "2.6.1", "@types/enzyme": "3.9.0", "@types/exenv": "^1.2.0", "@types/jest": "^24.0.11", diff --git a/packages/patternfly-4/react-core/src/components/ClipboardCopy/ClipboardCopy.d.ts b/packages/patternfly-4/react-core/src/components/ClipboardCopy/ClipboardCopy.d.ts index 945b8c778cd..98b169d9fe0 100644 --- a/packages/patternfly-4/react-core/src/components/ClipboardCopy/ClipboardCopy.d.ts +++ b/packages/patternfly-4/react-core/src/components/ClipboardCopy/ClipboardCopy.d.ts @@ -1,4 +1,4 @@ -import { FunctionComponent, HTMLProps, MouseEvent } from 'react'; +import { FunctionComponent, HTMLProps, MouseEvent, ReactNode, HTMLDivElement } from 'react'; import { OneOf } from '../../typeUtils'; import { PopoverPosition } from '../Popover'; @@ -8,9 +8,9 @@ export const ClipboardCopyVariant = { }; export interface ClipboardCopyProps extends HTMLProps { + className?: string; hoverTip?: string; clickTip?: string; - 'toggle-aria-label'?: string; isReadOnly?: boolean; variant?: OneOf; position?: OneOf; @@ -20,6 +20,7 @@ export interface ClipboardCopyProps extends HTMLProps { switchDelay?: number; onCopy?: (event: MouseEvent, text?: string) => void; onChange?: (text: string) => void; + children?: ReactNode; } declare const ClipboardCopy: FunctionComponent; diff --git a/packages/patternfly-4/react-core/src/components/ClipboardCopy/ClipboardCopy.js b/packages/patternfly-4/react-core/src/components/ClipboardCopy/ClipboardCopy.js index 98a8fdf3852..bf597dab2b9 100644 --- a/packages/patternfly-4/react-core/src/components/ClipboardCopy/ClipboardCopy.js +++ b/packages/patternfly-4/react-core/src/components/ClipboardCopy/ClipboardCopy.js @@ -60,7 +60,7 @@ class ClipboardCopy extends React.Component { 'toggle-aria-label': toggleAriaLabel, variant, position, - classname, + className, onChange, ...props } = this.props; @@ -70,7 +70,7 @@ class ClipboardCopy extends React.Component { const copyButtonIdPrefix = 'copy-button-'; return (
@@ -134,7 +134,7 @@ class ClipboardCopy extends React.Component { ClipboardCopy.propTypes = { /** Additional classes added to the clipboard copy container. */ - classname: PropTypes.string, + className: PropTypes.string, /** Tooltip message to display when hover the copy button */ hoverTip: PropTypes.string, /** Tooltip message to display when clicking the copy button */ diff --git a/packages/patternfly-4/react-core/src/components/ClipboardCopy/ExpandedContent.d.ts b/packages/patternfly-4/react-core/src/components/ClipboardCopy/ExpandedContent.d.ts deleted file mode 100644 index 0383fc3ef51..00000000000 --- a/packages/patternfly-4/react-core/src/components/ClipboardCopy/ExpandedContent.d.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { FunctionComponent, HTMLProps, ReactNode } from 'react'; -import { Omit } from '../../typeUtils'; - -export interface ExpandedContentProps extends Omit, 'onChange' | 'children'> { - children: ReactNode; - onChange?(value: string, event: FormEvent): void; -} - -declare const ExpandedContent: FunctionComponent; - -export default ExpandedContent; diff --git a/packages/patternfly-4/react-core/src/components/ClipboardCopy/ExpandedContent.js b/packages/patternfly-4/react-core/src/components/ClipboardCopy/ExpandedContent.js index ce7ed169f36..843a7397c53 100644 --- a/packages/patternfly-4/react-core/src/components/ClipboardCopy/ExpandedContent.js +++ b/packages/patternfly-4/react-core/src/components/ClipboardCopy/ExpandedContent.js @@ -3,15 +3,26 @@ import styles from '@patternfly/patternfly/components/ClipboardCopy/clipboard-co import { css } from '@patternfly/react-styles'; import PropTypes from 'prop-types'; -const ExpandedContent = ({ className, children, onChange, ...props }) => ( -
-