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

Swatch: Convert component to TypeScript #42162

Merged
merged 9 commits into from
Aug 5, 2022
Merged

Swatch: Convert component to TypeScript #42162

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8084e21
Swatch: Refactor component to TypeScript
Jul 5, 2022
80d943f
Update CHANGELOG.md
Jul 5, 2022
532d6ae
Merge branch 'trunk' into refactor/swatch-to-typescript
Jul 8, 2022
9a1a25b
Update tsconfig.json
Jul 8, 2022
434967f
Apply suggestions from code review
Jul 13, 2022
5cf19e9
Merge branch 'trunk' into refactor/swatch-to-typescript
Jul 13, 2022
ffc0611
Merge branch 'trunk' into refactor/swatch-to-typescript
Jul 19, 2022
bb71fc1
Merge branch 'trunk' into refactor/swatch-to-typescript
Aug 3, 2022
8ec6401
Merge branch 'trunk' into refactor/swatch-to-typescript
Aug 5, 2022
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
1 change: 1 addition & 0 deletions packages/components/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
- `TextHighlight`: Convert to TypeScript ([#41698](https://github.com/WordPress/gutenberg/pull/41698)).
- `Scrollable`: Convert to TypeScript ([#42016](https://github.com/WordPress/gutenberg/pull/42016)).
- `Spacer`: Complete TypeScript migration ([#42013](https://github.com/WordPress/gutenberg/pull/42013)).
- `Swatch`: Convert to TypeScript ([#42162](https://github.com/WordPress/gutenberg/pull/42162)).
- `TreeSelect`: Refactor away from `_.repeat()` ([#42070](https://github.com/WordPress/gutenberg/pull/42070/)).
- `FocalPointPicker` updated to satisfy `react/exhaustive-deps` eslint rule ([#41520](https://github.com/WordPress/gutenberg/pull/41520)).
- `ColorPicker` updated to satisfy `react/exhaustive-deps` eslint rule ([#41294](https://github.com/WordPress/gutenberg/pull/41294)).
Expand Down
3 changes: 2 additions & 1 deletion packages/components/src/swatch/index.js → packages/components/src/swatch/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@ import { swatch } from '@wordpress/icons';
* Internal dependencies
*/
import Icon from '../icon';
import type { SwatchProps } from './types';

function Swatch( { fill } ) {
function Swatch( { fill }: SwatchProps ) {
walbo marked this conversation as resolved.
Show resolved Hide resolved
return fill ? (
<span className="components-swatch" style={ { background: fill } } />
) : (
Expand Down
11 changes: 11 additions & 0 deletions packages/components/src/swatch/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
/**
* External dependencies
*/
import type { CSSProperties } from 'react';

export type SwatchProps = {
/**
* The color to display in the swatch.
*/
fill?: CSSProperties[ 'background' ];
};
1 change: 1 addition & 0 deletions packages/components/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@
"src/spacer/**/*",
"src/spinner/**/*",
"src/surface/**/*",
"src/swatch/**/*",
"src/text/**/*",
"src/text-control/**/*",
"src/text-highlight/**/*",
Expand Down