From 0f74d0af2fa589b709b105e12e0c24c606857096 Mon Sep 17 00:00:00 2001 From: Matt Chowning Date: Mon, 19 Aug 2019 16:33:59 -0400 Subject: [PATCH] Improve name of AdditionalSettings component --- .../src/list/additional-settings.js | 44 ------------------- packages/block-library/src/list/edit.js | 15 ++++--- .../src/list/ordered-list-settings.js | 43 ++++++++++++++++++ ...ive.js => ordered-list-settings.native.js} | 0 4 files changed, 51 insertions(+), 51 deletions(-) delete mode 100644 packages/block-library/src/list/additional-settings.js create mode 100644 packages/block-library/src/list/ordered-list-settings.js rename packages/block-library/src/list/{additional-settings.native.js => ordered-list-settings.native.js} (100%) diff --git a/packages/block-library/src/list/additional-settings.js b/packages/block-library/src/list/additional-settings.js deleted file mode 100644 index 9d12ae443b556..0000000000000 --- a/packages/block-library/src/list/additional-settings.js +++ /dev/null @@ -1,44 +0,0 @@ -/** - * WordPress dependencies - */ -import { __ } from '@wordpress/i18n'; -import { InspectorControls } from '@wordpress/block-editor'; -import { - TextControl, - PanelBody, - ToggleControl, -} from '@wordpress/components'; - -const AdditionalSettings = ( { setAttributes, ordered, reversed, start } ) => - ordered && ( - - - { - const int = parseInt( value, 10 ); - - setAttributes( { - // It should be possible to unset the value, - // e.g. with an empty string. - start: isNaN( int ) ? undefined : int, - } ); - } } - value={ Number.isInteger( start ) ? start.toString( 10 ) : '' } - step="1" - /> - { - setAttributes( { - // Unset the attribute if not reversed. - reversed: value || undefined, - } ); - } } - /> - - ); - -export default AdditionalSettings; diff --git a/packages/block-library/src/list/edit.js b/packages/block-library/src/list/edit.js index 4c928d9a8d5dd..53e0edda0ebf8 100644 --- a/packages/block-library/src/list/edit.js +++ b/packages/block-library/src/list/edit.js @@ -23,7 +23,7 @@ import { * Internal dependencies */ import { name } from './'; -import AdditionalSettings from './additional-settings'; +import OrderedListSettings from './ordered-list-settings'; export default function ListEdit( { attributes, @@ -138,11 +138,12 @@ export default function ListEdit( { > { controls } - + { ordered && ( + ) } ; } diff --git a/packages/block-library/src/list/ordered-list-settings.js b/packages/block-library/src/list/ordered-list-settings.js new file mode 100644 index 0000000000000..4cb845f423d65 --- /dev/null +++ b/packages/block-library/src/list/ordered-list-settings.js @@ -0,0 +1,43 @@ +/** + * WordPress dependencies + */ +import { __ } from '@wordpress/i18n'; +import { InspectorControls } from '@wordpress/block-editor'; +import { + TextControl, + PanelBody, + ToggleControl, +} from '@wordpress/components'; + +const OrderedListSettings = ( { setAttributes, reversed, start } ) => ( + + + { + const int = parseInt( value, 10 ); + + setAttributes( { + // It should be possible to unset the value, + // e.g. with an empty string. + start: isNaN( int ) ? undefined : int, + } ); + } } + value={ Number.isInteger( start ) ? start.toString( 10 ) : '' } + step="1" + /> + { + setAttributes( { + // Unset the attribute if not reversed. + reversed: value || undefined, + } ); + } } + /> + + ); + +export default OrderedListSettings; diff --git a/packages/block-library/src/list/additional-settings.native.js b/packages/block-library/src/list/ordered-list-settings.native.js similarity index 100% rename from packages/block-library/src/list/additional-settings.native.js rename to packages/block-library/src/list/ordered-list-settings.native.js