Merge branch 'feat-granular-plugin-setting' of https://github.com/gambitph/Stackable into feat-granular-plugin-setting

Arukuen · Arukuen · commit f277554a85ce · 2025-01-30T23:32:03.000+08:00
diff --git a/src/block/card/substitute.js b/src/block/card/substitute.js
@@ -3,7 +3,7 @@ export const substitute = {
 	transform: ( oldAttributes, innerBlocks ) => {
 		return [
 			'stackable/columns',
-			{ uniqueId: 'test' },
+			{},
 			[
 				[
 					'stackable/column',
diff --git a/src/block/carousel/index.js b/src/block/carousel/index.js
@@ -15,6 +15,7 @@ import schema from './schema'
 import metadata from './block.json'
 import example from './example'
 import deprecated from './deprecated'
+import substitute from './substitute'
 
 export const settings = {
 	...metadata,
@@ -34,4 +35,5 @@ export const settings = {
 	deprecated,
 	edit,
 	save,
+	substitute,
 }
diff --git a/src/block/carousel/substitute.js b/src/block/carousel/substitute.js
@@ -0,0 +1,14 @@
+export const substitute = {
+	from: 'stackable/carousel',
+	variants: [],
+	to: [ 'stackable/columns' ],
+	transform: ( oldAttributes, innerBlocks ) => {
+		return [
+			'stackable/columns',
+			{},
+			innerBlocks,
+		]
+	},
+}
+
+export default substitute
diff --git a/src/block/countdown/index.js b/src/block/countdown/index.js
@@ -15,6 +15,7 @@ import save from './save'
 import schema from './schema'
 import metadata from './block.json'
 import deprecated from './deprecated'
+import substitute from './substitute'
 
 export const settings = {
 	...metadata,
@@ -29,5 +30,6 @@ export const settings = {
 		align: [ 'center', 'wide', 'full' ],
 		spacing: true,
 	},
+	substitute,
 }
 
diff --git a/src/block/countdown/substitute.js b/src/block/countdown/substitute.js
@@ -0,0 +1,49 @@
+export const substitute = {
+	from: 'stackable/countdown',
+	variations: [],
+	to: 'stackable/columns',
+	transform: () => {
+		return [
+			'stackable/columns',
+			{},
+			[
+				[
+					'stackable/column',
+					{ align: 'center' },
+					[
+						[ 'core/text', {
+							fontSize: 'x-large',
+							content: '3',
+							align: 'center',
+							style: { spacing: { margin: { top: '0', bottom: '0' } } },
+						} ],
+						[ 'core/text', {
+							content: 'Days',
+							align: 'center',
+							style: { spacing: { margin: { top: '0', bottom: '0' } } },
+						} ],
+					],
+				],
+				[
+					'stackable/column',
+					{ align: 'center' },
+					[
+						[ 'core/text', {
+							fontSize: 'x-large',
+							content: '16',
+							align: 'center',
+							style: { spacing: { margin: { top: '0', bottom: '0' } } },
+						} ],
+						[ 'core/text', {
+							content: 'Hours',
+							align: 'center',
+							style: { spacing: { margin: { top: '0', bottom: '0' } } },
+						} ],
+					],
+				],
+			],
+		]
+	},
+}
+
+export default substitute
diff --git a/src/block/expand/index.js b/src/block/expand/index.js
@@ -16,6 +16,7 @@ import schema from './schema'
 import metadata from './block.json'
 import example from './example'
 import deprecated from './deprecated'
+import substitute from './substitute'
 
 /**
  * WordPress dependencies
@@ -37,4 +38,5 @@ export const settings = {
 	deprecated,
 	edit,
 	save,
+	substitute,
 }
diff --git a/src/block/expand/substitute.js b/src/block/expand/substitute.js
@@ -0,0 +1,11 @@
+export const substitute = {
+	from: 'stackable/expand',
+	to: 'stackable/text',
+	transform: ( oldAttributes, innerBlocks ) => {
+		return {
+			text: innerBlocks[ 2 ][ 1 ].text,
+		}
+	},
+}
+
+export default substitute
diff --git a/src/block/feature-grid/index.js b/src/block/feature-grid/index.js
@@ -17,6 +17,7 @@ import schema from './schema'
 import metadata from './block.json'
 import example from './example'
 import deprecated from './deprecated'
+import substitute from './substitute'
 
 /**
  * WordPress dependencies
@@ -41,4 +42,5 @@ export const settings = {
 	variations,
 	edit,
 	save,
+	substitute,
 }
diff --git a/src/block/feature-grid/substitute.js b/src/block/feature-grid/substitute.js
@@ -0,0 +1,14 @@
+export const substitute = {
+	from: 'stackable/feature-grid',
+	variants: [],
+	to: [ 'stackable/columns' ],
+	transform: ( oldAttributes, innerBlocks ) => {
+		return [
+			'stackable/columns',
+			{},
+			innerBlocks,
+		]
+	},
+}
+
+export default substitute
diff --git a/src/block/feature/index.js b/src/block/feature/index.js
@@ -17,6 +17,7 @@ import schema from './schema'
 import metadata from './block.json'
 import example from './example'
 import deprecated from './deprecated'
+import substitute from './substitute'
 
 /**
  * WordPress dependencies
@@ -42,4 +43,5 @@ export const settings = {
 	variations,
 	edit,
 	save,
+	substitute,
 }
diff --git a/src/block/feature/substitute.js b/src/block/feature/substitute.js
@@ -0,0 +1,14 @@
+export const substitute = {
+	from: 'stackable/feature',
+	variants: [],
+	to: [ 'stackable/columns' ],
+	transform: ( oldAttributes, innerBlocks ) => {
+		return [
+			'stackable/columns',
+			{},
+			innerBlocks,
+		]
+	},
+}
+
+export default substitute
diff --git a/src/block/hero/index.js b/src/block/hero/index.js
@@ -11,6 +11,7 @@ import save from './save'
 import schema from './schema'
 import example from './example'
 import deprecated from './deprecated'
+import substitute from './substitute'
 
 /**
  * External dependencies
@@ -40,4 +41,5 @@ export const settings = {
 	deprecated,
 	edit,
 	save,
+	substitute,
 }
diff --git a/src/block/hero/substitute.js b/src/block/hero/substitute.js
@@ -0,0 +1,25 @@
+export const substitute = {
+	from: 'stackable/hero',
+	variants: [ 'stackable/hero' ],
+	to: [ 'stackable/columns' ],
+	transform: ( oldAttributes, innerBlocks ) => {
+		return [
+			'stackable/columns',
+			{
+				// TODO: See if passing the entire oldAttributes works.
+				...oldAttributes,
+				// hasBackground: oldAttributes.hasBackground,
+				// blockBackgroundMediaUrl: oldAttributes.blockBackgroundMediaUrl,
+				// align: oldAttributes.align,
+				// contentAlign: oldAttributes.contentAlign,
+				// innerBlockContentAlign: oldAttributes.innerBlockContentAlign,
+				// blockHeight: oldAttributes.blockHeight,
+				// blockVerticalAlign: oldAttributes.blockVerticalAlign,
+				// hasContainer: oldAttributes.hasContainer,
+			},
+			[ 'stackable/column', {}, innerBlocks ],
+		]
+	},
+}
+
+export default substitute
diff --git a/src/block/horizontal-scroller/index.js b/src/block/horizontal-scroller/index.js
@@ -7,6 +7,7 @@ import schema from './schema'
 import example from './example'
 import metadata from './block.json'
 import deprecated from './deprecated'
+import substitute from './substitute'
 
 import { HorizontalScrollerIcon } from '~stackable/icons'
 
@@ -28,4 +29,5 @@ export const settings = {
 	deprecated,
 	edit,
 	save,
+	substitute,
 }
diff --git a/src/block/horizontal-scroller/substitute.js b/src/block/horizontal-scroller/substitute.js
@@ -0,0 +1,14 @@
+export const substitute = {
+	from: 'stackable/horizontal-scroller',
+	variants: [],
+	to: [ 'stackable/columns' ],
+	transform: ( oldAttributes, innerBlocks ) => {
+		return [
+			'stackable/columns',
+			{},
+			innerBlocks,
+		]
+	},
+}
+
+export default substitute
diff --git a/src/block/icon/index.js b/src/block/icon/index.js
@@ -17,6 +17,7 @@ import schema from './schema'
 import example from './example'
 import transforms from './transforms'
 import deprecated from './deprecated'
+import substitute from './substitute'
 
 /**
  * WordPress dependencies
@@ -36,4 +37,5 @@ export const settings = {
 	deprecated,
 	edit,
 	save,
+	substitute,
 }
diff --git a/src/block/icon/substitute.js b/src/block/icon/substitute.js
@@ -0,0 +1,7 @@
+// TODO: this results in an error. test with Blooom Service 1 design
+export const substitute = {
+	from: 'stackable/icon',
+	to: [ 'core/paragraph' ],
+}
+
+export default substitute
diff --git a/src/block/posts/index.js b/src/block/posts/index.js
@@ -13,6 +13,7 @@ import metadata from './block.json'
 import example from './example'
 import { BlogPostsIcon } from '~stackable/icons'
 import deprecated from './deprecated'
+import substitute from './substitute'
 
 export const settings = {
 	...metadata,
@@ -30,4 +31,5 @@ export const settings = {
 	variations,
 	edit,
 	save,
+	substitute,
 }
diff --git a/src/block/posts/substitute.js b/src/block/posts/substitute.js
@@ -0,0 +1,49 @@
+export const substitute = {
+	from: 'stackable/posts',
+	variants: [],
+	to: [ 'core/query' ],
+	transform: oldAttributes => {
+		return [
+			'core/query',
+			{
+				queryId: 0,
+				query: {
+					perPage: 10,
+					pages: 0,
+					offset: 0,
+					postType: 'post',
+					order: 'desc',
+					orderBy: 'date',
+					author: '',
+					search: '',
+					exclude: [],
+					sticky: '',
+					inherit: false,
+					taxQuery: null,
+					parents: [],
+					format: [],
+				},
+				layout: { type: 'default' },
+			},
+			[
+				[
+					'core/post-template',
+					{
+						layout: {
+							type: 'grid',
+							columnCount: oldAttributes.columns,
+						},
+					},
+					[
+						[ 'post-featured-image', { aspectRatio: '1' } ],
+						[ 'post-title', {} ],
+						[ 'post-date', {} ],
+						[ 'post-excerpt', { moreText: 'Continue Reading' } ],
+					],
+				],
+			],
+		]
+	},
+}
+
+export default substitute
diff --git a/src/util/colors.js b/src/util/colors.js
@@ -90,6 +90,9 @@ export const extractColor = value => {
  * @return {string} color in #RRGGBBAA format
  */
 export const colorOpacityToHexAplha = ( color, opacity ) => {
+	if ( ! color ) {
+		return ''
+	}
 	if ( color.startsWith( '#' ) ) {
 		// Get the first 6 hex digits.
 		const hex = color.slice( 0, 7 )

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ export const substitute = {`
`3`	`3`	`transform: ( oldAttributes, innerBlocks ) => {`
`4`	`4`	`return [`
`5`	`5`	`'stackable/columns',`
`6`		`- { uniqueId: 'test' },`
	`6`	`+ {},`
`7`	`7`	`[`
`8`	`8`	`[`
`9`	`9`	`'stackable/column',`