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

Fix: Inherit theme link styles for Button, Icon List, and ToC #3378

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
36 changes: 36 additions & 0 deletions src/block/button/deprecated.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,47 @@ import { Save } from './save'
import { attributes } from './schema'

import { withVersion } from '~stackable/higher-order'
import { semverCompare } from '~stackable/util'
import {
BlockDiv, CustomCSS, Button, Typography,
deprecateBlockBackgroundColorOpacity, deprecateButtonGradientColor,
deprecateContainerBackgroundColorOpacity, deprecateShadowColor,
deprecateContainerShadowColor, deprecateBlockShadowColor,
} from '~stackable/block-components'
import { addFilter } from '@wordpress/hooks'
import { useBlockProps } from '@wordpress/block-editor'

// If button style is link, change BlockDiv tag from <div> to <p> to inherit theme link styles.
addFilter( 'stackable.button.save.blockDiv.content', 'stackable/inheritThemeLinkStyles', ( output, props, propsToPass, blockClassNames, customAttributes, typographyInnerClassNames ) => {
if ( semverCompare( props.version, '<', '3.13.11' ) ) {
return (
<BlockDiv.Content
{ ...useBlockProps.save( { className: blockClassNames } ) }
attributes={ props.attributes }
applyCustomAttributes={ false }
version={ props.version }
>
{ props.attributes.generatedCss && <style>{ props.attributes.generatedCss }</style> }
<CustomCSS.Content attributes={ props.attributes } />
<Button.Content
{ ...propsToPass }
attributes={ props.attributes }
buttonProps={ {
id: props.attributes.anchorId || undefined,
...customAttributes,
} }
>
<Typography.Content
attributes={ props.attributes }
tagName="span"
className={ typographyInnerClassNames }
/>
</Button.Content>
</BlockDiv.Content>
)
}
return output
} )

const deprecated = [
{
Expand Down
1 change: 1 addition & 0 deletions src/block/button/edit.js
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ const Edit = props => {
attributes={ props.attributes }
className={ blockClassNames }
applyCustomAttributes={ false }
blockTag={ blockStyle === 'link' ? 'p' : null }
>
<Button
buttonProps={ {
Expand Down
44 changes: 24 additions & 20 deletions src/block/button/save.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import {
*/
import { compose } from '@wordpress/compose'
import { useBlockProps } from '@wordpress/block-editor'
import { applyFilters } from '@wordpress/hooks'

export const Save = props => {
const {
Expand All @@ -46,29 +47,32 @@ export const Save = props => {
] )

return (
<BlockDiv.Content
{ ...useBlockProps.save( { className: blockClassNames } ) }
attributes={ props.attributes }
applyCustomAttributes={ false }
version={ props.version }
>
{ props.attributes.generatedCss && <style>{ props.attributes.generatedCss }</style> }
<CustomCSS.Content attributes={ props.attributes } />
<Button.Content
{ ...propsToPass }
applyFilters( 'stackable.button.save.blockDiv.content', (
<BlockDiv.Content
{ ...useBlockProps.save( { className: blockClassNames } ) }
attributes={ props.attributes }
buttonProps={ {
id: props.attributes.anchorId || undefined,
...customAttributes,
} }
applyCustomAttributes={ false }
version={ props.version }
blockTag={ props.attributes.className === 'is-style-link' ? 'p' : null }
>
<Typography.Content
{ props.attributes.generatedCss && <style>{ props.attributes.generatedCss }</style> }
<CustomCSS.Content attributes={ props.attributes } />
<Button.Content
{ ...propsToPass }
attributes={ props.attributes }
tagName="span"
className={ typographyInnerClassNames }
/>
</Button.Content>
</BlockDiv.Content>
buttonProps={ {
id: props.attributes.anchorId || undefined,
...customAttributes,
} }
>
<Typography.Content
attributes={ props.attributes }
tagName="span"
className={ typographyInnerClassNames }
/>
</Button.Content>
</BlockDiv.Content>
), props, propsToPass, blockClassNames, customAttributes, typographyInnerClassNames )
)
}

Expand Down
22 changes: 21 additions & 1 deletion src/block/icon-list-item/deprecated.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,27 @@ import { Save } from './save'
import { attributes } from './schema'

import { withVersion } from '~stackable/higher-order'
import { deprecateBlockShadowColor, deprecateContainerShadowColor } from '~stackable/block-components'
import {
deprecateBlockShadowColor, deprecateContainerShadowColor, Typography,
} from '~stackable/block-components'
import { semverCompare } from '~stackable/util'

import { addFilter } from '@wordpress/hooks'

// Change tag from <span> to <p> to inherit theme link styles.
addFilter( 'stackable.icon-list-item.save.typography.content', 'stackable/inheritThemeLinkStyles', ( output, props, attrs, textClassNames ) => {
if ( semverCompare( props.version, '<', '3.13.11' ) ) {
return (
<Typography.Content
attributes={ attrs }
className={ textClassNames }
tagName="span"
/>
)
}

return output
} )

const deprecated = [
{
Expand Down
1 change: 0 additions & 1 deletion src/block/icon-list-item/edit.js
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,6 @@ const Edit = props => {
}
<Typography
ref={ useEnterRef }
tagName="span"
className={ textClassNames }
onMerge={ onMerge }
onPaste={ onPaste }
Expand Down
6 changes: 3 additions & 3 deletions src/block/icon-list-item/save.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import { getUseSvgDef } from '../icon-list/util'
* WordPress dependencies
*/
import { compose } from '@wordpress/compose'
import { applyFilters } from '@wordpress/hooks'

export const Save = props => {
const {
Expand Down Expand Up @@ -67,11 +68,10 @@ export const Save = props => {
hasLinearGradient={ false }
/> }
{ attributes.ordered && <span className="stk-block-icon-list-item__marker" aria-hidden="true"></span> }
<Typography.Content
{ applyFilters( 'stackable.icon-list-item.save.typography.content', <Typography.Content
attributes={ attributes }
tagName="span"
className={ textClassNames }
/>
/>, props, attributes, textClassNames ) }
</div>
</BlockDiv.Content>
)
Expand Down
6 changes: 6 additions & 0 deletions src/block/icon-list-item/style.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
.stk-block-icon-list-item {
list-style-type: none !important;

.stk-block-icon-list-item__text {
margin-block: 0;
margin: 0;
}
}

.stk-block-icon-list.stk-block {
.wp-block-stackable-icon-list-item:not(:last-child)::after {
content: "" !important;
Expand Down
9 changes: 9 additions & 0 deletions src/block/table-of-contents/deprecated.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { Save } from './save'
* External dependencies
*/
import { withVersion } from '~stackable/higher-order'
import { semverCompare } from '~stackable/util'
import compareVersions from 'compare-versions'
import {
deprecateBlockBackgroundColorOpacity, deprecateContainerBackgroundColorOpacity, deprecateTypographyGradientColor,
Expand All @@ -19,6 +20,14 @@ import {
*/
import { addFilter } from '@wordpress/hooks'

addFilter( 'stackable.table-of-contents.save.blockClasses', 'stackable/inheritThemeLinkStyles', ( output, textClasses, props ) => {
if ( semverCompare( props.version, '<', '3.13.11' ) ) {
return output.filter( className => className !== 'entry-content' )
}

return output
} )

addFilter( 'stackable.table-of-contents.save.blockClasses', 'stackable/classesNotRendered', ( output, textClasses, props ) => {
if ( compareVersions( props.version, '3.6.2' ) === 0 ) {
output.push( textClasses )
Expand Down
1 change: 1 addition & 0 deletions src/block/table-of-contents/save.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ export const Save = props => {
const blockClassNames = classnames( applyFilters( 'stackable.table-of-contents.save.blockClasses', [
className,
'stk-block-table-of-contents',
'entry-content', // add this class to inherit theme link styles
blockAlignmentClass,
responsiveClass,
], textClasses, props ) )
Expand Down
Loading