Skip to content
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

Jump to bottom

components: Add deprecated props adapter for ColorPicker #34014

Merged
merged 6 commits into from
Aug 12, 2021
Merged

components: Add deprecated props adapter for ColorPicker #34014

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
ca26e09
components: Add deprecated props adapter for ColorPicker
sarayourfriend Aug 11, 2021
246c426
Add disable alpha prop
sarayourfriend Aug 11, 2021
f673ae6
Export the legacy adapter
sarayourfriend Aug 11, 2021
aea2057
Make a more robust check for isLegacyProps
sarayourfriend Aug 12, 2021
30456bc
Fix legacy color type to actually match colorToState
sarayourfriend Aug 12, 2021
d8153f0
Add unit tests
sarayourfriend Aug 12, 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
Next Next commit
Make a more robust check for isLegacyProps
  • Loading branch information
@sarayourfriend
sarayourfriend committed Aug 12, 2021
commit aea20573429831f8a71ae79eb4ba3c762d2f4f4b
3 changes: 1 addition & 2 deletions packages/components/src/ui/color-picker/stories/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import { useState } from '@wordpress/element';
* Internal dependencies
*/
import { ColorPicker } from '..';
import { LegacyAdapter } from '../legacy-adapter';
import { Flex } from '../../../flex';
import { Spacer } from '../../../spacer';
import { space } from '../../utils/space';
Expand Down Expand Up @@ -69,7 +68,7 @@ const LegacyExample = () => {

return (
<Flex align="flex-start" justify="flex-start">
<LegacyAdapter { ...legacyProps } />
<ColorPicker { ...legacyProps } />
<pre style={ { width: '20em' } }>
{ JSON.stringify( legacyColor, undefined, 4 ) }
</pre>
Expand Down
6 changes: 5 additions & 1 deletion packages/components/src/ui/color-picker/use-deprecated-props.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,11 @@ export interface LegacyProps {
}

function isLegacyProps( props: any ): props is LegacyProps {
return typeof props.onChangeComplete !== 'undefined';
return (
typeof props.onChangeComplete !== 'undefined' ||
typeof props.color === 'string' ||
typeof props.hex === 'string'
sarayourfriend marked this conversation as resolved.
Show resolved Hide resolved
);
}

function getColorFromLegacyProps(
Expand Down