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

Update conditions to hide duotone panel #33295

Merged
merged 13 commits into from
Jul 12, 2021
Merged

Conversation

oandregal
Copy link
Member

@oandregal oandregal commented Jul 8, 2021

Stems from this issue #33280
Follows up #32002 and #31764

This updates the conditions to show/hide the duotone panel. See full panel enabled for reference:

Captura de ecrã de 2021-07-08 17-03-19

  • The duotone presets are hidden if color.duotone is empty or null (it no longer hides the whole duotone component if the color.duotone is null):

Captura de ecrã de 2021-07-08 17-09-33

  • If color.customDuotone is false or ( color.custom is false and color.palette is empty) we have this:

Captura de ecrã de 2021-07-08 21-33-44

  • If only color.custom is false we have this:

Captura de ecrã de 2021-07-08 21-34-16

  • The shadows/highlight presets are hidden if color.palette is empty on null (the control is still visible if color.custom is not false):

Captura de ecrã de 2021-07-08 17-02-59

  • The duotone control is hidden if color.duotone is empty and color.customDuotone is false (and also if color.palette is empty and color.custom is false, independently from what the color.customDuotone value is):

Captura de ecrã de 2021-07-08 17-01-11

@github-actions
Copy link

github-actions bot commented Jul 8, 2021

Size Change: +69 B (0%)

Total Size: 1.07 MB

Filename Size Change
build/block-editor/index.min.js 126 kB +58 B (0%)
build/components/index.min.js 194 kB +11 B (0%)
ℹ️ View Unchanged
Filename Size
build/a11y/index.min.js 1.12 kB
build/admin-manifest/index.min.js 1.41 kB
build/annotations/index.min.js 2.93 kB
build/api-fetch/index.min.js 2.44 kB
build/autop/index.min.js 2.28 kB
build/blob/index.min.js 673 B
build/block-directory/index.min.js 6.61 kB
build/block-directory/style-rtl.css 1.02 kB
build/block-directory/style.css 1.02 kB
build/block-editor/style-rtl.css 14 kB
build/block-editor/style.css 13.9 kB
build/block-library/blocks/archives/editor-rtl.css 61 B
build/block-library/blocks/archives/editor.css 60 B
build/block-library/blocks/archives/style-rtl.css 65 B
build/block-library/blocks/archives/style.css 65 B
build/block-library/blocks/audio/editor-rtl.css 58 B
build/block-library/blocks/audio/editor.css 58 B
build/block-library/blocks/audio/style-rtl.css 112 B
build/block-library/blocks/audio/style.css 112 B
build/block-library/blocks/audio/theme-rtl.css 125 B
build/block-library/blocks/audio/theme.css 125 B
build/block-library/blocks/block/editor-rtl.css 161 B
build/block-library/blocks/block/editor.css 161 B
build/block-library/blocks/button/editor-rtl.css 475 B
build/block-library/blocks/button/editor.css 474 B
build/block-library/blocks/button/style-rtl.css 603 B
build/block-library/blocks/button/style.css 602 B
build/block-library/blocks/buttons/editor-rtl.css 315 B
build/block-library/blocks/buttons/editor.css 315 B
build/block-library/blocks/buttons/style-rtl.css 375 B
build/block-library/blocks/buttons/style.css 375 B
build/block-library/blocks/calendar/style-rtl.css 208 B
build/block-library/blocks/calendar/style.css 208 B
build/block-library/blocks/categories/editor-rtl.css 84 B
build/block-library/blocks/categories/editor.css 83 B
build/block-library/blocks/categories/style-rtl.css 79 B
build/block-library/blocks/categories/style.css 79 B
build/block-library/blocks/code/style-rtl.css 90 B
build/block-library/blocks/code/style.css 90 B
build/block-library/blocks/code/theme-rtl.css 131 B
build/block-library/blocks/code/theme.css 131 B
build/block-library/blocks/columns/editor-rtl.css 190 B
build/block-library/blocks/columns/editor.css 190 B
build/block-library/blocks/columns/style-rtl.css 475 B
build/block-library/blocks/columns/style.css 476 B
build/block-library/blocks/cover/editor-rtl.css 670 B
build/block-library/blocks/cover/editor.css 670 B
build/block-library/blocks/cover/style-rtl.css 1.22 kB
build/block-library/blocks/cover/style.css 1.23 kB
build/block-library/blocks/embed/editor-rtl.css 486 B
build/block-library/blocks/embed/editor.css 486 B
build/block-library/blocks/embed/style-rtl.css 401 B
build/block-library/blocks/embed/style.css 400 B
build/block-library/blocks/embed/theme-rtl.css 124 B
build/block-library/blocks/embed/theme.css 124 B
build/block-library/blocks/file/editor-rtl.css 301 B
build/block-library/blocks/file/editor.css 300 B
build/block-library/blocks/file/style-rtl.css 255 B
build/block-library/blocks/file/style.css 255 B
build/block-library/blocks/file/view.min.js 780 B
build/block-library/blocks/freeform/editor-rtl.css 2.44 kB
build/block-library/blocks/freeform/editor.css 2.44 kB
build/block-library/blocks/gallery/editor-rtl.css 704 B
build/block-library/blocks/gallery/editor.css 705 B
build/block-library/blocks/gallery/style-rtl.css 1.06 kB
build/block-library/blocks/gallery/style.css 1.06 kB
build/block-library/blocks/gallery/theme-rtl.css 122 B
build/block-library/blocks/gallery/theme.css 122 B
build/block-library/blocks/group/editor-rtl.css 160 B
build/block-library/blocks/group/editor.css 160 B
build/block-library/blocks/group/style-rtl.css 57 B
build/block-library/blocks/group/style.css 57 B
build/block-library/blocks/group/theme-rtl.css 93 B
build/block-library/blocks/group/theme.css 93 B
build/block-library/blocks/heading/editor-rtl.css 152 B
build/block-library/blocks/heading/editor.css 152 B
build/block-library/blocks/heading/style-rtl.css 76 B
build/block-library/blocks/heading/style.css 76 B
build/block-library/blocks/home-link/style-rtl.css 259 B
build/block-library/blocks/home-link/style.css 259 B
build/block-library/blocks/html/editor-rtl.css 281 B
build/block-library/blocks/html/editor.css 281 B
build/block-library/blocks/image/editor-rtl.css 729 B
build/block-library/blocks/image/editor.css 727 B
build/block-library/blocks/image/style-rtl.css 481 B
build/block-library/blocks/image/style.css 485 B
build/block-library/blocks/image/theme-rtl.css 124 B
build/block-library/blocks/image/theme.css 124 B
build/block-library/blocks/latest-comments/style-rtl.css 286 B
build/block-library/blocks/latest-comments/style.css 286 B
build/block-library/blocks/latest-posts/editor-rtl.css 137 B
build/block-library/blocks/latest-posts/editor.css 137 B
build/block-library/blocks/latest-posts/style-rtl.css 534 B
build/block-library/blocks/latest-posts/style.css 532 B
build/block-library/blocks/list/style-rtl.css 63 B
build/block-library/blocks/list/style.css 63 B
build/block-library/blocks/media-text/editor-rtl.css 263 B
build/block-library/blocks/media-text/editor.css 264 B
build/block-library/blocks/media-text/style-rtl.css 492 B
build/block-library/blocks/media-text/style.css 489 B
build/block-library/blocks/more/editor-rtl.css 434 B
build/block-library/blocks/more/editor.css 434 B
build/block-library/blocks/navigation-link/editor-rtl.css 474 B
build/block-library/blocks/navigation-link/editor.css 473 B
build/block-library/blocks/navigation-link/style-rtl.css 94 B
build/block-library/blocks/navigation-link/style.css 94 B
build/block-library/blocks/navigation/editor-rtl.css 1.69 kB
build/block-library/blocks/navigation/editor.css 1.69 kB
build/block-library/blocks/navigation/style-rtl.css 1.65 kB
build/block-library/blocks/navigation/style.css 1.65 kB
build/block-library/blocks/navigation/view.min.js 2.87 kB
build/block-library/blocks/nextpage/editor-rtl.css 395 B
build/block-library/blocks/nextpage/editor.css 395 B
build/block-library/blocks/page-list/editor-rtl.css 310 B
build/block-library/blocks/page-list/editor.css 311 B
build/block-library/blocks/page-list/style-rtl.css 240 B
build/block-library/blocks/page-list/style.css 240 B
build/block-library/blocks/paragraph/editor-rtl.css 157 B
build/block-library/blocks/paragraph/editor.css 157 B
build/block-library/blocks/paragraph/style-rtl.css 247 B
build/block-library/blocks/paragraph/style.css 248 B
build/block-library/blocks/post-author/editor-rtl.css 209 B
build/block-library/blocks/post-author/editor.css 209 B
build/block-library/blocks/post-author/style-rtl.css 183 B
build/block-library/blocks/post-author/style.css 184 B
build/block-library/blocks/post-comments-form/style-rtl.css 140 B
build/block-library/blocks/post-comments-form/style.css 140 B
build/block-library/blocks/post-comments/style-rtl.css 360 B
build/block-library/blocks/post-comments/style.css 359 B
build/block-library/blocks/post-content/editor-rtl.css 139 B
build/block-library/blocks/post-content/editor.css 139 B
build/block-library/blocks/post-excerpt/editor-rtl.css 73 B
build/block-library/blocks/post-excerpt/editor.css 73 B
build/block-library/blocks/post-excerpt/style-rtl.css 69 B
build/block-library/blocks/post-excerpt/style.css 69 B
build/block-library/blocks/post-featured-image/editor-rtl.css 338 B
build/block-library/blocks/post-featured-image/editor.css 338 B
build/block-library/blocks/post-featured-image/style-rtl.css 141 B
build/block-library/blocks/post-featured-image/style.css 141 B
build/block-library/blocks/post-template/editor-rtl.css 100 B
build/block-library/blocks/post-template/editor.css 99 B
build/block-library/blocks/post-template/style-rtl.css 379 B
build/block-library/blocks/post-template/style.css 380 B
build/block-library/blocks/post-title/style-rtl.css 60 B
build/block-library/blocks/post-title/style.css 60 B
build/block-library/blocks/preformatted/style-rtl.css 103 B
build/block-library/blocks/preformatted/style.css 103 B
build/block-library/blocks/pullquote/editor-rtl.css 183 B
build/block-library/blocks/pullquote/editor.css 183 B
build/block-library/blocks/pullquote/style-rtl.css 318 B
build/block-library/blocks/pullquote/style.css 318 B
build/block-library/blocks/pullquote/theme-rtl.css 169 B
build/block-library/blocks/pullquote/theme.css 169 B
build/block-library/blocks/query-pagination-numbers/editor-rtl.css 122 B
build/block-library/blocks/query-pagination-numbers/editor.css 121 B
build/block-library/blocks/query-pagination/editor-rtl.css 270 B
build/block-library/blocks/query-pagination/editor.css 262 B
build/block-library/blocks/query-pagination/style-rtl.css 168 B
build/block-library/blocks/query-pagination/style.css 168 B
build/block-library/blocks/query-title/editor-rtl.css 86 B
build/block-library/blocks/query-title/editor.css 86 B
build/block-library/blocks/query/editor-rtl.css 131 B
build/block-library/blocks/query/editor.css 132 B
build/block-library/blocks/quote/style-rtl.css 169 B
build/block-library/blocks/quote/style.css 169 B
build/block-library/blocks/quote/theme-rtl.css 221 B
build/block-library/blocks/quote/theme.css 221 B
build/block-library/blocks/rss/editor-rtl.css 201 B
build/block-library/blocks/rss/editor.css 202 B
build/block-library/blocks/rss/style-rtl.css 290 B
build/block-library/blocks/rss/style.css 290 B
build/block-library/blocks/search/editor-rtl.css 211 B
build/block-library/blocks/search/editor.css 211 B
build/block-library/blocks/search/style-rtl.css 359 B
build/block-library/blocks/search/style.css 362 B
build/block-library/blocks/search/theme-rtl.css 64 B
build/block-library/blocks/search/theme.css 64 B
build/block-library/blocks/separator/editor-rtl.css 99 B
build/block-library/blocks/separator/editor.css 99 B
build/block-library/blocks/separator/style-rtl.css 251 B
build/block-library/blocks/separator/style.css 251 B
build/block-library/blocks/separator/theme-rtl.css 172 B
build/block-library/blocks/separator/theme.css 172 B
build/block-library/blocks/shortcode/editor-rtl.css 476 B
build/block-library/blocks/shortcode/editor.css 476 B
build/block-library/blocks/site-logo/editor-rtl.css 465 B
build/block-library/blocks/site-logo/editor.css 465 B
build/block-library/blocks/site-logo/style-rtl.css 154 B
build/block-library/blocks/site-logo/style.css 154 B
build/block-library/blocks/site-tagline/editor-rtl.css 87 B
build/block-library/blocks/site-tagline/editor.css 87 B
build/block-library/blocks/site-title/editor-rtl.css 85 B
build/block-library/blocks/site-title/editor.css 85 B
build/block-library/blocks/social-link/editor-rtl.css 164 B
build/block-library/blocks/social-link/editor.css 165 B
build/block-library/blocks/social-links/editor-rtl.css 800 B
build/block-library/blocks/social-links/editor.css 799 B
build/block-library/blocks/social-links/style-rtl.css 1.34 kB
build/block-library/blocks/social-links/style.css 1.34 kB
build/block-library/blocks/spacer/editor-rtl.css 308 B
build/block-library/blocks/spacer/editor.css 308 B
build/block-library/blocks/spacer/style-rtl.css 48 B
build/block-library/blocks/spacer/style.css 48 B
build/block-library/blocks/table/editor-rtl.css 478 B
build/block-library/blocks/table/editor.css 478 B
build/block-library/blocks/table/style-rtl.css 480 B
build/block-library/blocks/table/style.css 480 B
build/block-library/blocks/table/theme-rtl.css 188 B
build/block-library/blocks/table/theme.css 188 B
build/block-library/blocks/tag-cloud/editor-rtl.css 118 B
build/block-library/blocks/tag-cloud/editor.css 118 B
build/block-library/blocks/tag-cloud/style-rtl.css 94 B
build/block-library/blocks/tag-cloud/style.css 94 B
build/block-library/blocks/template-part/editor-rtl.css 551 B
build/block-library/blocks/template-part/editor.css 550 B
build/block-library/blocks/template-part/theme-rtl.css 101 B
build/block-library/blocks/template-part/theme.css 101 B
build/block-library/blocks/term-description/editor-rtl.css 90 B
build/block-library/blocks/term-description/editor.css 90 B
build/block-library/blocks/text-columns/editor-rtl.css 95 B
build/block-library/blocks/text-columns/editor.css 95 B
build/block-library/blocks/text-columns/style-rtl.css 166 B
build/block-library/blocks/text-columns/style.css 166 B
build/block-library/blocks/verse/style-rtl.css 87 B
build/block-library/blocks/verse/style.css 87 B
build/block-library/blocks/video/editor-rtl.css 569 B
build/block-library/blocks/video/editor.css 570 B
build/block-library/blocks/video/style-rtl.css 173 B
build/block-library/blocks/video/style.css 173 B
build/block-library/blocks/video/theme-rtl.css 124 B
build/block-library/blocks/video/theme.css 124 B
build/block-library/common-rtl.css 1.29 kB
build/block-library/common.css 1.29 kB
build/block-library/editor-rtl.css 9.85 kB
build/block-library/editor.css 9.84 kB
build/block-library/index.min.js 146 kB
build/block-library/reset-rtl.css 514 B
build/block-library/reset.css 515 B
build/block-library/style-rtl.css 10.2 kB
build/block-library/style.css 10.2 kB
build/block-library/theme-rtl.css 692 B
build/block-library/theme.css 693 B
build/block-serialization-default-parser/index.min.js 1.3 kB
build/block-serialization-spec-parser/index.min.js 3.06 kB
build/blocks/index.min.js 47.2 kB
build/components/style-rtl.css 16.1 kB
build/components/style.css 16.1 kB
build/compose/index.min.js 10.2 kB
build/core-data/index.min.js 12.4 kB
build/customize-widgets/index.min.js 10.3 kB
build/customize-widgets/style-rtl.css 1.48 kB
build/customize-widgets/style.css 1.48 kB
build/data-controls/index.min.js 830 B
build/data/index.min.js 7.22 kB
build/date/index.min.js 31.8 kB
build/deprecated/index.min.js 738 B
build/dom-ready/index.min.js 576 B
build/dom/index.min.js 4.66 kB
build/edit-navigation/index.min.js 13.8 kB
build/edit-navigation/style-rtl.css 3.12 kB
build/edit-navigation/style.css 3.12 kB
build/edit-post/classic-rtl.css 483 B
build/edit-post/classic.css 483 B
build/edit-post/index.min.js 58.6 kB
build/edit-post/style-rtl.css 7.25 kB
build/edit-post/style.css 7.24 kB
build/edit-site/index.min.js 25.9 kB
build/edit-site/style-rtl.css 5.04 kB
build/edit-site/style.css 5.03 kB
build/edit-widgets/index.min.js 16.1 kB
build/edit-widgets/style-rtl.css 3.88 kB
build/edit-widgets/style.css 3.89 kB
build/editor/index.min.js 38.6 kB
build/editor/style-rtl.css 3.88 kB
build/editor/style.css 3.88 kB
build/element/index.min.js 3.44 kB
build/escape-html/index.min.js 739 B
build/format-library/index.min.js 5.71 kB
build/format-library/style-rtl.css 668 B
build/format-library/style.css 669 B
build/hooks/index.min.js 1.76 kB
build/html-entities/index.min.js 628 B
build/i18n/index.min.js 3.73 kB
build/is-shallow-equal/index.min.js 709 B
build/keyboard-shortcuts/index.min.js 1.74 kB
build/keycodes/index.min.js 1.43 kB
build/list-reusable-blocks/index.min.js 2.07 kB
build/list-reusable-blocks/style-rtl.css 842 B
build/list-reusable-blocks/style.css 842 B
build/media-utils/index.min.js 3.08 kB
build/notices/index.min.js 1.07 kB
build/nux/index.min.js 2.31 kB
build/nux/style-rtl.css 745 B
build/nux/style.css 742 B
build/plugins/index.min.js 1.99 kB
build/primitives/index.min.js 1.03 kB
build/priority-queue/index.min.js 790 B
build/react-i18n/index.min.js 924 B
build/redux-routine/index.min.js 2.82 kB
build/reusable-blocks/index.min.js 2.56 kB
build/reusable-blocks/style-rtl.css 256 B
build/reusable-blocks/style.css 256 B
build/rich-text/index.min.js 10.6 kB
build/server-side-render/index.min.js 1.64 kB
build/shortcode/index.min.js 1.68 kB
build/token-list/index.min.js 847 B
build/url/index.min.js 1.95 kB
build/viewport/index.min.js 1.28 kB
build/warning/index.min.js 1.16 kB
build/widgets/index.min.js 6.45 kB
build/widgets/style-rtl.css 1.04 kB
build/widgets/style.css 1.05 kB
build/wordcount/index.min.js 1.24 kB

compressed-size-action

@oandregal oandregal self-assigned this Jul 8, 2021
@oandregal oandregal added [Feature] Design Tools Tools that impact the appearance of blocks both to expand the number of tools and improve the experi [Type] Bug An existing feature does not function as intended Backport to WP 6.7 Beta/RC Pull request that needs to be backported to the WordPress major release that's currently in beta [Status] In Progress Tracking issues with work in progress labels Jul 8, 2021
@oandregal oandregal marked this pull request as ready for review July 8, 2021 15:52
Copy link
Contributor

@ajlende ajlende left a comment

Choose a reason for hiding this comment

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

it no longer hides the whole duotone component if the color.duotone is null

I think we should be able to disable duotone without disabling the color palette or custom colors which is why it worked the way it did previously. I'm okay with having null (or maybe false instead?) disable the panel entirely while an empty array just removes the presets.

EDIT: However, it still makes sense to me to hide the whole thing when all three (color.custom, color.palette, and color.duotone) would result in the empty panel shown in #33280 (comment).

Captura de ecrã de 2021-07-08 11-44-53

@oandregal
Copy link
Member Author

oandregal commented Jul 8, 2021

I think we should be able to disable duotone without disabling the color palette or custom colors which is why it worked the way it did previously. I'm okay with having null (or maybe false instead?) disable the panel entirely while an empty array just removes the presets.

I'm sorry I've come late to the discussion, this is a bit disrupting for everyone. Let me share my mindset, which is to aim for consistency among all the tools consumers have and don't optimize for a specific one.

The duotone panel can work without duotone presets (color.duotone): there's still the color palette and the custom colors the user can play with. This is the same situation the other features have: the color panel has colors, gradients, links, and custom; the typography panel has font size, line height, font families; etc.

I understand how useful it can be to have a switch to disable panels entirely, be it duotone, colors, typography, etc. What are our options here?

  1. Reusing the same setting for hiding presets or the panel entirely. I'm not a fan of this approach, it adds confusion. While it could be argued that for the duotone panel the color.duotone might be a good choice, it gets muddier for the other features: color has 2 different color palettes (color.palette and color.gradients), typography has font sizes and font families, etc.

  2. Create a new setting to hide the panels entirely. I'd favor this one. The way I'd approach this is to land this PR as it is and then discuss if we can get this new setting on time for 5.8. If we don't, then we ship it in 5.9. I presume this is fine as the other panels have been working without a switch to disable them for a few WordPress versions.

I'd like to hear thoughts from others @jorgefilipecosta @youknowriad @mtias @jasmussen

Copy link
Member

@jorgefilipecosta jorgefilipecosta left a comment

Choose a reason for hiding this comment

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

Hi @nosolosw,

I think duotone should be consistent with the other presets we have. In that case we would have duotone presets that are always an array, and a customDuotone flag. Exactly as it happens on color, gradients, and font sizes.

Duotone appearing or not should not depend on colors. Duotone would not appear if duotone presets is empty and customDuotone is false, and it would appear otherwise.
If colors are disabled (color presets and customColors) but customDuotone is true it would still be possible to pick custom colors for a custom duotone. The same happens on gradients if customColors is false but customGradients is true I can still pick colors for building my gradients. They are independent controls.

@oandregal
Copy link
Member Author

So, Jorge is arguing that, in addition to all this PR does, the whole section below should be able to be disabled via a new color.customDuotone:

image

@jorgefilipecosta
Copy link
Member

Exactly,
color.duotone would control this part:
image

And that part would not be available if color.duotone is an empty array.

culor.customDuotone would control this part:
image

And that part would not be available if color.customDuotone is false.

If color.duotone is empty and color.customDuotone is false, the whole duotone functionality would not be available at all. And we would not have any reference to duotone on the UI.

@ajlende
Copy link
Contributor

ajlende commented Jul 8, 2021

@nosolosw I like the idea of having an option to disable panels that is separate from the preset arrays. I wanted to do something like that for duotone when I was working on it, but ended up going with the established pattern instead to avoid confusion for folks. Seems like something worth pursuing for 5.9.

Adding a separate color.customDuotone flag instead of relying on color.custom to disable it makes sense to me like @jorgefilipecosta said.

  • We'd have color.duotone control the top presets.

    Captura de ecrã de 2021-07-08 17-09-33

  • And then color.customDuotone control the bottom options.

    Captura de ecrã de 2021-07-08 17-25-57

  • I think color.custom can still disable the custom options.

    Captura de ecrã de 2021-07-08 17-01-31

  • And color.palette can still disable the palette. (I'd like to hear what @jasmussen has to say, but I think having this set to false can remove the Shadows and Highlights entirely, leaving just the duotone bar. This part probably doesn't have to be changed with this PR.)

    Captura de ecrã de 2021-07-08 17-02-59

  • To disable the panel entirely, you'd have to set both color.duotone to an empty array and color.customDuotone to false.

    Captura de ecrã de 2021-07-08 17-01-11

@oandregal
Copy link
Member Author

@ajlende nice, I just did that. I think we all three are in agreement.

Now, we need a last little thing: what should happen when color.custom is false? At the moment, it removes the "custom color" links plus the horizontal bar between the duotone presets and the shadows/highlights, see:

Captura de ecrã de 2021-07-08 20-55-16

However, I wonder why that bar is controlled by the color.custom? As I understand this interaction, that bar should be controlled by color.customDuotone: it should be visible if either the presets for shadows/highlights are visible or the custom color links are enabled. Does that make sense to you?

@ajlende
Copy link
Contributor

ajlende commented Jul 8, 2021

My thinking was that the duotone bar should be controlled by color.custom because you can only select custom colors with it. If you don't want to allow custom colors, then it needs to be either disabled or removed.

So the bar should be controlled by both color.customDuotone and color.custom. Both need to be enabled for it to show.

@oandregal
Copy link
Member Author

Ok, I tried to change the logic locally to see how this feels.

This is with color.custom false and only controlling the the "custom color" links:

Captura de ecrã de 2021-07-08 21-05-13

And this is with color.palette empty:

Captura de ecrã de 2021-07-08 21-08-22

@oandregal
Copy link
Member Author

oandregal commented Jul 8, 2021

My thinking was that the duotone bar should be controlled by color.custom because you can only select custom colors with it. If you don't want to allow custom colors, then it needs to be either disabled or removed.

Oh, wait. Can I interact with the bar to modify those colors? I think this may be the reason why I'm confused. If I should be able to do that, we do need to use color.custom, yes. The issue is that it doesn't work for me in either chrome or firefox (Ubuntu 21.04) :(

@oandregal
Copy link
Member Author

oandregal commented Jul 8, 2021

OK, pushed all that you mentioned. I think it's ready to ship.

In talking with Jorge about this he raised the concern of using color.custom to disable custom duotone colors. It could be argued that it should be replaced by other things (color.customDuotoneShadows, etc?). To me, it boils down to this: why someone disables the custom colors for users? Because they want the users to only be able to use a predefined set of colors everywhere, so I think using color.custom in the way it's used here is fine.

At the same time it has been a long day for me, so I'd welcome more eyes, including my own rested ones tomorrow :)

Copy link
Contributor

@ajlende ajlende left a comment

Choose a reason for hiding this comment

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

Seems to be working fine for me. Just had a couple code suggestions before getting this shipped.

packages/block-editor/src/hooks/duotone.js Outdated Show resolved Hide resolved
packages/block-editor/src/hooks/duotone.js Show resolved Hide resolved
@jasmussen
Copy link
Contributor

Thanks for your work on this, and I'm happy to see you working out the best path forward.

With regards to supporting custom colors, theme colors, various palettes and such, I don't thin the following note changes anything, but I wanted to point out that as part of #27331, we'll want a new color swatch picker that groups custom colors and swatches together. This is an older design, but it shows the flow:

The final design should be more like what's shown in #27473 (comment). But the ultimate goal is to not have to duplicate the entire palette for every color property there is, but instead surface those once you click the property first.

@oandregal
Copy link
Member Author

Cool, I've addressed all the comments and added docs as well. Would anyone mind giving a final review to this and green check as appropriate?

I've looked at #33295 (comment) with fresh eyes and still think the pre-existing logic for color.custom makes sense. I also like the addition of color.customDuotone. This works consistently with the other features that we have in my view.

@oandregal oandregal removed the [Status] In Progress Tracking issues with work in progress label Jul 9, 2021
Copy link
Contributor

@ajlende ajlende left a comment

Choose a reason for hiding this comment

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

Working well for me 👍

@oandregal oandregal merged commit 23369aa into trunk Jul 12, 2021
@oandregal oandregal deleted the update/hide-duotone-panel branch July 12, 2021 09:02
@github-actions github-actions bot added this to the Gutenberg 11.1 milestone Jul 12, 2021
@youknowriad youknowriad removed the Backport to WP 6.7 Beta/RC Pull request that needs to be backported to the WordPress major release that's currently in beta label Jul 12, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
[Feature] Design Tools Tools that impact the appearance of blocks both to expand the number of tools and improve the experi [Type] Bug An existing feature does not function as intended
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants