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

Fix Custom Palette colors and support multiple origins and theme cache issues. #38417

Merged
merged 26 commits into from
Feb 16, 2022
Merged

Fix Custom Palette colors and support multiple origins and theme cache issues. #38417

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
cb5688b
Mobile - Rich Text - Validate link colors before passing an invalid o…
Feb 1, 2022
dfae6b5
Remove unneeded check
Feb 1, 2022
fc0acd8
Mobile - Global styles - Parse custom palette colors e.g var:preset|c…
Feb 2, 2022
f1cd335
Mobile - Global styles - Update tests to take into account custom colors
Feb 2, 2022
70a915f
Mobile - Adds useMobileGlobalStylesColors hook to get global styles p…
Feb 2, 2022
345c1bb
Mobile - Update Cover and Global styles test
Feb 2, 2022
8752124
Mobile - Cover - Use memo for the inline color palette
Feb 2, 2022
b542e4e
Mobile - Cover - Revert test change due to colors update
Feb 2, 2022
d1c367e
Merge branch 'trunk' into rnmobile/fix/invalid-link-colors
Feb 7, 2022
520a9fd
Mobile - Add support for multiple color palettes and gradients includ…
Feb 8, 2022
4c57595
Mobile - Rich Text - Simply color palettes merge
Feb 8, 2022
a9cae49
Mobile - Global styles - Enable default palette and default gradients…
Feb 8, 2022
069787a
Mobile - Update CHANGELOG
Feb 8, 2022
71b728a
Mobile - Global styles utils - Update test with default values
Feb 8, 2022
89db02a
Merge branch 'trunk' into rnmobile/fix/invalid-link-colors
Feb 8, 2022
6612e73
Mobile - Provider - Fix replacing previous colors on settings update
Feb 8, 2022
982646a
Mobile - Enable text and color settings since we are providing defaul…
Feb 8, 2022
db59028
Mobile - Android - Fix issue where a restart was needed to load the t…
Feb 8, 2022
4dec4ac
Mobile - Reset Global styles base styles for standard themes. Fixes s…
Feb 8, 2022
586f06f
Mobile - Palette screen - Add top and bottom padding for the containe…
Feb 10, 2022
15598a0
Mobile - Bottom sheet navigation screen - Add missing dependencies in…
Feb 11, 2022
5de5d67
Mobile - Global styles - useMobileGlobalStylesColors: use the type to…
Feb 11, 2022
9eb0f97
Mobile - Provider - Always return getColorsAndGradients if it's not a…
Feb 11, 2022
94ab4c3
Mobile - Global styles - Enable default color/gradient palette if its…
Feb 14, 2022
b0dcea0
Merge branch 'trunk' into rnmobile/fix/invalid-link-colors
Feb 14, 2022
01a8ad9
Mobile - Global styles - Set default values for defaultEditor colors …
Feb 15, 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
Prev Previous commit
Next Next commit
Mobile - Update Cover and Global styles test
  • Loading branch information
Gerardo committed Feb 2, 2022
commit 345c1bbd14058771c8e0a331d5a03f4b935d5a2c
10 changes: 5 additions & 5 deletions packages/block-library/src/cover/test/edit.native.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ const COVER_BLOCK_SOLID_COLOR_HTML = `<!-- wp:cover {"overlayColor":"cyan-bluish
<!-- /wp:paragraph --></div></div>
<!-- /wp:cover -->`;

const COLOR_PINK = '#f78da7';
const COLOR_CYAN = '#0693e3';
const COLOR_RED = '#cf2e2e';
const COLOR_GRAY = '#abb8c3';
const GRADIENT_GREEN =
Expand Down Expand Up @@ -308,7 +308,7 @@ describe( 'color settings', () => {
const colorPalette = await waitFor( () =>
getByTestId( 'color-palette' )
);
const colorButton = within( colorPalette ).getByTestId( COLOR_PINK );
const colorButton = within( colorPalette ).getByTestId( COLOR_CYAN );

expect( colorButton ).toBeDefined();
fireEvent.press( colorButton );
Expand Down Expand Up @@ -338,7 +338,7 @@ describe( 'color settings', () => {

// Find the selected color
const colorPaletteButton = await waitFor( () =>
getByTestId( COLOR_PINK )
getByTestId( COLOR_CYAN )
);
expect( colorPaletteButton ).toBeDefined();

Expand Down Expand Up @@ -420,7 +420,7 @@ describe( 'color settings', () => {
const colorPalette = await waitFor( () =>
getByTestId( 'color-palette' )
);
const colorButton = within( colorPalette ).getByTestId( COLOR_PINK );
const colorButton = within( colorPalette ).getByTestId( COLOR_CYAN );

expect( colorButton ).toBeDefined();
fireEvent.press( colorButton );
Expand Down Expand Up @@ -450,7 +450,7 @@ describe( 'color settings', () => {

// Find the selected color
const colorPaletteButton = await waitFor( () =>
getByTestId( COLOR_PINK )
getByTestId( COLOR_CYAN )
);
expect( colorPaletteButton ).toBeDefined();

Expand Down
1 change: 1 addition & 0 deletions packages/components/src/mobile/global-styles-context/test/utils.native.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ describe( 'getGlobalStyles', () => {
gradients,
text: true,
background: true,
defaultPalette: true,
},
typography: {
fontSizes: RAW_FEATURES.typography.fontSizes,
Expand Down