From 4d0f8c29ec2e87fd896c42182bba313c9ee193f7 Mon Sep 17 00:00:00 2001 From: Alquen Antonio Sarmiento Date: Wed, 9 Oct 2024 15:46:47 +0800 Subject: [PATCH 1/4] fix(heading): heading v3 with less aggresive non use of theme margins --- src/block/heading/deprecated.js | 15 +++++++++++++++ src/block/heading/edit.js | 2 +- src/block/heading/save.js | 2 +- src/block/heading/style.scss | 7 +++++++ 4 files changed, 24 insertions(+), 2 deletions(-) diff --git a/src/block/heading/deprecated.js b/src/block/heading/deprecated.js index e8cc3be197..8075869ab3 100644 --- a/src/block/heading/deprecated.js +++ b/src/block/heading/deprecated.js @@ -19,6 +19,21 @@ import { */ import { addFilter } from '@wordpress/hooks' +// Version 3.13.9 Deprecations +addFilter( 'stackable.heading.save.blockClassNames', 'stackable/3.13.9', ( output, props ) => { + if ( compareVersions( props.version, '3.13.9' ) >= 0 ) { // Current version is greater than or equal to 3.13.9 + return output + } + + const responsiveClass = getResponsiveClasses( props.attributes ) + return [ + props.className, + 'stk-block-heading', + responsiveClass, + 'stk-block-heading--v2', + ] +} ) + // Version 3.6.1 Deprecations addFilter( 'stackable.heading.save.blockClassNames', 'stackable/3.6.1', ( output, props ) => { if ( compareVersions( props.version, '3.6.1' ) === 1 ) { // Current version is greater than 3.6.1 diff --git a/src/block/heading/edit.js b/src/block/heading/edit.js index 3b0a4624d9..bf66f249a0 100644 --- a/src/block/heading/edit.js +++ b/src/block/heading/edit.js @@ -81,7 +81,7 @@ const Edit = props => { const blockClassNames = classnames( [ className, 'stk-block-heading', - 'stk-block-heading--v2', + 'stk-block-heading--v3', ] ) const textClassNames = classnames( [ diff --git a/src/block/heading/save.js b/src/block/heading/save.js index b5c9a632ce..a79ec9148f 100644 --- a/src/block/heading/save.js +++ b/src/block/heading/save.js @@ -33,7 +33,7 @@ export const Save = props => { className, 'stk-block-heading', responsiveClass, - 'stk-block-heading--v2', + 'stk-block-heading--v3', ], props ) ) const textClassNames = classnames( [ diff --git a/src/block/heading/style.scss b/src/block/heading/style.scss index 05a05cfaa8..dca9da0553 100644 --- a/src/block/heading/style.scss +++ b/src/block/heading/style.scss @@ -10,3 +10,10 @@ margin: 0 !important; } } + +.stk-block-heading--v3 { + .stk-block-heading__text:not(.stk-block-heading--use-theme-margins) { + margin-top: 0 !important; + margin-bottom: 0 !important; + } +} From 7d8b5e2c80f9fc9122b96dccb9d1fa6095f46863 Mon Sep 17 00:00:00 2001 From: Alquen Sarmiento Date: Mon, 10 Feb 2025 10:55:32 +0800 Subject: [PATCH 2/4] chore: revert changes --- src/block/heading/deprecated.js | 15 --------------- src/block/heading/edit.js | 2 +- src/block/heading/save.js | 2 +- src/block/heading/style.scss | 7 ------- 4 files changed, 2 insertions(+), 24 deletions(-) diff --git a/src/block/heading/deprecated.js b/src/block/heading/deprecated.js index 8075869ab3..e8cc3be197 100644 --- a/src/block/heading/deprecated.js +++ b/src/block/heading/deprecated.js @@ -19,21 +19,6 @@ import { */ import { addFilter } from '@wordpress/hooks' -// Version 3.13.9 Deprecations -addFilter( 'stackable.heading.save.blockClassNames', 'stackable/3.13.9', ( output, props ) => { - if ( compareVersions( props.version, '3.13.9' ) >= 0 ) { // Current version is greater than or equal to 3.13.9 - return output - } - - const responsiveClass = getResponsiveClasses( props.attributes ) - return [ - props.className, - 'stk-block-heading', - responsiveClass, - 'stk-block-heading--v2', - ] -} ) - // Version 3.6.1 Deprecations addFilter( 'stackable.heading.save.blockClassNames', 'stackable/3.6.1', ( output, props ) => { if ( compareVersions( props.version, '3.6.1' ) === 1 ) { // Current version is greater than 3.6.1 diff --git a/src/block/heading/edit.js b/src/block/heading/edit.js index bf66f249a0..3b0a4624d9 100644 --- a/src/block/heading/edit.js +++ b/src/block/heading/edit.js @@ -81,7 +81,7 @@ const Edit = props => { const blockClassNames = classnames( [ className, 'stk-block-heading', - 'stk-block-heading--v3', + 'stk-block-heading--v2', ] ) const textClassNames = classnames( [ diff --git a/src/block/heading/save.js b/src/block/heading/save.js index a79ec9148f..b5c9a632ce 100644 --- a/src/block/heading/save.js +++ b/src/block/heading/save.js @@ -33,7 +33,7 @@ export const Save = props => { className, 'stk-block-heading', responsiveClass, - 'stk-block-heading--v3', + 'stk-block-heading--v2', ], props ) ) const textClassNames = classnames( [ diff --git a/src/block/heading/style.scss b/src/block/heading/style.scss index dca9da0553..05a05cfaa8 100644 --- a/src/block/heading/style.scss +++ b/src/block/heading/style.scss @@ -10,10 +10,3 @@ margin: 0 !important; } } - -.stk-block-heading--v3 { - .stk-block-heading__text:not(.stk-block-heading--use-theme-margins) { - margin-top: 0 !important; - margin-bottom: 0 !important; - } -} From b20abc47f229a218afa9b3fd38b37268c8756b16 Mon Sep 17 00:00:00 2001 From: Alquen Sarmiento Date: Mon, 10 Feb 2025 11:05:58 +0800 Subject: [PATCH 3/4] fix: if OceanWP theme is used, initially use the theme's margin to follow its layout --- src/block-components/typography/edit.js | 9 +++++++++ src/compatibility/index.js | 1 + src/compatibility/oceanwp/index.js | 26 +++++++++++++++++++++++++ 3 files changed, 36 insertions(+) create mode 100644 src/compatibility/oceanwp/index.js diff --git a/src/block-components/typography/edit.js b/src/block-components/typography/edit.js index 595d7f3bd9..3e7b98245f 100644 --- a/src/block-components/typography/edit.js +++ b/src/block-components/typography/edit.js @@ -100,6 +100,15 @@ export const Controls = props => { const onChangeContent = useCallback( text => setDebouncedText( escapeHTML( text ) ), [] ) + // OceanWP compatibility. + // If OceanWP theme is used, initially use the theme's margin to follow its layout + useEffect( () => { + if ( hasRemoveMargins ) { + const value = getAttribute( 'useThemeTextMargins' ) + updateAttribute( 'useThemeTextMargins', applyFilters( 'stackable.heading.edit.useThemeTextMargins', value ) ) + } + }, [] ) + return ( <> { applyFilters( 'stackable.block-component.typography.before', null, props ) } diff --git a/src/compatibility/index.js b/src/compatibility/index.js index 35febbb902..52f9395cac 100644 --- a/src/compatibility/index.js +++ b/src/compatibility/index.js @@ -1,2 +1,3 @@ import './kadence-theme' import './wp-6-2' +import './oceanwp' diff --git a/src/compatibility/oceanwp/index.js b/src/compatibility/oceanwp/index.js new file mode 100644 index 0000000000..207ec85a9c --- /dev/null +++ b/src/compatibility/oceanwp/index.js @@ -0,0 +1,26 @@ +/** + * Kadence Theme compatibility. + */ + +/** + * External dependencies + */ +import { currentTheme } from 'stackable' + +/** + * WordPress dependencies + */ +import { addFilter } from '@wordpress/hooks' + +addFilter( 'stackable.heading.edit.useThemeTextMargins', 'stackable/compatibility/oceanwp', value => { + if ( currentTheme !== 'oceanwp' ) { + return value + } + + // If no value has been set, default to true to use OceanWP margins + if ( value === '' ) { + return true + } + + return value +} ) From 347ef94f645114736877f8b8a5fb44412e8784ce Mon Sep 17 00:00:00 2001 From: Alquen Antonio Sarmiento Date: Wed, 12 Mar 2025 09:46:31 +0800 Subject: [PATCH 4/4] Update index.js --- src/compatibility/oceanwp/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/compatibility/oceanwp/index.js b/src/compatibility/oceanwp/index.js index 207ec85a9c..9af6507480 100644 --- a/src/compatibility/oceanwp/index.js +++ b/src/compatibility/oceanwp/index.js @@ -1,5 +1,5 @@ /** - * Kadence Theme compatibility. + * OceanWP compatibility. */ /**