@wordpress/block-library 7.5.0 → 7.6.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +6 -0
- package/README.md +3 -2
- package/babel-plugin.js +154 -0
- package/build/audio/edit.js +1 -1
- package/build/audio/edit.js.map +1 -1
- package/build/block/edit.js +10 -9
- package/build/block/edit.js.map +1 -1
- package/build/button/index.js +1 -0
- package/build/button/index.js.map +1 -1
- package/build/categories/edit.js +1 -1
- package/build/categories/edit.js.map +1 -1
- package/build/categories/index.js +1 -1
- package/build/comment-author-avatar/index.js +1 -0
- package/build/comment-author-avatar/index.js.map +1 -1
- package/build/comments-title/deprecated.js +110 -0
- package/build/comments-title/deprecated.js.map +1 -0
- package/build/comments-title/edit.js +35 -37
- package/build/comments-title/edit.js.map +1 -1
- package/build/comments-title/index.js +5 -8
- package/build/comments-title/index.js.map +1 -1
- package/build/cover/controls.native.js +2 -3
- package/build/cover/controls.native.js.map +1 -1
- package/build/cover/edit/block-controls.js +115 -0
- package/build/cover/edit/block-controls.js.map +1 -0
- package/build/cover/edit/cover-placeholder.js +49 -0
- package/build/cover/edit/cover-placeholder.js.map +1 -0
- package/build/cover/edit/index.js +333 -0
- package/build/cover/edit/index.js.map +1 -0
- package/build/cover/edit/inspector-controls.js +224 -0
- package/build/cover/edit/inspector-controls.js.map +1 -0
- package/build/cover/edit/resizable-cover.js +67 -0
- package/build/cover/edit/resizable-cover.js.map +1 -0
- package/build/cover/{use-cover-is-dark.js → edit/use-cover-is-dark.js} +0 -0
- package/build/cover/edit/use-cover-is-dark.js.map +1 -0
- package/build/cover/edit.native.js +0 -1
- package/build/cover/edit.native.js.map +1 -1
- package/build/cover/focal-point-settings-button.native.js.map +1 -1
- package/build/cover/shared.js +9 -0
- package/build/cover/shared.js.map +1 -1
- package/build/embed/embed-preview.js +1 -1
- package/build/embed/embed-preview.js.map +1 -1
- package/build/file/edit.native.js +0 -1
- package/build/file/edit.native.js.map +1 -1
- package/build/gallery/edit.js +2 -1
- package/build/gallery/edit.js.map +1 -1
- package/build/gallery/gallery.js +1 -1
- package/build/gallery/gallery.js.map +1 -1
- package/build/gallery/shared.js +2 -2
- package/build/gallery/shared.js.map +1 -1
- package/build/gallery/use-get-media.js +2 -1
- package/build/gallery/use-get-media.js.map +1 -1
- package/build/gallery/use-short-code-transform.js +19 -18
- package/build/gallery/use-short-code-transform.js.map +1 -1
- package/build/gallery/v1/gallery.js +1 -1
- package/build/gallery/v1/gallery.js.map +1 -1
- package/build/heading/edit.js +6 -2
- package/build/heading/edit.js.map +1 -1
- package/build/heading/index.js +1 -0
- package/build/heading/index.js.map +1 -1
- package/build/heading/transforms.js +1 -0
- package/build/heading/transforms.js.map +1 -1
- package/build/image/edit.js +5 -2
- package/build/image/edit.js.map +1 -1
- package/build/image/edit.native.js +0 -1
- package/build/image/edit.native.js.map +1 -1
- package/build/image/image.js +1 -1
- package/build/image/image.js.map +1 -1
- package/build/index.js +46 -10
- package/build/index.js.map +1 -1
- package/build/is-block-metadata-experimental.js +18 -0
- package/build/is-block-metadata-experimental.js.map +1 -0
- package/build/latest-posts/edit.js +30 -4
- package/build/latest-posts/edit.js.map +1 -1
- package/build/list/transforms.js +6 -0
- package/build/list/transforms.js.map +1 -1
- package/build/list/v2/edit.js +2 -1
- package/build/list/v2/edit.js.map +1 -1
- package/build/list/v2/migrate.js +1 -0
- package/build/list/v2/migrate.js.map +1 -1
- package/build/list/v2/transforms.js +46 -9
- package/build/list/v2/transforms.js.map +1 -1
- package/build/list-item/edit.js +7 -9
- package/build/list-item/edit.js.map +1 -1
- package/build/list-item/hooks/index.js +24 -0
- package/build/list-item/hooks/index.js.map +1 -1
- package/build/list-item/hooks/use-backspace.js +59 -0
- package/build/list-item/hooks/use-backspace.js.map +1 -0
- package/build/list-item/hooks/use-enter.js +6 -9
- package/build/list-item/hooks/use-enter.js.map +1 -1
- package/build/list-item/hooks/use-indent-list-item.js +33 -39
- package/build/list-item/hooks/use-indent-list-item.js.map +1 -1
- package/build/list-item/hooks/use-space.js +54 -0
- package/build/list-item/hooks/use-space.js.map +1 -0
- package/build/list-item/hooks/use-split.js +30 -0
- package/build/list-item/hooks/use-split.js.map +1 -0
- package/build/list-item/index.js +1 -0
- package/build/list-item/index.js.map +1 -1
- package/build/list-item/utils.js +1 -1
- package/build/list-item/utils.js.map +1 -1
- package/build/media-text/edit.native.js +2 -1
- package/build/media-text/edit.native.js.map +1 -1
- package/build/media-text/media-container.native.js +2 -4
- package/build/media-text/media-container.native.js.map +1 -1
- package/build/media-text/transforms.js +137 -8
- package/build/media-text/transforms.js.map +1 -1
- package/build/navigation/edit/index.js +86 -81
- package/build/navigation/edit/index.js.map +1 -1
- package/build/navigation/edit/inner-blocks.js +1 -5
- package/build/navigation/edit/inner-blocks.js.map +1 -1
- package/build/navigation/use-navigation-entities.js +3 -3
- package/build/navigation/use-navigation-entities.js.map +1 -1
- package/build/navigation-link/fallback-variations.js +1 -1
- package/build/navigation-link/fallback-variations.js.map +1 -1
- package/build/navigation-link/hooks.js +1 -1
- package/build/navigation-link/hooks.js.map +1 -1
- package/build/page-list/convert-to-links-modal.js +1 -1
- package/build/page-list/convert-to-links-modal.js.map +1 -1
- package/build/page-list/edit.js +1 -1
- package/build/page-list/edit.js.map +1 -1
- package/build/post-author/edit.js +1 -1
- package/build/post-author/edit.js.map +1 -1
- package/build/post-author-name/index.js +1 -0
- package/build/post-author-name/index.js.map +1 -1
- package/build/post-comment/index.js +1 -0
- package/build/post-comment/index.js.map +1 -1
- package/build/post-comments/edit.js +34 -16
- package/build/post-comments/edit.js.map +1 -1
- package/build/post-comments-count/index.js +1 -0
- package/build/post-comments-count/index.js.map +1 -1
- package/build/post-comments-form/form.js +1 -1
- package/build/post-comments-form/form.js.map +1 -1
- package/build/post-comments-link/index.js +1 -0
- package/build/post-comments-link/index.js.map +1 -1
- package/build/post-featured-image/edit.js +1 -1
- package/build/post-featured-image/edit.js.map +1 -1
- package/build/post-template/edit.js +7 -2
- package/build/post-template/edit.js.map +1 -1
- package/build/post-terms/edit.js +11 -2
- package/build/post-terms/edit.js.map +1 -1
- package/build/post-terms/hooks.js +33 -0
- package/build/post-terms/hooks.js.map +1 -0
- package/build/post-terms/index.js +12 -5
- package/build/post-terms/index.js.map +1 -1
- package/build/post-title/index.js +1 -1
- package/build/post-title/index.js.map +1 -1
- package/build/pullquote/edit.js +1 -1
- package/build/pullquote/edit.js.map +1 -1
- package/build/pullquote/edit.native.js +1 -1
- package/build/pullquote/edit.native.js.map +1 -1
- package/build/query/edit/inspector-controls/index.js +26 -17
- package/build/query/edit/inspector-controls/index.js.map +1 -1
- package/build/query/edit/inspector-controls/parent-control.js +148 -0
- package/build/query/edit/inspector-controls/parent-control.js.map +1 -0
- package/build/query/edit/inspector-controls/sticky-control.js +41 -0
- package/build/query/edit/inspector-controls/sticky-control.js.map +1 -0
- package/build/query/index.js +2 -1
- package/build/query/index.js.map +1 -1
- package/build/query/utils.js +28 -2
- package/build/query/utils.js.map +1 -1
- package/build/query-title/index.js +1 -1
- package/build/query-title/index.js.map +1 -1
- package/build/query-title/variations.js +1 -1
- package/build/query-title/variations.js.map +1 -1
- package/build/quote/edit.js +3 -2
- package/build/quote/edit.js.map +1 -1
- package/build/quote/v2/edit.js +1 -1
- package/build/quote/v2/edit.js.map +1 -1
- package/build/search/edit.js +1 -0
- package/build/search/edit.js.map +1 -1
- package/build/site-logo/edit.js +1 -1
- package/build/site-logo/edit.js.map +1 -1
- package/build/table/edit.js +15 -2
- package/build/table/edit.js.map +1 -1
- package/build/table-of-contents/edit.js +138 -66
- package/build/table-of-contents/edit.js.map +1 -1
- package/build/table-of-contents/index.js +13 -3
- package/build/table-of-contents/index.js.map +1 -1
- package/build/table-of-contents/list.js +16 -9
- package/build/table-of-contents/list.js.map +1 -1
- package/build/table-of-contents/save.js +40 -0
- package/build/table-of-contents/save.js.map +1 -0
- package/build/table-of-contents/utils.js +11 -77
- package/build/table-of-contents/utils.js.map +1 -1
- package/build/template-part/edit/index.js +7 -3
- package/build/template-part/edit/index.js.map +1 -1
- package/build/template-part/edit/inner-blocks.js +3 -8
- package/build/template-part/edit/inner-blocks.js.map +1 -1
- package/build/video/edit.js +1 -1
- package/build/video/edit.js.map +1 -1
- package/build-module/audio/edit.js +2 -2
- package/build-module/audio/edit.js.map +1 -1
- package/build-module/block/edit.js +11 -10
- package/build-module/block/edit.js.map +1 -1
- package/build-module/button/index.js +1 -0
- package/build-module/button/index.js.map +1 -1
- package/build-module/categories/edit.js +1 -1
- package/build-module/categories/edit.js.map +1 -1
- package/build-module/categories/index.js +1 -1
- package/build-module/comment-author-avatar/index.js +1 -0
- package/build-module/comment-author-avatar/index.js.map +1 -1
- package/build-module/comments-title/deprecated.js +102 -0
- package/build-module/comments-title/deprecated.js.map +1 -0
- package/build-module/comments-title/edit.js +38 -40
- package/build-module/comments-title/edit.js.map +1 -1
- package/build-module/comments-title/index.js +4 -8
- package/build-module/comments-title/index.js.map +1 -1
- package/build-module/cover/controls.native.js +2 -3
- package/build-module/cover/controls.native.js.map +1 -1
- package/build-module/cover/edit/block-controls.js +104 -0
- package/build-module/cover/edit/block-controls.js.map +1 -0
- package/build-module/cover/edit/cover-placeholder.js +38 -0
- package/build-module/cover/edit/cover-placeholder.js.map +1 -0
- package/build-module/cover/edit/index.js +307 -0
- package/build-module/cover/edit/index.js.map +1 -0
- package/build-module/cover/edit/inspector-controls.js +215 -0
- package/build-module/cover/edit/inspector-controls.js.map +1 -0
- package/build-module/cover/edit/resizable-cover.js +55 -0
- package/build-module/cover/edit/resizable-cover.js.map +1 -0
- package/build-module/cover/{use-cover-is-dark.js → edit/use-cover-is-dark.js} +0 -0
- package/build-module/cover/edit/use-cover-is-dark.js.map +1 -0
- package/build-module/cover/edit.native.js +0 -1
- package/build-module/cover/edit.native.js.map +1 -1
- package/build-module/cover/focal-point-settings-button.native.js.map +1 -1
- package/build-module/cover/shared.js +7 -0
- package/build-module/cover/shared.js.map +1 -1
- package/build-module/embed/embed-preview.js +2 -2
- package/build-module/embed/embed-preview.js.map +1 -1
- package/build-module/file/edit.native.js +0 -1
- package/build-module/file/edit.native.js.map +1 -1
- package/build-module/gallery/edit.js +2 -1
- package/build-module/gallery/edit.js.map +1 -1
- package/build-module/gallery/gallery.js +2 -2
- package/build-module/gallery/gallery.js.map +1 -1
- package/build-module/gallery/shared.js +2 -2
- package/build-module/gallery/shared.js.map +1 -1
- package/build-module/gallery/use-get-media.js +2 -1
- package/build-module/gallery/use-get-media.js.map +1 -1
- package/build-module/gallery/use-short-code-transform.js +19 -18
- package/build-module/gallery/use-short-code-transform.js.map +1 -1
- package/build-module/gallery/v1/gallery.js +2 -2
- package/build-module/gallery/v1/gallery.js.map +1 -1
- package/build-module/heading/edit.js +6 -2
- package/build-module/heading/edit.js.map +1 -1
- package/build-module/heading/index.js +1 -0
- package/build-module/heading/index.js.map +1 -1
- package/build-module/heading/transforms.js +1 -0
- package/build-module/heading/transforms.js.map +1 -1
- package/build-module/image/edit.js +6 -3
- package/build-module/image/edit.js.map +1 -1
- package/build-module/image/edit.native.js +0 -1
- package/build-module/image/edit.native.js.map +1 -1
- package/build-module/image/image.js +2 -2
- package/build-module/image/image.js.map +1 -1
- package/build-module/index.js +42 -10
- package/build-module/index.js.map +1 -1
- package/build-module/is-block-metadata-experimental.js +16 -0
- package/build-module/is-block-metadata-experimental.js.map +1 -0
- package/build-module/latest-posts/edit.js +29 -5
- package/build-module/latest-posts/edit.js.map +1 -1
- package/build-module/list/transforms.js +6 -0
- package/build-module/list/transforms.js.map +1 -1
- package/build-module/list/v2/edit.js +2 -1
- package/build-module/list/v2/edit.js.map +1 -1
- package/build-module/list/v2/migrate.js +1 -3
- package/build-module/list/v2/migrate.js.map +1 -1
- package/build-module/list/v2/transforms.js +46 -9
- package/build-module/list/v2/transforms.js.map +1 -1
- package/build-module/list-item/edit.js +8 -9
- package/build-module/list-item/edit.js.map +1 -1
- package/build-module/list-item/hooks/index.js +3 -0
- package/build-module/list-item/hooks/index.js.map +1 -1
- package/build-module/list-item/hooks/use-backspace.js +44 -0
- package/build-module/list-item/hooks/use-backspace.js.map +1 -0
- package/build-module/list-item/hooks/use-enter.js +6 -9
- package/build-module/list-item/hooks/use-enter.js.map +1 -1
- package/build-module/list-item/hooks/use-indent-list-item.js +33 -38
- package/build-module/list-item/hooks/use-indent-list-item.js.map +1 -1
- package/build-module/list-item/hooks/use-space.js +40 -0
- package/build-module/list-item/hooks/use-space.js.map +1 -0
- package/build-module/list-item/hooks/use-split.js +19 -0
- package/build-module/list-item/hooks/use-split.js.map +1 -0
- package/build-module/list-item/index.js +1 -0
- package/build-module/list-item/index.js.map +1 -1
- package/build-module/list-item/utils.js +1 -1
- package/build-module/list-item/utils.js.map +1 -1
- package/build-module/media-text/edit.native.js +2 -1
- package/build-module/media-text/edit.native.js.map +1 -1
- package/build-module/media-text/media-container.native.js +2 -4
- package/build-module/media-text/media-container.native.js.map +1 -1
- package/build-module/media-text/transforms.js +137 -8
- package/build-module/media-text/transforms.js.map +1 -1
- package/build-module/navigation/edit/index.js +87 -82
- package/build-module/navigation/edit/index.js.map +1 -1
- package/build-module/navigation/edit/inner-blocks.js +2 -6
- package/build-module/navigation/edit/inner-blocks.js.map +1 -1
- package/build-module/navigation/use-navigation-entities.js +1 -1
- package/build-module/navigation/use-navigation-entities.js.map +1 -1
- package/build-module/navigation-link/fallback-variations.js +1 -1
- package/build-module/navigation-link/fallback-variations.js.map +1 -1
- package/build-module/navigation-link/hooks.js +2 -2
- package/build-module/navigation-link/hooks.js.map +1 -1
- package/build-module/page-list/convert-to-links-modal.js +1 -1
- package/build-module/page-list/convert-to-links-modal.js.map +1 -1
- package/build-module/page-list/edit.js +1 -1
- package/build-module/page-list/edit.js.map +1 -1
- package/build-module/post-author/edit.js +1 -1
- package/build-module/post-author/edit.js.map +1 -1
- package/build-module/post-author-name/index.js +1 -0
- package/build-module/post-author-name/index.js.map +1 -1
- package/build-module/post-comment/index.js +1 -0
- package/build-module/post-comment/index.js.map +1 -1
- package/build-module/post-comments/edit.js +35 -16
- package/build-module/post-comments/edit.js.map +1 -1
- package/build-module/post-comments-count/index.js +1 -0
- package/build-module/post-comments-count/index.js.map +1 -1
- package/build-module/post-comments-form/form.js +1 -1
- package/build-module/post-comments-form/form.js.map +1 -1
- package/build-module/post-comments-link/index.js +1 -0
- package/build-module/post-comments-link/index.js.map +1 -1
- package/build-module/post-featured-image/edit.js +1 -1
- package/build-module/post-featured-image/edit.js.map +1 -1
- package/build-module/post-template/edit.js +7 -2
- package/build-module/post-template/edit.js.map +1 -1
- package/build-module/post-terms/edit.js +10 -3
- package/build-module/post-terms/edit.js.map +1 -1
- package/build-module/post-terms/hooks.js +25 -0
- package/build-module/post-terms/hooks.js.map +1 -0
- package/build-module/post-terms/index.js +10 -8
- package/build-module/post-terms/index.js.map +1 -1
- package/build-module/post-title/index.js +1 -1
- package/build-module/post-title/index.js.map +1 -1
- package/build-module/pullquote/edit.js +2 -2
- package/build-module/pullquote/edit.js.map +1 -1
- package/build-module/pullquote/edit.native.js +2 -2
- package/build-module/pullquote/edit.native.js.map +1 -1
- package/build-module/query/edit/inspector-controls/index.js +24 -17
- package/build-module/query/edit/inspector-controls/index.js.map +1 -1
- package/build-module/query/edit/inspector-controls/parent-control.js +135 -0
- package/build-module/query/edit/inspector-controls/parent-control.js.map +1 -0
- package/build-module/query/edit/inspector-controls/sticky-control.js +31 -0
- package/build-module/query/edit/inspector-controls/sticky-control.js.map +1 -0
- package/build-module/query/index.js +2 -1
- package/build-module/query/index.js.map +1 -1
- package/build-module/query/utils.js +21 -0
- package/build-module/query/utils.js.map +1 -1
- package/build-module/query-title/index.js +1 -1
- package/build-module/query-title/index.js.map +1 -1
- package/build-module/query-title/variations.js +2 -2
- package/build-module/query-title/variations.js.map +1 -1
- package/build-module/quote/edit.js +4 -3
- package/build-module/quote/edit.js.map +1 -1
- package/build-module/quote/v2/edit.js +2 -2
- package/build-module/quote/v2/edit.js.map +1 -1
- package/build-module/search/edit.js +1 -0
- package/build-module/search/edit.js.map +1 -1
- package/build-module/site-logo/edit.js +1 -1
- package/build-module/site-logo/edit.js.map +1 -1
- package/build-module/table/edit.js +17 -4
- package/build-module/table/edit.js.map +1 -1
- package/build-module/table-of-contents/edit.js +136 -68
- package/build-module/table-of-contents/edit.js.map +1 -1
- package/build-module/table-of-contents/index.js +12 -3
- package/build-module/table-of-contents/index.js.map +1 -1
- package/build-module/table-of-contents/list.js +18 -10
- package/build-module/table-of-contents/list.js.map +1 -1
- package/build-module/table-of-contents/save.js +28 -0
- package/build-module/table-of-contents/save.js.map +1 -0
- package/build-module/table-of-contents/utils.js +11 -73
- package/build-module/table-of-contents/utils.js.map +1 -1
- package/build-module/template-part/edit/index.js +8 -4
- package/build-module/template-part/edit/index.js.map +1 -1
- package/build-module/template-part/edit/inner-blocks.js +4 -9
- package/build-module/template-part/edit/inner-blocks.js.map +1 -1
- package/build-module/video/edit.js +2 -2
- package/build-module/video/edit.js.map +1 -1
- package/build-style/editor-rtl.css +4 -6
- package/build-style/editor.css +4 -6
- package/build-style/image/editor-rtl.css +1 -1
- package/build-style/image/editor.css +1 -1
- package/build-style/post-comments/style-rtl.css +22 -0
- package/build-style/post-comments/style.css +22 -0
- package/build-style/post-comments-form/style-rtl.css +1 -3
- package/build-style/post-comments-form/style.css +1 -3
- package/build-style/separator/editor-rtl.css +1 -0
- package/build-style/separator/editor.css +1 -0
- package/build-style/style-rtl.css +23 -3
- package/build-style/style.css +23 -3
- package/build-style/video/editor-rtl.css +2 -5
- package/build-style/video/editor.css +2 -5
- package/build-types/table-of-contents/list.d.ts +12 -0
- package/build-types/table-of-contents/list.d.ts.map +1 -0
- package/build-types/table-of-contents/utils.d.ts +24 -0
- package/build-types/table-of-contents/utils.d.ts.map +1 -0
- package/package.json +30 -29
- package/src/audio/edit.js +4 -2
- package/src/avatar/block.json +0 -1
- package/src/avatar/index.php +2 -2
- package/src/block/edit.js +39 -42
- package/src/block/test/edit.native.js +1 -1
- package/src/button/block.json +1 -0
- package/src/categories/block.json +1 -1
- package/src/categories/edit.js +1 -1
- package/src/comment-author-avatar/block.json +1 -0
- package/src/comments-title/block.json +0 -6
- package/src/comments-title/deprecated.js +34 -0
- package/src/comments-title/edit.js +44 -100
- package/src/comments-title/index.js +3 -1
- package/src/comments-title/index.php +41 -23
- package/src/cover/controls.native.js +1 -2
- package/src/cover/edit/block-controls.js +119 -0
- package/src/cover/edit/cover-placeholder.js +39 -0
- package/src/cover/edit/index.js +381 -0
- package/src/cover/edit/inspector-controls.js +286 -0
- package/src/cover/edit/resizable-cover.js +55 -0
- package/src/cover/{use-cover-is-dark.js → edit/use-cover-is-dark.js} +0 -0
- package/src/cover/edit.native.js +0 -1
- package/src/cover/editor.scss +1 -1
- package/src/cover/focal-point-settings-button.native.js +1 -1
- package/src/cover/index.php +20 -37
- package/src/cover/shared.js +4 -0
- package/src/cover/test/block-controls.js +62 -0
- package/src/embed/embed-preview.js +4 -2
- package/src/file/edit.native.js +0 -1
- package/src/gallery/edit.js +2 -1
- package/src/gallery/gallery.js +2 -2
- package/src/gallery/shared.js +3 -2
- package/src/gallery/use-get-media.js +2 -1
- package/src/gallery/use-short-code-transform.js +19 -16
- package/src/gallery/v1/gallery.js +2 -2
- package/src/heading/block.json +1 -0
- package/src/heading/edit.js +5 -2
- package/src/image/edit.js +9 -1
- package/src/image/edit.native.js +0 -1
- package/src/image/editor.scss +1 -1
- package/src/image/image.js +8 -2
- package/src/image/test/edit.native.js +7 -7
- package/src/index.js +50 -27
- package/src/is-block-metadata-experimental.js +19 -0
- package/src/latest-posts/edit.js +27 -2
- package/src/latest-posts/index.php +12 -6
- package/src/list/transforms.js +7 -0
- package/src/list/v2/edit.js +1 -0
- package/src/list/v2/migrate.js +1 -1
- package/src/list/v2/transforms.js +35 -0
- package/src/list-item/block.json +2 -1
- package/src/list-item/edit.js +17 -10
- package/src/list-item/hooks/index.js +3 -0
- package/src/list-item/hooks/use-backspace.js +52 -0
- package/src/list-item/hooks/use-enter.js +9 -16
- package/src/list-item/hooks/use-indent-list-item.js +50 -63
- package/src/list-item/hooks/use-space.js +48 -0
- package/src/list-item/hooks/use-split.js +24 -0
- package/src/list-item/utils.js +1 -1
- package/src/media-text/edit.native.js +3 -1
- package/src/media-text/media-container.native.js +2 -4
- package/src/media-text/transforms.js +154 -0
- package/src/navigation/edit/index.js +175 -169
- package/src/navigation/edit/inner-blocks.js +1 -8
- package/src/navigation/index.php +40 -0
- package/src/navigation/use-navigation-entities.js +1 -1
- package/src/navigation-link/fallback-variations.js +1 -1
- package/src/navigation-link/hooks.js +2 -2
- package/src/navigation-link/test/__snapshots__/hooks.js.snap +4 -4
- package/src/page-list/convert-to-links-modal.js +1 -1
- package/src/page-list/edit.js +1 -4
- package/src/post-author/edit.js +24 -22
- package/src/post-author-name/block.json +1 -0
- package/src/post-comment/block.json +1 -0
- package/src/post-comments/edit.js +54 -22
- package/src/post-comments/style.scss +26 -0
- package/src/post-comments-count/block.json +1 -0
- package/src/post-comments-form/form.js +1 -4
- package/src/post-comments-form/style.scss +1 -4
- package/src/post-comments-link/block.json +1 -0
- package/src/post-featured-image/edit.js +1 -1
- package/src/post-template/edit.js +5 -0
- package/src/post-template/index.php +30 -0
- package/src/post-terms/edit.js +19 -0
- package/src/post-terms/hooks.js +27 -0
- package/src/post-terms/index.js +14 -7
- package/src/post-terms/index.php +40 -2
- package/src/post-title/index.js +1 -1
- package/src/pullquote/edit.js +2 -2
- package/src/pullquote/edit.native.js +2 -2
- package/src/query/block.json +2 -1
- package/src/query/edit/inspector-controls/index.js +25 -11
- package/src/query/edit/inspector-controls/parent-control.js +133 -0
- package/src/query/edit/inspector-controls/sticky-control.js +25 -0
- package/src/query/utils.js +22 -0
- package/src/query-title/index.js +1 -1
- package/src/query-title/variations.js +2 -2
- package/src/quote/edit.js +5 -2
- package/src/quote/v2/edit.js +4 -2
- package/src/search/edit.js +1 -0
- package/src/search/index.php +1 -1
- package/src/separator/editor.scss +1 -0
- package/src/site-logo/edit.js +1 -1
- package/src/table/edit.js +19 -4
- package/src/table-of-contents/block.json +9 -2
- package/src/table-of-contents/edit.js +155 -75
- package/src/table-of-contents/index.js +2 -0
- package/src/table-of-contents/list.tsx +46 -0
- package/src/table-of-contents/save.js +25 -0
- package/src/table-of-contents/utils.ts +71 -0
- package/src/tag-cloud/block.json +1 -1
- package/src/template-part/edit/index.js +25 -15
- package/src/template-part/edit/inner-blocks.js +2 -10
- package/src/video/edit.js +4 -2
- package/src/video/editor.scss +3 -6
- package/test/babel-plugin.js +67 -0
- package/tsconfig.json +11 -0
- package/tsconfig.tsbuildinfo +1 -0
- package/build/cover/edit.js +0 -598
- package/build/cover/edit.js.map +0 -1
- package/build/cover/use-cover-is-dark.js.map +0 -1
- package/build/post-terms/variations.js +0 -37
- package/build/post-terms/variations.js.map +0 -1
- package/build-module/cover/edit.js +0 -575
- package/build-module/cover/edit.js.map +0 -1
- package/build-module/cover/use-cover-is-dark.js.map +0 -1
- package/build-module/post-terms/variations.js +0 -27
- package/build-module/post-terms/variations.js.map +0 -1
- package/src/cover/edit.js +0 -757
- package/src/post-terms/variations.js +0 -28
- package/src/table-of-contents/index.php +0 -346
- package/src/table-of-contents/list.js +0 -28
- package/src/table-of-contents/utils.js +0 -126
|
@@ -0,0 +1,133 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* WordPress dependencies
|
|
3
|
+
*/
|
|
4
|
+
import { __ } from '@wordpress/i18n';
|
|
5
|
+
import { FormTokenField } from '@wordpress/components';
|
|
6
|
+
import { useSelect } from '@wordpress/data';
|
|
7
|
+
import { store as coreStore } from '@wordpress/core-data';
|
|
8
|
+
import { useState, useEffect, useMemo } from '@wordpress/element';
|
|
9
|
+
import { useDebounce } from '@wordpress/compose';
|
|
10
|
+
|
|
11
|
+
/**
|
|
12
|
+
* Internal dependencies
|
|
13
|
+
*/
|
|
14
|
+
import { getEntitiesInfo, mapToIHasNameAndId } from '../../utils';
|
|
15
|
+
|
|
16
|
+
const EMPTY_ARRAY = [];
|
|
17
|
+
const BASE_QUERY = {
|
|
18
|
+
order: 'asc',
|
|
19
|
+
_fields: 'id,title',
|
|
20
|
+
context: 'view',
|
|
21
|
+
};
|
|
22
|
+
|
|
23
|
+
function ParentControl( { parents, postType, onChange } ) {
|
|
24
|
+
const [ search, setSearch ] = useState( '' );
|
|
25
|
+
const [ value, setValue ] = useState( EMPTY_ARRAY );
|
|
26
|
+
const [ suggestions, setSuggestions ] = useState( EMPTY_ARRAY );
|
|
27
|
+
const debouncedSearch = useDebounce( setSearch, 250 );
|
|
28
|
+
const { searchResults, searchHasResolved } = useSelect(
|
|
29
|
+
( select ) => {
|
|
30
|
+
if ( ! search ) {
|
|
31
|
+
return { searchResults: EMPTY_ARRAY, searchHasResolved: true };
|
|
32
|
+
}
|
|
33
|
+
const { getEntityRecords, hasFinishedResolution } = select(
|
|
34
|
+
coreStore
|
|
35
|
+
);
|
|
36
|
+
const selectorArgs = [
|
|
37
|
+
'postType',
|
|
38
|
+
postType,
|
|
39
|
+
{
|
|
40
|
+
...BASE_QUERY,
|
|
41
|
+
search,
|
|
42
|
+
orderby: 'relevance',
|
|
43
|
+
exclude: parents,
|
|
44
|
+
per_page: 20,
|
|
45
|
+
},
|
|
46
|
+
];
|
|
47
|
+
return {
|
|
48
|
+
searchResults: getEntityRecords( ...selectorArgs ),
|
|
49
|
+
searchHasResolved: hasFinishedResolution(
|
|
50
|
+
'getEntityRecords',
|
|
51
|
+
selectorArgs
|
|
52
|
+
),
|
|
53
|
+
};
|
|
54
|
+
},
|
|
55
|
+
[ search, parents ]
|
|
56
|
+
);
|
|
57
|
+
const currentParents = useSelect(
|
|
58
|
+
( select ) => {
|
|
59
|
+
if ( ! parents?.length ) return EMPTY_ARRAY;
|
|
60
|
+
const { getEntityRecords } = select( coreStore );
|
|
61
|
+
return getEntityRecords( 'postType', postType, {
|
|
62
|
+
...BASE_QUERY,
|
|
63
|
+
include: parents,
|
|
64
|
+
per_page: parents.length,
|
|
65
|
+
} );
|
|
66
|
+
},
|
|
67
|
+
[ parents ]
|
|
68
|
+
);
|
|
69
|
+
// Update the `value` state only after the selectors are resolved
|
|
70
|
+
// to avoid emptying the input when we're changing parents.
|
|
71
|
+
useEffect( () => {
|
|
72
|
+
if ( ! parents?.length ) {
|
|
73
|
+
setValue( EMPTY_ARRAY );
|
|
74
|
+
}
|
|
75
|
+
if ( ! currentParents?.length ) return;
|
|
76
|
+
const currentParentsInfo = getEntitiesInfo(
|
|
77
|
+
mapToIHasNameAndId( currentParents, 'title.rendered' )
|
|
78
|
+
);
|
|
79
|
+
// Returns only the existing entity ids. This prevents the component
|
|
80
|
+
// from crashing in the editor, when non existing ids are provided.
|
|
81
|
+
const sanitizedValue = parents.reduce( ( accumulator, id ) => {
|
|
82
|
+
const entity = currentParentsInfo.mapById[ id ];
|
|
83
|
+
if ( entity ) {
|
|
84
|
+
accumulator.push( {
|
|
85
|
+
id,
|
|
86
|
+
value: entity.name,
|
|
87
|
+
} );
|
|
88
|
+
}
|
|
89
|
+
return accumulator;
|
|
90
|
+
}, [] );
|
|
91
|
+
setValue( sanitizedValue );
|
|
92
|
+
}, [ parents, currentParents ] );
|
|
93
|
+
|
|
94
|
+
const entitiesInfo = useMemo( () => {
|
|
95
|
+
if ( ! searchResults?.length ) return EMPTY_ARRAY;
|
|
96
|
+
return getEntitiesInfo(
|
|
97
|
+
mapToIHasNameAndId( searchResults, 'title.rendered' )
|
|
98
|
+
);
|
|
99
|
+
}, [ searchResults ] );
|
|
100
|
+
// Update suggestions only when the query has resolved.
|
|
101
|
+
useEffect( () => {
|
|
102
|
+
if ( ! searchHasResolved ) return;
|
|
103
|
+
setSuggestions( entitiesInfo.names );
|
|
104
|
+
}, [ entitiesInfo.names, searchHasResolved ] );
|
|
105
|
+
|
|
106
|
+
const getIdByValue = ( entitiesMappedByName, entity ) => {
|
|
107
|
+
const id = entity?.id || entitiesMappedByName?.[ entity ]?.id;
|
|
108
|
+
if ( id ) return id;
|
|
109
|
+
};
|
|
110
|
+
const onParentChange = ( newValue ) => {
|
|
111
|
+
const ids = Array.from(
|
|
112
|
+
newValue.reduce( ( accumulator, entity ) => {
|
|
113
|
+
// Verify that new values point to existing entities.
|
|
114
|
+
const id = getIdByValue( entitiesInfo.mapByName, entity );
|
|
115
|
+
if ( id ) accumulator.add( id );
|
|
116
|
+
return accumulator;
|
|
117
|
+
}, new Set() )
|
|
118
|
+
);
|
|
119
|
+
setSuggestions( EMPTY_ARRAY );
|
|
120
|
+
onChange( { parents: ids } );
|
|
121
|
+
};
|
|
122
|
+
return (
|
|
123
|
+
<FormTokenField
|
|
124
|
+
label={ __( 'Parents' ) }
|
|
125
|
+
value={ value }
|
|
126
|
+
onInputChange={ debouncedSearch }
|
|
127
|
+
suggestions={ suggestions }
|
|
128
|
+
onChange={ onParentChange }
|
|
129
|
+
/>
|
|
130
|
+
);
|
|
131
|
+
}
|
|
132
|
+
|
|
133
|
+
export default ParentControl;
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* WordPress dependencies
|
|
3
|
+
*/
|
|
4
|
+
import { SelectControl } from '@wordpress/components';
|
|
5
|
+
import { __ } from '@wordpress/i18n';
|
|
6
|
+
|
|
7
|
+
const stickyOptions = [
|
|
8
|
+
{ label: __( 'Include' ), value: '' },
|
|
9
|
+
{ label: __( 'Exclude' ), value: 'exclude' },
|
|
10
|
+
{ label: __( 'Only' ), value: 'only' },
|
|
11
|
+
];
|
|
12
|
+
|
|
13
|
+
export default function StickyControl( { value, onChange } ) {
|
|
14
|
+
return (
|
|
15
|
+
<SelectControl
|
|
16
|
+
label={ __( 'Sticky posts' ) }
|
|
17
|
+
options={ stickyOptions }
|
|
18
|
+
value={ value }
|
|
19
|
+
onChange={ onChange }
|
|
20
|
+
help={ __(
|
|
21
|
+
'Blog posts can be "stickied", a feature that places them at the top of the front page of posts, keeping it there until new sticky posts are published.'
|
|
22
|
+
) }
|
|
23
|
+
/>
|
|
24
|
+
);
|
|
25
|
+
}
|
package/src/query/utils.js
CHANGED
|
@@ -1,9 +1,15 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* External dependencies
|
|
3
|
+
*/
|
|
4
|
+
import { get } from 'lodash';
|
|
5
|
+
|
|
1
6
|
/**
|
|
2
7
|
* WordPress dependencies
|
|
3
8
|
*/
|
|
4
9
|
import { useSelect } from '@wordpress/data';
|
|
5
10
|
import { useMemo } from '@wordpress/element';
|
|
6
11
|
import { store as coreStore } from '@wordpress/core-data';
|
|
12
|
+
import { decodeEntities } from '@wordpress/html-entities';
|
|
7
13
|
|
|
8
14
|
/**
|
|
9
15
|
* @typedef IHasNameAndId
|
|
@@ -47,6 +53,22 @@ export const getEntitiesInfo = ( entities ) => {
|
|
|
47
53
|
};
|
|
48
54
|
};
|
|
49
55
|
|
|
56
|
+
/**
|
|
57
|
+
* Helper util to map records to add a `name` prop from a
|
|
58
|
+
* provided path, in order to handle all entities in the same
|
|
59
|
+
* fashion(implementing`IHasNameAndId` interface).
|
|
60
|
+
*
|
|
61
|
+
* @param {Object[]} entities The array of entities.
|
|
62
|
+
* @param {string} path The path to map a `name` property from the entity.
|
|
63
|
+
* @return {IHasNameAndId[]} An array of enitities that now implement the `IHasNameAndId` interface.
|
|
64
|
+
*/
|
|
65
|
+
export const mapToIHasNameAndId = ( entities, path ) => {
|
|
66
|
+
return ( entities || [] ).map( ( entity ) => ( {
|
|
67
|
+
...entity,
|
|
68
|
+
name: decodeEntities( get( entity, path ) ),
|
|
69
|
+
} ) );
|
|
70
|
+
};
|
|
71
|
+
|
|
50
72
|
/**
|
|
51
73
|
* Returns a helper object that contains:
|
|
52
74
|
* 1. An `options` object from the available post types, to be passed to a `SelectControl`.
|
package/src/query-title/index.js
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
* WordPress dependencies
|
|
3
3
|
*/
|
|
4
4
|
import { __ } from '@wordpress/i18n';
|
|
5
|
-
import {
|
|
5
|
+
import { title } from '@wordpress/icons';
|
|
6
6
|
const variations = [
|
|
7
7
|
{
|
|
8
8
|
isDefault: true,
|
|
@@ -11,7 +11,7 @@ const variations = [
|
|
|
11
11
|
description: __(
|
|
12
12
|
'Display the archive title based on the queried object.'
|
|
13
13
|
),
|
|
14
|
-
icon:
|
|
14
|
+
icon: title,
|
|
15
15
|
attributes: {
|
|
16
16
|
type: 'archive',
|
|
17
17
|
},
|
package/src/quote/edit.js
CHANGED
|
@@ -14,7 +14,7 @@ import {
|
|
|
14
14
|
useBlockProps,
|
|
15
15
|
} from '@wordpress/block-editor';
|
|
16
16
|
import { BlockQuotation } from '@wordpress/components';
|
|
17
|
-
import { createBlock } from '@wordpress/blocks';
|
|
17
|
+
import { createBlock, getDefaultBlockName } from '@wordpress/blocks';
|
|
18
18
|
import { Platform } from '@wordpress/element';
|
|
19
19
|
|
|
20
20
|
const isWebPlatform = Platform.OS === 'web';
|
|
@@ -81,6 +81,7 @@ export default function QuoteEdit( {
|
|
|
81
81
|
createBlock( 'core/paragraph' )
|
|
82
82
|
}
|
|
83
83
|
textAlign={ align }
|
|
84
|
+
__unstableEmbedURLOnPaste
|
|
84
85
|
/>
|
|
85
86
|
{ ( ! RichText.isEmpty( citation ) || isSelected ) && (
|
|
86
87
|
<RichText
|
|
@@ -102,7 +103,9 @@ export default function QuoteEdit( {
|
|
|
102
103
|
className="wp-block-quote__citation"
|
|
103
104
|
textAlign={ align }
|
|
104
105
|
__unstableOnSplitAtEnd={ () =>
|
|
105
|
-
insertBlocksAfter(
|
|
106
|
+
insertBlocksAfter(
|
|
107
|
+
createBlock( getDefaultBlockName() )
|
|
108
|
+
)
|
|
106
109
|
}
|
|
107
110
|
/>
|
|
108
111
|
) }
|
package/src/quote/v2/edit.js
CHANGED
|
@@ -17,7 +17,7 @@ import {
|
|
|
17
17
|
} from '@wordpress/block-editor';
|
|
18
18
|
import { BlockQuotation } from '@wordpress/components';
|
|
19
19
|
import { useDispatch, useSelect, useRegistry } from '@wordpress/data';
|
|
20
|
-
import { createBlock } from '@wordpress/blocks';
|
|
20
|
+
import { createBlock, getDefaultBlockName } from '@wordpress/blocks';
|
|
21
21
|
import { Platform, useEffect } from '@wordpress/element';
|
|
22
22
|
import deprecated from '@wordpress/deprecated';
|
|
23
23
|
|
|
@@ -128,7 +128,9 @@ export default function QuoteEdit( {
|
|
|
128
128
|
}
|
|
129
129
|
className="wp-block-quote__citation"
|
|
130
130
|
__unstableOnSplitAtEnd={ () =>
|
|
131
|
-
insertBlocksAfter(
|
|
131
|
+
insertBlocksAfter(
|
|
132
|
+
createBlock( getDefaultBlockName() )
|
|
133
|
+
)
|
|
132
134
|
}
|
|
133
135
|
{ ...( ! isWebPlatform ? { textAlign: align } : {} ) }
|
|
134
136
|
/>
|
package/src/search/edit.js
CHANGED
package/src/search/index.php
CHANGED
|
@@ -86,7 +86,7 @@ function render_block_core_search( $attributes ) {
|
|
|
86
86
|
$button_classes .= ' has-icon';
|
|
87
87
|
|
|
88
88
|
$button_internal_markup =
|
|
89
|
-
'<svg
|
|
89
|
+
'<svg class="search-icon" viewBox="0 0 24 24" width="24" height="24">
|
|
90
90
|
<path d="M13.5 6C10.5 6 8 8.5 8 11.5c0 1.1.3 2.1.9 3l-3.4 3 1 1.1 3.4-2.9c1 .9 2.2 1.4 3.6 1.4 3 0 5.5-2.5 5.5-5.5C19 8.5 16.5 6 13.5 6zm0 9.5c-2.2 0-4-1.8-4-4s1.8-4 4-4 4 1.8 4 4-1.8 4-4 4z"></path>
|
|
91
91
|
</svg>';
|
|
92
92
|
}
|
package/src/site-logo/edit.js
CHANGED
|
@@ -469,7 +469,7 @@ export default function LogoEdit( {
|
|
|
469
469
|
|
|
470
470
|
const { createErrorNotice } = useDispatch( noticesStore );
|
|
471
471
|
const onUploadError = ( message ) => {
|
|
472
|
-
createErrorNotice( message
|
|
472
|
+
createErrorNotice( message, { type: 'snackbar' } );
|
|
473
473
|
};
|
|
474
474
|
|
|
475
475
|
const controls = canUserEdit && logoUrl && (
|
package/src/table/edit.js
CHANGED
|
@@ -6,7 +6,7 @@ import classnames from 'classnames';
|
|
|
6
6
|
/**
|
|
7
7
|
* WordPress dependencies
|
|
8
8
|
*/
|
|
9
|
-
import { useEffect, useState } from '@wordpress/element';
|
|
9
|
+
import { useEffect, useRef, useState } from '@wordpress/element';
|
|
10
10
|
import {
|
|
11
11
|
InspectorControls,
|
|
12
12
|
BlockControls,
|
|
@@ -40,7 +40,7 @@ import {
|
|
|
40
40
|
tableRowDelete,
|
|
41
41
|
table,
|
|
42
42
|
} from '@wordpress/icons';
|
|
43
|
-
import { createBlock } from '@wordpress/blocks';
|
|
43
|
+
import { createBlock, getDefaultBlockName } from '@wordpress/blocks';
|
|
44
44
|
|
|
45
45
|
/**
|
|
46
46
|
* Internal dependencies
|
|
@@ -105,6 +105,9 @@ function TableEdit( {
|
|
|
105
105
|
const colorProps = useColorProps( attributes );
|
|
106
106
|
const borderProps = useBorderProps( attributes );
|
|
107
107
|
|
|
108
|
+
const tableRef = useRef();
|
|
109
|
+
const [ hasTableCreated, setHasTableCreated ] = useState( false );
|
|
110
|
+
|
|
108
111
|
/**
|
|
109
112
|
* Updates the initial column count used for table creation.
|
|
110
113
|
*
|
|
@@ -137,6 +140,7 @@ function TableEdit( {
|
|
|
137
140
|
columnCount: parseInt( initialColumnCount, 10 ) || 2,
|
|
138
141
|
} )
|
|
139
142
|
);
|
|
143
|
+
setHasTableCreated( true );
|
|
140
144
|
}
|
|
141
145
|
|
|
142
146
|
/**
|
|
@@ -341,6 +345,15 @@ function TableEdit( {
|
|
|
341
345
|
}
|
|
342
346
|
}, [ isSelected ] );
|
|
343
347
|
|
|
348
|
+
useEffect( () => {
|
|
349
|
+
if ( hasTableCreated ) {
|
|
350
|
+
tableRef?.current
|
|
351
|
+
?.querySelector( 'td[contentEditable="true"]' )
|
|
352
|
+
?.focus();
|
|
353
|
+
setHasTableCreated( false );
|
|
354
|
+
}
|
|
355
|
+
}, [ hasTableCreated ] );
|
|
356
|
+
|
|
344
357
|
const sections = [ 'head', 'body', 'foot' ].filter(
|
|
345
358
|
( name ) => ! isEmptyTableSection( attributes[ name ] )
|
|
346
359
|
);
|
|
@@ -426,7 +439,7 @@ function TableEdit( {
|
|
|
426
439
|
const isEmpty = ! sections.length;
|
|
427
440
|
|
|
428
441
|
return (
|
|
429
|
-
<figure { ...useBlockProps() }>
|
|
442
|
+
<figure { ...useBlockProps( { ref: tableRef } ) }>
|
|
430
443
|
{ ! isEmpty && (
|
|
431
444
|
<>
|
|
432
445
|
<BlockControls group="block">
|
|
@@ -505,7 +518,9 @@ function TableEdit( {
|
|
|
505
518
|
// Deselect the selected table cell when the caption is focused.
|
|
506
519
|
unstableOnFocus={ () => setSelectedCell() }
|
|
507
520
|
__unstableOnSplitAtEnd={ () =>
|
|
508
|
-
insertBlocksAfter(
|
|
521
|
+
insertBlocksAfter(
|
|
522
|
+
createBlock( getDefaultBlockName() )
|
|
523
|
+
)
|
|
509
524
|
}
|
|
510
525
|
/>
|
|
511
526
|
) }
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"$schema": "https://schemas.wp.org/trunk/block.json",
|
|
3
3
|
"apiVersion": 2,
|
|
4
|
+
"__experimental": true,
|
|
4
5
|
"name": "core/table-of-contents",
|
|
5
6
|
"title": "Table of Contents",
|
|
6
7
|
"category": "layout",
|
|
@@ -8,13 +9,19 @@
|
|
|
8
9
|
"keywords": [ "document outline", "summary" ],
|
|
9
10
|
"textdomain": "default",
|
|
10
11
|
"attributes": {
|
|
12
|
+
"headings": {
|
|
13
|
+
"type": "array",
|
|
14
|
+
"items": {
|
|
15
|
+
"type": "object"
|
|
16
|
+
}
|
|
17
|
+
},
|
|
11
18
|
"onlyIncludeCurrentPage": {
|
|
12
19
|
"type": "boolean",
|
|
13
20
|
"default": false
|
|
14
21
|
}
|
|
15
22
|
},
|
|
16
|
-
"usesContext": [ "postId" ],
|
|
17
23
|
"supports": {
|
|
18
24
|
"html": false
|
|
19
|
-
}
|
|
25
|
+
},
|
|
26
|
+
"example": {}
|
|
20
27
|
}
|