release: Allow Page Templates Support

- Allow Page Templates Support

Author: HardeepAsrani

README.md

@@ -2,7 +2,7 @@
 **Contributors:** [themeisle](https://profiles.wordpress.org/themeisle)  
 **Tags:** neve, templates, patterns, blocks, starter, sites, demo, content, import  
 **Requires at least:** 4.7  
-**Tested up to:** 5.7  
+**Tested up to:** 5.8  
 **Requires PHP:** 5.6  
 **Stable tag:** trunk  
 **License:** GPLv3  

editor/build/index.asset.php

@@ -1 +1 @@
-<?php return array('dependencies' => array('wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-data', 'wp-edit-post', 'wp-element', 'wp-i18n', 'wp-keycodes', 'wp-plugins', 'wp-polyfill', 'wp-primitives'), 'version' => '6dee5b8d2c58119d8483ef50207dfa20');
+<?php return array('dependencies' => array('wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-data', 'wp-edit-post', 'wp-element', 'wp-i18n', 'wp-keycodes', 'wp-plugins', 'wp-polyfill', 'wp-primitives'), 'version' => 'e0e46189f874af1ba2715737a636a00d');

editor/build/index.js

@@ -1,3 +1,4 @@
+/* eslint-disable no-undef */
 /* global localStorage, tiTpc */
 import { stringifyUrl } from 'query-string';
 import { v4 as uuidv4 } from 'uuid';
@@ -282,7 +283,6 @@ export const publishTemplate = async (
 			premade: publishStatus ? 'yes' : 'no',
 			link,
 			...omit( tiTpc.params, 'meta' ),
-			meta: JSON.stringify( tiTpc.params.meta )
 		},
 	} );
 

editor/src/data/templates-cloud/index.js

@@ -1,5 +1,11 @@
+/* eslint-disable no-undef */
 /* eslint-disable camelcase */
-import { withDispatch, withSelect, useDispatch, useSelect } from '@wordpress/data';
+import {
+	withDispatch,
+	withSelect,
+	useDispatch,
+	useSelect,
+} from '@wordpress/data';
 import { useState, useEffect } from '@wordpress/element';
 import { Modal, Button } from '@wordpress/components';
 import { compose } from '@wordpress/compose';
@@ -12,6 +18,8 @@ import Content from './components/content';
 import PreviewFrame from '../../assets/src/Components/CloudLibrary/PreviewFrame';
 import { importTemplate } from './data/templates-cloud';
 
+const { omit } = lodash;
+
 const Edit = ( {
 	clientId,
 	isPreview,
@@ -21,9 +29,7 @@ const Edit = ( {
 	replaceBlocks,
 	closePreview,
 } ) => {
-	const {
-		type,
-	} = useSelect( ( select ) => ( {
+	const { type } = useSelect( ( select ) => ( {
 		type: select( 'core/editor' ).getEditedPostAttribute( 'type' ),
 	} ) );
 
@@ -100,14 +106,42 @@ const Edit = ( {
 		return sortingOrder.library;
 	};
 
+	const tryParseJSON = ( jsonString ) => {
+		try {
+			const o = JSON.parse( jsonString );
+
+			// Handle non-exception-throwing cases:
+			// Neither JSON.parse(false) or JSON.parse(1234) throw errors, hence the type-checking,
+			// but... JSON.parse(null) returns null, and typeof null === "object",
+			// so we must check for that, too. Thankfully, null is falsey, so this suffices:
+			// Source: https://stackoverflow.com/a/20392392
+			if ( o && typeof o === 'object' ) {
+				return o;
+			}
+		} catch ( e ) {}
+
+		return false;
+	};
+
 	const importBlocks = ( content, metaFields = [] ) => {
 		updateLibrary( [] );
 		updateTemplates( [] );
 
-		if ( 0 < metaFields.length && [ 'post', 'page' ].includes( type ) ) {
-			editPost( {
-				meta: { ...JSON.parse( metaFields ) },
-			} );
+		if (
+			0 < Object.keys( tryParseJSON( metaFields ) || {} ).length &&
+			[ 'post', 'page' ].includes( type )
+		) {
+			const fields = JSON.parse( metaFields );
+			const meta = {
+				...omit( { ...fields }, '_wp_page_template' ),
+			};
+			editPost( { meta } );
+
+			if ( 'page' === type && fields._wp_page_template ) {
+				editPost( {
+					template: fields._wp_page_template,
+				} );
+			}
 		}
 
 		replaceBlocks( clientId, parse( content ) );

editor/src/edit.js

@@ -1,3 +1,4 @@
+/* eslint-disable no-undef */
 /* eslint-disable camelcase */
 import { __ } from '@wordpress/i18n';
 import apiFetch from '@wordpress/api-fetch';
@@ -66,10 +67,28 @@ const Exporter = () => {
 		return getEditedPostAttribute( 'meta' );
 	}, [] );
 
+	const pageTemplate = useSelect( ( select ) => {
+		const { getEditedPostAttribute } = select( 'core/editor' );
+		return getEditedPostAttribute( 'template' );
+	}, [] );
+
 	useEffect( () => {
 		const metaKeys = window.tiTpc.metaKeys;
-		window.tiTpc.params.meta = Object.fromEntries( Object.entries( getMetaFields || {} ).filter(( [key, value] ) => metaKeys.includes( key )) );
-	}, [ getMetaFields ] );
+		window.tiTpc.params.meta = Object.fromEntries(
+			Object.entries( getMetaFields || {} ).filter( ( [ key ] ) =>
+				metaKeys.includes( key )
+			)
+		);
+
+		if ( pageTemplate ) {
+			window.tiTpc.params.meta._wp_page_template = pageTemplate;
+		} else if (
+			'' === pageTemplate &&
+			window.tiTpc.params.meta._wp_page_template
+		) {
+			delete window.tiTpc.params.meta._wp_page_template;
+		}
+	}, [ getMetaFields, pageTemplate ] );
 
 	const {
 		meta,

editor/src/extension.js

@@ -1 +1 @@
-<?php return array('dependencies' => array('react', 'wp-api-fetch', 'wp-components', 'wp-compose', 'wp-data', 'wp-element', 'wp-keycodes', 'wp-polyfill', 'wp-primitives'), 'version' => '6eb35ac9420a3150e7242a1550f19a2b');
+<?php return array('dependencies' => array('react', 'wp-api-fetch', 'wp-components', 'wp-compose', 'wp-data', 'wp-element', 'wp-keycodes', 'wp-polyfill', 'wp-primitives'), 'version' => 'd3c730dad6ad805a41cf255b7c7781b9');

elementor/build/index.asset.php

@@ -52,13 +52,23 @@ const Export = ( { updateCurrentTab } ) => {
 			doesExist = await getTemplate( templateID );
 		}
 
+		const meta = window.tiTpc.params.meta;
+
+		const currentTemplate = elementor.documents
+			.getCurrent()
+			.container.settings.get( 'template' );
+
+		if ( currentTemplate ) {
+			meta._wp_page_template = currentTemplate;
+		}
+
 		if ( doesExist ) {
 			await updateTemplate( {
 				template_id: templateID,
 				template_name: title,
 				content,
 				link: elementor.config.initial_document.urls.permalink,
-				meta: JSON.stringify( tiTpc.params.meta ),
+				meta: JSON.stringify( meta ),
 			} );
 		} else {
 			await exportTemplate( {

elementor/build/index.js

@@ -136,7 +136,7 @@ const TemplatesContent = ( {
 							item={ item }
 							id={ item.template_id }
 							title={ item.template_name }
-							meta={ item.meta || [] }
+							meta={ item.meta || '' }
 							onImport={ onImport }
 							onUpdateTemplate={ onUpdateTemplate }
 							onDelete={ onDelete }