Skip to content

Components: Replace Button with ui/Button using deprecated props strategy #29990

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
sarayourfriend wants to merge 6 commits into from
Closed

Components: Replace Button with ui/Button using deprecated props strategy #29990

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
93806bb
Components: Replace Button with ui/Button using deprecated props stra…
sarayourfriend Mar 18, 2021
4c28d32
Remove deprecation warning for icon as string
sarayourfriend Mar 18, 2021
238dc67
Handle isPressed correctly
sarayourfriend Mar 18, 2021
457ab0f
Expand button Dashicon comment explanation
sarayourfriend Mar 18, 2021
fd63d2d
Upgrade G2
sarayourfriend Mar 18, 2021
50ff05e
Use correct next button and fix pressed styles
sarayourfriend Mar 18, 2021
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
Prev Previous commit
Use correct next button and fix pressed styles
  • Loading branch information
@sarayourfriend
sarayourfriend committed Mar 18, 2021
commit 50ff05e01aa4450237920dc3de630c67d5c66a16
13 changes: 9 additions & 4 deletions packages/components/src/button/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
/**
* WordPress dependencies
*/
import { forwardRef } from '@wordpress/element';

/**
* Internal dependencies
*/
import { Button as NextButton } from '../ui/button';
import { TooltipButton as NextButton } from '../ui/tooltip-button';
import { useDeprecatedButtonProps } from './use-deprecated-button-props';

function Button( props ) {
function Button( props, forwardedRef ) {
const cleanedProps = useDeprecatedButtonProps( props );
return <NextButton { ...cleanedProps } />;
return <NextButton { ...cleanedProps } ref={ forwardedRef } />;
}

export default Button;
export default forwardRef( Button );
5 changes: 5 additions & 0 deletions packages/components/src/ui/base-button/styles.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,11 @@ export const Button = css`
svg {
display: block;
}

&[data-active='true'] {
background: ${ ui.get( 'colorText' ) };
color: ${ ui.get( 'colorTextInverted' ) };
}
`;

export const destructive = css`
Expand Down