Skip to content

Fix merge algorithm for global styles#24294

Merged
oandregal merged 2 commits intomasterfrom
fix/global-styles-merge-algorithm
Jul 30, 2020
Merged

Fix merge algorithm for global styles#24294
oandregal merged 2 commits intomasterfrom
fix/global-styles-merge-algorithm

Conversation

@oandregal
Copy link
Member

@oandregal oandregal commented Jul 30, 2020

Extracted from #24250

This fixes the merge algorithm for global styles.

Before:

$result = array_merge(
    [
        'typography' => [ 
            'font-family' => 'first',
            'line-height' => 'first'
        ]
    ],
    [
        'typography' => [
            'font-family' => 'second'
        ]
    ]
);

var_dump( $result );
// array(1) {
//  ["typography"]=>
//  array(1) {
//    ["font-family"]=>
//    string(6) "second"
//  }
//}

After:

$result['typography'] = array_merge(
    [
        'font-family' => 'first',
        'line-height' => 'first'
    ],
    [
        'font-family' => 'second'
    ]
);

var_dump( $result );
// array(1) {
//  ["typography"]=>
//  array(2) {
//    ["font-family"]=>
//    string(6) "second"
//    ["line-height"]=>
//    string(5) "first"
//  }
//}

@oandregal oandregal requested a review from youknowriad July 30, 2020 16:31
@oandregal oandregal self-assigned this Jul 30, 2020
@oandregal oandregal added the Global Styles Anything related to the broader Global Styles efforts, including Styles Engine and theme.json label Jul 30, 2020
youknowriad
youknowriad reviewed Jul 30, 2020
View reviewed changes
@github-actions
Copy link

github-actions bot commented Jul 30, 2020 •
edited
Loading

Size Change: 0 B

Total Size: 1.16 MB

ℹ️ View Unchanged
Filename Size Change
build/a11y/index.js 1.14 kB 0 B
build/annotations/index.js 3.67 kB 0 B
build/api-fetch/index.js 3.44 kB 0 B
build/autop/index.js 2.82 kB 0 B
build/blob/index.js 620 B 0 B
build/block-directory/index.js 7.93 kB 0 B
build/block-directory/style-rtl.css 953 B 0 B
build/block-directory/style.css 952 B 0 B
build/block-editor/index.js 125 kB 0 B
build/block-editor/style-rtl.css 10.8 kB 0 B
build/block-editor/style.css 10.8 kB 0 B
build/block-library/editor-rtl.css 7.58 kB 0 B
build/block-library/editor.css 7.58 kB 0 B
build/block-library/index.js 132 kB 0 B
build/block-library/style-rtl.css 7.76 kB 0 B
build/block-library/style.css 7.77 kB 0 B
build/block-library/theme-rtl.css 728 B 0 B
build/block-library/theme.css 729 B 0 B
build/block-serialization-default-parser/index.js 1.88 kB 0 B
build/block-serialization-spec-parser/index.js 3.1 kB 0 B
build/blocks/index.js 48.3 kB 0 B
build/components/index.js 200 kB 0 B
build/components/style-rtl.css 15.7 kB 0 B
build/components/style.css 15.7 kB 0 B
build/compose/index.js 9.68 kB 0 B
build/core-data/index.js 11.8 kB 0 B
build/data-controls/index.js 1.29 kB 0 B
build/data/index.js 8.45 kB 0 B
build/date/index.js 5.38 kB 0 B
build/deprecated/index.js 772 B 0 B
build/dom-ready/index.js 568 B 0 B
build/dom/index.js 3.23 kB 0 B
build/edit-navigation/index.js 10.9 kB 0 B
build/edit-navigation/style-rtl.css 1.08 kB 0 B
build/edit-navigation/style.css 1.08 kB 0 B
build/edit-post/index.js 304 kB 0 B
build/edit-post/style-rtl.css 5.61 kB 0 B
build/edit-post/style.css 5.61 kB 0 B
build/edit-site/index.js 17 kB 0 B
build/edit-site/style-rtl.css 3.06 kB 0 B
build/edit-site/style.css 3.06 kB 0 B
build/edit-widgets/index.js 9.38 kB 0 B
build/edit-widgets/style-rtl.css 2.45 kB 0 B
build/edit-widgets/style.css 2.45 kB 0 B
build/editor/editor-styles-rtl.css 537 B 0 B
build/editor/editor-styles.css 539 B 0 B
build/editor/index.js 45.3 kB 0 B
build/editor/style-rtl.css 3.8 kB 0 B
build/editor/style.css 3.79 kB 0 B
build/element/index.js 4.65 kB 0 B
build/escape-html/index.js 733 B 0 B
build/format-library/index.js 7.72 kB 0 B
build/format-library/style-rtl.css 547 B 0 B
build/format-library/style.css 548 B 0 B
build/hooks/index.js 2.13 kB 0 B
build/html-entities/index.js 621 B 0 B
build/i18n/index.js 3.56 kB 0 B
build/is-shallow-equal/index.js 711 B 0 B
build/keyboard-shortcuts/index.js 2.52 kB 0 B
build/keycodes/index.js 1.94 kB 0 B
build/list-reusable-blocks/index.js 3.11 kB 0 B
build/list-reusable-blocks/style-rtl.css 476 B 0 B
build/list-reusable-blocks/style.css 476 B 0 B
build/media-utils/index.js 5.33 kB 0 B
build/notices/index.js 1.79 kB 0 B
build/nux/index.js 3.4 kB 0 B
build/nux/style-rtl.css 671 B 0 B
build/nux/style.css 668 B 0 B
build/plugins/index.js 2.56 kB 0 B
build/primitives/index.js 1.41 kB 0 B
build/priority-queue/index.js 789 B 0 B
build/redux-routine/index.js 2.85 kB 0 B
build/rich-text/index.js 13.9 kB 0 B
build/server-side-render/index.js 2.71 kB 0 B
build/shortcode/index.js 1.7 kB 0 B
build/token-list/index.js 1.27 kB 0 B
build/url/index.js 4.06 kB 0 B
build/viewport/index.js 1.85 kB 0 B
build/warning/index.js 1.14 kB 0 B
build/wordcount/index.js 1.17 kB 0 B

compressed-size-action

youknowriad
youknowriad reviewed Jul 30, 2020
View reviewed changes
lib/global-styles.php
$user[ $block_name ][ $subtree ]
);
}
foreach ( array_keys( $core[ $block_name ]['styles'] ) as $subtree ) {
Copy link
Contributor

@youknowriad youknowriad Jul 30, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we expect the "core" styles to always contain all the keys?

Copy link
Member Author

@oandregal oandregal Jul 30, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With the current implementation, yes, as they all are normalized before being merged.

youknowriad
youknowriad approved these changes Jul 30, 2020
View reviewed changes
Copy link
Contributor

@youknowriad youknowriad left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 👍

@oandregal oandregal merged commit da89462 into master Jul 30, 2020
@oandregal oandregal deleted the fix/global-styles-merge-algorithm branch July 30, 2020 17:24
@github-actions github-actions bot added this to the Gutenberg 8.7 milestone Jul 30, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@youknowriad youknowriad youknowriad approved these changes

@spacedmonkey spacedmonkey Awaiting requested review from spacedmonkey

@TimothyBJacobs TimothyBJacobs Awaiting requested review from TimothyBJacobs

Assignees

@oandregal oandregal

Labels

Global Styles Anything related to the broader Global Styles efforts, including Styles Engine and theme.json

Projects

None yet

Milestone

Gutenberg 8.7

Development

Successfully merging this pull request may close these issues.

2 participants

@oandregal @youknowriad