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

Jump to bottom

List block: Add numbering type selection #51186

Merged
merged 8 commits into from
Jun 16, 2023
Merged

List block: Add numbering type selection #51186

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b5e1b91
Add numbering type selection
glendaviesnz Jun 2, 2023
c7b1b6a
Fix typo
glendaviesnz Jun 14, 2023
183eaed
Remove switch to styles panel
glendaviesnz Jun 14, 2023
4b7b522
Add new fixtures for list with type set
glendaviesnz Jun 14, 2023
fc458c6
Change of wording
glendaviesnz Jun 14, 2023
33f607f
Change casing of Roman
glendaviesnz Jun 16, 2023
ccb32f1
Remove redundant {}s
glendaviesnz Jun 16, 2023
171975d
Give the Romans there due respect
glendaviesnz Jun 16, 2023
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
24 changes: 22 additions & 2 deletions packages/block-library/src/list/ordered-list-settings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,14 @@
*/
import { __ } from '@wordpress/i18n';
import { InspectorControls } from '@wordpress/block-editor';
import { TextControl, PanelBody, ToggleControl } from '@wordpress/components';
import {
TextControl,
PanelBody,
ToggleControl,
SelectControl,
} from '@wordpress/components';

const OrderedListSettings = ( { setAttributes, reversed, start } ) => (
const OrderedListSettings = ( { setAttributes, reversed, start, type } ) => (
<InspectorControls>
<PanelBody title={ __( 'Ordered list settings' ) }>
<TextControl
Expand All @@ -24,6 +29,21 @@ const OrderedListSettings = ( { setAttributes, reversed, start } ) => (
value={ Number.isInteger( start ) ? start.toString( 10 ) : '' }
step="1"
/>
<SelectControl
__nextHasNoMarginBottom
label={ __( 'Numbering style' ) }
options={ [
{ value: '1', label: __( 'Numbers' ) },
{ value: 'A', label: __( 'Uppercase letters' ) },
{ value: 'a', label: __( 'Lowercase letters' ) },
{ value: 'I', label: __( 'Uppercase roman numerals' ) },
glendaviesnz marked this conversation as resolved.
Show resolved Hide resolved
{ value: 'i', label: __( 'Lowercase roman numerals' ) },
glendaviesnz marked this conversation as resolved.
Show resolved Hide resolved
] }
value={ type }
onChange={ ( newValue ) => {
setAttributes( { type: newValue } );
} }
glendaviesnz marked this conversation as resolved.
Show resolved Hide resolved
/>
<ToggleControl
__nextHasNoMarginBottom
label={ __( 'Reverse list numbering' ) }
Expand Down
7 changes: 7 additions & 0 deletions test/integration/fixtures/blocks/core__list__ol-with-type.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<!-- wp:list {"ordered":true,"type":"A"} -->
<ol type="A">
<!-- wp:list-item -->
<li>Item 1</li>
<!-- /wp:list-item -->
</ol>
<!-- /wp:list -->
21 changes: 21 additions & 0 deletions test/integration/fixtures/blocks/core__list__ol-with-type.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
[
{
"name": "core/list",
"isValid": true,
"attributes": {
"ordered": true,
"values": "",
"type": "A"
},
"innerBlocks": [
{
"name": "core/list-item",
"isValid": true,
"attributes": {
"content": "Item 1"
},
"innerBlocks": []
}
]
}
]
20 changes: 20 additions & 0 deletions test/integration/fixtures/blocks/core__list__ol-with-type.parsed.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
[
{
"blockName": "core/list",
"attrs": {
"ordered": true,
"type": "A"
},
"innerBlocks": [
{
"blockName": "core/list-item",
"attrs": {},
"innerBlocks": [],
"innerHTML": "\n\t<li>Item 1</li>\n\t",
"innerContent": [ "\n\t<li>Item 1</li>\n\t" ]
}
],
"innerHTML": "\n<ol type=\"A\">\n\t\n</ol>\n",
"innerContent": [ "\n<ol type=\"A\">\n\t", null, "\n</ol>\n" ]
}
]
5 changes: 5 additions & 0 deletions test/integration/fixtures/blocks/core__list__ol-with-type.serialized.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<!-- wp:list {"ordered":true,"type":"A"} -->
<ol type="A"><!-- wp:list-item -->
<li>Item 1</li>
<!-- /wp:list-item --></ol>
<!-- /wp:list -->