Skip to content

Commit

Permalink
Revert core edit function and replace with a native version
Browse files Browse the repository at this point in the history
  • Loading branch information
enejb committed Sep 10, 2021
1 parent 4fa4e0a commit 57c1d9a
Show file tree
Hide file tree
Showing 2 changed files with 147 additions and 47 deletions.
54 changes: 7 additions & 47 deletions packages/block-library/src/pullquote/edit.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ import {
BlockControls,
RichText,
useBlockProps,
getColorObjectByAttributeValues,
__experimentalGetColorClassesAndStyles as getColorClassesAndStyles,
} from '@wordpress/block-editor';
import { createBlock } from '@wordpress/blocks';

Expand All @@ -23,60 +21,22 @@ import { createBlock } from '@wordpress/blocks';
import { Figure } from './figure';
import { BlockQuote } from './blockquote';

const getBackgroundColor = ( { attributes, colors, style } ) => {
const { backgroundColor } = attributes;

const colorProps = getColorClassesAndStyles( attributes );
const colorObject = getColorObjectByAttributeValues(
colors,
backgroundColor
);

return (
colorObject?.color ||
colorProps.style?.backgroundColor ||
colorProps.style?.background ||
style?.backgroundColor
);
};

const getTextColor = ( { attributes, colors, style } ) => {
const colorProps = getColorClassesAndStyles( attributes );
const colorObject = getColorObjectByAttributeValues(
colors,
attributes.textColor
);

return colorObject?.color || colorProps.style?.color || style?.color;
};
const getBorderColor = ( props ) => {
const { wrapperProps, attributes } = props;
const { className } = attributes;

// Checking for the is-style-solid-color we can better approximate the pull quote style
const defaultColor =
className?.search( 'is-style-solid-color' ) !== -1
? getBackgroundColor( props )
: getTextColor( props );

return wrapperProps?.style?.borderColor || defaultColor;
};
/**
* Internal dependencies
*/

function PullQuoteEdit( props ) {
const { attributes, setAttributes, isSelected, insertBlocksAfter } = props;
function PullQuoteEdit( {
attributes,
setAttributes,
isSelected,
insertBlocksAfter,
} ) {
const { textAlign, citation, value } = attributes;

const blockProps = useBlockProps( {
className: classnames( {
[ `has-text-align-${ textAlign }` ]: textAlign,
} ),
backgroundColor: getBackgroundColor( props ),
borderColor: getBorderColor( props ),
} );

const shouldShowCitation = ! RichText.isEmpty( citation ) || isSelected;

return (
Expand All @@ -90,7 +50,7 @@ function PullQuoteEdit( props ) {
/>
</BlockControls>
<Figure { ...blockProps }>
<BlockQuote textColor={ getTextColor( props ) }>
<BlockQuote>
<RichText
identifier="value"
multiline
Expand Down
140 changes: 140 additions & 0 deletions packages/block-library/src/pullquote/edit.native.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,140 @@
/**
* External dependencies
*/
import classnames from 'classnames';

/**
* WordPress dependencies
*/
import { __ } from '@wordpress/i18n';
import {
AlignmentControl,
BlockControls,
RichText,
useBlockProps,
getColorObjectByAttributeValues,
__experimentalGetColorClassesAndStyles as getColorClassesAndStyles,
} from '@wordpress/block-editor';
import { createBlock } from '@wordpress/blocks';

/**
* Internal dependencies
*/
import { Figure } from './figure';
import { BlockQuote } from './blockquote';

const getBackgroundColor = ( { attributes, colors, style } ) => {
const { backgroundColor } = attributes;

const colorProps = getColorClassesAndStyles( attributes );
const colorObject = getColorObjectByAttributeValues(
colors,
backgroundColor
);

return (
colorObject?.color ||
colorProps.style?.backgroundColor ||
colorProps.style?.background ||
style?.backgroundColor
);
};

const getTextColor = ( { attributes, colors, style } ) => {
const colorProps = getColorClassesAndStyles( attributes );
const colorObject = getColorObjectByAttributeValues(
colors,
attributes.textColor
);

return colorObject?.color || colorProps.style?.color || style?.color;
};
const getBorderColor = ( props ) => {
const { wrapperProps, attributes } = props;
const { className } = attributes;

// Checking for the is-style-solid-color we can better approximate the pull quote style
const defaultColor =
className?.search( 'is-style-solid-color' ) !== -1
? getBackgroundColor( props )
: getTextColor( props );

return wrapperProps?.style?.borderColor || defaultColor;
};
/**
* Internal dependencies
*/

function PullQuoteEdit( props ) {
const { attributes, setAttributes, isSelected, insertBlocksAfter } = props;
const { textAlign, citation, value } = attributes;

const blockProps = useBlockProps( {
className: classnames( {
[ `has-text-align-${ textAlign }` ]: textAlign,
} ),
backgroundColor: getBackgroundColor( props ),
borderColor: getBorderColor( props ),
} );

const shouldShowCitation = ! RichText.isEmpty( citation ) || isSelected;

return (
<>
<BlockControls group="block">
<AlignmentControl
value={ textAlign }
onChange={ ( nextAlign ) => {
setAttributes( { textAlign: nextAlign } );
} }
/>
</BlockControls>
<Figure { ...blockProps }>
<BlockQuote textColor={ getTextColor( props ) }>
<RichText
identifier="value"
multiline
value={ value }
onChange={ ( nextValue ) =>
setAttributes( {
value: nextValue,
} )
}
aria-label={ __( 'Pullquote text' ) }
placeholder={
// translators: placeholder text used for the quote
__( 'Add quote' )
}
textAlign="center"
/>
{ shouldShowCitation && (
<RichText
identifier="citation"
value={ citation }
aria-label={ __( 'Pullquote citation text' ) }
placeholder={
// translators: placeholder text used for the citation
__( 'Add citation' )
}
onChange={ ( nextCitation ) =>
setAttributes( {
citation: nextCitation,
} )
}
className="wp-block-pullquote__citation"
__unstableMobileNoFocusOnMount
textAlign="center"
__unstableOnSplitAtEnd={ () =>
insertBlocksAfter(
createBlock( 'core/paragraph' )
)
}
/>
) }
</BlockQuote>
</Figure>
</>
);
}

export default PullQuoteEdit;

0 comments on commit 57c1d9a

Please sign in to comment.