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.

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 merging of arrays during config resolution #9706

Merged
merged 2 commits into from Nov 1, 2022
Merged

Fix merging of arrays during config resolution #9706

merged 2 commits into from Nov 1, 2022

Conversation

bradlc
Copy link
Contributor

@bradlc bradlc commented Nov 1, 2022

Fixes #9666

The result of the theme values in the extend section are not deeply merged when they are simple arrays test prior to this fix (the new array is appended onto the existing array instead of overriding it):

{
  fonts: {
    sans: ['Comic Sans'],
    serif: ['Papyrus', { fontFeatureSettings: '"cv11"' }],
    mono: [
      ['Menlo', 'Courier New', 'monospace'],
      ['Lobster', 'Papyrus'],
      { fontFeatureSettings: '"cv11"' },
    ],
  },
}

This fix assumes that the original intent was to use isPlainObject instead of the isObject function that returns true for arrays.

@bradlc bradlc merged commit e231ea6 into master Nov 1, 2022
@bradlc bradlc deleted the fix-9666 branch November 1, 2022 16:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

The sans font family is incorrectly generated on the html rule when using fontFeatureSettings
1 participant