Skip to content

fix(posts): add a wrapper to have custom selectorCallback #3427

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

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

fix(posts): add a wrapper to have custom selectorCallback #3427

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
40 changes: 40 additions & 0 deletions src/block-components/image/style.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ export const addStyles = ( blockStyleGenerator, props = {} ) => {

const {
selector = '.stk-img-wrapper',
selectorCallbackWrapper = null,
hoverSelector = '.stk-img-wrapper:hover',
hoverSelectorCallback = null,
enableWidth = true,
Expand Down Expand Up @@ -54,6 +55,10 @@ export const addStyles = ( blockStyleGenerator, props = {} ) => {
selector,
`${ selector } .stk-img-resizer-wrapper`,
],
selectorCallback: selectorCallbackWrapper ? selectorCallbackWrapper( [
selector,
`${ selector } .stk-img-resizer-wrapper`,
], ) : undefined,
renderIn: 'edit',
styleRule: 'aspectRatio',
attrName: 'imageAspectRatio',
Expand All @@ -63,6 +68,7 @@ export const addStyles = ( blockStyleGenerator, props = {} ) => {
}, {
...propsToPass,
selector,
selectorCallback: selectorCallbackWrapper ? selectorCallbackWrapper( `${ selector }` ) : undefined,
renderIn: 'save',
styleRule: 'aspectRatio',
attrName: 'imageAspectRatio',
Expand All @@ -74,6 +80,7 @@ export const addStyles = ( blockStyleGenerator, props = {} ) => {
blockStyleGenerator.addBlockStyles( 'imageWidth', [ {
...propsToPass,
selector: `${ selector }:not(.stk--is-resizing)`,
selectorCallback: selectorCallbackWrapper ? selectorCallbackWrapper( `${ selector }:not(.stk--is-resizing)` ) : undefined,
renderIn: 'edit',
styleRule: 'width',
attrName: 'imageWidth',
Expand All @@ -96,6 +103,7 @@ export const addStyles = ( blockStyleGenerator, props = {} ) => {
}, {
...propsToPass,
selector,
selectorCallback: selectorCallbackWrapper ? selectorCallbackWrapper( `${ selector }` ) : undefined,
renderIn: 'save',
styleRuleCallback: _widthStyleRuleCallback,
attrName: 'imageWidth',
Expand All @@ -120,6 +128,7 @@ export const addStyles = ( blockStyleGenerator, props = {} ) => {
blockStyleGenerator.addBlockStyles( 'imageHeight', [ {
...propsToPass,
selector: `${ selector }:not(.stk--is-resizing)`,
selectorCallback: selectorCallbackWrapper ? selectorCallbackWrapper( `${ selector }:not(.stk--is-resizing)` ) : undefined,
renderIn: 'edit',
styleRule: 'height',
attrName: 'imageHeight',
Expand Down Expand Up @@ -148,6 +157,7 @@ export const addStyles = ( blockStyleGenerator, props = {} ) => {
}, {
...propsToPass,
selector,
selectorCallback: selectorCallbackWrapper ? selectorCallbackWrapper( `${ selector }` ) : undefined,
renderIn: 'save',
styleRule: 'height',
attrName: 'imageHeight',
Expand Down Expand Up @@ -185,6 +195,7 @@ export const addStyles = ( blockStyleGenerator, props = {} ) => {
* @see https://stackoverflow.com/questions/12492006/box-shadow-on-element-with-webkit-mask-image
*/
selector: `${ selector } .stk-img-resizer-wrapper`,
selectorCallback: selectorCallbackWrapper ? selectorCallbackWrapper( `${ selector } .stk-img-resizer-wrapper` ) : undefined,
hoverSelector: hoverSelector ? `${ hoverSelector } .stk-img-resizer-wrapper` : undefined,
hoverSelectorCallback,
renderIn: 'edit',
Expand All @@ -196,6 +207,7 @@ export const addStyles = ( blockStyleGenerator, props = {} ) => {
}, {
...propsToPass,
selector,
selectorCallback: selectorCallbackWrapper ? selectorCallbackWrapper( `${ selector }` ) : undefined,
hoverSelector,
renderIn: 'save',
styleRule: 'filter',
Expand All @@ -208,6 +220,7 @@ export const addStyles = ( blockStyleGenerator, props = {} ) => {
blockStyleGenerator.addBlockStyles( 'imageFilter', [ {
...propsToPass,
selector: `${ selector } img`,
selectorCallback: selectorCallbackWrapper ? selectorCallbackWrapper( `${ selector } img` ) : undefined,
hoverSelector: `${ hoverSelector } img`,
hoverSelectorCallback,
styleRule: 'filter',
Expand All @@ -219,6 +232,7 @@ export const addStyles = ( blockStyleGenerator, props = {} ) => {
blockStyleGenerator.addBlockStyles( 'imageZoom', [ {
...propsToPass,
selector: `${ selector } img`,
selectorCallback: selectorCallbackWrapper ? selectorCallbackWrapper( `${ selector } img` ) : undefined,
hoverSelector: `${ hoverSelector } img`,
hoverSelectorCallback,
styleRule: 'transform',
Expand All @@ -238,6 +252,7 @@ export const addStyles = ( blockStyleGenerator, props = {} ) => {
* @see https://github.com/gambitph/Stackable/issues/1833
*/
selector: `${ selector } .stk-img-resizer-wrapper img`,
selectorCallback: selectorCallbackWrapper ? selectorCallbackWrapper( `${ selector } .stk-img-resizer-wrapper img` ) : undefined,
renderIn: 'edit',
styleRule: 'borderRadius',
attrName: 'imageBorderRadius',
Expand All @@ -246,6 +261,7 @@ export const addStyles = ( blockStyleGenerator, props = {} ) => {
}, {
...propsToPass,
selector: `${ selector } img`,
selectorCallback: selectorCallbackWrapper ? selectorCallbackWrapper( `${ selector } img` ) : undefined,
renderIn: 'save',
styleRule: 'borderRadius',
attrName: 'imageBorderRadius',
Expand All @@ -256,6 +272,7 @@ export const addStyles = ( blockStyleGenerator, props = {} ) => {
blockStyleGenerator.addBlockStyles( 'imageFocalPoint', [ {
...propsToPass,
selector: `${ selector } img`,
selectorCallback: selectorCallbackWrapper ? selectorCallbackWrapper( `${ selector } img` ) : undefined,
hoverSelector: `${ hoverSelector } img`,
hoverSelectorCallback,
styleRule: 'objectPosition',
Expand All @@ -269,6 +286,7 @@ export const addStyles = ( blockStyleGenerator, props = {} ) => {
blockStyleGenerator.addBlockStyles( 'imageFit', [ {
...propsToPass,
selector: `${ selector } img`,
selectorCallback: selectorCallbackWrapper ? selectorCallbackWrapper( `${ selector } img` ) : undefined,
styleRule: 'objectFit',
attrName: 'imageFit',
key: 'imageFit',
Expand All @@ -286,6 +304,11 @@ export const addStyles = ( blockStyleGenerator, props = {} ) => {
`${ selector } .stk-img-resizer-wrapper::after`,
`${ selector } .stk-img-resizer-wrapper::before`,
],
selectorCallback: selectorCallbackWrapper ? selectorCallbackWrapper( [
`${ selector } .stk-img-resizer-wrapper img`,
`${ selector } .stk-img-resizer-wrapper::after`,
`${ selector } .stk-img-resizer-wrapper::before`,
] ) : undefined,
styleRule: 'mask-image',
vendorPrefixes: [ '-webkit-' ],
attrName: 'imageShape',
Expand All @@ -309,6 +332,11 @@ export const addStyles = ( blockStyleGenerator, props = {} ) => {
`${ selector }::after`,
`${ selector }::before`,
],
selectorCallback: selectorCallbackWrapper ? selectorCallbackWrapper( [
`${ selector } img`,
`${ selector }::after`,
`${ selector }::before`,
] ) : undefined,
styleRule: 'mask-image',
vendorPrefixes: [ '-webkit-' ],
attrName: 'imageShape',
Expand All @@ -332,6 +360,7 @@ export const addStyles = ( blockStyleGenerator, props = {} ) => {
...propsToPass,
renderIn: 'save',
selector: `${ selector }::after`,
selectorCallback: selectorCallbackWrapper ? selectorCallbackWrapper( `${ selector }::after` ) : undefined,
hoverSelector: `${ hoverSelector }::after`,
hoverSelectorCallback,
styleRuleCallback: getAttribute => {
Expand Down Expand Up @@ -367,6 +396,9 @@ export const addStyles = ( blockStyleGenerator, props = {} ) => {
...propsToPass,
renderIn: 'edit',
selector: `${ selector } .stk-img-resizer-wrapper::after`,
selectorCallback: selectorCallbackWrapper ? selectorCallbackWrapper(
`${ selector } .stk-img-resizer-wrapper::after`
) : undefined,
hoverSelector: `${ hoverSelector } .stk-img-resizer-wrapper::after`,
hoverSelectorCallback,
styleRuleCallback: getAttribute => {
Expand Down Expand Up @@ -406,6 +438,7 @@ export const addStyles = ( blockStyleGenerator, props = {} ) => {
...propsToPass,
renderIn: 'edit',
selector: `${ selector }::after`,
selectorCallback: selectorCallbackWrapper ? selectorCallbackWrapper( `${ selector }::after` ) : undefined,
hoverSelector: `${ selector }::before`,
styleRuleCallback: getAttribute => {
const colorType = getAttribute( 'imageOverlayColorType' )
Expand Down Expand Up @@ -446,6 +479,7 @@ export const addStyles = ( blockStyleGenerator, props = {} ) => {
...propsToPass,
renderIn: 'save',
selector: `${ selector }::after`,
selectorCallback: selectorCallbackWrapper ? selectorCallbackWrapper( `${ selector }::after` ) : undefined,
hoverSelector: `${ selector }::before`,
styleRuleCallback: getAttribute => {
const colorType = getAttribute( 'imageOverlayColorType' )
Expand Down Expand Up @@ -489,6 +523,7 @@ export const addStyles = ( blockStyleGenerator, props = {} ) => {
...propsToPass,
renderIn: 'save',
selector: `${ selector }`,
selectorCallback: selectorCallbackWrapper ? selectorCallbackWrapper( `${ selector }` ) : undefined,
hoverSelector: `${ selector }::before`,
styleRule: '--stk-gradient-overlay',
attrName: 'imageOverlayOpacity',
Expand All @@ -498,6 +533,7 @@ export const addStyles = ( blockStyleGenerator, props = {} ) => {
...propsToPass,
renderIn: 'edit',
selector: `${ selector } .stk-img-resizer-wrapper`,
selectorCallback: selectorCallbackWrapper ? selectorCallbackWrapper( `${ selector } .stk-img-resizer-wrapper` ) : undefined,
hoverSelector: `${ selector } .stk-img-resizer-wrapper::before`,
styleRule: '--stk-gradient-overlay',
attrName: 'imageOverlayOpacity',
Expand All @@ -509,13 +545,17 @@ export const addStyles = ( blockStyleGenerator, props = {} ) => {
...propsToPass,
renderIn: 'save',
selector: `${ selector }::after, ${ selector }::before`,
selectorCallback: selectorCallbackWrapper ? selectorCallbackWrapper( `${ selector }::after, ${ selector }::before` ) : undefined,
styleRule: 'mix-blend-mode',
attrName: 'imageOverlayBlendMode',
key: 'imageOverlayBlendMode-save',
}, {
...propsToPass,
renderIn: 'edit',
selector: `${ selector } .stk-img-resizer-wrapper::after, ${ selector } .stk-img-resizer-wrapper::before`,
selectorCallback: selectorCallbackWrapper ? selectorCallbackWrapper(
`${ selector } .stk-img-resizer-wrapper::after, ${ selector } .stk-img-resizer-wrapper::before`
) : undefined,
hoverSelectorCallback,
styleRule: 'mix-blend-mode',
attrName: 'imageOverlayBlendMode',
Expand Down
18 changes: 10 additions & 8 deletions src/block/posts/style.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,15 +294,17 @@ Image.addStyles( blockStyles, {
}
return true
},
selectorCallback: getAttribute => {
const className = getAttribute( 'className' )
const blockStyle = getBlockStyle( variations, className )
const imageHasLink = getAttribute( 'imageHasLink' )

if ( [ 'list' ].includes( blockStyle?.name ) && imageHasLink ) {
return `${ itemSelector } .stk-block-posts__image-link`
selectorCallbackWrapper: ( selector = '.stk-img-wrapper' ) => {
return getAttribute => {
const className = getAttribute( 'className' )
const blockStyle = getBlockStyle( variations, className )
const imageHasLink = getAttribute( 'imageHasLink' )

if ( [ 'list' ].includes( blockStyle?.name ) && imageHasLink ) {
return `${ itemSelector } .stk-block-posts__image-link`
}
return selector
}
return '.stk-img-wrapper'
},
widthStyleRuleCallback: getAttribute => {
const className = getAttribute( 'className' )
Expand Down
Loading