diff --git a/.eslintrc.js b/.eslintrc.js index c9ce0119c..c13bc5930 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -14,9 +14,50 @@ const eslintConfig = { }, globals: { kt_blocks_params: 'readonly', - kadence_blocks_params: 'writeable', + kadence_blocks_params: 'writable', kt_deregister_params: 'readonly', kadence_blocks_user_params: 'readonly', + kadence_blocks_parallax: 'readonly', + kadence_blocks_form_params: 'readonly', + form_data: 'readonly', + grecaptcha: 'readonly', + kb_adv_form_params: 'readonly', + kadence_video_pop: 'readonly', + kadenceExtensionImagePicker: 'readonly', + kt_blocks_default_size: 'readonly', + kb_glightbox: 'readonly', + AOS: 'readonly', + kadenceHomeParams: 'readonly', + jarallax: 'readonly', + jQuery: 'readonly', + sessionStorage: 'writable', + localStorage: 'writable', + FormData: 'readonly', + location: 'readonly', + FileReader: 'readonly', + Headers: 'readonly', + pagenow: 'readonly', + ENTER: 'readonly', + Splide: 'readonly', + MouseEvent: 'readonly', + countUp: 'readonly', + CustomEvent: 'readonly', + DOMParser: 'readonly', + KadenceAccordion: 'readonly', + Gumshoe: 'readonly', + HTMLElement: 'readonly', + XMLHttpRequest: 'readonly', + Typed: 'readonly', + define: 'readonly', + history: 'writable', + filteredBlockPatterns: 'readable', + onSelectBlockPattern: 'readable', + blockCode: 'readable', + scrollTo: 'readable', + Image: 'readable', + Masonry: 'readable', + IntersectionObserver: 'readable', + getComputedStyle: 'readable', }, rules: { '@wordpress/i18n-text-domain': [ @@ -25,22 +66,23 @@ const eslintConfig = { allowedTextDomain: ['default', 'kadence-blocks', 'kadence-starter-templates'], }, ], + 'import/no-unresolved': [ + 'error', + { + ignore: ['@kadence/icons', '@kadence/components', '@kadence/helpers', '@wordpress/*'], + }, + ], 'import/no-extraneous-dependencies': 'off', - 'import/no-unresolved': 'off', - 'import/named': 'off', 'no-unused-vars': 'off', 'react-hooks/exhaustive-deps': 'off', 'no-shadow': 'off', - '@wordpress/i18n-ellipsis': 'off', 'jsdoc/require-param': 'off', 'no-nested-ternary': 'off', camelcase: 'off', - 'no-undef': 'off', '@wordpress/no-unsafe-wp-apis': 'off', 'react-hooks/rules-of-hooks': 'off', 'no-console': 'off', 'react/jsx-no-target-blank': 'off', - 'no-var': 'off', 'array-callback-return': 'off', 'jsdoc/check-types': 'off', 'jsdoc/check-tag-names': 'off', @@ -49,10 +91,7 @@ const eslintConfig = { eqeqeq: 'off', 'no-unused-expressions': 'off', 'jsx-a11y/no-autofocus': 'off', - '@wordpress/i18n-translator-comments': 'off', 'jsdoc/check-line-alignment': 'off', - 'no-useless-computed-key': 'off', - '@wordpress/no-unused-vars-before-return': 'off', 'react/no-unknown-property': 'off', 'react/jsx-key': 'off', 'jsdoc/check-param-names': 'off', @@ -64,15 +103,21 @@ const eslintConfig = { 'jsx-a11y/no-static-element-interactions': 'off', 'jsx-a11y/aria-role': 'off', 'jsdoc/require-param-type': 'off', - 'jsx-a11y/anchor-is-valid': 'off', 'no-redeclare': 'off', 'import/default': 'off', - '@wordpress/i18n-no-collapsible-whitespace': 'off', 'jsx-a11y/alt-text': 'off', 'no-bitwise': 'off', 'jsdoc/require-returns-check': 'off', '@wordpress/no-global-active-element': 'off', }, + overrides: [ + { + files: ['src/assets/js/**'], + rules: { + 'no-var': 'off', + }, + }, + ], ignorePatterns: [], }; diff --git a/.github/workflows/zip.yml b/.github/workflows/zip.yml index f8f69f6fa..d34de04c5 100644 --- a/.github/workflows/zip.yml +++ b/.github/workflows/zip.yml @@ -65,7 +65,7 @@ jobs: slack_channel: ${{ needs.set_vars.outputs.slack_channel }} slack_thread: ${{ needs.set_vars.outputs.slack_thread }} secrets: - COMPOSER_TOKEN: ${{ secrets.COMPOSER_TOKEN }} + COMPOSER_TOKEN: ${{ secrets.GH_BOT_TOKEN }} GH_BOT_TOKEN: ${{ secrets.GH_BOT_TOKEN }} JENKINS_SECRET: ${{ secrets.ZIP_JENKINS_SECRET }} S3_BUCKET: ${{ secrets.ZIP_S3_BUCKET }} diff --git a/includes/advanced-form/advanced-form-captcha-settings.php b/includes/advanced-form/advanced-form-captcha-settings.php index fc6ccbc64..e5e0482f3 100644 --- a/includes/advanced-form/advanced-form-captcha-settings.php +++ b/includes/advanced-form/advanced-form-captcha-settings.php @@ -119,7 +119,7 @@ private function is_using_kadence_captcha_settings( $attributes ) { } private function is_using_kadence_blocks_settings( $attributes ) { - if ( isset( $attributes['useKbSettings'] ) && $attributes['useKbSettings'] ) { + if ( !isset( $attributes['useKbSettings'] ) || ( isset( $attributes['useKbSettings'] ) && $attributes['useKbSettings'] ) ) { $this->using_kadence_blocks_settings = true; } else { $this->using_kadence_blocks_settings = false; diff --git a/includes/assets/js/gumshoe.min.js b/includes/assets/js/gumshoe.min.js index ec6bf6f47..d77a27f54 100644 --- a/includes/assets/js/gumshoe.min.js +++ b/includes/assets/js/gumshoe.min.js @@ -4,4 +4,4 @@ * (c) 2019 Chris Ferdinandi * MIT License * http://github.com/cferdinandi/gumshoe - */(function(a,b){"function"==typeof define&&define.amd?define([],function(){return b(a)}):"object"==typeof exports?module.exports=b(a):a.Gumshoe=b(a)})("undefined"==typeof global?"undefined"==typeof window?this:window:global,function(a){"use strict";const b={navClass:"active",contentClass:"active",nested:!1,nestedClass:"active",offset:0,reflow:!1,events:!0},c=function(){const a={};return Array.prototype.forEach.call(arguments,function(b){for(const c in b){if(!b.hasOwnProperty(c))return;a[c]=b[c]}}),a},d=function(a,b,c){if(c.settings.events){const d=new CustomEvent(a,{bubbles:!0,cancelable:!0,detail:c});b.dispatchEvent(d)}},e=function(a){let b=0;if(a.offsetParent)for(;a;)b+=a.offsetTop,a=a.offsetParent;return 0<=b?b:0},f=function(a){a&&a.sort(function(a,b){const c=e(a.content),d=e(b.content);return c=h())},l=function(a,b){return!!(k()&&j(a.content,b,!0))},m=function(a,b){const c=a[a.length-1];if(l(c,b))return c;for(let c=a.length-1;0<=c;c--)if(j(a[c].content,b))return a[c]};var n=function(a,b){if(b.nested&&a.parentNode){const c=a.parentNode.closest("li");c&&(c.classList.remove(b.nestedClass),n(c,b))}};const o=function(a,b){if(a){const c=a.nav.closest("li");c&&(c.classList.remove(b.navClass),a.content.classList.remove(b.contentClass),n(c,b),d("gumshoeDeactivate",c,{link:a.nav,content:a.content,settings:b}))}};var p=function(a,b){if(b.nested){const c=a.parentNode.closest("li");c&&(c.classList.add(b.nestedClass),p(c,b))}};const q=function(a,b){if(a){const c=a.nav.closest("li");c&&(c.classList.add(b.navClass),a.content.classList.add(b.contentClass),p(c,b),d("gumshoeActivate",c,{link:a.nav,content:a.content,settings:b}))}};return function(d,e){const g={};let h,i,j,k,l;g.setup=function(){h=document.querySelectorAll(d),i=[],Array.prototype.forEach.call(h,function(a){const b=document.getElementById(decodeURIComponent(a.hash.substr(1)));b&&i.push({nav:a,content:b})}),f(i)},g.detect=function(){const a=m(i,l);return a?void(j&&a.content===j.content||(o(j,l),q(a,l),j=a)):void(j&&(o(j,l),j=null))};const n=function(b){k&&a.cancelAnimationFrame(k),k=a.requestAnimationFrame(g.detect)},p=function(b){k&&a.cancelAnimationFrame(k),k=a.requestAnimationFrame(function(){f(i),g.detect()})};g.destroy=function(){j&&o(j,l),a.removeEventListener("scroll",n,!1),l.reflow&&a.removeEventListener("resize",p,!1),i=null,h=null,j=null,k=null,l=null};return function(){l=c(b,e||{}),g.setup(),g.detect(),a.addEventListener("scroll",n,!1),l.reflow&&a.addEventListener("resize",p,!1)}(),g}}); \ No newline at end of file + */(function(a,b){"function"==typeof define&&define.amd?define([],function(){return b(a)}):"object"==typeof exports?module.exports=b(a):a.Gumshoe=b(a)})("undefined"==typeof global?"undefined"==typeof window?this:window:global,function(a){"use strict";const b={navClass:"active",contentClass:"active",nested:!1,nestedClass:"active",offset:0,reflow:!1,events:!0},c=function(){const a={};return Array.prototype.forEach.call(arguments,function(b){for(const c in b){if(!b.hasOwnProperty(c))return;a[c]=b[c]}}),a},d=function(a,b,c){if(c.settings.events){const d=new CustomEvent(a,{bubbles:!0,cancelable:!0,detail:c});b.dispatchEvent(d)}},e=function(a){let b=0;if(a.offsetParent)for(;a;)b+=a.offsetTop,a=a.offsetParent;return 0<=b?b:0},f=function(a){a&&a.sort(function(a,b){const c=e(a.content),d=e(b.content);return c=h())},l=function(a,b){return!!(k()&&j(a.content,b,!0))},m=function(a,b){const c=a[a.length-1];if(l(c,b))return c;for(let c=a.length-1;0<=c;c--)if(j(a[c].content,b))return a[c]};var n=function(a,b){if(b.nested&&a.parentNode){const c=a.parentNode.closest("li");c&&(c.classList.remove(b.nestedClass),n(c,b))}};const o=function(a,b){if(a){const c=a.nav.closest("li");c&&(c.classList.remove(b.navClass),a.content.classList.remove(b.contentClass),n(c,b),d("gumshoeDeactivate",c,{link:a.nav,content:a.content,settings:b}))}};var p=function(a,b){if(b.nested){const c=a.parentNode.closest("li");c&&(c.classList.add(b.nestedClass),p(c,b))}};const q=function(a,b){if(a){const c=a.nav.closest("li");c&&(c.classList.add(b.navClass),a.content.classList.add(b.contentClass),p(c,b),d("gumshoeActivate",c,{link:a.nav,content:a.content,settings:b}))}};return function(d,e){const g={};let h,i,j,k,l;g.setup=function(){h=document.querySelectorAll(d),i=[],Array.prototype.forEach.call(h,function(a){const b=document.getElementById(decodeURIComponent(a.hash.substr(1)));b&&i.push({nav:a,content:b})}),f(i)},g.detect=function(){const a=m(i,l);return a?void(j&&a.content===j.content||(o(j,l),q(a,l),j=a)):void(j&&(o(j,l),j=null))};const n=function(b){k&&a.cancelAnimationFrame(k),k=a.requestAnimationFrame(g.detect)},p=function(b){k&&a.cancelAnimationFrame(k),k=a.requestAnimationFrame(function(){f(i),g.detect()})};g.destroy=function(){j&&o(j,l),a.removeEventListener("scroll",n,!1),l.reflow&&a.removeEventListener("resize",p,!1),i=null,h=null,j=null,k=null,l=null};return function(){l=c(b,e||{}),g.setup(),g.detect(),a.addEventListener("scroll",n,!1),l.reflow&&a.addEventListener("resize",p,!1)}(),g}}); \ No newline at end of file diff --git a/includes/assets/js/kb-header-block.min.js b/includes/assets/js/kb-header-block.min.js index bbe42332f..9c50b5b24 100644 --- a/includes/assets/js/kb-header-block.min.js +++ b/includes/assets/js/kb-header-block.min.js @@ -1 +1 @@ -class KBHeader{components={};_state;root;rootID;autoTransparentSpacing;sticky;stickyTablet;stickyMobile;transparent;transparentTablet;transparentMobile;stickySection;stickySectionTablet;stickySectionMobile;activeSize="mobile";lastScrollTop=0;activeOffsetTop=0;shrinkMain=!1;shrinkMainHeight=0;shrinkMainHeightTablet=0;shrinkMainHeightMobile=0;shrinkStartHeight=0;currentTopPosition=0;anchorOffset=0;activeHeader;isSticking=!1;isTransparent=!1;constructor(a,b={}){this.root="string"==typeof a?document.querySelector(a):a,this.rootID="aaa",this.autoTransparentSpacing="1"===this.root.dataset?.autoTransparentSpacing,this.sticky="1"==this.root.dataset?.sticky,this.stickyTablet="1"==this.root.dataset?.stickyTablet,this.stickyMobile="1"==this.root.dataset?.stickyMobile,this.transparent="1"==this.root.dataset?.transparent,this.transparentTablet="1"==this.root.dataset?.transparentTablet,this.transparentMobile="1"==this.root.dataset?.transparentMobile,this.stickySection=this.root.dataset?.stickySection,this.stickySectionTablet=this.root.dataset?.stickySectionTablet,this.stickySectionMobile=this.root.dataset?.stickySectionMobile,this.shrinkMain="1"===this.root.dataset?.shrinkMain,this.shrinkMainHeight=this.root.dataset?.shrinkMainHeight,this.shrinkMainHeightTablet=this.root.dataset?.shrinkMainHeightTablet,this.shrinkMainHeightMobile=this.root.dataset?.shrinkMainHeightMobile,this.revealScrollUp="1"===this.root.dataset?.revealScrollUp,this._state="CREATED",this.transparent&&this.autoTransparentSpacing&&this.initAutoTransparentSpacing(),(this.sticky||this.stickyTablet||this.stickyMobile)&&this.stickySection&&this.initStickyHeader();var c=new Event("MOUNTED",{bubbles:!0});c.qlID=this.rootID,this.root.dispatchEvent(c),this._state="IDLE"}initAutoTransparentSpacing(){const a=this;this.setAutoTransparentSpacing(),document.onresize=a.setAutoTransparentSpacing}setAutoTransparentSpacing(){const a=this.getHeight(),b=this.root.nextElementSibling;b.style.paddingTop=a+"px"}getHeight(){return this.root.querySelector("div").clientHeight}initStickyHeader(){this.activeHeader=this.root.querySelector(".wp-block-kadence-header-desktop"),parseInt(kadenceHeaderConfig.breakPoints.desktop){this.updateSticky("updateActive").bind(this)})}respondToVisibility(a,b){var c={root:document.documentElement},d=new IntersectionObserver(a=>{a.forEach(a=>{b(0this.lastScrollTop)var n=Math.floor(Math.floor(this.activeOffsetTop)-Math.floor(e)+Math.floor(startHeight));else var n=Math.floor(this.activeOffsetTop-e);var o=this.activeHeader.querySelectorAll(".custom-logo"),p=this.activeHeader.querySelector(".wp-block-kadence-header-row-center");if(this.shrinkStartHeight||(this.shrinkStartHeight=p.offsetHeight),window.scrollY<=n){if(p.style.height=this.shrinkStartHeight+"px",p.style.minHeight=this.shrinkStartHeight+"px",p.style.maxHeight=this.shrinkStartHeight+"px",o)for(let a=0;an){var q=Math.max(m,this.shrinkStartHeight-(window.scrollY-(this.activeOffsetTop-e)));if(p.style.height=q+"px",p.style.minHeight=q+"px",p.style.maxHeight=q+"px",o)for(let a=0;athis.lastScrollTop,s=Math.floor(this.anchorOffset+g);if(f<=this.anchorOffset-e)this.activeHeader.style.top=0,this.currentTopPosition=0,this.setStickyChanged(!1);else if(f<=s){if(r)this.activeHeader.style.top=0,this.currentTopPosition=0,this.setStickyChanged(!1);else{this.activeHeader.classList.remove("item-hidden-above");var t=f-this.anchorOffset+e;this.activeHeader.style.top=t+"px",this.currentTopPosition=t,this.setStickyChanged(!0)}}else if(r){this.activeHeader.classList.add("item-hidden-above");var t=f-this.anchorOffset+e-g;this.activeHeader.style.top=t+"px",this.currentTopPosition=t,this.setStickyChanged(!0)}else{this.activeHeader.classList.remove("item-hidden-above");var t=f-this.anchorOffset+e;this.activeHeader.style.top=t+"px",this.currentTopPosition=t,this.setStickyChanged(!0)}this.activeHeader.style.top=t+"px"}else{var s=Math.floor(this.anchorOffset-e);if(f<=s)this.activeHeader.style.top=0,this.currentTopPosition=0,this.setStickyChanged(!1);else{var t=f-this.anchorOffset+e;this.activeHeader.style.top=t+"px",this.currentTopPosition=t,this.setStickyChanged(!0)}}this.lastScrollTop=f,window.scrollY==s?(this.activeHeader.classList.add("item-is-fixed"),this.activeHeader.classList.add("item-at-start"),this.activeHeader.classList.remove("item-is-stuck"),l.classList.add("child-is-fixed"),document.body.classList.add("header-is-fixed")):window.scrollY>s?this.revealScrollUp?window.scrollY{window.KBHeaderBlocks=[];var a=document.querySelectorAll(".wp-block-kadence-header");for(let c=0;c{this.updateSticky("updateActive").bind(this)})}respondToVisibility(a,b){var c={root:document.documentElement},d=new IntersectionObserver(a=>{a.forEach(a=>{b(0this.lastScrollTop)var m=Math.floor(Math.floor(this.activeOffsetTop)-Math.floor(b)+Math.floor(l));else var m=Math.floor(this.activeOffsetTop-b);var n=this.activeHeader.querySelectorAll(".custom-logo"),o=this.activeHeader.querySelector(".wp-block-kadence-header-row-center");if(this.shrinkStartHeight||(this.shrinkStartHeight=o.offsetHeight),window.scrollY<=m){if(o.style.height=this.shrinkStartHeight+"px",o.style.minHeight=this.shrinkStartHeight+"px",o.style.maxHeight=this.shrinkStartHeight+"px",n)for(let a=0;am){var p=Math.max(l,this.shrinkStartHeight-(window.scrollY-(this.activeOffsetTop-b)));if(o.style.height=p+"px",o.style.minHeight=p+"px",o.style.maxHeight=p+"px",n)for(let a=0;athis.lastScrollTop,r=Math.floor(this.anchorOffset+d);if(c<=this.anchorOffset-b)this.activeHeader.style.top=0,this.currentTopPosition=0,this.setStickyChanged(!1);else if(c<=r){if(q)this.activeHeader.style.top=0,this.currentTopPosition=0,this.setStickyChanged(!1);else{this.activeHeader.classList.remove("item-hidden-above");var s=c-this.anchorOffset+b;this.activeHeader.style.top=s+"px",this.currentTopPosition=s,this.setStickyChanged(!0)}}else if(q){this.activeHeader.classList.add("item-hidden-above");var s=c-this.anchorOffset+b-d;this.activeHeader.style.top=s+"px",this.currentTopPosition=s,this.setStickyChanged(!0)}else{this.activeHeader.classList.remove("item-hidden-above");var s=c-this.anchorOffset+b;this.activeHeader.style.top=s+"px",this.currentTopPosition=s,this.setStickyChanged(!0)}this.activeHeader.style.top=s+"px"}else{var r=Math.floor(this.anchorOffset-b);if(c<=r)this.activeHeader.style.top=0,this.currentTopPosition=0,this.setStickyChanged(!1);else{var s=c-this.anchorOffset+b;this.activeHeader.style.top=s+"px",this.currentTopPosition=s,this.setStickyChanged(!0)}}this.lastScrollTop=c,window.scrollY==r?(this.activeHeader.classList.add("item-is-fixed"),this.activeHeader.classList.add("item-at-start"),this.activeHeader.classList.remove("item-is-stuck"),k.classList.add("child-is-fixed"),document.body.classList.add("header-is-fixed")):window.scrollY>r?this.revealScrollUp?window.scrollY{window.KBHeaderBlocks=[];var a=document.querySelectorAll(".wp-block-kadence-header");for(let c=0;c .kt-blocks-carousel-init");this.bootstrapSliders(c)},bootstrapSliders(a){if(a&&0!==a.length)for(let c=0;c=e?0:Math.floor(e/2),arrows:!!(1{const d=parseInt(a[c]);return Number.isNaN(d)||c.includes("sliderGap")?"true"===a[c]||"false"===a[c]?{...b,[c]:JSON.parse(a[c])}:{...b,[c]:a[c]}:{...b,[c]:d}},{})},createSplideElements(a){const b=a.children.length;for(const b of a.children)b.classList.add("splide__slide"),b.classList.contains("last")&&b.classList.remove("last");const c=document.createElement("div");c.classList.add("splide__track");const d=document.createElement("div");return d.classList.add("splide__list"),d.innerHTML=a.innerHTML,c.innerHTML=d.outerHTML,a.innerHTML=c.outerHTML,a.classList.add("splide"),b},getSplideOptions(a){const b=1===a.sliderScroll&&1,c={trimSpace:!0,drag:!0,perPage:a.columnsXxl||1,type:a.sliderFade?"fade":"loop",easing:a.sliderAnimSpeed&&1e3 .kt-blocks-carousel-init");this.bootstrapSliders(c)},bootstrapSliders(a){if(a&&0!==a.length)for(let c=0;c=e?0:Math.floor(e/2),arrows:!!(1{const d=parseInt(a[c]);return Number.isNaN(d)||c.includes("sliderGap")?"true"===a[c]||"false"===a[c]?{...b,[c]:JSON.parse(a[c])}:{...b,[c]:a[c]}:{...b,[c]:d}},{})},createSplideElements(a){const b=a.children.length;for(const b of a.children)b.classList.add("splide__slide"),b.classList.contains("last")&&b.classList.remove("last");const c=document.createElement("div");c.classList.add("splide__track");const d=document.createElement("div");return d.classList.add("splide__list"),d.innerHTML=a.innerHTML,c.innerHTML=d.outerHTML,a.innerHTML=c.outerHTML,a.classList.add("splide"),b},getSplideOptions(a){const b=1===a.sliderScroll&&1,c={trimSpace:!0,drag:!0,perPage:a.columnsXxl||1,type:a.sliderFade?"fade":"loop",easing:a.sliderAnimSpeed&&1e3{if(!a.classList.contains("initialized")){a.querySelectorAll(":scope > .kt-tabs-title-list").forEach(a=>{a.setAttribute("role","tablist")}),a.querySelectorAll(":scope > .kt-tabs-content-wrap > .kt-tab-inner-content").forEach(a=>{a.setAttribute("role","tabpanel"),a.setAttribute("aria-hidden","true")}),a.querySelectorAll(":scope > .kt-tabs-title-list li a").forEach(b=>{const c=b.parentElement,d=c.getAttribute("id"),e=c.classList.contains("kt-tab-title-active"),f=c.classList.contains("kt-tabs-accordion-title"),g=b.getAttribute("data-tab"),h=a.querySelector(":scope > .kt-tabs-content-wrap > .kt-inner-tab-"+g);f?b.setAttribute("aria-selected",!!e):(h.setAttribute("aria-labelledby",d),c.setAttribute("role","presentation"),b.setAttribute("role","tab"),b.setAttribute("aria-controls",d),b.setAttribute("tabindex",e?"0":"-1")),h.setAttribute("aria-hidden",e?"false":"true"),e&&(h.style.display="block")}),a.querySelectorAll(":scope > .kt-tabs-title-list li").forEach(a=>{a.addEventListener("keydown",function(b){switch(b.which){case 37:a.previousElementSibling?a.previousElementSibling.querySelector("a").click():a.parentElement.querySelector("li:last-of-type > a").click();break;case 39:a.nextElementSibling?a.nextElementSibling.querySelector("a").click():a.parentElement.querySelector("li:first-of-type > a").click()}})});const b=new Event("resize");window.dispatchEvent(b);const c=a.querySelectorAll(".kt-tabs-title-list li a");c.forEach(a=>{a.addEventListener("click",function(b){b.preventDefault();const c=a.getAttribute("data-tab"),d=a.closest(".kt-tabs-wrap");window.KBTabs.setActiveTab(d,c)})}),a.classList.contains("kt-create-accordion")&&a.querySelectorAll(":scope > .kt-tabs-title-list .kt-title-item").forEach(a=>{const b=a.querySelector("a").getAttribute("data-tab"),c=a.classList,d=a.closest(".kt-tabs-wrap"),e=d.querySelector(":scope > .kt-tabs-content-wrap"),f=window.document.createElement("div");f.className=[...c].concat(["kt-tabs-accordion-title","kt-tabs-accordion-title-"+b]).join(" "),f.innerHTML=a.innerHTML,e.insertBefore(f,e.querySelector(":scope > .kt-inner-tab-"+b)),e.querySelector(":scope > .kt-tabs-accordion-title-"+b+" a").removeAttribute("role"),e.querySelector(":scope > .kt-tabs-accordion-title-"+b+" a").removeAttribute("tabindex")});const d=a.querySelectorAll(".kt-tabs-accordion-title a");d.forEach(a=>{const b=a.closest(".kt-create-accordion")?.dataset?.noAllowMultipleOpen;a.addEventListener("click",function(c){window.KBTabs.setActiveAccordion(c,a,b)})}),a.classList.add("initialized")}}),window.KBTabs.setActiveWithHash()},setActiveWithHash(){if(""==window.location.hash)return;const a=window.document.querySelector(window.location.hash+".kt-title-item");if(!a)return;const b=window.document.querySelector("#"+window.location.hash.substring(1)),c=b.querySelector("a").getAttribute("data-tab"),d=b.closest(".kt-tabs-wrap");window.KBTabs.setActiveTab(d,c),window.KBTabs.isMobileSize()&&d.classList.contains("kt-tabs-mobile-layout-accordion")||window.KBTabs.isTabletSize()&&d.classList.contains("kt-tabs-tablet-layout-accordion")?d.querySelector(".kt-tabs-content-wrap > .kt-tabs-accordion-title.kt-tabs-accordion-title-"+c).scrollIntoView({behavior:"smooth"}):d.classList.contains("kt-tabs-layout-vtabs")&&d.querySelector(".kt-tabs-content-wrap").scrollIntoView({behavior:"smooth"})},isMobileSize(){return 767>=window.innerWidth},isTabletSize(){return 767=window.innerWidth},setActiveAccordion(a,b,c){a.preventDefault();const d=b.getAttribute("data-tab"),e=b.parentElement,f=b.closest(".kt-tabs-wrap"),g=f.querySelector(":scope > .kt-tabs-content-wrap > .kt-inner-tab-"+d);if(e.classList.contains("kt-tab-title-active")?(f.classList.remove("kt-active-tab-"+d),e.classList.replace("kt-tab-title-active","kt-tab-title-inactive"),g.style.display="none"):(f.classList.add("kt-active-tab-"+d),e.classList.replace("kt-tab-title-inactive","kt-tab-title-active"),g.style.display="block"),c){const a=f.querySelectorAll(".kt-tabs-accordion-title a");a.forEach(a=>{const b=a.getAttribute("data-tab"),c=a.parentElement,e=f.querySelector(":scope > .kt-tabs-content-wrap > .kt-inner-tab-"+b);b!=d&&(c.classList.replace("kt-tab-title-active","kt-tab-title-inactive"),e.style.display="none")})}const h=new Event("resize");window.dispatchEvent(h);const i=new Event("kadence-tabs-open");window.dispatchEvent(i)},setActiveTab(a,b,c=!0){const d=a.querySelector(":scope > .kt-tabs-title-list > li.kt-tab-title-active a"),e=a.querySelector(":scope > .kt-tabs-title-list > li.kt-tab-title-active");e.classList.replace("kt-tab-title-active","kt-tab-title-inactive"),d.setAttribute("tabindex","-1"),d.setAttribute("aria-selected","false"),a.className=a.className.replace(/\bkt-active-tab-\S+/g,"kt-active-tab-"+b);const f=a.querySelector(":scope > .kt-tabs-title-list > li.kt-title-item-"+b+" a"),g=a.querySelector(":scope > .kt-tabs-title-list > li.kt-title-item-"+b);g.classList.replace("kt-tab-title-inactive","kt-tab-title-active"),f.setAttribute("tabindex","0"),f.setAttribute("aria-selected","true"),a.querySelectorAll(":scope > .kt-tabs-content-wrap > .kt-tab-inner-content").forEach(a=>{a.style.display="none"});const h=a.querySelector(":scope > .kt-tabs-content-wrap > .kt-inner-tab-"+b);h.style.display="block",c&&f.focus(),window.KBTabs.setAriaAttributesForTabs(a,b);const i=new Event("resize");window.dispatchEvent(i);const j=new Event("kadence-tabs-open");window.dispatchEvent(j)},setAriaAttributesForTabs(a,b){a.querySelectorAll(":scope > .kt-tabs-content-wrap > .kt-tab-inner-content:not(.kt-inner-tab-"+b+")").forEach(a=>a.setAttribute("aria-hidden","true")),a.querySelector(":scope > .kt-tabs-content-wrap > .kt-inner-tab-"+b).setAttribute("aria-hidden","false"),a.querySelectorAll(":scope > .kt-tabs-content-wrap > .kt-tabs-accordion-title:not(.kt-tabs-accordion-title-"+b+")").forEach(a=>{a.classList.replace("kt-tab-title-active","kt-tab-title-inactive"),a.setAttribute("tabindex","-1"),a.setAttribute("aria-selected","false")});const c=a.querySelector(":scope >.kt-tabs-content-wrap > .kt-tabs-accordion-title.kt-tabs-accordion-title-"+b);c&&(c.classList.replace("kt-tab-title-inactive","kt-tab-title-active"),c.setAttribute("tabindex","0"),c.setAttribute("aria-selected","true"))},init(){console.log(1),window.KBTabs.setupTabs(),window.addEventListener("hashchange",window.KBTabs.setActiveWithHash,!1)}},"loading"===document.readyState?document.addEventListener("DOMContentLoaded",window.KBTabs.init):window.KBTabs.init(),document.addEventListener("kb-query-loaded",window.KBTabs.init)})(); \ No newline at end of file +(function(){"use strict";window.KBTabs={setupTabs(){const a=document.querySelectorAll(".kt-tabs-wrap");a.forEach(a=>{if(!a.classList.contains("initialized")){a.querySelectorAll(":scope > .kt-tabs-title-list").forEach(a=>{a.setAttribute("role","tablist")}),a.querySelectorAll(":scope > .kt-tabs-content-wrap > .kt-tab-inner-content").forEach(a=>{a.setAttribute("role","tabpanel"),a.setAttribute("aria-hidden","true")}),a.querySelectorAll(":scope > .kt-tabs-title-list li a").forEach(b=>{const c=b.parentElement,d=c.getAttribute("id"),e=c.classList.contains("kt-tab-title-active"),f=c.classList.contains("kt-tabs-accordion-title"),g=b.getAttribute("data-tab"),h=a.querySelector(":scope > .kt-tabs-content-wrap > .kt-inner-tab-"+g);f?b.setAttribute("aria-selected",!!e):(h.setAttribute("aria-labelledby",d),c.setAttribute("role","presentation"),b.setAttribute("role","tab"),b.setAttribute("aria-controls",d),b.setAttribute("tabindex",e?"0":"-1")),h.setAttribute("aria-hidden",e?"false":"true"),e&&(h.style.display="block")}),a.querySelectorAll(":scope > .kt-tabs-title-list li").forEach(a=>{a.addEventListener("keydown",function(b){switch(b.which){case 37:a.previousElementSibling?a.previousElementSibling.querySelector("a").click():a.parentElement.querySelector("li:last-of-type > a").click();break;case 39:a.nextElementSibling?a.nextElementSibling.querySelector("a").click():a.parentElement.querySelector("li:first-of-type > a").click()}})});const b=new Event("resize");window.dispatchEvent(b);const c=a.querySelectorAll(".kt-tabs-title-list li a");c.forEach(a=>{a.addEventListener("click",function(b){b.preventDefault();const c=a.getAttribute("data-tab"),d=a.closest(".kt-tabs-wrap");window.KBTabs.setActiveTab(d,c)})}),a.classList.contains("kt-create-accordion")&&a.querySelectorAll(":scope > .kt-tabs-title-list .kt-title-item").forEach(a=>{const b=a.querySelector("a").getAttribute("data-tab"),c=a.classList,d=a.closest(".kt-tabs-wrap"),e=d.querySelector(":scope > .kt-tabs-content-wrap"),f=window.document.createElement("div");f.className=[...c].concat(["kt-tabs-accordion-title","kt-tabs-accordion-title-"+b]).join(" "),f.innerHTML=a.innerHTML,e.insertBefore(f,e.querySelector(":scope > .kt-inner-tab-"+b)),e.querySelector(":scope > .kt-tabs-accordion-title-"+b+" a").removeAttribute("role"),e.querySelector(":scope > .kt-tabs-accordion-title-"+b+" a").removeAttribute("tabindex")});const d=a.querySelectorAll(".kt-tabs-accordion-title a");d.forEach(a=>{const b=a.closest(".kt-create-accordion")?.dataset?.noAllowMultipleOpen;a.addEventListener("click",function(c){window.KBTabs.setActiveAccordion(c,a,b)})}),a.classList.add("initialized")}}),window.KBTabs.setActiveWithHash()},setActiveWithHash(){if(""==window.location.hash)return;const a=window.document.querySelector(window.location.hash+".kt-title-item");if(!a)return;const b=window.document.querySelector("#"+window.location.hash.substring(1)),c=b.querySelector("a").getAttribute("data-tab"),d=b.closest(".kt-tabs-wrap");window.KBTabs.setActiveTab(d,c),window.KBTabs.isMobileSize()&&d.classList.contains("kt-tabs-mobile-layout-accordion")||window.KBTabs.isTabletSize()&&d.classList.contains("kt-tabs-tablet-layout-accordion")?d.querySelector(".kt-tabs-content-wrap > .kt-tabs-accordion-title.kt-tabs-accordion-title-"+c).scrollIntoView({behavior:"smooth"}):d.classList.contains("kt-tabs-layout-vtabs")&&d.querySelector(".kt-tabs-content-wrap").scrollIntoView({behavior:"smooth"})},isMobileSize(){return 767>=window.innerWidth},isTabletSize(){return 767=window.innerWidth},setActiveAccordion(a,b,c){a.preventDefault();const d=b.getAttribute("data-tab"),e=b.parentElement,f=b.closest(".kt-tabs-wrap"),g=f.querySelector(":scope > .kt-tabs-content-wrap > .kt-inner-tab-"+d);if(e.classList.contains("kt-tab-title-active")?(f.classList.remove("kt-active-tab-"+d),e.classList.replace("kt-tab-title-active","kt-tab-title-inactive"),g.style.display="none"):(f.classList.add("kt-active-tab-"+d),e.classList.replace("kt-tab-title-inactive","kt-tab-title-active"),g.style.display="block"),c){const a=f.querySelectorAll(".kt-tabs-accordion-title a");a.forEach(a=>{const b=a.getAttribute("data-tab"),c=a.parentElement,e=f.querySelector(":scope > .kt-tabs-content-wrap > .kt-inner-tab-"+b);b!=d&&(c.classList.replace("kt-tab-title-active","kt-tab-title-inactive"),e.style.display="none")})}const h=new Event("resize");window.dispatchEvent(h);const i=new Event("kadence-tabs-open");window.dispatchEvent(i)},setActiveTab(a,b,c=!0){const d=a.querySelector(":scope > .kt-tabs-title-list > li.kt-tab-title-active a"),e=a.querySelector(":scope > .kt-tabs-title-list > li.kt-tab-title-active");e.classList.replace("kt-tab-title-active","kt-tab-title-inactive"),d.setAttribute("tabindex","-1"),d.setAttribute("aria-selected","false"),a.className=a.className.replace(/\bkt-active-tab-\S+/g,"kt-active-tab-"+b);const f=a.querySelector(":scope > .kt-tabs-title-list > li.kt-title-item-"+b+" a"),g=a.querySelector(":scope > .kt-tabs-title-list > li.kt-title-item-"+b);g.classList.replace("kt-tab-title-inactive","kt-tab-title-active"),f.setAttribute("tabindex","0"),f.setAttribute("aria-selected","true"),a.querySelectorAll(":scope > .kt-tabs-content-wrap > .kt-tab-inner-content").forEach(a=>{a.style.display="none"});const h=a.querySelector(":scope > .kt-tabs-content-wrap > .kt-inner-tab-"+b);h.style.display="block",c&&f.focus(),window.KBTabs.setAriaAttributesForTabs(a,b);const i=new Event("resize");window.dispatchEvent(i);const j=new Event("kadence-tabs-open");window.dispatchEvent(j)},setAriaAttributesForTabs(a,b){a.querySelectorAll(":scope > .kt-tabs-content-wrap > .kt-tab-inner-content:not(.kt-inner-tab-"+b+")").forEach(a=>a.setAttribute("aria-hidden","true")),a.querySelector(":scope > .kt-tabs-content-wrap > .kt-inner-tab-"+b).setAttribute("aria-hidden","false"),a.querySelectorAll(":scope > .kt-tabs-content-wrap > .kt-tabs-accordion-title:not(.kt-tabs-accordion-title-"+b+")").forEach(a=>{a.classList.replace("kt-tab-title-active","kt-tab-title-inactive"),a.setAttribute("tabindex","-1"),a.setAttribute("aria-selected","false")});const c=a.querySelector(":scope >.kt-tabs-content-wrap > .kt-tabs-accordion-title.kt-tabs-accordion-title-"+b);c&&(c.classList.replace("kt-tab-title-inactive","kt-tab-title-active"),c.setAttribute("tabindex","0"),c.setAttribute("aria-selected","true"))},init(){window.KBTabs.setupTabs(),window.addEventListener("hashchange",window.KBTabs.setActiveWithHash,!1)}},"loading"===document.readyState?document.addEventListener("DOMContentLoaded",window.KBTabs.init):window.KBTabs.init(),document.addEventListener("kb-query-loaded",window.KBTabs.init)})(); \ No newline at end of file diff --git a/includes/blocks/class-kadence-blocks-image-block.php b/includes/blocks/class-kadence-blocks-image-block.php index dcb7c5225..73bfa2faf 100644 --- a/includes/blocks/class-kadence-blocks-image-block.php +++ b/includes/blocks/class-kadence-blocks-image-block.php @@ -321,6 +321,7 @@ public function build_css( $attributes, $css, $unique_id, $unique_style_id ) { return $css->css_output(); } + /** * Build HTML for dynamic blocks * @@ -340,6 +341,9 @@ public function build_html( $attributes, $unique_id, $content, $block_instance ) $content = str_replace( 'alt=""', 'alt="' . esc_attr( $alt ) . '"', $content ); } } + if ( strpos( $content, 'kb-tooltip-hidden-content') !== false ) { + $this->enqueue_script( 'kadence-blocks-tippy' ); + } return $content; } @@ -356,8 +360,9 @@ public function register_scripts() { return; } wp_register_script( 'kadence-blocks-' . $this->block_name, KADENCE_BLOCKS_URL . 'includes/assets/js/kb-image-block.min.js', array(), KADENCE_BLOCKS_VERSION, true ); + wp_register_script( 'kadence-blocks-popper', KADENCE_BLOCKS_URL . 'includes/assets/js/popper.min.js', array(), KADENCE_BLOCKS_VERSION, true ); + wp_register_script( 'kadence-blocks-tippy', KADENCE_BLOCKS_URL . 'includes/assets/js/kb-tippy.min.js', array( 'kadence-blocks-popper' ), KADENCE_BLOCKS_VERSION, true ); } - } Kadence_Blocks_Image_Block::get_instance(); diff --git a/includes/blocks/class-kadence-blocks-navigation-block.php b/includes/blocks/class-kadence-blocks-navigation-block.php index 19d5b9813..2d90d2cf7 100644 --- a/includes/blocks/class-kadence-blocks-navigation-block.php +++ b/includes/blocks/class-kadence-blocks-navigation-block.php @@ -304,18 +304,24 @@ public function sized_dynamic_styles( $css, $attributes, $unique_id, $size = 'De * @return mixed */ public function build_html( $attributes, $unique_id, $content, $block_instance ) { - $nav_block = get_post( $attributes['id'] ); + $nav_block = null; + $in_template_preview = isset($attributes['templateKey']) && $attributes['templateKey']; - if ( ! $nav_block || 'kadence_navigation' !== $nav_block->post_type ) { - return ''; - } + //If this is a templated navigation placeholder, we're going to skip a bunch of the normal logic and checks + if ( ! $in_template_preview ) { + $nav_block = get_post( $attributes['id'] ); - if ( 'publish' !== $nav_block->post_status || ! empty( $nav_block->post_password ) ) { - return ''; + if ( ! $nav_block || 'kadence_navigation' !== $nav_block->post_type ) { + return ''; + } + + if ( 'publish' !== $nav_block->post_status || ! empty( $nav_block->post_password ) ) { + return ''; + } } // Prevent a nav block from being rendered inside itself. - if ( isset( self::$seen_refs[ $attributes['id'] ] ) ) { + if ( isset( self::$seen_refs[ $attributes['id'] ] ) && ! $attributes['templateKey'] ) { // WP_DEBUG_DISPLAY must only be honored when WP_DEBUG. This precedent // is set in `wp_debug_mode()`. $is_debug = WP_DEBUG && WP_DEBUG_DISPLAY; @@ -330,8 +336,15 @@ public function build_html( $attributes, $unique_id, $content, $block_instance ) $nav_attributes = $this->get_attributes_with_defaults_cpt( $attributes['id'], 'kadence_navigation', '_kad_navigation_' ); $nav_attributes = json_decode( json_encode( $nav_attributes ), true ); - // Remove the advanced nav block so it doesn't try and render. - $content = preg_replace( '//', '', $nav_block->post_content ); + if ( ! $in_template_preview ) { + // Remove the advanced nav block so it doesn't try and render. + $content = preg_replace( '//', '', $nav_block->post_content ); + } else { + $content = $this->applyTemplateKeyBlocks($attributes); + $nav_attributes['orientation'] = str_contains( $attributes['templateKey'], 'vertical' ) ? 'vertical' : 'horizontal'; + $nav_attributes['orientationTablet'] = str_contains( $attributes['templateKey'], 'vertical' ) ? 'vertical' : 'horizontal'; + $nav_attributes['orientationMobile'] = str_contains( $attributes['templateKey'], 'vertical' ) ? 'vertical' : 'horizontal'; + } $content = str_replace( '', '', $content ); $content = str_replace( '', '', $content ); $content = str_replace( '', '', $content ); @@ -446,6 +459,63 @@ public function build_html( $attributes, $unique_id, $content, $block_instance ) ); } + /** + * Generates content to replace actual blocks for templated navigation placeholders. + * This should match the templated blocks created in the editor for the same template keys + * + * @param array $attributes The database attribtues. + */ + public function applyTemplateKeyBlocks( $attributes ) { + if ( isset($attributes['templateKey']) && $attributes['templateKey'] ) { + switch ($attributes['templateKey']) { + case 'long': + return ' + + + + + + + + + '; + break; + case 'long-vertical': + return ' + + + + + + + + + '; + break; + case 'short': + return ' + + + + + + '; + break; + + default: + return ' + + + + + + '; + break; + } + } + return ''; + } + /** * Registers scripts and styles. */ diff --git a/includes/blocks/class-kadence-blocks-navigation-link-block.php b/includes/blocks/class-kadence-blocks-navigation-link-block.php index dcaa8eb40..fcb786aea 100644 --- a/includes/blocks/class-kadence-blocks-navigation-link-block.php +++ b/includes/blocks/class-kadence-blocks-navigation-link-block.php @@ -487,9 +487,9 @@ public function sized_dynamic_styles( $css, $attributes, $unique_id, $size = 'De // $css->set_selector( '.header-navigation[class*="header-navigation-dropdown-animation-fade"] #menu-item-' . $item->ID . '.kadence-menu-mega-enabled > .sub-menu' ); // $css->add_property( 'margin-left', '-' . ( $data['mega_menu_custom_width'] ? floor( $data['mega_menu_custom_width'] / 2 ) : '400' ) . 'px' ); - } else if ($sized_attributes['megaMenuWidth'] === 'full') { + } else if ($sized_attributes['megaMenuWidth'] === 'full' || $sized_attributes['megaMenuWidth'] === '') { //this is handled by a seperate js file - } else if ($sized_attributes['megaMenuWidth'] === 'container' || $sized_attributes['megaMenuWidth'] === '') { + } else if ($sized_attributes['megaMenuWidth'] === 'container' ) { $css->set_selector( '.wp-block-kadence-navigation .menu-container ul.menu .wp-block-kadence-navigation-link' . $unique_id ); @@ -558,9 +558,9 @@ public function build_html( $attributes, $unique_id, $content, $block_instance ) $has_icon = $nav_link_attributes['mediaType'] == 'icon' && ! empty( $nav_link_attributes['mediaIcon'][0]['icon'] ); $has_image = $nav_link_attributes['mediaType'] == 'image' && ! empty( $nav_link_attributes['mediaImage'][0]['url'] ); - $mega_menu_width_class = 'kadence-menu-mega-width-' . ( $nav_link_attributes['megaMenuWidth'] ? $nav_link_attributes['megaMenuWidth'] : 'container' ); - $mega_menu_width_class_tablet = 'kadence-menu-mega-width-tablet-' . ( $nav_link_attributes['megaMenuWidthTablet'] ? $nav_link_attributes['megaMenuWidthTablet'] : 'container' ); - $mega_menu_width_class_mobile = 'kadence-menu-mega-width-mobile-' . ( $nav_link_attributes['megaMenuWidthMobile'] ? $nav_link_attributes['megaMenuWidthMobile'] : 'container' ); + $mega_menu_width_class = 'kadence-menu-mega-width-' . ( $nav_link_attributes['megaMenuWidth'] ? $nav_link_attributes['megaMenuWidth'] : 'full' ); + $mega_menu_width_class_tablet = 'kadence-menu-mega-width-tablet-' . ( $nav_link_attributes['megaMenuWidthTablet'] ? $nav_link_attributes['megaMenuWidthTablet'] : 'full' ); + $mega_menu_width_class_mobile = 'kadence-menu-mega-width-mobile-' . ( $nav_link_attributes['megaMenuWidthMobile'] ? $nav_link_attributes['megaMenuWidthMobile'] : 'full' ); $wrapper_classes = array(); $wrapper_classes[] = 'wp-block-kadence-navigation-link' . $unique_id; diff --git a/includes/blocks/class-kadence-blocks-show-more-block.php b/includes/blocks/class-kadence-blocks-show-more-block.php index 17d54318c..71241ba41 100644 --- a/includes/blocks/class-kadence-blocks-show-more-block.php +++ b/includes/blocks/class-kadence-blocks-show-more-block.php @@ -124,6 +124,7 @@ public function build_css( $attributes, $css, $unique_id, $unique_style_id ) { $css->add_property( 'max-height', 'none' ); $css->add_property( '-webkit-mask-image', 'none' ); $css->add_property( 'mask-image', 'none' ); + $css->add_property( 'overflow-y', 'unset' ); $css->set_selector( '.kb-block-show-more-container' . $unique_id . '.kb-smc-open > .wp-block-kadence-advancedbtn .kt-btn-wrap:nth-child(1), .kb-block-show-more-container' . $unique_id . '.kb-smc-open > .wp-block-kadence-advancedbtn .wp-block-kadence-singlebtn:nth-of-type(1)' ); $css->add_property( 'display', 'none' ); diff --git a/includes/class-kadence-blocks-prebuilt-library.php b/includes/class-kadence-blocks-prebuilt-library.php index cb52939c3..75cfb3286 100644 --- a/includes/class-kadence-blocks-prebuilt-library.php +++ b/includes/class-kadence-blocks-prebuilt-library.php @@ -503,7 +503,7 @@ public function prebuilt_connection_info_ajax_callback() { if ( ! empty( $final_data['name'] ) ) { wp_send_json( $final_data ); } - wp_send_json( esc_html__( 'No Connection data', 'kadence-blocks' ) ); + wp_send_json( esc_html__( 'No Connection data available', 'kadence-blocks' ) ); } die; } diff --git a/includes/header/class-kadence-header-cpt.php b/includes/header/class-kadence-header-cpt.php index b38e69180..e8f157f07 100644 --- a/includes/header/class-kadence-header-cpt.php +++ b/includes/header/class-kadence-header-cpt.php @@ -39,6 +39,9 @@ public function __construct() { add_action( 'init', array( $this, 'register_meta' ), 20 ); add_filter( 'user_has_cap', array( $this, 'filter_post_type_user_caps' ) ); + // Define the form post gutenberg template. + add_action( 'init', array( $this, 'form_gutenberg_template' ) ); + if( is_admin() ) { if ( class_exists( 'Cpt_To_Template' ) ) { new Cpt_To_Template( $this->post_type ); @@ -47,6 +50,19 @@ public function __construct() { } + /** + * Add filters for element content output. + */ + public function form_gutenberg_template() { + $post_type_object = get_post_type_object( $this->post_type ); + $post_type_object->template = array( + array( + 'kadence/header', + ), + ); + $post_type_object->template_lock = 'all'; + } + /** * Registers the header post type. */ @@ -79,7 +95,7 @@ public function register_post_type() { 'public' => false, 'has_archive' => false, 'show_ui' => true, - 'show_in_menu' => true, + 'show_in_menu' => 'kadence-blocks', 'show_in_admin_bar' => false, 'show_in_rest' => true, 'rewrite' => false, diff --git a/includes/header/img/onboarding.png b/includes/header/img/onboarding.png new file mode 100644 index 000000000..0b5ac3176 Binary files /dev/null and b/includes/header/img/onboarding.png differ diff --git a/includes/navigation/class-kadence-navigation-cpt.php b/includes/navigation/class-kadence-navigation-cpt.php index 2bdf86470..94a04213d 100644 --- a/includes/navigation/class-kadence-navigation-cpt.php +++ b/includes/navigation/class-kadence-navigation-cpt.php @@ -31,6 +31,9 @@ public function __construct() { add_action( 'init', array( $this, 'register_meta' ), 20 ); add_filter( 'user_has_cap', array( $this, 'filter_post_type_user_caps' ) ); + // Define the form post gutenberg template. + add_action( 'init', array( $this, 'form_gutenberg_template' ) ); + if( is_admin() ) { if ( class_exists( 'Cpt_To_Template' ) ) { new Cpt_To_Template( $this->post_type ); @@ -38,6 +41,20 @@ public function __construct() { } } + /** + * Add filters for element content output. + */ + public function form_gutenberg_template() { + $post_type_object = get_post_type_object( $this->post_type ); + $post_type_object->template = array( + array( + 'kadence/navigation', + ), + ); + $post_type_object->template_lock = 'all'; + } + + /** * Registers the form post type. */ @@ -56,28 +73,28 @@ public function register_post_type() { 'labels' => array( 'name' => _x( 'Kadence Navigation', 'post type general name', 'kadence-blocks' ), 'singular_name' => _x( 'Kadence Navigation', 'post type singular name', 'kadence-blocks' ), - 'add_new' => __( 'Add New Kadence Navigation Menu', 'kadence-blocks' ), - 'add_new_item' => __( 'Add New Kadence Navigation Menu', 'kadence-blocks' ), - 'new_item' => __( 'New Kadence Navigation Menu', 'kadence-blocks' ), - 'edit_item' => __( 'Edit Kadence Navigation Menu', 'kadence-blocks' ), - 'view_item' => __( 'View Kadence Navigation Menu', 'kadence-blocks' ), - 'all_items' => __( 'Kadence Navigation Menus', 'kadence-blocks' ), - 'search_items' => __( 'Search Kadence Navigation Menus', 'kadence-blocks' ), - 'parent_item_colon' => __( 'Parent Kadence Navigation Menu:', 'kadence-blocks' ), - 'not_found' => __( 'No Kadence Navigation Menu found.', 'kadence-blocks' ), - 'not_found_in_trash' => __( 'No Kadence Navigation Menu found in Trash.', 'kadence-blocks' ), - 'archives' => __( 'Kadence Navigation Menu archives', 'kadence-blocks' ), - 'insert_into_item' => __( 'Insert into Kadence Navigation Menu', 'kadence-blocks' ), - 'uploaded_to_this_item' => __( 'Uploaded to this Kadence Navigation Menu', 'kadence-blocks' ), - 'filter_items_list' => __( 'Filter Kadence Navigation Menu list', 'kadence-blocks' ), - 'items_list_navigation' => __( 'Kadence Navigation Menus list navigation', 'kadence-blocks' ), - 'items_list' => __( 'Kadence Navigation Menus list', 'kadence-blocks' ), + 'add_new' => __( 'Add New Kadence Navigation', 'kadence-blocks' ), + 'add_new_item' => __( 'Add New Kadence Navigation', 'kadence-blocks' ), + 'new_item' => __( 'New Kadence Navigation', 'kadence-blocks' ), + 'edit_item' => __( 'Edit Kadence Navigation', 'kadence-blocks' ), + 'view_item' => __( 'View Kadence Navigation', 'kadence-blocks' ), + 'all_items' => __( 'Kadence Navigations', 'kadence-blocks' ), + 'search_items' => __( 'Search Kadence Navigations', 'kadence-blocks' ), + 'parent_item_colon' => __( 'Parent Kadence Navigation:', 'kadence-blocks' ), + 'not_found' => __( 'No Kadence Navigation found.', 'kadence-blocks' ), + 'not_found_in_trash' => __( 'No Kadence Navigation found in Trash.', 'kadence-blocks' ), + 'archives' => __( 'Kadence Navigation archives', 'kadence-blocks' ), + 'insert_into_item' => __( 'Insert into Kadence Navigation', 'kadence-blocks' ), + 'uploaded_to_this_item' => __( 'Uploaded to this Kadence Navigation', 'kadence-blocks' ), + 'filter_items_list' => __( 'Filter Kadence Navigation list', 'kadence-blocks' ), + 'items_list_navigation' => __( 'Kadence Navigation list navigation', 'kadence-blocks' ), + 'items_list' => __( 'Kadence Navigation list', 'kadence-blocks' ), ), - 'description' => __( 'Kadence Navigation menus that can be inserted into your site.', 'kadence-blocks' ), + 'description' => __( 'Kadence Navigations that can be inserted into your site.', 'kadence-blocks' ), 'public' => false, 'has_archive' => false, 'show_ui' => true, - 'show_in_menu' => true, + 'show_in_menu' => 'kadence-blocks', 'show_in_admin_bar' => false, 'show_in_rest' => true, 'rewrite' => false, diff --git a/includes/settings/class-kadence-blocks-settings.php b/includes/settings/class-kadence-blocks-settings.php index d3ea79469..3b01e164f 100644 --- a/includes/settings/class-kadence-blocks-settings.php +++ b/includes/settings/class-kadence-blocks-settings.php @@ -789,6 +789,7 @@ public function home_scripts() { 'isNetworkEnabled' => $using_network_enabled, ) ); + wp_set_script_translations( 'admin-kadence-home', 'kadence-blocks' ); wp_enqueue_style( 'kadence-blocks-admin-css', KADENCE_BLOCKS_URL . 'includes/assets/css/admin-dashboard.min.css', array( 'wp-jquery-ui-dialog', 'wp-color-picker' ), KADENCE_BLOCKS_VERSION, 'all' ); wp_enqueue_media(); } @@ -1250,10 +1251,10 @@ public function config_page() { echo '
'; if ( in_array( $block['slug'], $unregistered_blocks ) ) { $btntitle = __( 'Activate', 'kadence-blocks' ); - echo '' . esc_html( $btntitle ) . ''; + echo '' . esc_html( $btntitle ) . ''; } else { $btntitle = __( 'Deactivate', 'kadence-blocks' ); - // echo '' . esc_html( $btntitle ) . ''; + // echo '' . esc_html( $btntitle ) . ''; } if( !empty( $block['link'] ) && !empty( $block['linkText'] ) ) { echo '' . esc_html( $block['linkText'] ) . ''; diff --git a/kadence-blocks.php b/kadence-blocks.php index f8e46c692..fa1754d29 100644 --- a/kadence-blocks.php +++ b/kadence-blocks.php @@ -5,7 +5,7 @@ * Description: Advanced Page Building Blocks for Gutenberg. Create custom column layouts, backgrounds, dual buttons, icons etc. * Author: Kadence WP * Author URI: https://www.kadencewp.com - * Version: 3.2.48 + * Version: 3.2.50 * Requires PHP: 7.4 * Text Domain: kadence-blocks * License: GPL2+ @@ -20,7 +20,7 @@ } define( 'KADENCE_BLOCKS_PATH', realpath( plugin_dir_path( __FILE__ ) ) . DIRECTORY_SEPARATOR ); define( 'KADENCE_BLOCKS_URL', plugin_dir_url( __FILE__ ) ); -define( 'KADENCE_BLOCKS_VERSION', '3.2.48' ); +define( 'KADENCE_BLOCKS_VERSION', '3.2.50' ); require_once plugin_dir_path( __FILE__ ) . 'vendor/vendor-prefixed/autoload.php'; require_once plugin_dir_path( __FILE__ ) . 'vendor/autoload.php'; diff --git a/readme.txt b/readme.txt index 89e68e57e..f176af85b 100644 --- a/readme.txt +++ b/readme.txt @@ -3,8 +3,8 @@ Contributors: britner, oakesjosh, woodardmc Tags: gutenberg, blocks, page builder, editor, gutenberg blocks Donate link: https://www.kadencewp.com/about-us/ Requires at least: 6.3 -Tested up to: 6.5 -Stable tag: 3.2.48 +Tested up to: 6.6 +Stable tag: 3.2.50 Requires PHP: 7.4 License: GPLv2 or later License URI: https://www.gnu.org/licenses/gpl-2.0.html @@ -174,6 +174,23 @@ Please report security bugs found in the Kadence Blocks plugin's source code thr == Changelog == += 3.2.50 = +Release Date: July 24th 2024 +* Fix: Resolved instance where advanced form was not validating captcha. + += 3.2.49 = +Release Date: July 19th 2024 +* Add: Tooltips for images. +* Fix: Prevent API call when Kadence AI is disabled. +* Fix: Icon list alignment not showing properly in editor. +* Fix: Issue with aria describedby attributes in advanced form. +* Fix: Stretch vertical align not being applied to sections on mobile and tablet. +* Fix: Center aligned infobox image when used inside a section. +* Fix: Accordion pane spacing issue. +* Fix: Load google fonts locally option not saving in Dashboard > Kadence > Home. +* Fix: Focal point not being used for row layout with background images when parallax is enabled. +* Fix: Gallery block not initializing when used in a query loop card. + = 3.2.48 = Release Date: June 27th 2024 * Fix: Issue with vertical alignment in tablet for sections. diff --git a/src/assets/js/gumshoe.js b/src/assets/js/gumshoe.js index ff943368d..85244e3b7 100644 --- a/src/assets/js/gumshoe.js +++ b/src/assets/js/gumshoe.js @@ -152,10 +152,10 @@ */ const isInView = function (elem, settings, bottom) { const bounds = elem.getBoundingClientRect(); - const offset = getOffset(settings); if (bottom) { return parseInt(bounds.bottom, 10) < (window.innerHeight || document.documentElement.clientHeight); } + const offset = getOffset(settings); return parseInt(bounds.top, 10) <= offset; }; diff --git a/src/assets/js/kb-header-block.js b/src/assets/js/kb-header-block.js index cce10f9ed..cd9a43183 100644 --- a/src/assets/js/kb-header-block.js +++ b/src/assets/js/kb-header-block.js @@ -148,7 +148,7 @@ class KBHeader { constructor(target, options = {}) { //target the target const self = this; - this.root = 'string' == typeof target ? document.querySelector(target) : target; + this.root = 'string' === typeof target ? document.querySelector(target) : target; //TODO get a real root id parsed from the block unique id. this.rootID = 'aaa'; this.autoTransparentSpacing = this.root.dataset?.autoTransparentSpacing === '1'; @@ -260,18 +260,16 @@ class KBHeader { updateSticky(e) { const self = this; + if (!this.activeHeader) { + return; + } + //TODO change wrapper to something that also applies to fse themes - var wrapper = document.getElementById('wrapper'), - proSticky = document.querySelectorAll('.kadence-pro-fixed-above'), - proElements = document.querySelectorAll('.kadence-before-wrapper-item'); + const wrapper = document.getElementById('wrapper'); var offsetTop = this.getOffset(wrapper).top; this.anchorOffset = this.getOffset(this.root).top; var currScrollTop = window.scrollY; - if (!this.activeHeader) { - return; - } - // Set current active screen size if (parseInt(kadenceHeaderConfig.breakPoints.desktop) < window.innerWidth) { this.activeSize = 'desktop'; @@ -285,9 +283,9 @@ class KBHeader { //don't do sticky stuff if the current screen size is not set to style sticky if ( !( - (this.activeSize == 'desktop' && this.sticky) || - (this.activeSize == 'tablet' && this.stickyTablet) || - (this.activeSize == 'mobile' && this.stickyMobile) + (this.activeSize === 'desktop' && this.sticky) || + (this.activeSize === 'tablet' && this.stickyTablet) || + (this.activeSize === 'mobile' && this.stickyMobile) ) ) { //reset all state classes and end @@ -303,7 +301,7 @@ class KBHeader { } //set current active header for current size - if (this.activeSize == 'desktop') { + if (this.activeSize === 'desktop') { this.activeHeader = this.root.querySelector('.wp-block-kadence-header-desktop'); } else { this.activeHeader = this.root.querySelector('.wp-block-kadence-header-tablet'); @@ -315,7 +313,7 @@ class KBHeader { //set the container anchor height to create a sized placeholder for the header (but only if we're not also transparent) var elHeight = this.activeHeader.offsetHeight; const activeSizeCased = - this.activeSize == 'desktop' ? '' : this.activeSize.charAt(0).toUpperCase() + this.activeSize.slice(1); + this.activeSize === 'desktop' ? '' : this.activeSize.charAt(0).toUpperCase() + this.activeSize.slice(1); if (!this['transparent' + activeSizeCased]) { this.root.style.height = elHeight + 'px'; } @@ -325,6 +323,8 @@ class KBHeader { var boomBar = document.querySelector('.boom_bar'); offsetTop = this.getOffset(wrapper).top - boomBar.offsetHeight; } + + var proElements = document.querySelectorAll('.kadence-before-wrapper-item'); if (proElements.length) { var proElementOffset = 0; for (let i = 0; i < proElements.length; i++) { @@ -332,6 +332,8 @@ class KBHeader { } offsetTop = this.getOffset(wrapper).top - proElementOffset; } + + var proSticky = document.querySelectorAll('.kadence-pro-fixed-above'); if (proSticky.length) { var proOffset = 0; for (let i = 0; i < proSticky.length; i++) { @@ -349,9 +351,9 @@ class KBHeader { // Run the shrinking / unshrinking processing if (this.shrinkMain) { var shrinkHeight = - this.activeSize == 'mobile' + this.activeSize === 'mobile' ? this.shrinkMainHeightMobile - : this.activeSize == 'tablet' + : this.activeSize === 'tablet' ? this.shrinkMainHeightTablet : this.shrinkMainHeight; if (shrinkHeight) { @@ -360,7 +362,7 @@ class KBHeader { if (this.revealScrollUp) { if (window.scrollY > this.lastScrollTop) { var totalOffsetDelay = Math.floor( - Math.floor(this.activeOffsetTop) - Math.floor(offsetTop) + Math.floor(startHeight) + Math.floor(this.activeOffsetTop) - Math.floor(offsetTop) + Math.floor(shrinkHeight) ); } else { var totalOffsetDelay = Math.floor(this.activeOffsetTop - offsetTop); diff --git a/src/assets/js/kb-splide-init.js b/src/assets/js/kb-splide-init.js index c1088de11..0a675526b 100644 --- a/src/assets/js/kb-splide-init.js +++ b/src/assets/js/kb-splide-init.js @@ -316,4 +316,7 @@ document.addEventListener('kadenceJSInitReload', function () { kadenceBlocksSplide.init(); }); + document.addEventListener('kb-query-loaded', function () { + kadenceBlocksSplide.init(); + }); })(); diff --git a/src/assets/js/kt-tabs.js b/src/assets/js/kt-tabs.js index b4157b639..0069b95c2 100644 --- a/src/assets/js/kt-tabs.js +++ b/src/assets/js/kt-tabs.js @@ -272,7 +272,6 @@ }, init() { - console.log(1); window.KBTabs.setupTabs(); window.addEventListener('hashchange', window.KBTabs.setActiveWithHash, false); }, diff --git a/src/blocks/advanced-form/components/form-title/index.js b/src/blocks/advanced-form/components/form-title/index.js index ef84be830..ba85ef160 100644 --- a/src/blocks/advanced-form/components/form-title/index.js +++ b/src/blocks/advanced-form/components/form-title/index.js @@ -1,7 +1,7 @@ /** * WordPress dependencies */ -import { __ } from '@wordpress/i18n'; +import { __, sprintf } from '@wordpress/i18n'; import { Placeholder, Button, TextControl, ButtonGroup, TextareaControl } from '@wordpress/components'; import { KadenceRadioButtons } from '@kadence/components'; import { useState } from '@wordpress/element'; diff --git a/src/blocks/advanced-form/components/submit-actions/fluent-crm/index.js b/src/blocks/advanced-form/components/submit-actions/fluent-crm/index.js index 2cc84e648..a14aefe35 100644 --- a/src/blocks/advanced-form/components/submit-actions/fluent-crm/index.js +++ b/src/blocks/advanced-form/components/submit-actions/fluent-crm/index.js @@ -3,8 +3,6 @@ * */ -/* global kadence_blocks_params */ - /** * Imports */ diff --git a/src/blocks/advanced-form/fields/submit/edit.js b/src/blocks/advanced-form/fields/submit/edit.js index 185a0364a..9f575e267 100644 --- a/src/blocks/advanced-form/fields/submit/edit.js +++ b/src/blocks/advanced-form/fields/submit/edit.js @@ -1556,7 +1556,7 @@ export default function KadenceButtonEdit({ )} setAttributes({ text: value })} allowedFormats={applyFilters( diff --git a/src/blocks/advancedbtn/editOld.js b/src/blocks/advancedbtn/editOld.js index 762630af9..52ab541b3 100644 --- a/src/blocks/advancedbtn/editOld.js +++ b/src/blocks/advancedbtn/editOld.js @@ -845,7 +845,7 @@ function KadenceAdvancedButton(props) { )} {/* { applyFilters( 'kadence.dynamicContent', { if ( 1 === index ) { @@ -869,7 +869,7 @@ function KadenceAdvancedButton(props) { />, attributes, 'btns:' + index + ':text' ) } */} { if (1 === index) { diff --git a/src/blocks/advancedheading/ai-text/ai-text.js b/src/blocks/advancedheading/ai-text/ai-text.js index caacab17d..0fad3ed02 100644 --- a/src/blocks/advancedheading/ai-text/ai-text.js +++ b/src/blocks/advancedheading/ai-text/ai-text.js @@ -427,8 +427,8 @@ export const AIText = { } placeholder={ hasContent || aiSuggestion - ? __('Ask Kadence AI to edit...', 'kadence-blocks') - : __('Ask Kadence AI to generate...', 'kadence-blocks') + ? __('Ask Kadence AI to edit…', 'kadence-blocks') + : __('Ask Kadence AI to generate…', 'kadence-blocks') } value={prompt} rows={dynamicRows} diff --git a/src/blocks/advancedheading/edit.js b/src/blocks/advancedheading/edit.js index 5b7bccae7..12795fdec 100644 --- a/src/blocks/advancedheading/edit.js +++ b/src/blocks/advancedheading/edit.js @@ -777,7 +777,7 @@ function KadenceAdvancedHeading(props) { const classes = classnames({ [`kt-adv-heading${uniqueID}`]: uniqueID, - ['kadence-advancedheading-text']: true, + 'kadence-advancedheading-text': true, 'kb-content-is-dynamic': isDynamicReplaced, [textColorClass]: textColorClass, 'has-text-color': textColorClass, diff --git a/src/blocks/countdown/countdown-timer/edit.js b/src/blocks/countdown/countdown-timer/edit.js index 239529250..60f0ae324 100644 --- a/src/blocks/countdown/countdown-timer/edit.js +++ b/src/blocks/countdown/countdown-timer/edit.js @@ -27,6 +27,7 @@ function KadenceCoundownTimer(props) { const { attributes, setAttributes, clientId, parentBlock } = props; const { uniqueID } = attributes; + // eslint-disable-next-line no-undef const parentID = undefined !== parentBlock[0].attributes.uniqueID ? parentBlock[0].attributes.uniqueID : rootID; const { addUniqueID } = useDispatch('kadenceblocks/data'); diff --git a/src/blocks/countup/edit.js b/src/blocks/countup/edit.js index 17846f714..55d50f9cc 100644 --- a/src/blocks/countup/edit.js +++ b/src/blocks/countup/edit.js @@ -416,7 +416,7 @@ function KadenceCounterUp(props) { className={'kb-count-up-title'} value={title} onChange={(content) => setAttributes({ title: content })} - placeholder={__('Type Here...', 'kadence-blocks')} + placeholder={__('Type Here…', 'kadence-blocks')} style={{ display: 'block', fontWeight: titleFont[0].weight, diff --git a/src/blocks/form/fluentcrm.js b/src/blocks/form/fluentcrm.js index 63a1c51da..ead651448 100644 --- a/src/blocks/form/fluentcrm.js +++ b/src/blocks/form/fluentcrm.js @@ -3,8 +3,6 @@ * */ -/* global kadence_blocks_params */ - /** * Imports */ diff --git a/src/blocks/header/children/components/child-container/index.js b/src/blocks/header/children/components/child-container/index.js index 4ad625631..162029da2 100644 --- a/src/blocks/header/children/components/child-container/index.js +++ b/src/blocks/header/children/components/child-container/index.js @@ -71,7 +71,7 @@ export default function ChildContainer(props, size = 'Desktop') { { className: innerBlockClasses, style: { - display: previewDevice === size ? 'block' : 'none', + display: previewDevice === size || (previewDevice == 'Mobile' && size == 'Tablet') ? 'block' : 'none', }, }, { diff --git a/src/blocks/header/children/off-canvas/components/backend-styles/index.js b/src/blocks/header/children/off-canvas/components/backend-styles/index.js index e3494d42a..1c0d7f5a2 100644 --- a/src/blocks/header/children/off-canvas/components/backend-styles/index.js +++ b/src/blocks/header/children/off-canvas/components/backend-styles/index.js @@ -197,17 +197,17 @@ export default function BackendStyles(props) { ); //content area inner alignment - if (previewHAlign == 'center') { + if (previewHAlign === 'center') { css.add_property('align-items', 'center'); css.add_property('margin-left', 'auto'); css.add_property('margin-right', 'auto'); - } else if (previewHAlign == 'right') { + } else if (previewHAlign === 'right') { css.add_property('align-items', 'flex-end'); css.add_property('margin-left', 'auto'); } - if (previewVAlign == 'center') { + if (previewVAlign === 'center') { css.add_property('justify-content', 'center'); - } else if (previewVAlign == 'bottom') { + } else if (previewVAlign === 'bottom') { css.add_property('justify-content', 'flex-end'); } diff --git a/src/blocks/header/children/off-canvas/edit.js b/src/blocks/header/children/off-canvas/edit.js index 1ebb029b2..9d14409a3 100644 --- a/src/blocks/header/children/off-canvas/edit.js +++ b/src/blocks/header/children/off-canvas/edit.js @@ -319,7 +319,7 @@ export function Edit(props) { mobileValue={maxWidthMobile ? maxWidthMobile : ''} onChangeMobile={(value) => setAttributes({ maxWidthMobile: value })} min={0} - max={maxWidthUnit == 'px' ? 1500 : 100} + max={maxWidthUnit === 'px' ? 1500 : 100} step={1} unit={maxWidthUnit} showUnit={true} diff --git a/src/blocks/header/children/row/block.json b/src/blocks/header/children/row/block.json index 1aa098c83..9329bae1d 100644 --- a/src/blocks/header/children/row/block.json +++ b/src/blocks/header/children/row/block.json @@ -7,7 +7,8 @@ "category": "design", "description": "Kadence header row", "supports": { - "inserter": true + "inserter": true, + "ktdynamic": true }, "textdomain": "kadence-blocks", "attributes": { @@ -157,7 +158,7 @@ "type": "number", "default": null }, - "heightDesktop": { + "heightMobile": { "type": "number", "default": null }, diff --git a/src/blocks/header/children/row/edit.js b/src/blocks/header/children/row/edit.js index 543687896..c1be7d516 100644 --- a/src/blocks/header/children/row/edit.js +++ b/src/blocks/header/children/row/edit.js @@ -268,7 +268,7 @@ export function Edit(props) { /> setActiveTab(value)} activeTab={activeTab} /> @@ -298,13 +298,17 @@ export function Edit(props) { mobileValue={minHeightMobile} onChangeMobile={(value) => setAttributes({ minHeightMobile: value })} min={0} - max={minHeightUnit == 'px' ? 600 : 100} + max={minHeightUnit === 'px' ? 600 : 100} + initialPosition={0} step={1} unit={minHeightUnit} onUnit={(value) => { setAttributes({ minHeightUnit: value }); }} units={['px', 'em', 'vh']} + reset={() => + setAttributes({ minHeight: null, minHeightTablet: null, minHeightMobile: null }) + } showUnit={true} /> setAttributes({ heightMobile: value })} min={0} - max={heightUnit == 'px' ? 600 : 100} + initialPosition={0} + max={heightUnit === 'px' ? 600 : 100} step={1} unit={heightUnit} onUnit={(value) => { setAttributes({ heightUnit: value }); }} units={['px', 'em', 'vh']} + reset={() => setAttributes({ height: null, heightTablet: null, heightMobile: null })} showUnit={true} /> - {layout != 'contained' && layout != 'fullwidth' && ( + {layout !== 'contained' && layout !== 'fullwidth' && ( setAttributes({ maxWidthMobile: value })} min={0} - max={maxWidthUnit == 'px' ? 600 : 100} + initialPosition={0} + max={maxWidthUnit === 'px' ? 600 : 100} step={1} unit={maxWidthUnit} onUnit={(value) => { setAttributes({ maxWidthUnit: value }); }} + reset={() => + setAttributes({ maxWidth: null, maxWidthTablet: null, maxWidthMobile: null }) + } units={['px', 'em', 'vw', '%']} showUnit={true} /> @@ -363,7 +373,6 @@ export function Edit(props) { units={['px', 'em', 'vw']} showUnit={true} /> - { }; return ( -
-

{__('Desktop Layout', 'kadence-blocks')}

-

{__('Choose a header layout for desktop.', 'kadence-blocks')}

+
+
+

{__('Desktop Layout', 'kadence-blocks')}

+

{__('Choose a header layout for desktop.', 'kadence-blocks')}

-
- - -
- -
-
onChange({ headerDesktop: 'blank' })} - > - +
+ +
- {activeTab === 'basic' && - Object.keys(basicOptions).map((key) => ( -
-
onChange({ headerDesktop: key })} - > - {basicOptions[key].icon} +
+
onChange({ headerDesktop: 'blank' })} + > + +
+ + {activeTab === 'basic' && + Object.keys(basicOptions).map((key) => ( +
+
onChange({ headerDesktop: key })} + > + {basicOptions[key].icon} +
+ {basicOptions[key].title}
- {basicOptions[key].title} -
- ))} + ))} - {activeTab === 'multi-row' && - Object.keys(muiltiRowOptions).map((key) => ( -
-
onChange({ headerDesktop: key })} - > - {muiltiRowOptions[key].icon} + {activeTab === 'multi-row' && + Object.keys(muiltiRowOptions).map((key) => ( +
+
onChange({ headerDesktop: key })} + > + {muiltiRowOptions[key].icon} +
+ {muiltiRowOptions[key].title}
- {muiltiRowOptions[key].title} -
- ))} + ))} +
); diff --git a/src/blocks/header/components/onboard/existing.js b/src/blocks/header/components/onboard/existing.js index 68549a7c0..b99f45612 100644 --- a/src/blocks/header/components/onboard/existing.js +++ b/src/blocks/header/components/onboard/existing.js @@ -47,32 +47,34 @@ const HeaderExisting = ({ data, onChange }) => { ]; return ( -
-

{__('Header Selection', 'kadence-blocks')}

-

{__('Select and existing header or create a new one.', 'kadence-blocks')}

+
+
+

{__('Header Selection', 'kadence-blocks')}

+

{__('Select and existing header or create a new one.', 'kadence-blocks')}

-
-
onChange({ headerExisting: 'blank' })} - > - -
+
+
onChange({ headerExisting: 'blank' })} + > + +
- {Object.keys(options).map((key) => ( -
-
onChange({ headerExisting: options[key].value })} - style={{ padding: '20px' }} - > - + {Object.keys(options).map((key) => ( +
+
onChange({ headerExisting: options[key].value })} + style={{ padding: '20px' }} + > + +
+ {options[key].label}
- {options[key].label} -
- ))} + ))} +
); diff --git a/src/blocks/header/components/onboard/icons/mobile/index.js b/src/blocks/header/components/onboard/icons/mobile/index.js index 7cb4352ea..be209584d 100644 --- a/src/blocks/header/components/onboard/icons/mobile/index.js +++ b/src/blocks/header/components/onboard/icons/mobile/index.js @@ -6,3 +6,6 @@ export { default as Mobile2Hover } from './mobile-2-hover'; export { default as Mobile3 } from './mobile-3'; export { default as Mobile3Hover } from './mobile-3-hover'; + +export { default as Mobile4 } from './mobile-4'; +export { default as Mobile4Hover } from './mobile-4-hover'; diff --git a/src/blocks/header/components/onboard/icons/mobile/mobile-1-hover.js b/src/blocks/header/components/onboard/icons/mobile/mobile-1-hover.js index 5063dbb90..4a68fafdf 100644 --- a/src/blocks/header/components/onboard/icons/mobile/mobile-1-hover.js +++ b/src/blocks/header/components/onboard/icons/mobile/mobile-1-hover.js @@ -2,94 +2,124 @@ import React from 'react'; function Icon() { return ( - + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + ); diff --git a/src/blocks/header/components/onboard/icons/mobile/mobile-1.js b/src/blocks/header/components/onboard/icons/mobile/mobile-1.js index 943f20e0f..c53016e86 100644 --- a/src/blocks/header/components/onboard/icons/mobile/mobile-1.js +++ b/src/blocks/header/components/onboard/icons/mobile/mobile-1.js @@ -2,19 +2,16 @@ import React from 'react'; function Icon() { return ( - + - - - - - - - + + + + + ); diff --git a/src/blocks/header/components/onboard/icons/mobile/mobile-2-hover.js b/src/blocks/header/components/onboard/icons/mobile/mobile-2-hover.js index ff55dcada..d61f308fe 100644 --- a/src/blocks/header/components/onboard/icons/mobile/mobile-2-hover.js +++ b/src/blocks/header/components/onboard/icons/mobile/mobile-2-hover.js @@ -2,62 +2,56 @@ import React from 'react'; function Icon() { return ( - + - - - - - - - - - + + + + + + + + + + + + + + + ); diff --git a/src/blocks/header/components/onboard/icons/mobile/mobile-2.js b/src/blocks/header/components/onboard/icons/mobile/mobile-2.js index 3803570e7..7a135299b 100644 --- a/src/blocks/header/components/onboard/icons/mobile/mobile-2.js +++ b/src/blocks/header/components/onboard/icons/mobile/mobile-2.js @@ -2,19 +2,15 @@ import React from 'react'; function Icon() { return ( - + - - - - - - - + + + + ); diff --git a/src/blocks/header/components/onboard/icons/mobile/mobile-3-hover.js b/src/blocks/header/components/onboard/icons/mobile/mobile-3-hover.js index f43fc08cf..e7efa23b1 100644 --- a/src/blocks/header/components/onboard/icons/mobile/mobile-3-hover.js +++ b/src/blocks/header/components/onboard/icons/mobile/mobile-3-hover.js @@ -2,72 +2,228 @@ import React from 'react'; function Icon() { return ( - + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ); diff --git a/src/blocks/header/components/onboard/icons/mobile/mobile-3.js b/src/blocks/header/components/onboard/icons/mobile/mobile-3.js index 68506438e..2a97adab8 100644 --- a/src/blocks/header/components/onboard/icons/mobile/mobile-3.js +++ b/src/blocks/header/components/onboard/icons/mobile/mobile-3.js @@ -2,19 +2,13 @@ import React from 'react'; function Icon() { return ( - - - - - + + + - - - ); diff --git a/src/blocks/header/components/onboard/icons/mobile/mobile-4-hover.js b/src/blocks/header/components/onboard/icons/mobile/mobile-4-hover.js new file mode 100644 index 000000000..3b0e24c54 --- /dev/null +++ b/src/blocks/header/components/onboard/icons/mobile/mobile-4-hover.js @@ -0,0 +1,158 @@ +import React from 'react'; + +function Icon() { + return ( + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ); +} + +export default Icon; diff --git a/src/blocks/header/components/onboard/icons/mobile/mobile-4.js b/src/blocks/header/components/onboard/icons/mobile/mobile-4.js new file mode 100644 index 000000000..a586cf74e --- /dev/null +++ b/src/blocks/header/components/onboard/icons/mobile/mobile-4.js @@ -0,0 +1,17 @@ +import React from 'react'; + +function Icon() { + return ( + + + + + + + ); +} + +export default Icon; diff --git a/src/blocks/header/components/onboard/mobile.js b/src/blocks/header/components/onboard/mobile.js index cd3295c92..ac729a0c0 100644 --- a/src/blocks/header/components/onboard/mobile.js +++ b/src/blocks/header/components/onboard/mobile.js @@ -15,55 +15,62 @@ const HeaderMobile = ({ data, onChange }) => { }, [data, onChange]); const basicOptions = { - 'basic-1': { + 'mobile-1': { title: __('Mobile 1', 'kadence-blocks'), icon: , iconHover: , }, - 'basic-2': { + 'mobile-2': { title: __('Mobile 2', 'kadence-blocks'), icon: , iconHover: , }, - 'basic-3': { + 'mobile-3': { title: __('Mobile 3', 'kadence-blocks'), icon: , iconHover: , }, + 'mobile-4': { + title: __('Mobile 4', 'kadence-blocks'), + icon: , + iconHover: , + }, }; return ( -
-

{__('Mobile Layout', 'kadence-blocks')}

-

{__('Choose a header layout for mobile.', 'kadence-blocks')}

- -
- -
+
+
+

{__('Mobile Layout', 'kadence-blocks')}

+

{__('Choose a header layout for mobile.', 'kadence-blocks')}

-
-
onChange({ headerMobile: 'blank' })} - > - +
+
- {Object.keys(basicOptions).map((key) => ( -
-
onChange({ headerMobile: key })} - onMouseEnter={() => setHoveredOption(key)} - onMouseLeave={() => setHoveredOption(null)} - > - {hoveredOption === key ? basicOptions[key].iconHover : basicOptions[key].icon} -
- {basicOptions[key].title} +
+
onChange({ headerMobile: 'blank' })} + > +
- ))} + + {Object.keys(basicOptions).map((key) => ( +
+
onChange({ headerMobile: key })} + onMouseEnter={() => setHoveredOption(key)} + onMouseLeave={() => setHoveredOption(null)} + > + {hoveredOption === key ? basicOptions[key].iconHover : basicOptions[key].icon} +
+ {basicOptions[key].title} +
+ ))} +
); diff --git a/src/blocks/header/components/onboard/name.js b/src/blocks/header/components/onboard/name.js index 5d122933f..82b482a4d 100644 --- a/src/blocks/header/components/onboard/name.js +++ b/src/blocks/header/components/onboard/name.js @@ -13,23 +13,33 @@ const HeaderName = ({ data, onChange }) => { }, [data]); return ( -
-

{__('Header Name', 'kadence-blocks')}

-

{__('Give your header a name and a description', 'kadence-blocks')}

- onChange({ headerName })} - autoFocus={true} - /> +
+
+
+ {__('Headers +
+
+

{__('Header Name', 'kadence-blocks')}

+

{__('Give your header a name and a description', 'kadence-blocks')}

+ onChange({ headerName })} + autoFocus={true} + /> - onChange({ headerDescription })} - /> + onChange({ headerDescription })} + /> +
+
); }; diff --git a/src/blocks/header/components/popover-tutorial/editor.scss b/src/blocks/header/components/popover-tutorial/editor.scss index 1599e161d..3bb0ee4e6 100644 --- a/src/blocks/header/components/popover-tutorial/editor.scss +++ b/src/blocks/header/components/popover-tutorial/editor.scss @@ -29,7 +29,14 @@ color: $color-primary; } - button { + .kb-header-popover-btns { + display: flex; + //showing buttons in reverse order so "next" is first in the dom and first focused + flex-direction: row-reverse; + gap: 5px; + } + + button.kb-header-popover-btn { font-size: 14px; &.is-primary { diff --git a/src/blocks/header/components/popover-tutorial/index.js b/src/blocks/header/components/popover-tutorial/index.js index 9cb3a4298..50874bc85 100644 --- a/src/blocks/header/components/popover-tutorial/index.js +++ b/src/blocks/header/components/popover-tutorial/index.js @@ -7,20 +7,21 @@ import { useState, useEffect } from '@wordpress/element'; import { POPOVER_TUTORIAL_OPTIONS, POPOVER_TUTORIAL_OPTIONS_CONTENT } from '../constants'; import './editor.scss'; -export default function HeaderOnboard(props) { - const { headerRef } = props; +export default function PopoverTutorial(props) { + const { headerRef, formData } = props; // Use internal state instead of a ref to make sure that the component // re-renders when the popover's anchor updates. - const [onboardingFinished, setOnboardingFinished] = useState(true); const [popoverTutorialStep, setPopoverTutorialStep] = useState(0); const [popoverTutorialComplete, setPopoverTutorialComplete] = useState(true); - const hasCompletedPopoverTutorial = false; - const key = 'basic'; - const popoverTutorialOptions = POPOVER_TUTORIAL_OPTIONS?.[key]; + const key = formData?.headerDesktop ?? 'generic'; + const popoverTutorialOptions = POPOVER_TUTORIAL_OPTIONS?.[key] + ? POPOVER_TUTORIAL_OPTIONS?.[key] + : POPOVER_TUTORIAL_OPTIONS?.generic; useEffect(() => { + // savePopoverTutorialComplete(false); const settingModel = new wp.api.models.Settings(); settingModel.fetch().then((response) => { if (response) { @@ -31,17 +32,11 @@ export default function HeaderOnboard(props) { }, []); const savePopoverTutorialComplete = (status) => { - setPopoverTutorialComplete(true); + setPopoverTutorialComplete(status); const settingModel2 = new wp.api.models.Settings({ kadence_blocks_header_popover_tutorial_complete: status, }); - settingModel.save(); - // settingModel2.save().then((response) => { - // console.log(3, response); - // createSuccessNotice(__('Totorial completed', 'kadence-blocks'), { - // type: 'snackbar', - // }); - // }); + settingModel2.save(); }; const popoverStepContent = () => { @@ -81,10 +76,27 @@ export default function HeaderOnboard(props) { }} > - {popoverTutorialStep + 1 == popoverTutorialOptions.length && <>Finish} - {popoverTutorialStep + 1 != popoverTutorialOptions.length && <>Next} + {popoverTutorialStep + 1 == popoverTutorialOptions.length && ( + <>{__('Finish', 'kadence-blocks')} + )} + {popoverTutorialStep + 1 != popoverTutorialOptions.length && ( + <>{__('Next', 'kadence-blocks')} + )} + {popoverTutorialStep > 0 && ( + + )}
diff --git a/src/blocks/header/components/select-or-create-placeholder/index.js b/src/blocks/header/components/select-or-create-placeholder/index.js index 720415100..ef4d3d99c 100644 --- a/src/blocks/header/components/select-or-create-placeholder/index.js +++ b/src/blocks/header/components/select-or-create-placeholder/index.js @@ -39,7 +39,7 @@ export default function SelectOrCreatePlaceholder({ return ( diff --git a/src/blocks/header/components/visual-builder/editor.scss b/src/blocks/header/components/visual-builder/editor.scss index e6e0794b2..a79e97591 100644 --- a/src/blocks/header/components/visual-builder/editor.scss +++ b/src/blocks/header/components/visual-builder/editor.scss @@ -1,5 +1,5 @@ $height_bottom_bar: 25px; -$height_top_bar: 92px; +$height_top_bar: 60px; $height_top_bars_mobile: 155px; $height_top_bottom_bars: $height_top_bar + $height_bottom_bar; $sidebar_width: 280px; @@ -13,9 +13,10 @@ $fixed_height: 300px; padding: 10px; position: fixed; width: 100%; - bottom: 0; + bottom: $height_bottom_bar; left: 0; z-index: 9999; + box-sizing: border-box; justify-content: flex-end; display: flex; @@ -38,17 +39,18 @@ $fixed_height: 300px; position: fixed; width: 100%; height: $fixed_height; - bottom: 0; + bottom: $height_bottom_bar; left: 0; z-index: 9999; display: block; + box-sizing: border-box; @media (min-width: 782px) { height: $fixed_height; } &.kb-header-visual-builder-modal-top { - top: 98px; + top: $height_top_bar; bottom: 0; } @@ -69,7 +71,7 @@ $fixed_height: 300px; top: 4px; right: 4px; - button { + button.components-button { margin-left: 10px; } } @@ -137,6 +139,7 @@ $fixed_height: 300px; min-height: 62px; align-items: center; padding: 6px 10px; + box-sizing: border-box; &.visual-column-wrapper-empty-center { display: none !important; @@ -267,6 +270,19 @@ $fixed_height: 300px; } } +.block-editor-iframe__body .is-mobile-preview { + .kb-header-visual-builder-modal { + .modal-settings { + button.components-button { + min-width: 24px; + justify-content: center; + padding: 0; + font-size: 0px; + } + } + } +} + //Something in the block editor transforms top level block wrappers after adding blocks, this prevents that and keeps appropriate modal display //.wp-block-kadence-header div { // transform: none !important; diff --git a/src/blocks/header/components/visual-builder/index.js b/src/blocks/header/components/visual-builder/index.js index 17f5c73f9..28af8d280 100644 --- a/src/blocks/header/components/visual-builder/index.js +++ b/src/blocks/header/components/visual-builder/index.js @@ -1,8 +1,8 @@ -import { useRef, useState } from '@wordpress/element'; +import { useRef, useState, useEffect } from '@wordpress/element'; import { Button } from '@wordpress/components'; import { useEditorElement, capitalizeFirstLetter, blockExists } from '@kadence/helpers'; import { __ } from '@wordpress/i18n'; -import { useSelect, useDispatch } from '@wordpress/data'; +import { useSelect, useDispatch, select } from '@wordpress/data'; import { get } from 'lodash'; import ModalClose from './close'; @@ -49,7 +49,7 @@ export default function VisualBuilder({ clientId, previewDevice, isSelected }) { setPreviewDeviceType(capitalizeFirstLetter(value)); // if tab we're switching away from was off canvas... - if (tab == 'off-canvas') { + if (tab === 'off-canvas') { setOffCanvasOpenId(null); selectBlock(clientId); } @@ -61,7 +61,7 @@ export default function VisualBuilder({ clientId, previewDevice, isSelected }) { } //when we switch to tablet, pin the editor to the top - if (value == 'Tablet') { + if (value === 'Tablet') { setHeaderVisualBuilderOpenPosition('top'); } else { setHeaderVisualBuilderOpenPosition('bottom'); @@ -69,7 +69,7 @@ export default function VisualBuilder({ clientId, previewDevice, isSelected }) { setTab(value); }; - const { topLevelBlocks, childSelected, isVisible, modalPosition } = useSelect( + const { topLevelBlocks, childSelected, isVisible, modalPosition, isHeaderTemplate } = useSelect( (select) => { const { getBlockOrder, getBlock, hasSelectedInnerBlock } = select('core/block-editor'); @@ -80,12 +80,22 @@ export default function VisualBuilder({ clientId, previewDevice, isSelected }) { childSelected: hasSelectedInnerBlock(clientId, true), isVisible: select('kadenceblocks/data').getOpenHeaderVisualBuilderId() === clientId, modalPosition: select('kadenceblocks/data').getOpenHeaderVisualBuilderPosition(), + isHeaderTemplate: select('core/editor').getEditedPostAttribute('area') === 'header', }; }, [clientId] ); + useEffect(() => { + //if we're already in a tablet / mobile device than we should automatically switch the tab, etc + if (previewDevice === 'Tablet' || previewDevice === 'Mobile') { + setHeaderVisualBuilderOpenPosition('top'); + } + setTab(previewDevice == 'Mobile' || previewDevice == 'Tablet' ? 'Tablet' : 'Desktop'); + }, [isVisible, previewDevice]); + const setIsVisible = () => { + console.log(1, previewDevice); setHeaderVisualBuilderOpenId(isVisible ? null : clientId); }; @@ -96,7 +106,7 @@ export default function VisualBuilder({ clientId, previewDevice, isSelected }) { const editorElement = useEditorElement(ref, [previewDevice]); const editorWidth = editorElement?.clientWidth; const editorLeft = editorElement?.getBoundingClientRect().left; - const editorFooterHeight = previewDevice == 'Desktop' ? '25px' : '0'; + const editorFooterHeight = previewDevice === 'Desktop' ? '25px' : '0'; if (!hasTrigger && tab === 'off-canvas') { updateTab('Desktop', desktopBlocks); @@ -104,6 +114,20 @@ export default function VisualBuilder({ clientId, previewDevice, isSelected }) { return ( <> + {isVisible && ( + + )}
{!isVisible && (isSelected || childSelected) && (
+ +
)} {isVisible && ( @@ -125,7 +150,6 @@ export default function VisualBuilder({ clientId, previewDevice, isSelected }) { style={{ width: editorWidth + 'px', left: editorLeft + 'px', - bottom: editorFooterHeight, }} >
@@ -141,7 +165,7 @@ export default function VisualBuilder({ clientId, previewDevice, isSelected }) { disabled={tabletBlocks === null} onClick={() => updateTab('Tablet', tabletBlocks)} > - {__('Tablet', 'kadence-blocks')} + {__('Tablet / Mobile', 'kadence-blocks')} {hasTrigger && (
)}
+ + {/* hide the metaboxes area that currently take up the same space as the visual builder while the teaser or builder is active */} + {(isVisible || (!isVisible && (isSelected || childSelected))) && ( + + )} ); } diff --git a/src/blocks/header/edit-inner.js b/src/blocks/header/edit-inner.js index c9e68c2cc..54b20b382 100644 --- a/src/blocks/header/edit-inner.js +++ b/src/blocks/header/edit-inner.js @@ -69,8 +69,18 @@ import metadata from './block.json'; const ANCHOR_REGEX = /[\s#]/g; export function EditInner(props) { - const { attributes, setAttributes, clientId, context, direct, id, isSelected, headerRef, justCompletedOnboarding } = - props; + const { + attributes, + setAttributes, + clientId, + context, + direct, + id, + isSelected, + headerRef, + justCompletedOnboarding, + formData, + } = props; const { setHeaderVisualBuilderOpenId } = useDispatch('kadenceblocks/data'); const { previewDevice, showVisualBuilder } = useSelect( @@ -740,14 +750,14 @@ export function EditInner(props) { onChangeTablet={(value) => setMetaAttribute(value, 'isTransparentTablet')} onChangeMobile={(value) => setMetaAttribute(value, 'isTransparentMobile')} /> - {previewIsTransparent == '1' && ( + {previewIsTransparent === '1' && ( setMetaAttribute(value, 'autoTransparentSpacing')} /> )} - {previewIsSticky == '1' && ( + {previewIsSticky === '1' && ( <> - {previewIsTransparent != '1' && ( + {previewIsTransparent !== '1' && ( )} - {previewIsTransparent == '1' && ( + {previewIsTransparent === '1' && ( )} - {previewIsSticky == '1' && ( + {previewIsSticky === '1' && ( - {previewIsTransparent == '1' && ( + {previewIsTransparent === '1' && ( )} - {previewIsSticky == '1' && ( + {previewIsSticky === '1' && ( { + return { + directPostData: postId + ? select(coreStore).getEditedEntityRecord('postType', 'kadence_header', postId) + : '', + }; + }, + [justCompletedOnboarding] + ); + const { addUniqueID } = useDispatch('kadenceblocks/data'); const { isUniqueID, isUniqueBlock, parentData, previewDevice, isPreviewMode } = useSelect( (select) => { @@ -98,8 +110,6 @@ export function Edit(props) { [clientId] ); - const previewIsTransparent = getPreviewSize(previewDevice, isTransparent, isTransparentTablet, isTransparentMobile); - const blockClasses = classnames({ 'wp-block-kadence-header': true, [`wp-block-kadence-header${uniqueID}`]: uniqueID, @@ -138,12 +148,14 @@ export function Edit(props) { let mainBlockContent = ( <>
- {/* No headerselected or selected header was deleted from the site, display chooser */} + {/* No header selected or selected header was deleted from the site, display chooser */} {(id === 0 || (undefined === postExists && !isLoading)) && ( setAttributes({ id: nextId })} setJustCompletedOnboarding={setJustCompletedOnboarding} + formData={formData} + setFormData={setFormData} /> )} @@ -212,6 +224,7 @@ export function Edit(props) { direct={false} id={id} justCompletedOnboarding={justCompletedOnboarding} + formData={formData} /> )} @@ -224,14 +237,28 @@ export function Edit(props) { if (currentPostType === 'kadence_header') { mainBlockContent = ( <> + {justCompletedOnboarding === false && isEmpty(directPostData?.content) && id === 0 && !isLoading && ( + + )}
- +
); } + const previewIsTransparent = getPreviewSize(previewDevice, isTransparent, isTransparentTablet, isTransparentMobile); if (previewIsTransparent) { return
{mainBlockContent}
; } @@ -240,9 +267,78 @@ export function Edit(props) { export default Edit; -function Chooser({ commit, clientId, setJustCompletedOnboarding }) { +function CreateNewOnly({ clientId, setJustCompletedOnboarding, postId }) { + const { setHeaderVisualBuilderOpenId } = useDispatch('kadenceblocks/data'); + + const [isOnboardingOpen, setIsOnboardingOpen] = useState(true); + const [isPublishing, publishNew] = useEntityPublish('kadence_header', postId); + const [blocks, onInput, onChange] = useEntityBlockEditor('postType', 'kadence_header', { id: postId }); + const [existingTitle, setTitle] = useHeaderProp('title', postId); + const [meta, setMeta] = useHeaderProp('meta', postId); + const updateTemplate = async (id, formData) => { + const { headerName, headerDesktop, headerMobile, headerDescription } = formData; + + try { + const response = await publishNew(); + let updatedMeta = meta; + + const { templateInnerBlocks, templatePostMeta } = buildTemplateFromSelection(headerDesktop, headerMobile); + + if (response.id) { + if (templateInnerBlocks && headerDesktop !== 'skip' && headerMobile !== 'skip') { + updatedMeta = { ...meta, ...templatePostMeta }; + onChange(templateInnerBlocks, clientId); + } else { + // Skip, or template not found + onChange([createBlock('kadence/header', {}, HEADER_INNERBLOCK_DEFAULTS)], clientId); + } + + setTitle(headerName); + + updatedMeta._kad_header_description = headerDescription; + + setMeta({ ...meta, updatedMeta }); + await wp.data + .dispatch('core') + .saveEditedEntityRecord('postType', 'kadence_header', id) + .then(() => { + setIsOnboardingOpen(false); + setJustCompletedOnboarding(true); + }); + } + } catch (error) { + console.error(error); + setJustCompletedOnboarding(true); + } + }; + + const handleSubmit = (formData) => { + updateTemplate(postId, formData); + + //automatically open the visual editor when we've just created a new header + setHeaderVisualBuilderOpenId(clientId); + }; + + const steps = [ + { key: 'name', name: 'Header Name', visualNumber: 1, component: HeaderName }, + { key: 'desktop', name: 'Desktop Layout', visualNumber: 2, component: HeaderDesktop }, + { key: 'mobile', name: 'Mobile Layout', visualNumber: 3, component: HeaderMobile }, + ]; + + return ( + { + setIsOnboardingOpen(false); + }} + onSubmit={handleSubmit} + /> + ); +} + +function Chooser({ commit, clientId, setJustCompletedOnboarding, formData, setFormData }) { const [tmpId, setTmpId] = useState(0); - const [formData, setFormData] = useState(null); const { setHeaderVisualBuilderOpenId } = useDispatch('kadenceblocks/data'); @@ -255,22 +351,6 @@ function Chooser({ commit, clientId, setJustCompletedOnboarding }) { const [isOnboardingOpen, setIsOnboardingOpen] = useState(true); - useEffect(() => { - if (tmpId && formData) { - updateTemplate(tmpId, formData); - } - }, [formData, tmpId]); - - const createPost = async () => { - try { - const response = await addNew(); - return response.id; - } catch (error) { - console.error(error); - return false; - } - }; - const updateTemplate = async (id, formData) => { const { headerName, headerDesktop, headerMobile, headerDescription } = formData; @@ -306,6 +386,22 @@ function Chooser({ commit, clientId, setJustCompletedOnboarding }) { } }; + useEffect(() => { + if (tmpId && formData) { + updateTemplate(tmpId, formData); + } + }, [formData, tmpId]); + + const createPost = async () => { + try { + const response = await addNew(); + return response.id; + } catch (error) { + console.error(error); + return false; + } + }; + const handleSubmit = (formData) => { if (formData.headerExisting && Number.isInteger(formData.headerExisting)) { commit(formData.headerExisting); @@ -317,6 +413,7 @@ function Chooser({ commit, clientId, setJustCompletedOnboarding }) { } }); } + setJustCompletedOnboarding(true); //automatically open the visual editor when we've just created a new header setHeaderVisualBuilderOpenId(clientId); @@ -337,8 +434,6 @@ function Chooser({ commit, clientId, setJustCompletedOnboarding }) { setIsOnboardingOpen(false); if (!response?.complete) { wp.data.dispatch('core/block-editor').removeBlock(clientId); - } else { - setJustCompletedOnboarding(true); } }} onSubmit={handleSubmit} diff --git a/src/blocks/header/helpers.js b/src/blocks/header/helpers.js index 60a616431..de83232ff 100644 --- a/src/blocks/header/helpers.js +++ b/src/blocks/header/helpers.js @@ -17,6 +17,12 @@ import { innerBlocks as MultiRow3InnerBlocks, postMeta as MultiRow3PostMeta } fr import { innerBlocks as MultiRow4InnerBlocks, postMeta as MultiRow4PostMeta } from './templates/multi-row-4'; import { innerBlocks as MultiRow5InnerBlocks, postMeta as MultiRow5PostMeta } from './templates/multi-row-5'; +// Mobile templates +import { innerBlocks as Mobile1InnerBlocks, postMeta as Mobile1PostMeta } from './templates/mobile-1'; +import { innerBlocks as Mobile2InnerBlocks, postMeta as Mobile2PostMeta } from './templates/mobile-2'; +import { innerBlocks as Mobile3InnerBlocks, postMeta as Mobile3PostMeta } from './templates/mobile-3'; +import { innerBlocks as Mobile4InnerBlocks, postMeta as Mobile4PostMeta } from './templates/mobile-4'; + export function buildTemplateFromSelection(desktop, mobile) { // If it's an exact match to existing template, return that template if (desktop === mobile) { @@ -221,8 +227,8 @@ function getDataFromKey(key) { response.templatePostMeta = Basic3PostMeta; response.templateInnerBlocks = Basic3InnerBlocks(); } else if (key === 'basic-4') { - response.templatePostMeta = Basic4InnerBlocks; - response.templateInnerBlocks = Basic4PostMeta(); + response.templatePostMeta = Basic4PostMeta; + response.templateInnerBlocks = Basic4InnerBlocks(); } else if (key === 'basic-5') { response.templatePostMeta = Basic5PostMeta; response.templateInnerBlocks = Basic5InnerBlocks(); @@ -247,7 +253,51 @@ function getDataFromKey(key) { } else if (key === 'multi-row-5') { response.templatePostMeta = MultiRow5PostMeta; response.templateInnerBlocks = MultiRow5InnerBlocks(); + } else if (key === 'mobile-1') { + response.templatePostMeta = Mobile1PostMeta; + response.templateInnerBlocks = Mobile1InnerBlocks(); + } else if (key === 'mobile-2') { + response.templatePostMeta = Mobile2PostMeta; + response.templateInnerBlocks = Mobile2InnerBlocks(); + } else if (key === 'mobile-3') { + response.templatePostMeta = Mobile3PostMeta; + response.templateInnerBlocks = Mobile3InnerBlocks(); + } else if (key === 'mobile-4') { + response.templatePostMeta = Mobile4PostMeta; + response.templateInnerBlocks = Mobile4InnerBlocks(); + } + + // Replace placeholder relative URL with absolute URL + if (response.templateInnerBlocks) { + response.templateInnerBlocks = replaceInAttributes( + response.templateInnerBlocks, + '/wp-content/plugins/kadence-blocks/includes/assets/images/placeholder/', + kadence_blocks_params.kadenceBlocksUrl + '/includes/assets/images/placeholder/' + ); } return response; } + +function replaceInAttributes(obj, searchValue, replaceValue) { + // Check if the input is an array + if (Array.isArray(obj)) { + // Loop through each item in the array + obj.forEach((item, index) => { + obj[index] = replaceInAttributes(item, searchValue, replaceValue); + }); + } else if (typeof obj === 'object' && obj !== null) { + // Loop through each key in the object + for (const key in obj) { + if (typeof obj[key] === 'string') { + // If the value is a string, replace the substring + obj[key] = obj[key].replace(searchValue, replaceValue); + } else { + // If the value is an object or array, call the function recursively + obj[key] = replaceInAttributes(obj[key], searchValue, replaceValue); + } + } + } + // Return the modified object + return obj; +} diff --git a/src/blocks/header/templates/basic-1.js b/src/blocks/header/templates/basic-1.js index 0062747aa..18e7f905e 100644 --- a/src/blocks/header/templates/basic-1.js +++ b/src/blocks/header/templates/basic-1.js @@ -1,5 +1,5 @@ /** - * Template: Basic – Middle Logo + * Template: Basic: 2 buttons * Post Type: kadence_header */ @@ -7,19 +7,11 @@ import { createBlock } from '@wordpress/blocks'; const postMeta = { _kad_header_background: { type: 'normal', color: 'palette8' }, - _kad_header_flex: { - direction: ['horizontal', '', ''], - justifyContent: ['center', '', ''], - verticalAlignment: ['', '', ''], - }, - _kad_header_padding: ['md', 'md', 'md', 'md'], - _kad_header_height: ['110', '', ''], - _kad_header_isTransparent: '0', _kad_header_shadow: [ { enable: false, color: '#000000', - opacity: 0.20000000000000001, + opacity: 0.2, spread: 0, blur: 2, hOffset: 1, @@ -32,24 +24,36 @@ const postMeta = { function innerBlocks() { return [ createBlock('kadence/header', {}, [ - createBlock('kadence/header-container-desktop', { uniqueID: '6_8a54ee-e5' }, [ + createBlock('kadence/header-container-desktop', { uniqueID: '6_1d8d24-bf' }, [ createBlock( 'kadence/header-row', - { uniqueID: '6_ab0443-66', location: 'top', metadata: { name: 'Top Row' } }, + { + uniqueID: '6_10764d-6d', + location: 'top', + metadata: { name: 'Top Row' }, + }, [ createBlock( 'kadence/header-section', - { uniqueID: '6_d3211c-99', location: 'left', metadata: { name: 'Left Section' } }, + { + uniqueID: '6_e00be5-fd', + location: 'left', + metadata: { name: 'Left Section' }, + }, [ createBlock( 'kadence/header-column', - { uniqueID: '6_91abed-d2', location: 'left', metadata: { name: 'Left' } }, + { + uniqueID: '6_50fd6d-90', + location: 'left', + metadata: { name: 'Left' }, + }, [] ), createBlock( 'kadence/header-column', { - uniqueID: '6_9f5961-32', + uniqueID: '6_269ef9-ff', location: 'center-left', metadata: { name: 'Center Left' }, }, @@ -59,17 +63,25 @@ function innerBlocks() { ), createBlock( 'kadence/header-column', - { uniqueID: '6_378e9d-cd', location: 'center', metadata: { name: 'Center' } }, + { + uniqueID: '6_c8207e-c2', + location: 'center', + metadata: { name: 'Center' }, + }, [] ), createBlock( 'kadence/header-section', - { uniqueID: '6_abbeb1-2a', location: 'right', metadata: { name: 'Right Section' } }, + { + uniqueID: '6_695d80-c4', + location: 'right', + metadata: { name: 'Right Section' }, + }, [ createBlock( 'kadence/header-column', { - uniqueID: '6_8b2d3c-0b', + uniqueID: '6_99c7cf-82', location: 'center-right', metadata: { name: 'Center Right' }, }, @@ -77,7 +89,11 @@ function innerBlocks() { ), createBlock( 'kadence/header-column', - { uniqueID: '6_e1ec2c-70', location: 'right', metadata: { name: 'Right' } }, + { + uniqueID: '6_388d65-77', + location: 'right', + metadata: { name: 'Right' }, + }, [] ), ] @@ -87,135 +103,135 @@ function innerBlocks() { createBlock( 'kadence/header-row', { - uniqueID: '6_727312-9d', + uniqueID: '6_e34992-48', location: 'center', - layout: 'fullwidth', - padding: ['sm', 'sm', 'sm', 'sm'], metadata: { name: 'Middle Row' }, }, [ createBlock( 'kadence/header-section', - { uniqueID: '6_5ef4ea-76', location: 'left', metadata: { name: 'Left Section' } }, + { + uniqueID: '6_a696a4-d7', + location: 'left', + metadata: { name: 'Left Section' }, + }, [ createBlock( 'kadence/header-column', - { uniqueID: '6_ef1743-20', location: 'left', metadata: { name: 'Left' } }, - [] + { uniqueID: '6_0ee19c-e3', location: 'left', metadata: { name: 'Left' } }, + [ + createBlock( + 'kadence/image', + { + imgMaxWidth: 100, + sizeSlug: 'full', + linkDestination: 'none', + uniqueID: '6_e0ac3d-70', + globalAlt: true, + url: '/wp-content/plugins/kadence-blocks/includes/assets/images/placeholder/logo-dark.png', + }, + [] + ), + ] ), createBlock( 'kadence/header-column', { - uniqueID: '6_424422-01', + uniqueID: '6_be370d-cf', location: 'center-left', metadata: { name: 'Center Left' }, }, - [ - createBlock('kadence/navigation', { - uniqueID: '6_adaeb5-22', - templateKey: 'short', - }), - ] + [] ), ] ), createBlock( 'kadence/header-column', - { uniqueID: '6_d73051-3d', location: 'center', metadata: { name: 'Center' } }, - [ - createBlock( - 'kadence/image', - { - imgMaxWidth: 200, - sizeSlug: 'full', - linkDestination: 'none', - uniqueID: '6_28864c-2f', - marginDesktop: ['', 'md', '', 'md'], - globalAlt: true, - url: '/wp-content/plugins/kadence-blocks/includes/assets/images/placeholder/logo-dark.png', - }, - [] - ), - ] + { + uniqueID: '6_025f5a-10', + location: 'center', + metadata: { name: 'Center' }, + }, + [createBlock('kadence/navigation', { uniqueID: '6_d4bf5e-7f', templateKey: 'long' }, [])] ), createBlock( 'kadence/header-section', - { uniqueID: '6_f00bb1-7f', location: 'right', metadata: { name: 'Right Section' } }, + { + uniqueID: '6_2ac6ad-37', + location: 'right', + metadata: { name: 'Right Section' }, + }, [ createBlock( 'kadence/header-column', { - uniqueID: '6_71b76c-e9', + uniqueID: '6_897bf0-ab', location: 'center-right', metadata: { name: 'Center Right' }, }, - [ - createBlock( - 'kadence/navigation', - { uniqueID: '6_9c1e43-30', templateKey: 'short' }, - [] - ), - ] + [] ), createBlock( 'kadence/header-column', - { uniqueID: '6_5264df-4a', location: 'right', metadata: { name: 'Right' } }, + { + uniqueID: '6_3aebe7-3c', + location: 'right', + metadata: { name: 'Right' }, + }, [ - createBlock('kadence/icon', { uniqueID: '6_9537c3-c2', gap: ['xs', '', ''] }, [ + createBlock('kadence/advancedbtn', { uniqueID: '6_a61a9b-27' }, [ createBlock( - 'kadence/single-icon', + 'kadence/singlebtn', { - uniqueID: '6_b9f9c3-6a', - icon: 'fa_facebook-n', - link: '#', - size: 20, - title: 'Facebook', - color: 'palette9', - background: 'palette6', - borderRadius: 50, - borderWidth: 0, - padding: [5, 5, 5, 5], - style: 'stacked', - hColor: 'palette9', - hBackground: 'palette5', + uniqueID: '6_014d21-8f', + text: 'Call To Action', + sizePreset: 'small', + typography: [ + { + size: ['', '', ''], + sizeType: 'px', + lineHeight: ['', '', ''], + lineType: '', + letterSpacing: [0.5, '', ''], + letterType: 'px', + textTransform: 'uppercase', + family: 'var( --global-heading-font-family, inherit )', + google: false, + style: 'normal', + weight: 'inherit', + variant: '', + subset: '', + loadGoogle: true, + }, + ], }, [] ), createBlock( - 'kadence/single-icon', + 'kadence/singlebtn', { - uniqueID: '6_bccd99-2a', - icon: 'fa_instagram', - link: '#', - size: 20, - title: 'Instagram', - color: 'palette9', - background: 'palette6', - borderRadius: 50, - borderWidth: 0, - padding: [5, 5, 5, 5], - style: 'stacked', - hColor: 'palette9', - hBackground: 'palette5', - }, - [] - ), - createBlock( - 'kadence/single-icon', - { - uniqueID: '6_6c450f-b6', - icon: 'fa_youtube', - link: '#', - size: 20, - title: 'Youtube', - color: 'palette9', - background: 'palette6', - borderRadius: 50, - borderWidth: 0, - padding: [5, 5, 5, 5], - style: 'stacked', - hColor: 'palette9', - hBackground: 'palette5', + uniqueID: '6_d950a8-bc', + text: 'Secondary', + sizePreset: 'small', + inheritStyles: 'outline', + typography: [ + { + size: ['', '', ''], + sizeType: 'px', + lineHeight: ['', '', ''], + lineType: '', + letterSpacing: [0.5, '', ''], + letterType: 'px', + textTransform: 'uppercase', + family: 'var( --global-heading-font-family, inherit )', + google: false, + style: 'normal', + weight: 'inherit', + variant: '', + subset: '', + loadGoogle: true, + }, + ], }, [] ), @@ -228,21 +244,33 @@ function innerBlocks() { ), createBlock( 'kadence/header-row', - { uniqueID: '6_1be4fc-bb', location: 'bottom', metadata: { name: 'Bottom Row' } }, + { + uniqueID: '6_58634c-1c', + location: 'bottom', + metadata: { name: 'Bottom Row' }, + }, [ createBlock( 'kadence/header-section', - { uniqueID: '6_d29711-a5', location: 'left', metadata: { name: 'Left Section' } }, + { + uniqueID: '6_ed1fec-d5', + location: 'left', + metadata: { name: 'Left Section' }, + }, [ createBlock( 'kadence/header-column', - { uniqueID: '6_709416-dd', location: 'left', metadata: { name: 'Left' } }, + { + uniqueID: '6_3618a0-b3', + location: 'left', + metadata: { name: 'Left' }, + }, [] ), createBlock( 'kadence/header-column', { - uniqueID: '6_1b739b-8c', + uniqueID: '6_d7db3e-35', location: 'center-left', metadata: { name: 'Center Left' }, }, @@ -252,17 +280,25 @@ function innerBlocks() { ), createBlock( 'kadence/header-column', - { uniqueID: '6_ff0421-eb', location: 'center', metadata: { name: 'Center' } }, + { + uniqueID: '6_6ddb39-f2', + location: 'center', + metadata: { name: 'Center' }, + }, [] ), createBlock( 'kadence/header-section', - { uniqueID: '6_099ace-7c', location: 'right', metadata: { name: 'Right Section' } }, + { + uniqueID: '6_324d1c-7e', + location: 'right', + metadata: { name: 'Right Section' }, + }, [ createBlock( 'kadence/header-column', { - uniqueID: '6_9e83d6-e8', + uniqueID: '6_63b27c-19', location: 'center-right', metadata: { name: 'Center Right' }, }, @@ -270,7 +306,11 @@ function innerBlocks() { ), createBlock( 'kadence/header-column', - { uniqueID: '6_176e1e-df', location: 'right', metadata: { name: 'Right' } }, + { + uniqueID: '6_66a6bb-66', + location: 'right', + metadata: { name: 'Right' }, + }, [] ), ] @@ -278,50 +318,68 @@ function innerBlocks() { ] ), ]), - createBlock('kadence/header-container-tablet', { uniqueID: '6_cdd54e-ec' }, [ - createBlock('kadence/header-row', { uniqueID: '6_9a68e2-ec', metadata: { name: 'Top Row' } }, [ - createBlock( - 'kadence/header-column', - { uniqueID: '6_d14800-cd', location: 'tablet-left', metadata: { name: 'Left' } }, - [] - ), - createBlock( - 'kadence/header-column', - { uniqueID: '6_8e1cce-17', metadata: { name: 'Center' }, location: 'tablet-center' }, - [] - ), - createBlock( - 'kadence/header-column', - { uniqueID: '6_3f44b0-36', location: 'tablet-right', metadata: { name: 'Right' } }, - [] - ), - ]), + createBlock('kadence/header-container-tablet', { uniqueID: '6_0db05f-19' }, [ createBlock( 'kadence/header-row', { - uniqueID: '6_be98a1-59', - layout: 'fullwidth', - vAlignTablet: 'center', - metadata: { name: 'Middle Row' }, + uniqueID: '6_d3c183-dc', + metadata: { name: 'Top Row' }, }, [ createBlock( 'kadence/header-column', - { uniqueID: '6_f7efdb-52', location: 'tablet-left', metadata: { name: 'Left' } }, + { + uniqueID: '6_735956-a1', + location: 'tablet-left', + metadata: { name: 'Left' }, + }, [] ), createBlock( 'kadence/header-column', - { uniqueID: '6_7048f8-e9', metadata: { name: 'Center' }, location: 'tablet-center' }, + { + uniqueID: '6_96ebcd-88', + metadata: { name: 'Center', location: 'tablet-center' }, + }, + [] + ), + createBlock( + 'kadence/header-column', + { + uniqueID: '6_55f6b1-b9', + location: 'tablet-right', + metadata: { name: 'Right' }, + }, + [] + ), + ] + ), + createBlock( + 'kadence/header-row', + { + uniqueID: '6_0cacf3-2c', + layout: 'fullwidth', + vAlignTablet: 'center', + metadata: { name: 'Middle Row' }, + }, + [ + createBlock( + 'kadence/header-column', + { + uniqueID: '6_b29fb9-7a', + location: 'tablet-left', + metadata: { name: 'Left' }, + }, [ createBlock( - 'kadence/image', + 'kadence/off-canvas-trigger', { - imgMaxWidthTablet: 100, - sizeSlug: 'full', - linkDestination: 'none', - uniqueID: '6_267191-57', - url: '/wp-content/plugins/kadence-blocks/includes/assets/images/placeholder/logo-dark.png', + uniqueID: '6_7d4a68-e6', + iconSizeTablet: 25, + iconColorTablet: 'palette3', + iconColorHoverTablet: 'palette3', + iconBackgroundColorTablet: 'palette8', + iconBackgroundColorHoverTablet: 'palette8', }, [] ), @@ -329,39 +387,60 @@ function innerBlocks() { ), createBlock( 'kadence/header-column', - { uniqueID: '6_f780bf-26', location: 'tablet-right', metadata: { name: 'Right' } }, + { + uniqueID: '6_4503bc-d7', + metadata: { name: 'Center', location: 'tablet-center' }, + }, [ createBlock( - 'kadence/off-canvas-trigger', + 'kadence/image', { - uniqueID: '6_fdfe09-2d', - icon: 'fe_alignJustify', - iconSizeTablet: 25, - iconColorTablet: 'palette3', - iconColorHoverTablet: 'palette3', - iconBackgroundColorTablet: 'palette8', - iconBackgroundColorHoverTablet: 'palette8', + imgMaxWidthTablet: 100, + sizeSlug: 'full', + linkDestination: 'none', + uniqueID: '6_947fd5-0f', + url: '/wp-content/plugins/kadence-blocks/includes/assets/images/placeholder/logo-dark.png', }, [] ), ] ), + createBlock( + 'kadence/header-column', + { + uniqueID: '6_924005-96', + location: 'tablet-right', + metadata: { name: 'Right' }, + }, + [] + ), ] ), - createBlock('kadence/header-row', { uniqueID: '6_12c3d7-de', metadata: { name: 'Bottom Row' } }, [ + createBlock('kadence/header-row', { uniqueID: '6_e4a604-e0', metadata: { name: 'Bottom Row' } }, [ createBlock( 'kadence/header-column', - { uniqueID: '6_092ed2-c2', location: 'tablet-left', metadata: { name: 'Left' } }, + { + uniqueID: '6_8ac929-9b', + location: 'tablet-left', + metadata: { name: 'Left' }, + }, [] ), createBlock( 'kadence/header-column', - { uniqueID: '6_ee92c3-ac', metadata: { name: 'Center' }, location: 'tablet-center' }, + { + uniqueID: '6_1241a8-a6', + metadata: { name: 'Center', location: 'tablet-center' }, + }, [] ), createBlock( 'kadence/header-column', - { uniqueID: '6_6e0811-10', location: 'tablet-right', metadata: { name: 'Right' } }, + { + uniqueID: '6_a59f90-39', + location: 'tablet-right', + metadata: { name: 'Right' }, + }, [] ), ]), @@ -369,100 +448,18 @@ function innerBlocks() { createBlock( 'kadence/off-canvas', { - uniqueID: '6_e673a2-87', - slideFrom: 'right', - widthType: 'full', - containerMaxWidthTablet: 400, - backgroundColorTablet: 'palette6', - hAlignTablet: 'center', + uniqueID: '6_aa8c37-35', + maxWidthTablet: 700, + containerMaxWidthTablet: 350, + backgroundColorTablet: 'palette3', + hAlignTablet: 'left', vAlignTablet: 'center', + closeIcon: 'fas_window-close', closeIconSizeTablet: 25, closeIconColorTablet: 'palette9', closeIconColorHoverTablet: 'palette9', - closeIconBackgroundColorTablet: 'palette6', - closeIconBackgroundColorHoverTablet: 'palette6', }, - [ - createBlock('kadence/navigation', { uniqueID: '6_533373-5b' }, []), - createBlock( - 'kadence/rowlayout', - { - uniqueID: '6_75ef70-f8', - columns: 3, - tabletLayout: 'equal', - tabletGutter: 'skinny', - customGutter: ['', 16, ''], - colLayout: 'equal', - tabletPadding: ['', 'xs', '', 'xs'], - kbVersion: 2, - }, - [ - createBlock( - 'kadence/column', - { borderWidth: ['', '', '', ''], uniqueID: '6_396b70-3b', kbVersion: 2 }, - [ - createBlock('kadence/icon', { uniqueID: '6_1a3587-77' }, [ - createBlock( - 'kadence/single-icon', - { - uniqueID: '6_4b320e-48', - icon: 'fa_facebook-n', - link: '#', - title: 'Facebook', - color: 'palette9', - hColor: 'palette7', - tabletSize: 25, - }, - [] - ), - ]), - ] - ), - createBlock( - 'kadence/column', - { id: 2, borderWidth: ['', '', '', ''], uniqueID: '6_e3d637-45', kbVersion: 2 }, - [ - createBlock('kadence/icon', { uniqueID: '6_e45144-3c' }, [ - createBlock( - 'kadence/single-icon', - { - uniqueID: '6_a6aad3-d4', - icon: 'fe_instagram', - link: '#', - title: 'Instagram', - color: 'palette9', - hColor: 'palette7', - tabletSize: 25, - }, - [] - ), - ]), - ] - ), - createBlock( - 'kadence/column', - { id: 3, borderWidth: ['', '', '', ''], uniqueID: '6_8e7341-eb', kbVersion: 2 }, - [ - createBlock('kadence/icon', { uniqueID: '6_cf6c5e-9f' }, [ - createBlock( - 'kadence/single-icon', - { - uniqueID: '6_4c7b45-e9', - icon: 'fa_youtube', - link: '#', - title: 'Youtube', - color: 'palette9', - hColor: 'palette7', - tabletSize: 25, - }, - [] - ), - ]), - ] - ), - ] - ), - ] + [createBlock('kadence/navigation', { uniqueID: '6_bc45c6-f6', templateKey: 'long-vertical' }, [])] ), ]), ]; diff --git a/src/blocks/header/templates/basic-2.js b/src/blocks/header/templates/basic-2.js index 28f2a992c..6e5f7e930 100644 --- a/src/blocks/header/templates/basic-2.js +++ b/src/blocks/header/templates/basic-2.js @@ -1,15 +1,20 @@ /** - * Template: Standard Headers + * Template: Basic: Logo – Nav – CTA * Post Type: kadence_header */ + import { createBlock } from '@wordpress/blocks'; const postMeta = { + _kad_header_background: { type: 'normal', color: 'palette8' }, + _kad_header_height: ['80', '', ''], + _kad_header_isSticky: '0', + _kad_header_isTransparent: '0', _kad_header_shadow: [ { enable: false, color: '#000000', - opacity: 0.20000000000000001, + opacity: 0.2, spread: 0, blur: 2, hOffset: 1, @@ -22,24 +27,36 @@ const postMeta = { function innerBlocks() { return [ createBlock('kadence/header', {}, [ - createBlock('kadence/header-container-desktop', { uniqueID: '6_1d8d24-bf' }, [ + createBlock('kadence/header-container-desktop', { uniqueID: '6_b9c987-a7' }, [ createBlock( 'kadence/header-row', - { uniqueID: '6_10764d-6d', location: 'top', metadata: { name: 'Top Row' } }, + { + uniqueID: '6_6c9b81-87', + location: 'top', + metadata: { name: 'Top Row' }, + }, [ createBlock( 'kadence/header-section', - { uniqueID: '6_e00be5-fd', location: 'left', metadata: { name: 'Left Section' } }, + { + uniqueID: '6_bc4f28-70', + location: 'left', + metadata: { name: 'Left Section' }, + }, [ createBlock( 'kadence/header-column', - { uniqueID: '6_50fd6d-90', location: 'left', metadata: { name: 'Left' } }, + { + uniqueID: '6_b96307-98', + location: 'left', + metadata: { name: 'Left' }, + }, [] ), createBlock( 'kadence/header-column', { - uniqueID: '6_269ef9-ff', + uniqueID: '6_ef8816-65', location: 'center-left', metadata: { name: 'Center Left' }, }, @@ -49,17 +66,25 @@ function innerBlocks() { ), createBlock( 'kadence/header-column', - { uniqueID: '6_c8207e-c2', location: 'center', metadata: { name: 'Center' } }, + { + uniqueID: '6_a747de-57', + location: 'center', + metadata: { name: 'Center' }, + }, [] ), createBlock( 'kadence/header-section', - { uniqueID: '6_695d80-c4', location: 'right', metadata: { name: 'Right Section' } }, + { + uniqueID: '6_d87423-24', + location: 'right', + metadata: { name: 'Right Section' }, + }, [ createBlock( 'kadence/header-column', { - uniqueID: '6_99c7cf-82', + uniqueID: '6_8f50a6-ea', location: 'center-right', metadata: { name: 'Center Right' }, }, @@ -67,7 +92,11 @@ function innerBlocks() { ), createBlock( 'kadence/header-column', - { uniqueID: '6_388d65-77', location: 'right', metadata: { name: 'Right' } }, + { + uniqueID: '6_e7481c-77', + location: 'right', + metadata: { name: 'Right' }, + }, [] ), ] @@ -76,23 +105,32 @@ function innerBlocks() { ), createBlock( 'kadence/header-row', - { uniqueID: '6_e34992-48', location: 'center', metadata: { name: 'Middle Row' } }, + { + uniqueID: '6_ebec9e-74', + location: 'center', + vAlign: 'center', + metadata: { name: 'Middle Row' }, + }, [ createBlock( 'kadence/header-section', - { uniqueID: '6_a696a4-d7', location: 'left', metadata: { name: 'Left Section' } }, + { + uniqueID: '6_d957c0-53', + location: 'left', + metadata: { name: 'Left Section' }, + }, [ createBlock( 'kadence/header-column', - { uniqueID: '6_0ee19c-e3', location: 'left', metadata: { name: 'Left' } }, + { uniqueID: '6_569d28-f9', location: 'left', metadata: { name: 'Left' } }, [ createBlock( 'kadence/image', { - imgMaxWidth: 100, + imgMaxWidth: 105, sizeSlug: 'full', linkDestination: 'none', - uniqueID: '6_e0ac3d-70', + uniqueID: '6_961c4f-90', globalAlt: true, url: '/wp-content/plugins/kadence-blocks/includes/assets/images/placeholder/logo-dark.png', }, @@ -103,7 +141,7 @@ function innerBlocks() { createBlock( 'kadence/header-column', { - uniqueID: '6_be370d-cf', + uniqueID: '6_f2df43-27', location: 'center-left', metadata: { name: 'Center Left' }, }, @@ -113,17 +151,25 @@ function innerBlocks() { ), createBlock( 'kadence/header-column', - { uniqueID: '6_025f5a-10', location: 'center', metadata: { name: 'Center' } }, - [createBlock('kadence/navigation', { uniqueID: '6_d4bf5e-7f' }, [])] + { + uniqueID: '6_43f7e5-b0', + location: 'center', + metadata: { name: 'Center' }, + }, + [] ), createBlock( 'kadence/header-section', - { uniqueID: '6_2ac6ad-37', location: 'right', metadata: { name: 'Right Section' } }, + { + uniqueID: '6_82e24a-5e', + location: 'right', + metadata: { name: 'Right Section' }, + }, [ createBlock( 'kadence/header-column', { - uniqueID: '6_897bf0-ab', + uniqueID: '6_594813-d8', location: 'center-right', metadata: { name: 'Center Right' }, }, @@ -131,56 +177,44 @@ function innerBlocks() { ), createBlock( 'kadence/header-column', - { uniqueID: '6_3aebe7-3c', location: 'right', metadata: { name: 'Right' } }, + { + uniqueID: '6_62cdc0-cb', + location: 'right', + metadata: { name: 'Right' }, + }, [ - createBlock('kadence/advancedbtn', { uniqueID: '6_a61a9b-27' }, [ - createBlock( - 'kadence/singlebtn', - { - uniqueID: '6_014d21-8f', - text: 'Call To Action', - sizePreset: 'small', - typography: [ - { - size: ['', '', ''], - sizeType: 'px', - lineHeight: ['', '', ''], - lineType: '', - letterSpacing: [0.5, '', ''], - letterType: 'px', - textTransform: 'uppercase', - family: 'var( --global-heading-font-family, inherit )', - google: false, - style: 'normal', - weight: 'inherit', - variant: '', - subset: '', - loadGoogle: true, - }, - ], - }, - [] - ), + createBlock( + 'kadence/navigation', + { + uniqueID: '6_59d3e4-f2', + templateKey: 'short', + }, + [] + ), + createBlock('kadence/advancedbtn', { uniqueID: '6_b0e311-af' }, [ createBlock( 'kadence/singlebtn', { - uniqueID: '6_d950a8-bc', - text: 'Secondary', + uniqueID: '6_bcb4c5-2a', + text: 'Call to Action', sizePreset: 'small', - inheritStyles: 'outline', + color: 'palette9', + background: 'palette3', + colorHover: 'palette9', + backgroundHover: 'palette6', typography: [ { - size: ['', '', ''], + size: ['sm', '', ''], sizeType: 'px', lineHeight: ['', '', ''], lineType: '', - letterSpacing: [0.5, '', ''], + letterSpacing: ['', '', ''], letterType: 'px', textTransform: 'uppercase', - family: 'var( --global-heading-font-family, inherit )', - google: false, - style: 'normal', - weight: 'inherit', + family: '', + google: '', + style: '', + weight: '', variant: '', subset: '', loadGoogle: true, @@ -198,21 +232,33 @@ function innerBlocks() { ), createBlock( 'kadence/header-row', - { uniqueID: '6_58634c-1c', location: 'bottom', metadata: { name: 'Bottom Row' } }, + { + uniqueID: '6_db25ae-87', + location: 'bottom', + metadata: { name: 'Bottom Row' }, + }, [ createBlock( 'kadence/header-section', - { uniqueID: '6_ed1fec-d5', location: 'left', metadata: { name: 'Left Section' } }, + { + uniqueID: '6_f60ab1-8b', + location: 'left', + metadata: { name: 'Left Section' }, + }, [ createBlock( 'kadence/header-column', - { uniqueID: '6_3618a0-b3', location: 'left', metadata: { name: 'Left' } }, + { + uniqueID: '6_a8aad6-0f', + location: 'left', + metadata: { name: 'Left' }, + }, [] ), createBlock( 'kadence/header-column', { - uniqueID: '6_d7db3e-35', + uniqueID: '6_934650-c2', location: 'center-left', metadata: { name: 'Center Left' }, }, @@ -222,17 +268,25 @@ function innerBlocks() { ), createBlock( 'kadence/header-column', - { uniqueID: '6_6ddb39-f2', location: 'center', metadata: { name: 'Center' } }, + { + uniqueID: '6_8ed3ff-b3', + location: 'center', + metadata: { name: 'Center' }, + }, [] ), createBlock( 'kadence/header-section', - { uniqueID: '6_324d1c-7e', location: 'right', metadata: { name: 'Right Section' } }, + { + uniqueID: '6_57d3e4-b8', + location: 'right', + metadata: { name: 'Right Section' }, + }, [ createBlock( 'kadence/header-column', { - uniqueID: '6_63b27c-19', + uniqueID: '6_355050-69', location: 'center-right', metadata: { name: 'Center Right' }, }, @@ -240,7 +294,11 @@ function innerBlocks() { ), createBlock( 'kadence/header-column', - { uniqueID: '6_66a6bb-66', location: 'right', metadata: { name: 'Right' } }, + { + uniqueID: '6_aec591-8e', + location: 'right', + metadata: { name: 'Right' }, + }, [] ), ] @@ -248,46 +306,25 @@ function innerBlocks() { ] ), ]), - createBlock('kadence/header-container-tablet', { uniqueID: '6_0db05f-19' }, [ - createBlock('kadence/header-row', { uniqueID: '6_d3c183-dc', metadata: { name: 'Top Row' } }, [ - createBlock( - 'kadence/header-column', - { uniqueID: '6_735956-a1', location: 'tablet-left', metadata: { name: 'Left' } }, - [] - ), - createBlock( - 'kadence/header-column', - { uniqueID: '6_96ebcd-88', metadata: { name: 'Center' }, location: 'tablet-center' }, - [] - ), - createBlock( - 'kadence/header-column', - { uniqueID: '6_55f6b1-b9', location: 'tablet-right', metadata: { name: 'Right' } }, - [] - ), - ]), + createBlock('kadence/header-container-tablet', { uniqueID: '6_741598-d5' }, [ createBlock( 'kadence/header-row', { - uniqueID: '6_0cacf3-2c', - layout: 'fullwidth', - vAlignTablet: 'center', - metadata: { name: 'Middle Row' }, + uniqueID: '6_a08282-68', + metadata: { name: 'Top Row' }, }, [ createBlock( 'kadence/header-column', - { uniqueID: '6_b29fb9-7a', location: 'tablet-left', metadata: { name: 'Left' } }, + { uniqueID: '6_43b503-12', location: 'tablet-left', metadata: { name: 'Left' } }, [ createBlock( - 'kadence/off-canvas-trigger', + 'kadence/image', { - uniqueID: '6_7d4a68-e6', - iconSizeTablet: 25, - iconColorTablet: 'palette3', - iconColorHoverTablet: 'palette3', - iconBackgroundColorTablet: 'palette8', - iconBackgroundColorHoverTablet: 'palette8', + sizeSlug: 'full', + linkDestination: 'none', + uniqueID: '6_eb8552-af', + url: '/wp-content/plugins/kadence-blocks/includes/assets/images/placeholder/logo-dark.png', }, [] ), @@ -295,42 +332,89 @@ function innerBlocks() { ), createBlock( 'kadence/header-column', - { uniqueID: '6_4503bc-d7', metadata: { name: 'Center' }, location: 'tablet-center' }, + { + uniqueID: '6_552a9f-e7', + metadata: { name: 'Center', location: 'tablet-center' }, + }, + [] + ), + createBlock( + 'kadence/header-column', + { + uniqueID: '6_e13dc2-d0', + location: 'tablet-right', + metadata: { name: 'Right' }, + }, [ createBlock( - 'kadence/image', + 'kadence/off-canvas-trigger', { - imgMaxWidthTablet: 100, - sizeSlug: 'full', - linkDestination: 'none', - uniqueID: '6_947fd5-0f', - url: '/wp-content/plugins/kadence-blocks/includes/assets/images/placeholder/logo-dark.png', + uniqueID: '6_9fd5e3-19', + iconSizeTablet: 20, + iconColorTablet: 'palette3', + iconColorHoverTablet: 'palette6', + iconBackgroundColorTablet: 'palette8', + iconBackgroundColorHoverTablet: 'palette8', }, [] ), ] ), - createBlock( - 'kadence/header-column', - { uniqueID: '6_924005-96', location: 'tablet-right', metadata: { name: 'Right' } }, - [] - ), ] ), - createBlock('kadence/header-row', { uniqueID: '6_e4a604-e0', metadata: { name: 'Bottom Row' } }, [ + createBlock('kadence/header-row', { uniqueID: '6_68c1c3-80', metadata: { name: 'Middle Row' } }, [ + createBlock( + 'kadence/header-column', + { + uniqueID: '6_ee97d8-f1', + location: 'tablet-left', + metadata: { name: 'Left' }, + }, + [] + ), + createBlock( + 'kadence/header-column', + { + uniqueID: '6_16a0d7-83', + metadata: { name: 'Center', location: 'tablet-center' }, + }, + [] + ), + createBlock( + 'kadence/header-column', + { + uniqueID: '6_0d1746-3e', + location: 'tablet-right', + metadata: { name: 'Right' }, + }, + [] + ), + ]), + createBlock('kadence/header-row', { uniqueID: '6_78c60d-7b', metadata: { name: 'Bottom Row' } }, [ createBlock( 'kadence/header-column', - { uniqueID: '6_8ac929-9b', location: 'tablet-left', metadata: { name: 'Left' } }, + { + uniqueID: '6_8e84ad-2c', + location: 'tablet-left', + metadata: { name: 'Left' }, + }, [] ), createBlock( 'kadence/header-column', - { uniqueID: '6_1241a8-a6', metadata: { name: 'Center' }, location: 'tablet-center' }, + { + uniqueID: '6_c839f3-8d', + metadata: { name: 'Center', location: 'tablet-center' }, + }, [] ), createBlock( 'kadence/header-column', - { uniqueID: '6_a59f90-39', location: 'tablet-right', metadata: { name: 'Right' } }, + { + uniqueID: '6_ca5c87-c5', + location: 'tablet-right', + metadata: { name: 'Right' }, + }, [] ), ]), @@ -338,18 +422,76 @@ function innerBlocks() { createBlock( 'kadence/off-canvas', { - uniqueID: '6_aa8c37-35', + uniqueID: '6_1d3153-51', + slideFrom: 'right', maxWidthTablet: 700, - containerMaxWidthTablet: 350, + containerMaxWidthTablet: 400, backgroundColorTablet: 'palette3', - hAlignTablet: 'left', + paddingTablet: ['sm', 'sm', 'sm', 'sm'], + hAlignTablet: 'center', vAlignTablet: 'center', - closeIcon: 'fas_window-close', + closeIcon: 'fe_xSquare', closeIconSizeTablet: 25, closeIconColorTablet: 'palette9', closeIconColorHoverTablet: 'palette9', + closeIconBackgroundColorTablet: 'palette3', + closeIconBackgroundColorHoverTablet: 'palette3', + closeIconPaddingTablet: ['xs', 'xs', 'xs', 'xs'], }, - [createBlock('kadence/navigation', { uniqueID: '6_bc45c6-f6' }, [])] + [ + createBlock( + 'kadence/navigation', + { + uniqueID: '6_3492b0-e3', + templateKey: 'short-vertical', + }, + [] + ), + createBlock('kadence/advancedbtn', { uniqueID: '6_c13bb6-27' }, [ + createBlock( + 'kadence/singlebtn', + { + uniqueID: '6_d23d99-07', + text: 'Call to action', + sizePreset: 'small', + tabletMargin: ['md', '', '', ''], + color: 'palette9', + background: 'palette3', + colorHover: 'palette9', + backgroundHover: 'palette6', + tabletBorderStyle: [ + { + top: ['palette9', '', ''], + right: ['palette9', '', ''], + bottom: ['palette9', '', ''], + left: ['palette9', '', ''], + unit: '', + }, + ], + inheritStyles: 'outline', + typography: [ + { + size: ['sm', '', ''], + sizeType: 'px', + lineHeight: ['', '', ''], + lineType: '', + letterSpacing: ['', '', ''], + letterType: 'px', + textTransform: 'uppercase', + family: '', + google: '', + style: '', + weight: '', + variant: '', + subset: '', + loadGoogle: true, + }, + ], + }, + [] + ), + ]), + ] ), ]), ]; diff --git a/src/blocks/header/templates/basic-3.js b/src/blocks/header/templates/basic-3.js index 4c2bef552..41a5e087d 100644 --- a/src/blocks/header/templates/basic-3.js +++ b/src/blocks/header/templates/basic-3.js @@ -19,7 +19,7 @@ const postMeta = { { enable: false, color: '#000000', - opacity: 0.20000000000000001, + opacity: 0.2, spread: 0, blur: 2, hOffset: 1, @@ -35,15 +35,27 @@ function innerBlocks() { createBlock('kadence/header-container-desktop', { uniqueID: '6_8a54ee-e5' }, [ createBlock( 'kadence/header-row', - { uniqueID: '6_ab0443-66', location: 'top', metadata: { name: 'Top Row' } }, + { + uniqueID: '6_ab0443-66', + location: 'top', + metadata: { name: 'Top Row' }, + }, [ createBlock( 'kadence/header-section', - { uniqueID: '6_d3211c-99', location: 'left', metadata: { name: 'Left Section' } }, + { + uniqueID: '6_d3211c-99', + location: 'left', + metadata: { name: 'Left Section' }, + }, [ createBlock( 'kadence/header-column', - { uniqueID: '6_91abed-d2', location: 'left', metadata: { name: 'Left' } }, + { + uniqueID: '6_91abed-d2', + location: 'left', + metadata: { name: 'Left' }, + }, [] ), createBlock( @@ -59,12 +71,20 @@ function innerBlocks() { ), createBlock( 'kadence/header-column', - { uniqueID: '6_378e9d-cd', location: 'center', metadata: { name: 'Center' } }, + { + uniqueID: '6_378e9d-cd', + location: 'center', + metadata: { name: 'Center' }, + }, [] ), createBlock( 'kadence/header-section', - { uniqueID: '6_abbeb1-2a', location: 'right', metadata: { name: 'Right Section' } }, + { + uniqueID: '6_abbeb1-2a', + location: 'right', + metadata: { name: 'Right Section' }, + }, [ createBlock( 'kadence/header-column', @@ -77,7 +97,11 @@ function innerBlocks() { ), createBlock( 'kadence/header-column', - { uniqueID: '6_e1ec2c-70', location: 'right', metadata: { name: 'Right' } }, + { + uniqueID: '6_e1ec2c-70', + location: 'right', + metadata: { name: 'Right' }, + }, [] ), ] @@ -96,11 +120,19 @@ function innerBlocks() { [ createBlock( 'kadence/header-section', - { uniqueID: '6_5ef4ea-76', location: 'left', metadata: { name: 'Left Section' } }, + { + uniqueID: '6_5ef4ea-76', + location: 'left', + metadata: { name: 'Left Section' }, + }, [ createBlock( 'kadence/header-column', - { uniqueID: '6_ef1743-20', location: 'left', metadata: { name: 'Left' } }, + { + uniqueID: '6_ef1743-20', + location: 'left', + metadata: { name: 'Left' }, + }, [] ), createBlock( @@ -110,13 +142,23 @@ function innerBlocks() { location: 'center-left', metadata: { name: 'Center Left' }, }, - [createBlock('kadence/navigation', { uniqueID: '6_adaeb5-22' }, [])] + [ + createBlock( + 'kadence/navigation', + { uniqueID: '6_adaeb5-22', templateKey: 'short' }, + [] + ), + ] ), ] ), createBlock( 'kadence/header-column', - { uniqueID: '6_d73051-3d', location: 'center', metadata: { name: 'Center' } }, + { + uniqueID: '6_d73051-3d', + location: 'center', + metadata: { name: 'Center' }, + }, [ createBlock( 'kadence/image', @@ -135,7 +177,11 @@ function innerBlocks() { ), createBlock( 'kadence/header-section', - { uniqueID: '6_f00bb1-7f', location: 'right', metadata: { name: 'Right Section' } }, + { + uniqueID: '6_f00bb1-7f', + location: 'right', + metadata: { name: 'Right Section' }, + }, [ createBlock( 'kadence/header-column', @@ -144,67 +190,51 @@ function innerBlocks() { location: 'center-right', metadata: { name: 'Center Right' }, }, - [createBlock('kadence/navigation', { uniqueID: '6_9c1e43-30' }, [])] + [ + createBlock( + 'kadence/navigation', + { uniqueID: '6_9c1e43-30', templateKey: 'short-vertical' }, + [] + ), + ] ), createBlock( 'kadence/header-column', - { uniqueID: '6_5264df-4a', location: 'right', metadata: { name: 'Right' } }, + { + uniqueID: '6_5264df-4a', + location: 'right', + metadata: { name: 'Right' }, + }, [ - createBlock('kadence/icon', { uniqueID: '6_9537c3-c2', gap: ['xs', '', ''] }, [ - createBlock( - 'kadence/single-icon', - { - uniqueID: '6_b9f9c3-6a', - icon: 'fa_facebook-n', - link: '#', - size: 20, - title: 'Facebook', - color: 'palette9', - background: 'palette6', - borderRadius: 50, - borderWidth: 0, - padding: [5, 5, 5, 5], - style: 'stacked', - hColor: 'palette9', - hBackground: 'palette5', - }, - [] - ), + createBlock('kadence/advancedbtn', { uniqueID: '6_c4c399-29' }, [ createBlock( - 'kadence/single-icon', + 'kadence/singlebtn', { - uniqueID: '6_bccd99-2a', - icon: 'fa_instagram', - link: '#', - size: 20, - title: 'Instagram', + uniqueID: '6_1dcf73-af', + text: 'CAll to action', + sizePreset: 'small', color: 'palette9', - background: 'palette6', - borderRadius: 50, - borderWidth: 0, - padding: [5, 5, 5, 5], - style: 'stacked', - hColor: 'palette9', - hBackground: 'palette5', - }, - [] - ), - createBlock( - 'kadence/single-icon', - { - uniqueID: '6_6c450f-b6', - icon: 'fa_youtube', - link: '#', - size: 20, - title: 'Youtube', - color: 'palette9', - background: 'palette6', - borderRadius: 50, - borderWidth: 0, - padding: [5, 5, 5, 5], - style: 'stacked', - hColor: 'palette9', - hBackground: 'palette5', + background: 'palette3', + colorHover: 'palette9', + backgroundHover: 'palette6', + typography: [ + { + size: ['sm', '', ''], + sizeType: 'px', + lineHeight: ['', '', ''], + lineType: '', + letterSpacing: [1, '', ''], + letterType: 'px', + textTransform: 'uppercase', + family: '', + google: '', + style: '', + weight: '500', + variant: '', + subset: '', + loadGoogle: true, + }, + ], }, [] ), @@ -217,15 +247,27 @@ function innerBlocks() { ), createBlock( 'kadence/header-row', - { uniqueID: '6_1be4fc-bb', location: 'bottom', metadata: { name: 'Bottom Row' } }, + { + uniqueID: '6_1be4fc-bb', + location: 'bottom', + metadata: { name: 'Bottom Row' }, + }, [ createBlock( 'kadence/header-section', - { uniqueID: '6_d29711-a5', location: 'left', metadata: { name: 'Left Section' } }, + { + uniqueID: '6_d29711-a5', + location: 'left', + metadata: { name: 'Left Section' }, + }, [ createBlock( 'kadence/header-column', - { uniqueID: '6_709416-dd', location: 'left', metadata: { name: 'Left' } }, + { + uniqueID: '6_709416-dd', + location: 'left', + metadata: { name: 'Left' }, + }, [] ), createBlock( @@ -241,12 +283,20 @@ function innerBlocks() { ), createBlock( 'kadence/header-column', - { uniqueID: '6_ff0421-eb', location: 'center', metadata: { name: 'Center' } }, + { + uniqueID: '6_ff0421-eb', + location: 'center', + metadata: { name: 'Center' }, + }, [] ), createBlock( 'kadence/header-section', - { uniqueID: '6_099ace-7c', location: 'right', metadata: { name: 'Right Section' } }, + { + uniqueID: '6_099ace-7c', + location: 'right', + metadata: { name: 'Right Section' }, + }, [ createBlock( 'kadence/header-column', @@ -259,7 +309,11 @@ function innerBlocks() { ), createBlock( 'kadence/header-column', - { uniqueID: '6_176e1e-df', location: 'right', metadata: { name: 'Right' } }, + { + uniqueID: '6_176e1e-df', + location: 'right', + metadata: { name: 'Right' }, + }, [] ), ] @@ -268,23 +322,41 @@ function innerBlocks() { ), ]), createBlock('kadence/header-container-tablet', { uniqueID: '6_cdd54e-ec' }, [ - createBlock('kadence/header-row', { uniqueID: '6_9a68e2-ec', metadata: { name: 'Top Row' } }, [ - createBlock( - 'kadence/header-column', - { uniqueID: '6_d14800-cd', location: 'tablet-left', metadata: { name: 'Left' } }, - [] - ), - createBlock( - 'kadence/header-column', - { uniqueID: '6_8e1cce-17', metadata: { name: 'Center' }, location: 'tablet-center' }, - [] - ), - createBlock( - 'kadence/header-column', - { uniqueID: '6_3f44b0-36', location: 'tablet-right', metadata: { name: 'Right' } }, - [] - ), - ]), + createBlock( + 'kadence/header-row', + { + uniqueID: '6_9a68e2-ec', + metadata: { name: 'Top Row' }, + }, + [ + createBlock( + 'kadence/header-column', + { + uniqueID: '6_d14800-cd', + location: 'tablet-left', + metadata: { name: 'Left' }, + }, + [] + ), + createBlock( + 'kadence/header-column', + { + uniqueID: '6_8e1cce-17', + metadata: { name: 'Center', location: 'tablet-center' }, + }, + [] + ), + createBlock( + 'kadence/header-column', + { + uniqueID: '6_3f44b0-36', + location: 'tablet-right', + metadata: { name: 'Right' }, + }, + [] + ), + ] + ), createBlock( 'kadence/header-row', { @@ -296,12 +368,19 @@ function innerBlocks() { [ createBlock( 'kadence/header-column', - { uniqueID: '6_f7efdb-52', location: 'tablet-left', metadata: { name: 'Left' } }, + { + uniqueID: '6_f7efdb-52', + location: 'tablet-left', + metadata: { name: 'Left' }, + }, [] ), createBlock( 'kadence/header-column', - { uniqueID: '6_7048f8-e9', metadata: { name: 'Center' }, location: 'tablet-center' }, + { + uniqueID: '6_7048f8-e9', + metadata: { name: 'Center', location: 'tablet-center' }, + }, [ createBlock( 'kadence/image', @@ -318,7 +397,11 @@ function innerBlocks() { ), createBlock( 'kadence/header-column', - { uniqueID: '6_f780bf-26', location: 'tablet-right', metadata: { name: 'Right' } }, + { + uniqueID: '6_f780bf-26', + location: 'tablet-right', + metadata: { name: 'Right' }, + }, [ createBlock( 'kadence/off-canvas-trigger', @@ -340,17 +423,28 @@ function innerBlocks() { createBlock('kadence/header-row', { uniqueID: '6_12c3d7-de', metadata: { name: 'Bottom Row' } }, [ createBlock( 'kadence/header-column', - { uniqueID: '6_092ed2-c2', location: 'tablet-left', metadata: { name: 'Left' } }, + { + uniqueID: '6_092ed2-c2', + location: 'tablet-left', + metadata: { name: 'Left' }, + }, [] ), createBlock( 'kadence/header-column', - { uniqueID: '6_ee92c3-ac', metadata: { name: 'Center' }, location: 'tablet-center' }, + { + uniqueID: '6_ee92c3-ac', + metadata: { name: 'Center', location: 'tablet-center' }, + }, [] ), createBlock( 'kadence/header-column', - { uniqueID: '6_6e0811-10', location: 'tablet-right', metadata: { name: 'Right' } }, + { + uniqueID: '6_6e0811-10', + location: 'tablet-right', + metadata: { name: 'Right' }, + }, [] ), ]), @@ -372,7 +466,7 @@ function innerBlocks() { closeIconBackgroundColorHoverTablet: 'palette6', }, [ - createBlock('kadence/navigation', { uniqueID: '6_533373-5b' }, []), + createBlock('kadence/navigation', { uniqueID: '6_533373-5b', templateKey: 'short' }, []), createBlock( 'kadence/rowlayout', { @@ -388,7 +482,11 @@ function innerBlocks() { [ createBlock( 'kadence/column', - { borderWidth: ['', '', '', ''], uniqueID: '6_396b70-3b', kbVersion: 2 }, + { + borderWidth: ['', '', '', ''], + uniqueID: '6_396b70-3b', + kbVersion: 2, + }, [ createBlock('kadence/icon', { uniqueID: '6_1a3587-77' }, [ createBlock( @@ -409,7 +507,12 @@ function innerBlocks() { ), createBlock( 'kadence/column', - { id: 2, borderWidth: ['', '', '', ''], uniqueID: '6_e3d637-45', kbVersion: 2 }, + { + id: 2, + borderWidth: ['', '', '', ''], + uniqueID: '6_e3d637-45', + kbVersion: 2, + }, [ createBlock('kadence/icon', { uniqueID: '6_e45144-3c' }, [ createBlock( @@ -430,7 +533,12 @@ function innerBlocks() { ), createBlock( 'kadence/column', - { id: 3, borderWidth: ['', '', '', ''], uniqueID: '6_8e7341-eb', kbVersion: 2 }, + { + id: 3, + borderWidth: ['', '', '', ''], + uniqueID: '6_8e7341-eb', + kbVersion: 2, + }, [ createBlock('kadence/icon', { uniqueID: '6_cf6c5e-9f' }, [ createBlock( diff --git a/src/blocks/header/templates/basic-4.js b/src/blocks/header/templates/basic-4.js index 5aa74577d..f730f2318 100644 --- a/src/blocks/header/templates/basic-4.js +++ b/src/blocks/header/templates/basic-4.js @@ -1,17 +1,16 @@ /** - * Template: Off Canvas Header 1 + * Template: Off Canvas Header – 3 * Post Type: kadence_header */ import { createBlock } from '@wordpress/blocks'; const postMeta = { - _kad_header_autoTransparentSpacing: '1', _kad_header_shadow: [ { enable: false, color: '#000000', - opacity: 0.20000000000000001, + opacity: 0.2, spread: 0, blur: 2, hOffset: 1, @@ -19,53 +18,43 @@ const postMeta = { inset: false, }, ], - _kad_header_backgroundSticky: { - color: 'palette7', - image: '', - imageID: '', - position: 'center center', - size: 'cover', - repeat: 'no-repeat', - attachment: 'scroll', - type: 'normal', - gradient: '', - }, _kad_header_isSticky: '1', _kad_header_isTransparent: '1', - _kad_header_backgroundTransparent: { - color: 'palette9', - image: '', - imageID: '', - position: 'center center', - size: 'cover', - repeat: 'no-repeat', - attachment: 'scroll', - type: 'normal', - gradient: '', - }, }; function innerBlocks() { return [ createBlock('kadence/header', {}, [ - createBlock('kadence/header-container-desktop', { uniqueID: '10_968ead-cb' }, [ + createBlock('kadence/header-container-desktop', { uniqueID: '10_4bb9bf-15' }, [ createBlock( 'kadence/header-row', - { uniqueID: '10_6f786b-b4', location: 'top', metadata: { name: 'Top Row' } }, + { + uniqueID: '10_937552-59', + location: 'top', + metadata: { name: 'Top Row' }, + }, [ createBlock( 'kadence/header-section', - { uniqueID: '10_5d5bd7-54', location: 'left', metadata: { name: 'Left Section' } }, + { + uniqueID: '10_25122c-3a', + location: 'left', + metadata: { name: 'Left Section' }, + }, [ createBlock( 'kadence/header-column', - { uniqueID: '10_d39fd1-a7', location: 'left', metadata: { name: 'Left' } }, + { + uniqueID: '10_3751b1-1f', + location: 'left', + metadata: { name: 'Left' }, + }, [] ), createBlock( 'kadence/header-column', { - uniqueID: '10_7baf4f-a5', + uniqueID: '10_6f98c2-57', location: 'center-left', metadata: { name: 'Center Left' }, }, @@ -75,17 +64,25 @@ function innerBlocks() { ), createBlock( 'kadence/header-column', - { uniqueID: '10_9f5235-b5', location: 'center', metadata: { name: 'Center' } }, + { + uniqueID: '10_2a7ee2-86', + location: 'center', + metadata: { name: 'Center' }, + }, [] ), createBlock( 'kadence/header-section', - { uniqueID: '10_d73ff1-09', location: 'right', metadata: { name: 'Right Section' } }, + { + uniqueID: '10_25884a-6a', + location: 'right', + metadata: { name: 'Right Section' }, + }, [ createBlock( 'kadence/header-column', { - uniqueID: '10_3ebdce-3a', + uniqueID: '10_3f47ba-01', location: 'center-right', metadata: { name: 'Center Right' }, }, @@ -93,7 +90,11 @@ function innerBlocks() { ), createBlock( 'kadence/header-column', - { uniqueID: '10_1ffa87-b2', location: 'right', metadata: { name: 'Right' } }, + { + uniqueID: '10_ab8d5b-b7', + location: 'right', + metadata: { name: 'Right' }, + }, [] ), ] @@ -102,32 +103,34 @@ function innerBlocks() { ), createBlock( 'kadence/header-row', - { uniqueID: '10_888396-50', location: 'center', metadata: { name: 'Middle Row' } }, + { + uniqueID: '10_0c6f2f-f7', + location: 'center', + vAlign: 'center', + metadata: { name: 'Middle Row' }, + }, [ createBlock( 'kadence/header-section', - { uniqueID: '10_e536f1-8a', location: 'left', metadata: { name: 'Left Section' } }, + { + uniqueID: '10_4ff4c4-28', + location: 'left', + metadata: { name: 'Left Section' }, + }, [ createBlock( 'kadence/header-column', - { uniqueID: '10_e34255-d3', location: 'left', metadata: { name: 'Left' } }, - [ - createBlock( - 'kadence/image', - { - sizeSlug: 'full', - linkDestination: 'none', - uniqueID: '10_8a74e4-3e', - url: '/wp-content/plugins/kadence-blocks/includes/assets/images/placeholder/logo-dark.png', - }, - [] - ), - ] + { + uniqueID: '10_40369a-c7', + location: 'left', + metadata: { name: 'Left' }, + }, + [createBlock('kadence/off-canvas-trigger', { uniqueID: '10_db7fdb-a2' }, [])] ), createBlock( 'kadence/header-column', { - uniqueID: '10_4abf0b-c1', + uniqueID: '10_af51dc-f8', location: 'center-left', metadata: { name: 'Center Left' }, }, @@ -137,17 +140,38 @@ function innerBlocks() { ), createBlock( 'kadence/header-column', - { uniqueID: '10_849b5b-6b', location: 'center', metadata: { name: 'Center' } }, - [] + { uniqueID: '10_2b4829-44', location: 'center', metadata: { name: 'Center' } }, + [ + createBlock( + 'kadence/image', + { + sizeSlug: 'full', + linkDestination: 'none', + uniqueID: '10_997063-66', + marginDesktop: ['', 'xxl', '', ''], + url: '/wp-content/plugins/kadence-blocks/includes/assets/images/placeholder/logo-dark.png', + }, + [] + ), + createBlock( + 'kadence/navigation', + { uniqueID: '10_a99bde-ab', templateKey: 'short' }, + [] + ), + ] ), createBlock( 'kadence/header-section', - { uniqueID: '10_56ebea-d1', location: 'right', metadata: { name: 'Right Section' } }, + { + uniqueID: '10_0dffdd-85', + location: 'right', + metadata: { name: 'Right Section' }, + }, [ createBlock( 'kadence/header-column', { - uniqueID: '10_0505fa-29', + uniqueID: '10_8d717f-f6', location: 'center-right', metadata: { name: 'Center Right' }, }, @@ -155,39 +179,12 @@ function innerBlocks() { ), createBlock( 'kadence/header-column', - { uniqueID: '10_d0fad7-ea', location: 'right', metadata: { name: 'Right' } }, - [ - createBlock( - 'kadence/off-canvas-trigger', - { - uniqueID: '10_9d95b2-4b', - iconColor: 'palette4', - iconColorHover: 'palette4', - iconBackgroundColor: 'palette7', - iconBackgroundColorHover: 'palette7', - padding: ['xxs', 'xxs', '0', 'xxs'], - border: [ - { - top: ['palette7', '', 1], - right: ['palette7', '', 1], - bottom: ['palette7', '', 1], - left: ['palette7', '', 1], - unit: 'px', - }, - ], - borderHover: [ - { - top: ['palette4', '', 1], - right: ['palette4', '', 1], - bottom: ['palette4', '', 1], - left: ['palette4', '', 1], - unit: 'px', - }, - ], - }, - [] - ), - ] + { + uniqueID: '10_ca45b0-12', + location: 'right', + metadata: { name: 'Right' }, + }, + [] ), ] ), @@ -195,21 +192,33 @@ function innerBlocks() { ), createBlock( 'kadence/header-row', - { uniqueID: '10_860f00-42', location: 'bottom', metadata: { name: 'Bottom Row' } }, + { + uniqueID: '10_eb770d-58', + location: 'bottom', + metadata: { name: 'Bottom Row' }, + }, [ createBlock( 'kadence/header-section', - { uniqueID: '10_e4230b-35', location: 'left', metadata: { name: 'Left Section' } }, + { + uniqueID: '10_e7b84f-d1', + location: 'left', + metadata: { name: 'Left Section' }, + }, [ createBlock( 'kadence/header-column', - { uniqueID: '10_f40ed0-0d', location: 'left', metadata: { name: 'Left' } }, + { + uniqueID: '10_47163f-9a', + location: 'left', + metadata: { name: 'Left' }, + }, [] ), createBlock( 'kadence/header-column', { - uniqueID: '10_9e6fa9-7e', + uniqueID: '10_23fa3b-f5', location: 'center-left', metadata: { name: 'Center Left' }, }, @@ -219,17 +228,25 @@ function innerBlocks() { ), createBlock( 'kadence/header-column', - { uniqueID: '10_6cf997-44', location: 'center', metadata: { name: 'Center' } }, + { + uniqueID: '10_e30972-e2', + location: 'center', + metadata: { name: 'Center' }, + }, [] ), createBlock( 'kadence/header-section', - { uniqueID: '10_5e49ea-f5', location: 'right', metadata: { name: 'Right Section' } }, + { + uniqueID: '10_14adfb-ed', + location: 'right', + metadata: { name: 'Right Section' }, + }, [ createBlock( 'kadence/header-column', { - uniqueID: '10_16286d-e4', + uniqueID: '10_b46df5-ca', location: 'center-right', metadata: { name: 'Center Right' }, }, @@ -237,7 +254,11 @@ function innerBlocks() { ), createBlock( 'kadence/header-column', - { uniqueID: '10_cebf42-fc', location: 'right', metadata: { name: 'Right' } }, + { + uniqueID: '10_c875db-c7', + location: 'right', + metadata: { name: 'Right' }, + }, [] ), ] @@ -245,127 +266,110 @@ function innerBlocks() { ] ), ]), - createBlock('kadence/header-container-tablet', { uniqueID: '10_7339cb-dc' }, [ - createBlock('kadence/header-row', { uniqueID: '10_ff22b0-b9', metadata: { name: 'Top Row' } }, [ - createBlock( - 'kadence/header-column', - { uniqueID: '10_40aa2f-05', location: 'tablet-left', metadata: { name: 'Left' } }, - [] - ), + createBlock('kadence/header-container-tablet', { uniqueID: '10_4a8680-20' }, [ + createBlock( + 'kadence/header-row', + { + uniqueID: '10_e08c6d-ac', + metadata: { name: 'Top Row' }, + }, + [ + createBlock( + 'kadence/header-column', + { + uniqueID: '10_6b6d27-26', + location: 'tablet-left', + metadata: { name: 'Left' }, + }, + [] + ), + createBlock( + 'kadence/header-column', + { + uniqueID: '10_44d96b-23', + metadata: { name: 'Center', location: 'tablet-center' }, + }, + [] + ), + createBlock( + 'kadence/header-column', + { + uniqueID: '10_284cab-6d', + location: 'tablet-right', + metadata: { name: 'Right' }, + }, + [] + ), + ] + ), + createBlock('kadence/header-row', { uniqueID: '10_09a8ed-dc', metadata: { name: 'Middle Row' } }, [ createBlock( 'kadence/header-column', - { uniqueID: '10_c2473b-5d', metadata: { name: 'Center' }, location: 'tablet-center' }, + { + uniqueID: '10_1fcb90-c6', + location: 'tablet-left', + metadata: { name: 'Left' }, + }, [] ), createBlock( 'kadence/header-column', - { uniqueID: '10_689c72-5a', location: 'tablet-right', metadata: { name: 'Right' } }, + { + uniqueID: '10_378ead-16', + metadata: { name: 'Center', location: 'tablet-center' }, + }, [] ), - ]), - createBlock('kadence/header-row', { uniqueID: '10_f501f7-a6', metadata: { name: 'Middle Row' } }, [ - createBlock( - 'kadence/header-column', - { uniqueID: '10_0d66dd-55', location: 'tablet-left', metadata: { name: 'Left' } }, - [ - createBlock( - 'kadence/image', - { - imgMaxWidthTablet: 100, - sizeSlug: 'full', - linkDestination: 'none', - uniqueID: '10_015386-a1', - url: '/wp-content/plugins/kadence-blocks/includes/assets/images/placeholder/logo-dark.png', - }, - [] - ), - ] - ), createBlock( 'kadence/header-column', - { uniqueID: '10_d71e8e-0c', metadata: { name: 'Center' }, location: 'tablet-center' }, + { + uniqueID: '10_b6b1bd-02', + location: 'tablet-right', + metadata: { name: 'Right' }, + }, [] ), - createBlock( - 'kadence/header-column', - { uniqueID: '10_7f6a43-63', location: 'tablet-right', metadata: { name: 'Right' } }, - [ - createBlock( - 'kadence/off-canvas-trigger', - { - uniqueID: '10_d85126-03', - iconSizeTablet: 25, - iconColorTablet: 'palette4', - iconColorHoverTablet: 'palette4', - iconBackgroundColorTablet: 'palette7', - iconBackgroundColorHoverTablet: 'palette7', - paddingTablet: ['xxs', 'xxs', '0', 'xxs'], - borderTablet: [ - { - top: ['palette7', '', 1], - right: ['palette7', '', 1], - bottom: ['palette7', '', 1], - left: ['palette7', '', 1], - unit: '', - }, - ], - borderHoverTablet: [ - { - top: ['palette4', '', 1], - right: ['palette4', '', 1], - bottom: ['palette4', '', 1], - left: ['palette4', '', 1], - unit: '', - }, - ], - borderRadiusTablet: [3, 3, 3, 3], - }, - [] - ), - ] - ), ]), - createBlock('kadence/header-row', { uniqueID: '10_8bc98d-52', metadata: { name: 'Bottom Row' } }, [ + createBlock('kadence/header-row', { uniqueID: '10_c3f581-b1', metadata: { name: 'Bottom Row' } }, [ createBlock( 'kadence/header-column', - { uniqueID: '10_68494a-b5', location: 'tablet-left', metadata: { name: 'Left' } }, + { + uniqueID: '10_52f47e-ce', + location: 'tablet-left', + metadata: { name: 'Left' }, + }, [] ), createBlock( 'kadence/header-column', - { uniqueID: '10_8716fa-e6', metadata: { name: 'Center' }, location: 'tablet-center' }, + { + uniqueID: '10_9324ca-ec', + metadata: { name: 'Center', location: 'tablet-center' }, + }, [] ), createBlock( 'kadence/header-column', - { uniqueID: '10_984f70-75', location: 'tablet-right', metadata: { name: 'Right' } }, + { + uniqueID: '10_3ce3fd-74', + location: 'tablet-right', + metadata: { name: 'Right' }, + }, [] ), ]), ]), - createBlock( - 'kadence/off-canvas', - { - uniqueID: '10_146ae3-9e', - slideFrom: 'right', - widthType: 'full', - containerMaxWidthTablet: 400, - backgroundColor: 'palette3', - paddingTablet: ['xl', 'xl', 'xl', 'xl'], - hAlign: 'center', - hAlignTablet: 'center', - vAlign: 'center', - vAlignTablet: 'center', - closeIconSizeTablet: 25, - closeIconColor: 'palette7', - closeIconColorTablet: 'palette9', - closeIconColorHover: 'palette9', - closeIconColorHoverTablet: 'palette9', - closeIconBackgroundColorTablet: 'palette3', - closeIconBackgroundColorHoverTablet: 'palette3', - }, - [createBlock('kadence/navigation', { uniqueID: '10_d18939-76' }, [])] - ), + createBlock('kadence/off-canvas', { uniqueID: '10_96e964-fa' }, [ + createBlock( + 'kadence/infobox', + { + uniqueID: '10_0f0957-f1', + kbVersion: 2, + }, + [] + ), + createBlock('kadence/infobox', { uniqueID: '10_2d0f82-f2', kbVersion: 2 }, []), + ]), ]), ]; } diff --git a/src/blocks/header/templates/basic-5.js b/src/blocks/header/templates/basic-5.js index 09f1328e9..d3834d474 100644 --- a/src/blocks/header/templates/basic-5.js +++ b/src/blocks/header/templates/basic-5.js @@ -1,17 +1,17 @@ /** - * Template: Off Canvas Header 2 + * Template: Off Canvas Header 1 * Post Type: kadence_header */ import { createBlock } from '@wordpress/blocks'; const postMeta = { - _kad_header_revealScrollUp: '1', + _kad_header_autoTransparentSpacing: '1', _kad_header_shadow: [ { enable: false, color: '#000000', - opacity: 0.20000000000000001, + opacity: 0.2, spread: 0, blur: 2, hOffset: 1, @@ -19,69 +19,65 @@ const postMeta = { inset: false, }, ], - _kad_header_background: { - color: 'palette8', + _kad_header_backgroundSticky: { + color: 'palette7', image: '', imageID: '', - imagePosition: 'center center', - imageSize: 'cover', - imageRepeat: 'no-repeat', - imageAttachment: 'scroll', + position: 'center center', + size: 'cover', + repeat: 'no-repeat', + attachment: 'scroll', type: 'normal', gradient: '', }, _kad_header_isSticky: '1', - _kad_header_isTransparent: '0', - _kad_header_border: [ - { - top: ['palette3', 'solid', 1], - right: ['', 'solid', ''], - bottom: ['palette3', 'solid', 1], - left: ['', 'solid', ''], - unit: 'px', - }, - ], - _kad_header_borderTablet: [ - { - top: ['', 'solid', ''], - right: ['', 'solid', ''], - bottom: ['', 'solid', ''], - left: ['', 'solid', ''], - unit: '', - }, - ], - _kad_header_borderMobile: [ - { - top: ['', 'solid', ''], - right: ['', 'solid', ''], - bottom: ['', 'solid', ''], - left: ['', 'solid', ''], - unit: '', - }, - ], + _kad_header_isTransparent: '1', + _kad_header_backgroundTransparent: { + color: 'palette9', + image: '', + imageID: '', + position: 'center center', + size: 'cover', + repeat: 'no-repeat', + attachment: 'scroll', + type: 'normal', + gradient: '', + }, }; function innerBlocks() { return [ createBlock('kadence/header', {}, [ - createBlock('kadence/header-container-desktop', { uniqueID: '10_47dd5f-61' }, [ + createBlock('kadence/header-container-desktop', { uniqueID: '10_968ead-cb' }, [ createBlock( 'kadence/header-row', - { uniqueID: '10_cfc06c-ce', location: 'top', metadata: { name: 'Top Row' } }, + { + uniqueID: '10_6f786b-b4', + location: 'top', + metadata: { name: 'Top Row' }, + }, [ createBlock( 'kadence/header-section', - { uniqueID: '10_7cad62-6c', location: 'left', metadata: { name: 'Left Section' } }, + { + uniqueID: '10_5d5bd7-54', + location: 'left', + metadata: { name: 'Left Section' }, + }, [ createBlock( 'kadence/header-column', - { uniqueID: '10_dfa1c3-41', location: 'left', metadata: { name: 'Left' } }, + { + uniqueID: '10_d39fd1-a7', + location: 'left', + metadata: { name: 'Left' }, + }, [] ), createBlock( 'kadence/header-column', { - uniqueID: '10_f6db3b-53', + uniqueID: '10_7baf4f-a5', location: 'center-left', metadata: { name: 'Center Left' }, }, @@ -91,17 +87,25 @@ function innerBlocks() { ), createBlock( 'kadence/header-column', - { uniqueID: '10_0ff5c6-3a', location: 'center', metadata: { name: 'Center' } }, + { + uniqueID: '10_9f5235-b5', + location: 'center', + metadata: { name: 'Center' }, + }, [] ), createBlock( 'kadence/header-section', - { uniqueID: '10_1051ef-b1', location: 'right', metadata: { name: 'Right Section' } }, + { + uniqueID: '10_d73ff1-09', + location: 'right', + metadata: { name: 'Right Section' }, + }, [ createBlock( 'kadence/header-column', { - uniqueID: '10_d03c44-3e', + uniqueID: '10_3ebdce-3a', location: 'center-right', metadata: { name: 'Center Right' }, }, @@ -109,7 +113,11 @@ function innerBlocks() { ), createBlock( 'kadence/header-column', - { uniqueID: '10_2b9c58-2f', location: 'right', metadata: { name: 'Right' } }, + { + uniqueID: '10_1ffa87-b2', + location: 'right', + metadata: { name: 'Right' }, + }, [] ), ] @@ -119,89 +127,39 @@ function innerBlocks() { createBlock( 'kadence/header-row', { - uniqueID: '10_548d34-93', + uniqueID: '10_888396-50', location: 'center', - layout: 'fullwidth', - background: { - color: 'palette8', - image: '', - imageID: '', - position: 'center center', - size: 'cover', - repeat: 'no-repeat', - attachment: 'scroll', - type: 'normal', - gradient: '', - }, - minHeight: 60, - vAlign: 'center', metadata: { name: 'Middle Row' }, }, [ createBlock( 'kadence/header-section', - { uniqueID: '10_a9eaf4-88', location: 'left', metadata: { name: 'Left Section' } }, + { + uniqueID: '10_e536f1-8a', + location: 'left', + metadata: { name: 'Left Section' }, + }, [ createBlock( 'kadence/header-column', - { uniqueID: '10_f0b099-6d', location: 'left', metadata: { name: 'Left' } }, + { uniqueID: '10_e34255-d3', location: 'left', metadata: { name: 'Left' } }, [ - createBlock('kadence/advancedbtn', { uniqueID: '10_dd8bb8-58' }, [ - createBlock( - 'kadence/singlebtn', - { - uniqueID: '10_b752c7-cc', - text: 'Call to Action', - sizePreset: 'small', - color: 'palette3', - colorHover: 'palette6', - borderStyle: [ - { - top: ['palette3', '', ''], - right: ['palette3', '', ''], - bottom: ['palette3', '', ''], - left: ['palette3', '', ''], - unit: 'px', - }, - ], - borderHoverStyle: [ - { - top: ['palette6', '', ''], - right: ['palette6', '', ''], - bottom: ['palette6', '', ''], - left: ['palette6', '', ''], - unit: 'px', - }, - ], - inheritStyles: 'outline', - typography: [ - { - size: ['sm', '', ''], - sizeType: 'px', - lineHeight: ['', '', ''], - lineType: '', - letterSpacing: [1, '', ''], - letterType: 'px', - textTransform: 'uppercase', - family: 'var( --global-heading-font-family, inherit )', - google: false, - style: 'normal', - weight: '600', - variant: '', - subset: '', - loadGoogle: true, - }, - ], - }, - [] - ), - ]), + createBlock( + 'kadence/image', + { + sizeSlug: 'full', + linkDestination: 'none', + uniqueID: '10_8a74e4-3e', + url: '/wp-content/plugins/kadence-blocks/includes/assets/images/placeholder/logo-dark.png', + }, + [] + ), ] ), createBlock( 'kadence/header-column', { - uniqueID: '10_fad384-ae', + uniqueID: '10_4abf0b-c1', location: 'center-left', metadata: { name: 'Center Left' }, }, @@ -211,28 +169,25 @@ function innerBlocks() { ), createBlock( 'kadence/header-column', - { uniqueID: '10_dd0168-26', location: 'center', metadata: { name: 'Center' } }, - [ - createBlock( - 'kadence/image', - { - sizeSlug: 'full', - linkDestination: 'none', - uniqueID: '10_639a2d-4d', - url: '/wp-content/plugins/kadence-blocks/includes/assets/images/placeholder/logo-dark.png', - }, - [] - ), - ] + { + uniqueID: '10_849b5b-6b', + location: 'center', + metadata: { name: 'Center' }, + }, + [] ), createBlock( 'kadence/header-section', - { uniqueID: '10_346913-8b', location: 'right', metadata: { name: 'Right Section' } }, + { + uniqueID: '10_56ebea-d1', + location: 'right', + metadata: { name: 'Right Section' }, + }, [ createBlock( 'kadence/header-column', { - uniqueID: '10_33f7a0-20', + uniqueID: '10_0505fa-29', location: 'center-right', metadata: { name: 'Center Right' }, }, @@ -240,98 +195,41 @@ function innerBlocks() { ), createBlock( 'kadence/header-column', - { uniqueID: '10_75f9e9-f4', location: 'right', metadata: { name: 'Right' } }, + { + uniqueID: '10_d0fad7-ea', + location: 'right', + metadata: { name: 'Right' }, + }, [ createBlock( - 'kadence/rowlayout', + 'kadence/off-canvas-trigger', { - uniqueID: '10_c9b4dc-a3', - collapseGutter: 'skinny', - customRowGutter: [10, '', ''], - columnGutter: 'custom', - customGutter: [10, '', ''], - colLayout: 'equal', - maxWidth: 400, - firstColumnWidth: 65, - secondColumnWidth: 35, - kbVersion: 2, - }, - [ - createBlock( - 'kadence/column', + uniqueID: '10_9d95b2-4b', + iconColor: 'palette4', + iconColorHover: 'palette4', + iconBackgroundColor: 'palette7', + iconBackgroundColorHover: 'palette7', + padding: ['xxs', 'xxs', '0', 'xxs'], + border: [ { - borderWidth: ['', '', '', ''], - uniqueID: '10_85221c-18', - kbVersion: 2, + top: ['palette7', '', 1], + right: ['palette7', '', 1], + bottom: ['palette7', '', 1], + left: ['palette7', '', 1], + unit: 'px', }, - [ - createBlock( - 'kadence/advancedheading', - { - uniqueID: '10_dafc06-6d', - letterSpacing: 1, - typography: 'var( --global-body-font-family, inherit )', - fontWeight: '600', - markBorder: '', - markBorderStyles: [ - { - top: [null, '', ''], - right: [null, '', ''], - bottom: [null, '', ''], - left: [null, '', ''], - unit: 'px', - }, - ], - tabletMarkBorderStyles: [ - { - top: [null, '', ''], - right: [null, '', ''], - bottom: [null, '', ''], - left: [null, '', ''], - unit: 'px', - }, - ], - mobileMarkBorderStyles: [ - { - top: [null, '', ''], - right: [null, '', ''], - bottom: [null, '', ''], - left: [null, '', ''], - unit: 'px', - }, - ], - textTransform: 'uppercase', - htmlTag: 'div', - fontSize: ['sm', '', ''], - }, - [] - ), - ] - ), - createBlock( - 'kadence/column', + ], + borderHover: [ { - id: 2, - borderWidth: ['', '', '', ''], - uniqueID: '10_df90f5-bb', - kbVersion: 2, + top: ['palette4', '', 1], + right: ['palette4', '', 1], + bottom: ['palette4', '', 1], + left: ['palette4', '', 1], + unit: 'px', }, - [ - createBlock( - 'kadence/off-canvas-trigger', - { - uniqueID: '10_e079d5-c3', - icon: 'ic_fourUp', - iconColor: 'palette3', - iconColorHover: 'palette6', - iconBackgroundColor: 'palette8', - iconBackgroundColorHover: 'palette8', - }, - [] - ), - ] - ), - ] + ], + }, + [] ), ] ), @@ -341,21 +239,33 @@ function innerBlocks() { ), createBlock( 'kadence/header-row', - { uniqueID: '10_65fbc1-8b', location: 'bottom', metadata: { name: 'Bottom Row' } }, + { + uniqueID: '10_860f00-42', + location: 'bottom', + metadata: { name: 'Bottom Row' }, + }, [ createBlock( 'kadence/header-section', - { uniqueID: '10_65db21-47', location: 'left', metadata: { name: 'Left Section' } }, + { + uniqueID: '10_e4230b-35', + location: 'left', + metadata: { name: 'Left Section' }, + }, [ createBlock( 'kadence/header-column', - { uniqueID: '10_97c123-a5', location: 'left', metadata: { name: 'Left' } }, + { + uniqueID: '10_f40ed0-0d', + location: 'left', + metadata: { name: 'Left' }, + }, [] ), createBlock( 'kadence/header-column', { - uniqueID: '10_dee5c5-c2', + uniqueID: '10_9e6fa9-7e', location: 'center-left', metadata: { name: 'Center Left' }, }, @@ -365,17 +275,25 @@ function innerBlocks() { ), createBlock( 'kadence/header-column', - { uniqueID: '10_25d778-94', location: 'center', metadata: { name: 'Center' } }, + { + uniqueID: '10_6cf997-44', + location: 'center', + metadata: { name: 'Center' }, + }, [] ), createBlock( 'kadence/header-section', - { uniqueID: '10_010c01-6d', location: 'right', metadata: { name: 'Right Section' } }, + { + uniqueID: '10_5e49ea-f5', + location: 'right', + metadata: { name: 'Right Section' }, + }, [ createBlock( 'kadence/header-column', { - uniqueID: '10_09d8ba-72', + uniqueID: '10_16286d-e4', location: 'center-right', metadata: { name: 'Center Right' }, }, @@ -383,7 +301,11 @@ function innerBlocks() { ), createBlock( 'kadence/header-column', - { uniqueID: '10_cab003-9b', location: 'right', metadata: { name: 'Right' } }, + { + uniqueID: '10_cebf42-fc', + location: 'right', + metadata: { name: 'Right' }, + }, [] ), ] @@ -391,28 +313,50 @@ function innerBlocks() { ] ), ]), - createBlock('kadence/header-container-tablet', { uniqueID: '10_030330-ff' }, [ - createBlock('kadence/header-row', { uniqueID: '10_ab4dfa-81', metadata: { name: 'Top Row' } }, [ - createBlock( - 'kadence/header-column', - { uniqueID: '10_0fd69b-d5', location: 'tablet-left', metadata: { name: 'Left' } }, - [] - ), - createBlock( - 'kadence/header-column', - { uniqueID: '10_2102c6-23', metadata: { name: 'Center' }, location: 'tablet-center' }, - [] - ), - createBlock( - 'kadence/header-column', - { uniqueID: '10_de5bf7-9c', location: 'tablet-right', metadata: { name: 'Right' } }, - [] - ), - ]), - createBlock('kadence/header-row', { uniqueID: '10_c37740-ce', metadata: { name: 'Middle Row' } }, [ + createBlock('kadence/header-container-tablet', { uniqueID: '10_7339cb-dc' }, [ + createBlock( + 'kadence/header-row', + { + uniqueID: '10_ff22b0-b9', + metadata: { name: 'Top Row' }, + }, + [ + createBlock( + 'kadence/header-column', + { + uniqueID: '10_40aa2f-05', + location: 'tablet-left', + metadata: { name: 'Left' }, + }, + [] + ), + createBlock( + 'kadence/header-column', + { + uniqueID: '10_c2473b-5d', + metadata: { name: 'Center', location: 'tablet-center' }, + }, + [] + ), + createBlock( + 'kadence/header-column', + { + uniqueID: '10_689c72-5a', + location: 'tablet-right', + metadata: { name: 'Right' }, + }, + [] + ), + ] + ), + createBlock('kadence/header-row', { uniqueID: '10_f501f7-a6', metadata: { name: 'Middle Row' } }, [ createBlock( 'kadence/header-column', - { uniqueID: '10_d16dac-89', location: 'tablet-left', metadata: { name: 'Left' } }, + { + uniqueID: '10_0d66dd-55', + location: 'tablet-left', + metadata: { name: 'Left' }, + }, [ createBlock( 'kadence/image', @@ -420,7 +364,7 @@ function innerBlocks() { imgMaxWidthTablet: 100, sizeSlug: 'full', linkDestination: 'none', - uniqueID: '10_768b26-c2', + uniqueID: '10_015386-a1', url: '/wp-content/plugins/kadence-blocks/includes/assets/images/placeholder/logo-dark.png', }, [] @@ -429,120 +373,80 @@ function innerBlocks() { ), createBlock( 'kadence/header-column', - { uniqueID: '10_c2e29f-f3', metadata: { name: 'Center' }, location: 'tablet-center' }, + { + uniqueID: '10_d71e8e-0c', + metadata: { name: 'Center', location: 'tablet-center' }, + }, [] ), createBlock( 'kadence/header-column', - { uniqueID: '10_da4b6e-3f', location: 'tablet-right', metadata: { name: 'Right' } }, + { + uniqueID: '10_7f6a43-63', + location: 'tablet-right', + metadata: { name: 'Right' }, + }, [ createBlock( - 'kadence/rowlayout', + 'kadence/off-canvas-trigger', { - uniqueID: '10_88b878-5a', - tabletLayout: 'equal', - tabletGutter: 'skinny', - customGutter: ['', 16, ''], - colLayout: 'equal', - verticalAlignment: 'middle', - kbVersion: 2, - }, - [ - createBlock( - 'kadence/column', - { borderWidth: ['', '', '', ''], uniqueID: '10_95bbb6-da', kbVersion: 2 }, - [ - createBlock( - 'kadence/advancedheading', - { - uniqueID: '10_c080ac-97', - align: 'right', - color: 'palette3', - letterSpacing: '', - tabletLetterSpacing: 1, - mobileLetterSpacing: '', - markBorder: '', - markBorderStyles: [ - { - top: [null, '', ''], - right: [null, '', ''], - bottom: [null, '', ''], - left: [null, '', ''], - unit: 'px', - }, - ], - tabletMarkBorderStyles: [ - { - top: [null, '', ''], - right: [null, '', ''], - bottom: [null, '', ''], - left: [null, '', ''], - unit: 'px', - }, - ], - mobileMarkBorderStyles: [ - { - top: [null, '', ''], - right: [null, '', ''], - bottom: [null, '', ''], - left: [null, '', ''], - unit: 'px', - }, - ], - textTransform: 'uppercase', - colorClass: 'theme-palette3', - htmlTag: 'div', - fontSize: ['', 'sm', ''], - }, - [] - ), - ] - ), - createBlock( - 'kadence/column', + uniqueID: '10_d85126-03', + iconSizeTablet: 25, + iconColorTablet: 'palette4', + iconColorHoverTablet: 'palette4', + iconBackgroundColorTablet: 'palette7', + iconBackgroundColorHoverTablet: 'palette7', + paddingTablet: ['xxs', 'xxs', '0', 'xxs'], + borderTablet: [ + { + top: ['palette7', '', 1], + right: ['palette7', '', 1], + bottom: ['palette7', '', 1], + left: ['palette7', '', 1], + unit: '', + }, + ], + borderHoverTablet: [ { - id: 2, - borderWidth: ['', '', '', ''], - uniqueID: '10_bc8cae-ab', - justifyContent: ['', 'flex-start', ''], - verticalAlignment: 'middle', - kbVersion: 2, + top: ['palette4', '', 1], + right: ['palette4', '', 1], + bottom: ['palette4', '', 1], + left: ['palette4', '', 1], + unit: '', }, - [ - createBlock( - 'kadence/off-canvas-trigger', - { - uniqueID: '10_151eec-16', - icon: 'ic_fourUp', - iconSizeTablet: 25, - iconColorTablet: 'palette3', - iconColorHoverTablet: 'palette3', - iconBackgroundColorTablet: 'palette8', - iconBackgroundColorHoverTablet: 'palette8', - }, - [] - ), - ] - ), - ] + ], + borderRadiusTablet: [3, 3, 3, 3], + }, + [] ), ] ), ]), - createBlock('kadence/header-row', { uniqueID: '10_063c11-db', metadata: { name: 'Bottom Row' } }, [ + createBlock('kadence/header-row', { uniqueID: '10_8bc98d-52', metadata: { name: 'Bottom Row' } }, [ createBlock( 'kadence/header-column', - { uniqueID: '10_bf01fc-ee', location: 'tablet-left', metadata: { name: 'Left' } }, + { + uniqueID: '10_68494a-b5', + location: 'tablet-left', + metadata: { name: 'Left' }, + }, [] ), createBlock( 'kadence/header-column', - { uniqueID: '10_f52042-78', metadata: { name: 'Center' }, location: 'tablet-center' }, + { + uniqueID: '10_8716fa-e6', + metadata: { name: 'Center', location: 'tablet-center' }, + }, [] ), createBlock( 'kadence/header-column', - { uniqueID: '10_efd061-74', location: 'tablet-right', metadata: { name: 'Right' } }, + { + uniqueID: '10_984f70-75', + location: 'tablet-right', + metadata: { name: 'Right' }, + }, [] ), ]), @@ -550,161 +454,25 @@ function innerBlocks() { createBlock( 'kadence/off-canvas', { - uniqueID: '10_8734cb-ee', + uniqueID: '10_146ae3-9e', slideFrom: 'right', - maxWidth: 700, - containerMaxWidth: 500, - backgroundColor: 'palette6', - pageBackgroundColor: 'rgba(0,0,0,0)', + widthType: 'full', + containerMaxWidthTablet: 400, + backgroundColor: 'palette3', + paddingTablet: ['xl', 'xl', 'xl', 'xl'], + hAlign: 'center', + hAlignTablet: 'center', vAlign: 'center', - closeIcon: 'fe_x', - closeIconColor: 'palette8', + vAlignTablet: 'center', + closeIconSizeTablet: 25, + closeIconColor: 'palette7', + closeIconColorTablet: 'palette9', closeIconColorHover: 'palette9', + closeIconColorHoverTablet: 'palette9', + closeIconBackgroundColorTablet: 'palette3', + closeIconBackgroundColorHoverTablet: 'palette3', }, - [ - createBlock('kadence/navigation', { uniqueID: '10_8bfb46-ae' }, []), - createBlock( - 'kadence/rowlayout', - { - uniqueID: '10_0d41ea-63', - columns: 1, - colLayout: 'equal', - inheritMaxWidth: true, - kbVersion: 2, - }, - [ - createBlock( - 'kadence/column', - { borderWidth: ['', '', '', ''], uniqueID: '10_ecad58-0a', kbVersion: 2 }, - [ - createBlock( - 'kadence/advancedheading', - { - uniqueID: '10_8d7f6a-cb', - color: 'palette9', - margin: ['', '', 'xs', ''], - markBorder: '', - markBorderStyles: [ - { - top: [null, '', ''], - right: [null, '', ''], - bottom: [null, '', ''], - left: [null, '', ''], - unit: 'px', - }, - ], - tabletMarkBorderStyles: [ - { - top: [null, '', ''], - right: [null, '', ''], - bottom: [null, '', ''], - left: [null, '', ''], - unit: 'px', - }, - ], - mobileMarkBorderStyles: [ - { - top: [null, '', ''], - right: [null, '', ''], - bottom: [null, '', ''], - left: [null, '', ''], - unit: 'px', - }, - ], - colorClass: 'theme-palette9', - htmlTag: 'div', - fontSize: ['sm', '', ''], - icon: 'fe_mail', - }, - [] - ), - createBlock( - 'kadence/advancedheading', - { - uniqueID: '10_c34138-26', - color: 'palette9', - margin: ['', '', 'xs', ''], - markBorder: '', - markBorderStyles: [ - { - top: [null, '', ''], - right: [null, '', ''], - bottom: [null, '', ''], - left: [null, '', ''], - unit: 'px', - }, - ], - tabletMarkBorderStyles: [ - { - top: [null, '', ''], - right: [null, '', ''], - bottom: [null, '', ''], - left: [null, '', ''], - unit: 'px', - }, - ], - mobileMarkBorderStyles: [ - { - top: [null, '', ''], - right: [null, '', ''], - bottom: [null, '', ''], - left: [null, '', ''], - unit: 'px', - }, - ], - colorClass: 'theme-palette9', - htmlTag: 'div', - fontSize: ['sm', '', ''], - icon: 'fe_phone', - }, - [] - ), - createBlock( - 'kadence/advancedheading', - { - uniqueID: '10_5cc5ac-0d', - color: 'palette9', - markBorder: '', - markBorderStyles: [ - { - top: [null, '', ''], - right: [null, '', ''], - bottom: [null, '', ''], - left: [null, '', ''], - unit: 'px', - }, - ], - tabletMarkBorderStyles: [ - { - top: [null, '', ''], - right: [null, '', ''], - bottom: [null, '', ''], - left: [null, '', ''], - unit: 'px', - }, - ], - mobileMarkBorderStyles: [ - { - top: [null, '', ''], - right: [null, '', ''], - bottom: [null, '', ''], - left: [null, '', ''], - unit: 'px', - }, - ], - colorClass: 'theme-palette9', - htmlTag: 'div', - fontSize: ['sm', '', ''], - icon: 'fe_mapPin', - iconVerticalAlign: 'baseline', - }, - [] - ), - ] - ), - ] - ), - ] + [createBlock('kadence/navigation', { uniqueID: '10_d18939-76', templateKey: 'short' }, [])] ), ]), ]; diff --git a/src/blocks/header/templates/basic-6.js b/src/blocks/header/templates/basic-6.js index 35727e1b4..817a945bd 100644 --- a/src/blocks/header/templates/basic-6.js +++ b/src/blocks/header/templates/basic-6.js @@ -1,16 +1,17 @@ /** - * Template: Off Canvas Header – 3 + * Template: Off Canvas Header 2 * Post Type: kadence_header */ import { createBlock } from '@wordpress/blocks'; const postMeta = { + _kad_header_revealScrollUp: '1', _kad_header_shadow: [ { enable: false, color: '#000000', - opacity: 0.20000000000000001, + opacity: 0.2, spread: 0, blur: 2, hOffset: 1, @@ -18,31 +19,81 @@ const postMeta = { inset: false, }, ], + _kad_header_background: { + color: 'palette8', + image: '', + imageID: '', + imagePosition: 'center center', + imageSize: 'cover', + imageRepeat: 'no-repeat', + imageAttachment: 'scroll', + type: 'normal', + gradient: '', + }, _kad_header_isSticky: '1', - _kad_header_isTransparent: '1', + _kad_header_isTransparent: '0', + _kad_header_border: [ + { + top: ['palette3', 'solid', 1], + right: ['', 'solid', ''], + bottom: ['palette3', 'solid', 1], + left: ['', 'solid', ''], + unit: 'px', + }, + ], + _kad_header_borderTablet: [ + { + top: ['', 'solid', ''], + right: ['', 'solid', ''], + bottom: ['', 'solid', ''], + left: ['', 'solid', ''], + unit: '', + }, + ], + _kad_header_borderMobile: [ + { + top: ['', 'solid', ''], + right: ['', 'solid', ''], + bottom: ['', 'solid', ''], + left: ['', 'solid', ''], + unit: '', + }, + ], }; function innerBlocks() { return [ createBlock('kadence/header', {}, [ - createBlock('kadence/header-container-desktop', { uniqueID: '10_4bb9bf-15' }, [ + createBlock('kadence/header-container-desktop', { uniqueID: '10_47dd5f-61' }, [ createBlock( 'kadence/header-row', - { uniqueID: '10_937552-59', location: 'top', metadata: { name: 'Top Row' } }, + { + uniqueID: '10_cfc06c-ce', + location: 'top', + metadata: { name: 'Top Row' }, + }, [ createBlock( 'kadence/header-section', - { uniqueID: '10_25122c-3a', location: 'left', metadata: { name: 'Left Section' } }, + { + uniqueID: '10_7cad62-6c', + location: 'left', + metadata: { name: 'Left Section' }, + }, [ createBlock( 'kadence/header-column', - { uniqueID: '10_3751b1-1f', location: 'left', metadata: { name: 'Left' } }, + { + uniqueID: '10_dfa1c3-41', + location: 'left', + metadata: { name: 'Left' }, + }, [] ), createBlock( 'kadence/header-column', { - uniqueID: '10_6f98c2-57', + uniqueID: '10_f6db3b-53', location: 'center-left', metadata: { name: 'Center Left' }, }, @@ -52,17 +103,25 @@ function innerBlocks() { ), createBlock( 'kadence/header-column', - { uniqueID: '10_2a7ee2-86', location: 'center', metadata: { name: 'Center' } }, + { + uniqueID: '10_0ff5c6-3a', + location: 'center', + metadata: { name: 'Center' }, + }, [] ), createBlock( 'kadence/header-section', - { uniqueID: '10_25884a-6a', location: 'right', metadata: { name: 'Right Section' } }, + { + uniqueID: '10_1051ef-b1', + location: 'right', + metadata: { name: 'Right Section' }, + }, [ createBlock( 'kadence/header-column', { - uniqueID: '10_3f47ba-01', + uniqueID: '10_d03c44-3e', location: 'center-right', metadata: { name: 'Center Right' }, }, @@ -70,7 +129,11 @@ function innerBlocks() { ), createBlock( 'kadence/header-column', - { uniqueID: '10_ab8d5b-b7', location: 'right', metadata: { name: 'Right' } }, + { + uniqueID: '10_2b9c58-2f', + location: 'right', + metadata: { name: 'Right' }, + }, [] ), ] @@ -80,26 +143,106 @@ function innerBlocks() { createBlock( 'kadence/header-row', { - uniqueID: '10_0c6f2f-f7', + uniqueID: '10_548d34-93', location: 'center', - layout: 'fullwidth', + background: { + color: 'palette8', + image: '', + imageID: '', + position: 'center center', + size: 'cover', + repeat: 'no-repeat', + attachment: 'scroll', + type: 'normal', + gradient: '', + }, + minHeight: 60, vAlign: 'center', metadata: { name: 'Middle Row' }, }, [ createBlock( 'kadence/header-section', - { uniqueID: '10_4ff4c4-28', location: 'left', metadata: { name: 'Left Section' } }, + { + uniqueID: '10_a9eaf4-88', + location: 'left', + metadata: { name: 'Left Section' }, + }, [ createBlock( 'kadence/header-column', - { uniqueID: '10_40369a-c7', location: 'left', metadata: { name: 'Left' } }, - [createBlock('kadence/off-canvas-trigger', { uniqueID: '10_db7fdb-a2' }, [])] + { uniqueID: '10_f0b099-6d', location: 'left', metadata: { name: 'Left' } }, + [ + createBlock( + 'kadence/advancedbtn', + { + uniqueID: '10_dd8bb8-58', + margin: [ + { + desk: ['', '', '0', ''], + tablet: ['', '', '', ''], + mobile: ['', '', '', ''], + }, + ], + orientation: [null, '', ''], + }, + [ + createBlock( + 'kadence/singlebtn', + { + uniqueID: '10_b752c7-cc', + text: 'Call to Action', + sizePreset: 'small', + color: 'palette3', + colorHover: 'palette6', + borderStyle: [ + { + top: ['palette3', '', ''], + right: ['palette3', '', ''], + bottom: ['palette3', '', ''], + left: ['palette3', '', ''], + unit: 'px', + }, + ], + borderHoverStyle: [ + { + top: ['palette6', '', ''], + right: ['palette6', '', ''], + bottom: ['palette6', '', ''], + left: ['palette6', '', ''], + unit: 'px', + }, + ], + inheritStyles: 'outline', + typography: [ + { + size: ['sm', '', ''], + sizeType: 'px', + lineHeight: ['', '', ''], + lineType: '', + letterSpacing: [1, '', ''], + letterType: 'px', + textTransform: 'uppercase', + family: 'var( --global-heading-font-family, inherit )', + google: false, + style: 'normal', + weight: '600', + variant: '', + subset: '', + loadGoogle: true, + }, + ], + }, + [] + ), + ] + ), + ] ), createBlock( 'kadence/header-column', { - uniqueID: '10_af51dc-f8', + uniqueID: '10_fad384-ae', location: 'center-left', metadata: { name: 'Center Left' }, }, @@ -109,30 +252,32 @@ function innerBlocks() { ), createBlock( 'kadence/header-column', - { uniqueID: '10_2b4829-44', location: 'center', metadata: { name: 'Center' } }, + { uniqueID: '10_dd0168-26', location: 'center', metadata: { name: 'Center' } }, [ createBlock( 'kadence/image', { sizeSlug: 'full', linkDestination: 'none', - uniqueID: '10_997063-66', - marginDesktop: ['', 'xxl', '', ''], + uniqueID: '10_639a2d-4d', url: '/wp-content/plugins/kadence-blocks/includes/assets/images/placeholder/logo-dark.png', }, [] ), - createBlock('kadence/navigation', { uniqueID: '10_a99bde-ab' }, []), ] ), createBlock( 'kadence/header-section', - { uniqueID: '10_0dffdd-85', location: 'right', metadata: { name: 'Right Section' } }, + { + uniqueID: '10_346913-8b', + location: 'right', + metadata: { name: 'Right Section' }, + }, [ createBlock( 'kadence/header-column', { - uniqueID: '10_8d717f-f6', + uniqueID: '10_33f7a0-20', location: 'center-right', metadata: { name: 'Center Right' }, }, @@ -140,8 +285,104 @@ function innerBlocks() { ), createBlock( 'kadence/header-column', - { uniqueID: '10_ca45b0-12', location: 'right', metadata: { name: 'Right' } }, - [] + { + uniqueID: '10_75f9e9-f4', + location: 'right', + metadata: { name: 'Right' }, + }, + [ + createBlock( + 'kadence/rowlayout', + { + uniqueID: '10_c9b4dc-a3', + collapseGutter: 'skinny', + customRowGutter: [10, '', ''], + columnGutter: 'custom', + customGutter: [10, '', ''], + colLayout: 'equal', + maxWidth: 400, + firstColumnWidth: 65, + secondColumnWidth: 35, + kbVersion: 2, + }, + [ + createBlock( + 'kadence/column', + { + borderWidth: ['', '', '', ''], + uniqueID: '10_85221c-18', + kbVersion: 2, + }, + [ + createBlock( + 'kadence/advancedheading', + { + uniqueID: '10_dafc06-6d', + letterSpacing: 1, + typography: 'var( --global-body-font-family, inherit )', + fontWeight: '600', + markBorder: '', + markBorderStyles: [ + { + top: [null, '', ''], + right: [null, '', ''], + bottom: [null, '', ''], + left: [null, '', ''], + unit: 'px', + }, + ], + tabletMarkBorderStyles: [ + { + top: [null, '', ''], + right: [null, '', ''], + bottom: [null, '', ''], + left: [null, '', ''], + unit: 'px', + }, + ], + mobileMarkBorderStyles: [ + { + top: [null, '', ''], + right: [null, '', ''], + bottom: [null, '', ''], + left: [null, '', ''], + unit: 'px', + }, + ], + textTransform: 'uppercase', + htmlTag: 'div', + fontSize: ['sm', '', ''], + }, + [] + ), + ] + ), + createBlock( + 'kadence/column', + { + id: 2, + borderWidth: ['', '', '', ''], + uniqueID: '10_df90f5-bb', + kbVersion: 2, + }, + [ + createBlock( + 'kadence/off-canvas-trigger', + { + uniqueID: '10_e079d5-c3', + icon: 'ic_fourUp', + iconColor: 'palette3', + iconColorHover: 'palette6', + iconBackgroundColor: 'palette8', + iconBackgroundColorHover: 'palette8', + }, + [] + ), + ] + ), + ] + ), + ] ), ] ), @@ -149,21 +390,33 @@ function innerBlocks() { ), createBlock( 'kadence/header-row', - { uniqueID: '10_eb770d-58', location: 'bottom', metadata: { name: 'Bottom Row' } }, + { + uniqueID: '10_65fbc1-8b', + location: 'bottom', + metadata: { name: 'Bottom Row' }, + }, [ createBlock( 'kadence/header-section', - { uniqueID: '10_e7b84f-d1', location: 'left', metadata: { name: 'Left Section' } }, + { + uniqueID: '10_65db21-47', + location: 'left', + metadata: { name: 'Left Section' }, + }, [ createBlock( 'kadence/header-column', - { uniqueID: '10_47163f-9a', location: 'left', metadata: { name: 'Left' } }, + { + uniqueID: '10_97c123-a5', + location: 'left', + metadata: { name: 'Left' }, + }, [] ), createBlock( 'kadence/header-column', { - uniqueID: '10_23fa3b-f5', + uniqueID: '10_dee5c5-c2', location: 'center-left', metadata: { name: 'Center Left' }, }, @@ -173,17 +426,25 @@ function innerBlocks() { ), createBlock( 'kadence/header-column', - { uniqueID: '10_e30972-e2', location: 'center', metadata: { name: 'Center' } }, + { + uniqueID: '10_25d778-94', + location: 'center', + metadata: { name: 'Center' }, + }, [] ), createBlock( 'kadence/header-section', - { uniqueID: '10_14adfb-ed', location: 'right', metadata: { name: 'Right Section' } }, + { + uniqueID: '10_010c01-6d', + location: 'right', + metadata: { name: 'Right Section' }, + }, [ createBlock( 'kadence/header-column', { - uniqueID: '10_b46df5-ca', + uniqueID: '10_09d8ba-72', location: 'center-right', metadata: { name: 'Center Right' }, }, @@ -191,7 +452,11 @@ function innerBlocks() { ), createBlock( 'kadence/header-column', - { uniqueID: '10_c875db-c7', location: 'right', metadata: { name: 'Right' } }, + { + uniqueID: '10_cab003-9b', + location: 'right', + metadata: { name: 'Right' }, + }, [] ), ] @@ -199,63 +464,366 @@ function innerBlocks() { ] ), ]), - createBlock('kadence/header-container-tablet', { uniqueID: '10_4a8680-20' }, [ - createBlock('kadence/header-row', { uniqueID: '10_e08c6d-ac', metadata: { name: 'Top Row' } }, [ - createBlock( - 'kadence/header-column', - { uniqueID: '10_6b6d27-26', location: 'tablet-left', metadata: { name: 'Left' } }, - [] - ), - createBlock( - 'kadence/header-column', - { uniqueID: '10_44d96b-23', metadata: { name: 'Center' }, location: 'tablet-center' }, - [] - ), - createBlock( - 'kadence/header-column', - { uniqueID: '10_284cab-6d', location: 'tablet-right', metadata: { name: 'Right' } }, - [] - ), - ]), - createBlock('kadence/header-row', { uniqueID: '10_09a8ed-dc', metadata: { name: 'Middle Row' } }, [ + createBlock('kadence/header-container-tablet', { uniqueID: '10_030330-ff' }, [ + createBlock( + 'kadence/header-row', + { + uniqueID: '10_ab4dfa-81', + metadata: { name: 'Top Row' }, + }, + [ + createBlock( + 'kadence/header-column', + { + uniqueID: '10_0fd69b-d5', + location: 'tablet-left', + metadata: { name: 'Left' }, + }, + [] + ), + createBlock( + 'kadence/header-column', + { + uniqueID: '10_2102c6-23', + metadata: { name: 'Center', location: 'tablet-center' }, + }, + [] + ), + createBlock( + 'kadence/header-column', + { + uniqueID: '10_de5bf7-9c', + location: 'tablet-right', + metadata: { name: 'Right' }, + }, + [] + ), + ] + ), + createBlock('kadence/header-row', { uniqueID: '10_c37740-ce', metadata: { name: 'Middle Row' } }, [ createBlock( 'kadence/header-column', - { uniqueID: '10_1fcb90-c6', location: 'tablet-left', metadata: { name: 'Left' } }, - [] + { + uniqueID: '10_d16dac-89', + location: 'tablet-left', + metadata: { name: 'Left' }, + }, + [ + createBlock( + 'kadence/image', + { + imgMaxWidthTablet: 100, + sizeSlug: 'full', + linkDestination: 'none', + uniqueID: '10_768b26-c2', + url: '/wp-content/plugins/kadence-blocks/includes/assets/images/placeholder/logo-dark.png', + }, + [] + ), + ] ), createBlock( 'kadence/header-column', - { uniqueID: '10_378ead-16', metadata: { name: 'Center' }, location: 'tablet-center' }, + { + uniqueID: '10_c2e29f-f3', + metadata: { name: 'Center', location: 'tablet-center' }, + }, [] ), createBlock( 'kadence/header-column', - { uniqueID: '10_b6b1bd-02', location: 'tablet-right', metadata: { name: 'Right' } }, - [] + { + uniqueID: '10_da4b6e-3f', + location: 'tablet-right', + metadata: { name: 'Right' }, + }, + [ + createBlock( + 'kadence/rowlayout', + { + uniqueID: '10_88b878-5a', + tabletLayout: 'equal', + tabletGutter: 'skinny', + customGutter: ['', 16, ''], + colLayout: 'equal', + verticalAlignment: 'middle', + kbVersion: 2, + }, + [ + createBlock( + 'kadence/column', + { borderWidth: ['', '', '', ''], uniqueID: '10_95bbb6-da', kbVersion: 2 }, + [ + createBlock( + 'kadence/advancedheading', + { + uniqueID: '10_c080ac-97', + align: 'right', + color: 'palette3', + tabletLetterSpacing: 1, + markBorder: '', + markBorderStyles: [ + { + top: [null, '', ''], + right: [null, '', ''], + bottom: [null, '', ''], + left: [null, '', ''], + unit: 'px', + }, + ], + tabletMarkBorderStyles: [ + { + top: [null, '', ''], + right: [null, '', ''], + bottom: [null, '', ''], + left: [null, '', ''], + unit: 'px', + }, + ], + mobileMarkBorderStyles: [ + { + top: [null, '', ''], + right: [null, '', ''], + bottom: [null, '', ''], + left: [null, '', ''], + unit: 'px', + }, + ], + textTransform: 'uppercase', + colorClass: 'theme-palette3', + htmlTag: 'div', + fontSize: ['', 'sm', ''], + }, + [] + ), + ] + ), + createBlock( + 'kadence/column', + { + id: 2, + borderWidth: ['', '', '', ''], + uniqueID: '10_bc8cae-ab', + justifyContent: ['', 'flex-start', ''], + verticalAlignment: 'middle', + kbVersion: 2, + }, + [ + createBlock( + 'kadence/off-canvas-trigger', + { + uniqueID: '10_151eec-16', + icon: 'ic_fourUp', + iconSizeTablet: 25, + iconColorTablet: 'palette3', + iconColorHoverTablet: 'palette3', + iconBackgroundColorTablet: 'palette8', + iconBackgroundColorHoverTablet: 'palette8', + }, + [] + ), + ] + ), + ] + ), + ] ), ]), - createBlock('kadence/header-row', { uniqueID: '10_c3f581-b1', metadata: { name: 'Bottom Row' } }, [ - createBlock( - 'kadence/header-column', - { uniqueID: '10_52f47e-ce', location: 'tablet-left', metadata: { name: 'Left' } }, - [] - ), - createBlock( - 'kadence/header-column', - { uniqueID: '10_9324ca-ec', metadata: { name: 'Center' }, location: 'tablet-center' }, - [] - ), + createBlock( + 'kadence/header-row', + { + uniqueID: '10_063c11-db', + metadata: { name: 'Bottom Row' }, + }, + [ + createBlock( + 'kadence/header-column', + { + uniqueID: '10_bf01fc-ee', + location: 'tablet-left', + metadata: { name: 'Left' }, + }, + [] + ), + createBlock( + 'kadence/header-column', + { + uniqueID: '10_f52042-78', + metadata: { name: 'Center', location: 'tablet-center' }, + }, + [] + ), + createBlock( + 'kadence/header-column', + { + uniqueID: '10_efd061-74', + location: 'tablet-right', + metadata: { name: 'Right' }, + }, + [] + ), + ] + ), + ]), + createBlock( + 'kadence/off-canvas', + { + uniqueID: '10_8734cb-ee', + slideFrom: 'right', + maxWidth: 700, + containerMaxWidth: 500, + backgroundColor: 'palette6', + pageBackgroundColor: 'rgba(0,0,0,0)', + vAlign: 'center', + closeIcon: 'fe_x', + closeIconColor: 'palette8', + closeIconColorHover: 'palette9', + }, + [ + createBlock('kadence/navigation', { uniqueID: '10_8bfb46-ae', templateKey: 'short' }, []), createBlock( - 'kadence/header-column', - { uniqueID: '10_3ce3fd-74', location: 'tablet-right', metadata: { name: 'Right' } }, - [] + 'kadence/rowlayout', + { + uniqueID: '10_0d41ea-63', + columns: 1, + colLayout: 'equal', + inheritMaxWidth: true, + kbVersion: 2, + }, + [ + createBlock( + 'kadence/column', + { borderWidth: ['', '', '', ''], uniqueID: '10_ecad58-0a', kbVersion: 2 }, + [ + createBlock( + 'kadence/advancedheading', + { + uniqueID: '10_8d7f6a-cb', + color: 'palette9', + margin: ['', '', 'xs', ''], + markBorder: '', + markBorderStyles: [ + { + top: [null, '', ''], + right: [null, '', ''], + bottom: [null, '', ''], + left: [null, '', ''], + unit: 'px', + }, + ], + tabletMarkBorderStyles: [ + { + top: [null, '', ''], + right: [null, '', ''], + bottom: [null, '', ''], + left: [null, '', ''], + unit: 'px', + }, + ], + mobileMarkBorderStyles: [ + { + top: [null, '', ''], + right: [null, '', ''], + bottom: [null, '', ''], + left: [null, '', ''], + unit: 'px', + }, + ], + colorClass: 'theme-palette9', + htmlTag: 'div', + fontSize: ['sm', '', ''], + icon: 'fe_mail', + }, + [] + ), + createBlock( + 'kadence/advancedheading', + { + uniqueID: '10_c34138-26', + color: 'palette9', + margin: ['', '', 'xs', ''], + markBorder: '', + markBorderStyles: [ + { + top: [null, '', ''], + right: [null, '', ''], + bottom: [null, '', ''], + left: [null, '', ''], + unit: 'px', + }, + ], + tabletMarkBorderStyles: [ + { + top: [null, '', ''], + right: [null, '', ''], + bottom: [null, '', ''], + left: [null, '', ''], + unit: 'px', + }, + ], + mobileMarkBorderStyles: [ + { + top: [null, '', ''], + right: [null, '', ''], + bottom: [null, '', ''], + left: [null, '', ''], + unit: 'px', + }, + ], + colorClass: 'theme-palette9', + htmlTag: 'div', + fontSize: ['sm', '', ''], + icon: 'fe_phone', + }, + [] + ), + createBlock( + 'kadence/advancedheading', + { + uniqueID: '10_5cc5ac-0d', + color: 'palette9', + markBorder: '', + markBorderStyles: [ + { + top: [null, '', ''], + right: [null, '', ''], + bottom: [null, '', ''], + left: [null, '', ''], + unit: 'px', + }, + ], + tabletMarkBorderStyles: [ + { + top: [null, '', ''], + right: [null, '', ''], + bottom: [null, '', ''], + left: [null, '', ''], + unit: 'px', + }, + ], + mobileMarkBorderStyles: [ + { + top: [null, '', ''], + right: [null, '', ''], + bottom: [null, '', ''], + left: [null, '', ''], + unit: 'px', + }, + ], + colorClass: 'theme-palette9', + htmlTag: 'div', + fontSize: ['sm', '', ''], + icon: 'fe_mapPin', + iconVerticalAlign: 'baseline', + }, + [] + ), + ] + ), + ] ), - ]), - ]), - createBlock('kadence/off-canvas', { uniqueID: '10_96e964-fa' }, [ - createBlock('kadence/infobox', { uniqueID: '10_0f0957-f1', kbVersion: 2 }, []), - createBlock('kadence/infobox', { uniqueID: '10_2d0f82-f2', kbVersion: 2 }, []), - ]), + ] + ), ]), ]; } diff --git a/src/blocks/header/templates/basic-7.js b/src/blocks/header/templates/basic-7.js index 37518eef9..518987c96 100644 --- a/src/blocks/header/templates/basic-7.js +++ b/src/blocks/header/templates/basic-7.js @@ -10,7 +10,7 @@ const postMeta = { { enable: false, color: '#000000', - opacity: 0.20000000000000001, + opacity: 0.2, spread: 0, blur: 2, hOffset: 1, @@ -29,15 +29,27 @@ function innerBlocks() { createBlock('kadence/header-container-desktop', { uniqueID: '10_9b8274-df' }, [ createBlock( 'kadence/header-row', - { uniqueID: '10_f4816d-58', location: 'top', metadata: { name: 'Top Row' } }, + { + uniqueID: '10_f4816d-58', + location: 'top', + metadata: { name: 'Top Row' }, + }, [ createBlock( 'kadence/header-section', - { uniqueID: '10_1db117-66', location: 'left', metadata: { name: 'Left Section' } }, + { + uniqueID: '10_1db117-66', + location: 'left', + metadata: { name: 'Left Section' }, + }, [ createBlock( 'kadence/header-column', - { uniqueID: '10_eeb809-55', location: 'left', metadata: { name: 'Left' } }, + { + uniqueID: '10_eeb809-55', + location: 'left', + metadata: { name: 'Left' }, + }, [] ), createBlock( @@ -53,12 +65,20 @@ function innerBlocks() { ), createBlock( 'kadence/header-column', - { uniqueID: '10_a6253a-9a', location: 'center', metadata: { name: 'Center' } }, + { + uniqueID: '10_a6253a-9a', + location: 'center', + metadata: { name: 'Center' }, + }, [] ), createBlock( 'kadence/header-section', - { uniqueID: '10_817efa-f4', location: 'right', metadata: { name: 'Right Section' } }, + { + uniqueID: '10_817efa-f4', + location: 'right', + metadata: { name: 'Right Section' }, + }, [ createBlock( 'kadence/header-column', @@ -71,7 +91,11 @@ function innerBlocks() { ), createBlock( 'kadence/header-column', - { uniqueID: '10_be6fab-2d', location: 'right', metadata: { name: 'Right' } }, + { + uniqueID: '10_be6fab-2d', + location: 'right', + metadata: { name: 'Right' }, + }, [] ), ] @@ -83,7 +107,6 @@ function innerBlocks() { { uniqueID: '10_38d32f-b3', location: 'center', - layout: 'fullwidth', minHeight: 60, vAlign: 'center', metadata: { name: 'Middle Row' }, @@ -91,11 +114,19 @@ function innerBlocks() { [ createBlock( 'kadence/header-section', - { uniqueID: '10_e3294a-db', location: 'left', metadata: { name: 'Left Section' } }, + { + uniqueID: '10_e3294a-db', + location: 'left', + metadata: { name: 'Left Section' }, + }, [ createBlock( 'kadence/header-column', - { uniqueID: '10_93f2a8-d7', location: 'left', metadata: { name: 'Left' } }, + { + uniqueID: '10_93f2a8-d7', + location: 'left', + metadata: { name: 'Left' }, + }, [ createBlock( 'kadence/off-canvas-trigger', @@ -139,7 +170,11 @@ function innerBlocks() { ), createBlock( 'kadence/header-section', - { uniqueID: '10_9225e0-a4', location: 'right', metadata: { name: 'Right Section' } }, + { + uniqueID: '10_9225e0-a4', + location: 'right', + metadata: { name: 'Right Section' }, + }, [ createBlock( 'kadence/header-column', @@ -152,7 +187,11 @@ function innerBlocks() { ), createBlock( 'kadence/header-column', - { uniqueID: '10_38aa24-cf', location: 'right', metadata: { name: 'Right' } }, + { + uniqueID: '10_38aa24-cf', + location: 'right', + metadata: { name: 'Right' }, + }, [ createBlock('kadence/icon', { uniqueID: '10_b26f06-67' }, [ createBlock( @@ -177,15 +216,27 @@ function innerBlocks() { ), createBlock( 'kadence/header-row', - { uniqueID: '10_be279b-96', location: 'bottom', metadata: { name: 'Bottom Row' } }, + { + uniqueID: '10_be279b-96', + location: 'bottom', + metadata: { name: 'Bottom Row' }, + }, [ createBlock( 'kadence/header-section', - { uniqueID: '10_156db1-12', location: 'left', metadata: { name: 'Left Section' } }, + { + uniqueID: '10_156db1-12', + location: 'left', + metadata: { name: 'Left Section' }, + }, [ createBlock( 'kadence/header-column', - { uniqueID: '10_4fd11e-d8', location: 'left', metadata: { name: 'Left' } }, + { + uniqueID: '10_4fd11e-d8', + location: 'left', + metadata: { name: 'Left' }, + }, [] ), createBlock( @@ -201,12 +252,20 @@ function innerBlocks() { ), createBlock( 'kadence/header-column', - { uniqueID: '10_662575-4d', location: 'center', metadata: { name: 'Center' } }, + { + uniqueID: '10_662575-4d', + location: 'center', + metadata: { name: 'Center' }, + }, [] ), createBlock( 'kadence/header-section', - { uniqueID: '10_bad89b-9f', location: 'right', metadata: { name: 'Right Section' } }, + { + uniqueID: '10_bad89b-9f', + location: 'right', + metadata: { name: 'Right Section' }, + }, [ createBlock( 'kadence/header-column', @@ -219,7 +278,11 @@ function innerBlocks() { ), createBlock( 'kadence/header-column', - { uniqueID: '10_1bcc4f-41', location: 'right', metadata: { name: 'Right' } }, + { + uniqueID: '10_1bcc4f-41', + location: 'right', + metadata: { name: 'Right' }, + }, [] ), ] @@ -228,27 +291,49 @@ function innerBlocks() { ), ]), createBlock('kadence/header-container-tablet', { uniqueID: '10_ea8334-1d' }, [ - createBlock('kadence/header-row', { uniqueID: '10_b87809-b2', metadata: { name: 'Top Row' } }, [ - createBlock( - 'kadence/header-column', - { uniqueID: '10_a5fe2e-3d', location: 'tablet-left', metadata: { name: 'Left' } }, - [] - ), - createBlock( - 'kadence/header-column', - { uniqueID: '10_a628c2-31', metadata: { name: 'Center' }, location: 'tablet-center' }, - [] - ), - createBlock( - 'kadence/header-column', - { uniqueID: '10_835e6f-11', location: 'tablet-right', metadata: { name: 'Right' } }, - [] - ), - ]), + createBlock( + 'kadence/header-row', + { + uniqueID: '10_b87809-b2', + metadata: { name: 'Top Row' }, + }, + [ + createBlock( + 'kadence/header-column', + { + uniqueID: '10_a5fe2e-3d', + location: 'tablet-left', + metadata: { name: 'Left' }, + }, + [] + ), + createBlock( + 'kadence/header-column', + { + uniqueID: '10_a628c2-31', + metadata: { name: 'Center', location: 'tablet-center' }, + }, + [] + ), + createBlock( + 'kadence/header-column', + { + uniqueID: '10_835e6f-11', + location: 'tablet-right', + metadata: { name: 'Right' }, + }, + [] + ), + ] + ), createBlock('kadence/header-row', { uniqueID: '10_5922ae-0e', metadata: { name: 'Middle Row' } }, [ createBlock( 'kadence/header-column', - { uniqueID: '10_748893-45', location: 'tablet-left', metadata: { name: 'Left' } }, + { + uniqueID: '10_748893-45', + location: 'tablet-left', + metadata: { name: 'Left' }, + }, [ createBlock( 'kadence/image', @@ -265,12 +350,19 @@ function innerBlocks() { ), createBlock( 'kadence/header-column', - { uniqueID: '10_c2fbc3-92', metadata: { name: 'Center' }, location: 'tablet-center' }, + { + uniqueID: '10_c2fbc3-92', + metadata: { name: 'Center', location: 'tablet-center' }, + }, [] ), createBlock( 'kadence/header-column', - { uniqueID: '10_42c593-4d', location: 'tablet-right', metadata: { name: 'Right' } }, + { + uniqueID: '10_42c593-4d', + location: 'tablet-right', + metadata: { name: 'Right' }, + }, [ createBlock('kadence/icon', { uniqueID: '10_875530-ba', tabletTextAlignment: 'right' }, [ createBlock( @@ -287,23 +379,41 @@ function innerBlocks() { ] ), ]), - createBlock('kadence/header-row', { uniqueID: '10_b4c9b8-ca', metadata: { name: 'Bottom Row' } }, [ - createBlock( - 'kadence/header-column', - { uniqueID: '10_722118-db', location: 'tablet-left', metadata: { name: 'Left' } }, - [] - ), - createBlock( - 'kadence/header-column', - { uniqueID: '10_d5ddbd-e2', metadata: { name: 'Center' }, location: 'tablet-center' }, - [] - ), - createBlock( - 'kadence/header-column', - { uniqueID: '10_3f8aab-6f', location: 'tablet-right', metadata: { name: 'Right' } }, - [] - ), - ]), + createBlock( + 'kadence/header-row', + { + uniqueID: '10_b4c9b8-ca', + metadata: { name: 'Bottom Row' }, + }, + [ + createBlock( + 'kadence/header-column', + { + uniqueID: '10_722118-db', + location: 'tablet-left', + metadata: { name: 'Left' }, + }, + [] + ), + createBlock( + 'kadence/header-column', + { + uniqueID: '10_d5ddbd-e2', + metadata: { name: 'Center', location: 'tablet-center' }, + }, + [] + ), + createBlock( + 'kadence/header-column', + { + uniqueID: '10_3f8aab-6f', + location: 'tablet-right', + metadata: { name: 'Right' }, + }, + [] + ), + ] + ), ]), createBlock( 'kadence/off-canvas', @@ -330,7 +440,7 @@ function innerBlocks() { }, [] ), - createBlock('kadence/navigation', { uniqueID: '10_6f903e-a7' }, []), + createBlock('kadence/navigation', { uniqueID: '10_6f903e-a7', templateKey: 'short' }, []), ] ), ]), diff --git a/src/blocks/header/templates/mobile-1.js b/src/blocks/header/templates/mobile-1.js new file mode 100644 index 000000000..fe3c3be53 --- /dev/null +++ b/src/blocks/header/templates/mobile-1.js @@ -0,0 +1,472 @@ +/** + * Template: Mobile – 1 + * Post Type: kadence_header + */ + +import { createBlock } from '@wordpress/blocks'; + +const postMeta = { + _kad_header_shadow: [ + { + enable: false, + color: '#000000', + opacity: 0.2, + spread: 0, + blur: 2, + hOffset: 1, + vOffset: 1, + inset: false, + }, + ], +}; + +function innerBlocks() { + return [ + createBlock('kadence/header', {}, [ + createBlock('kadence/header-container-desktop', { uniqueID: '42_e52e8f-ef' }, [ + createBlock( + 'kadence/header-row', + { + uniqueID: '42_072324-fd', + location: 'top', + metadata: { name: 'Top Row' }, + }, + [ + createBlock( + 'kadence/header-section', + { + uniqueID: '42_e7dbf9-aa', + location: 'left', + metadata: { name: 'Left Section' }, + }, + [ + createBlock( + 'kadence/header-column', + { + uniqueID: '42_72525b-ba', + location: 'left', + metadata: { name: 'Left' }, + }, + [] + ), + createBlock( + 'kadence/header-column', + { + uniqueID: '42_e15cf0-4e', + location: 'center-left', + metadata: { name: 'Center Left' }, + }, + [] + ), + ] + ), + createBlock( + 'kadence/header-column', + { + uniqueID: '42_675a02-c5', + location: 'center', + metadata: { name: 'Center' }, + }, + [] + ), + createBlock( + 'kadence/header-section', + { + uniqueID: '42_fa6524-07', + location: 'right', + metadata: { name: 'Right Section' }, + }, + [ + createBlock( + 'kadence/header-column', + { + uniqueID: '42_ae3f27-ed', + location: 'center-right', + metadata: { name: 'Center Right' }, + }, + [] + ), + createBlock( + 'kadence/header-column', + { + uniqueID: '42_6b3646-b5', + location: 'right', + metadata: { name: 'Right' }, + }, + [] + ), + ] + ), + ] + ), + createBlock( + 'kadence/header-row', + { + uniqueID: '42_cc738e-02', + location: 'center', + metadata: { name: 'Middle Row' }, + }, + [ + createBlock( + 'kadence/header-section', + { + uniqueID: '42_31a719-ac', + location: 'left', + metadata: { name: 'Left Section' }, + }, + [ + createBlock( + 'kadence/header-column', + { uniqueID: '42_fa7143-0a', location: 'left', metadata: { name: 'Left' } }, + [ + createBlock( + 'kadence/image', + { + imgMaxWidth: 100, + sizeSlug: 'full', + linkDestination: 'none', + uniqueID: '42_700bf6-9f', + globalAlt: true, + url: '/wp-content/plugins/kadence-blocks/includes/assets/images/placeholder/logo-dark.png', + }, + [] + ), + ] + ), + createBlock( + 'kadence/header-column', + { + uniqueID: '42_a1f09b-2a', + location: 'center-left', + metadata: { name: 'Center Left' }, + }, + [] + ), + ] + ), + createBlock( + 'kadence/header-column', + { + uniqueID: '42_c10169-40', + location: 'center', + metadata: { name: 'Center' }, + }, + [createBlock('kadence/navigation', { uniqueID: '42_aa5abb-ca', templateKey: 'short' }, [])] + ), + createBlock( + 'kadence/header-section', + { + uniqueID: '42_9de6d3-31', + location: 'right', + metadata: { name: 'Right Section' }, + }, + [ + createBlock( + 'kadence/header-column', + { + uniqueID: '42_4c0530-47', + location: 'center-right', + metadata: { name: 'Center Right' }, + }, + [] + ), + createBlock( + 'kadence/header-column', + { + uniqueID: '42_178588-71', + location: 'right', + metadata: { name: 'Right' }, + }, + [ + createBlock('kadence/advancedbtn', { uniqueID: '42_067a44-b6' }, [ + createBlock( + 'kadence/singlebtn', + { + uniqueID: '42_30e239-70', + text: 'Call To Action', + sizePreset: 'small', + typography: [ + { + size: ['', '', ''], + sizeType: 'px', + lineHeight: ['', '', ''], + lineType: '', + letterSpacing: [0.5, '', ''], + letterType: 'px', + textTransform: 'uppercase', + family: 'var( --global-heading-font-family, inherit )', + google: false, + style: 'normal', + weight: 'inherit', + variant: '', + subset: '', + loadGoogle: true, + }, + ], + }, + [] + ), + createBlock( + 'kadence/singlebtn', + { + uniqueID: '42_bb54fd-29', + text: 'Secondary', + sizePreset: 'small', + inheritStyles: 'outline', + typography: [ + { + size: ['', '', ''], + sizeType: 'px', + lineHeight: ['', '', ''], + lineType: '', + letterSpacing: [0.5, '', ''], + letterType: 'px', + textTransform: 'uppercase', + family: 'var( --global-heading-font-family, inherit )', + google: false, + style: 'normal', + weight: 'inherit', + variant: '', + subset: '', + loadGoogle: true, + }, + ], + }, + [] + ), + ]), + ] + ), + ] + ), + ] + ), + createBlock( + 'kadence/header-row', + { + uniqueID: '42_444e11-16', + location: 'bottom', + metadata: { name: 'Bottom Row' }, + }, + [ + createBlock( + 'kadence/header-section', + { + uniqueID: '42_635709-96', + location: 'left', + metadata: { name: 'Left Section' }, + }, + [ + createBlock( + 'kadence/header-column', + { + uniqueID: '42_0cdfc4-61', + location: 'left', + metadata: { name: 'Left' }, + }, + [] + ), + createBlock( + 'kadence/header-column', + { + uniqueID: '42_db96a3-56', + location: 'center-left', + metadata: { name: 'Center Left' }, + }, + [] + ), + ] + ), + createBlock( + 'kadence/header-column', + { + uniqueID: '42_2a66e5-ba', + location: 'center', + metadata: { name: 'Center' }, + }, + [] + ), + createBlock( + 'kadence/header-section', + { + uniqueID: '42_b20a52-4f', + location: 'right', + metadata: { name: 'Right Section' }, + }, + [ + createBlock( + 'kadence/header-column', + { + uniqueID: '42_edd10e-67', + location: 'center-right', + metadata: { name: 'Center Right' }, + }, + [] + ), + createBlock( + 'kadence/header-column', + { + uniqueID: '42_90a9fe-73', + location: 'right', + metadata: { name: 'Right' }, + }, + [] + ), + ] + ), + ] + ), + ]), + createBlock('kadence/header-container-tablet', { uniqueID: '42_99b740-24' }, [ + createBlock( + 'kadence/header-row', + { + uniqueID: '42_b11bd1-c0', + metadata: { name: 'Top Row' }, + }, + [ + createBlock( + 'kadence/header-column', + { + uniqueID: '42_c92648-8e', + location: 'tablet-left', + metadata: { name: 'Left' }, + }, + [] + ), + createBlock( + 'kadence/header-column', + { + uniqueID: '42_4e4853-63', + metadata: { name: 'Center', location: 'tablet-center' }, + }, + [] + ), + createBlock( + 'kadence/header-column', + { + uniqueID: '42_ebe192-48', + location: 'tablet-right', + metadata: { name: 'Right' }, + }, + [] + ), + ] + ), + createBlock( + 'kadence/header-row', + { + uniqueID: '42_5ed048-42', + layout: 'fullwidth', + vAlignTablet: 'center', + metadata: { name: 'Middle Row' }, + }, + [ + createBlock( + 'kadence/header-column', + { + uniqueID: '42_19270f-d5', + location: 'tablet-left', + metadata: { name: 'Left' }, + }, + [ + createBlock( + 'kadence/off-canvas-trigger', + { + uniqueID: '42_6165e0-2d', + iconSizeTablet: 25, + iconColorTablet: 'palette3', + iconColorHoverTablet: 'palette3', + iconBackgroundColorTablet: 'palette8', + iconBackgroundColorHoverTablet: 'palette8', + }, + [] + ), + ] + ), + createBlock( + 'kadence/header-column', + { + uniqueID: '42_c5037b-3f', + metadata: { name: 'Center', location: 'tablet-center' }, + }, + [ + createBlock( + 'kadence/image', + { + imgMaxWidthTablet: 100, + sizeSlug: 'full', + linkDestination: 'none', + uniqueID: '42_11aab1-8e', + url: '/wp-content/plugins/kadence-blocks/includes/assets/images/placeholder/logo-dark.png', + }, + [] + ), + ] + ), + createBlock( + 'kadence/header-column', + { + uniqueID: '42_a5ebed-38', + location: 'tablet-right', + metadata: { name: 'Right' }, + }, + [] + ), + ] + ), + createBlock('kadence/header-row', { uniqueID: '42_1fe649-e4', metadata: { name: 'Bottom Row' } }, [ + createBlock( + 'kadence/header-column', + { + uniqueID: '42_cf727a-2c', + location: 'tablet-left', + metadata: { name: 'Left' }, + }, + [] + ), + createBlock( + 'kadence/header-column', + { + uniqueID: '42_a6e551-1c', + metadata: { name: 'Center', location: 'tablet-center' }, + }, + [] + ), + createBlock( + 'kadence/header-column', + { + uniqueID: '42_c73452-ad', + location: 'tablet-right', + metadata: { name: 'Right' }, + }, + [] + ), + ]), + ]), + createBlock( + 'kadence/off-canvas', + { + uniqueID: '42_ec0ed5-87', + slideFrom: 'right', + maxWidthTablet: 700, + containerMaxWidth: '', + containerMaxWidthTablet: '', + containerMaxWidthMobile: '', + widthTablet: 450, + backgroundColorTablet: 'palette4', + hAlignTablet: 'left', + vAlignTablet: 'top', + closeIcon: 'fe_x', + closeIconSizeTablet: 25, + closeIconColorTablet: 'palette9', + closeIconColorHoverTablet: 'palette9', + closeIconPaddingTablet: ['sm', 'sm', '', ''], + }, + [createBlock('kadence/navigation', { uniqueID: '42_9ae050-24', templateKey: 'short-vertical' }, [])] + ), + ]), + ]; +} + +export { postMeta, innerBlocks }; diff --git a/src/blocks/header/templates/mobile-2.js b/src/blocks/header/templates/mobile-2.js new file mode 100644 index 000000000..f9cea1f2a --- /dev/null +++ b/src/blocks/header/templates/mobile-2.js @@ -0,0 +1,450 @@ +/** + * Template: Mobile-2 + * Post Type: kadence_header + */ + +import { createBlock } from '@wordpress/blocks'; + +const postMeta = { + _kad_header_shadow: [ + { + enable: false, + color: '#000000', + opacity: 0.2, + spread: 0, + blur: 2, + hOffset: 1, + vOffset: 1, + inset: false, + }, + ], +}; + +function innerBlocks() { + return [ + createBlock('kadence/header', {}, [ + createBlock('kadence/header-container-desktop', { uniqueID: '56_20a751-5b' }, [ + createBlock( + 'kadence/header-row', + { + uniqueID: '56_55ec9f-b5', + location: 'top', + metadata: { name: 'Top Row' }, + }, + [ + createBlock( + 'kadence/header-section', + { + uniqueID: '56_79c0c0-db', + location: 'left', + metadata: { name: 'Left Section' }, + }, + [ + createBlock( + 'kadence/header-column', + { + uniqueID: '56_4fc859-d0', + location: 'left', + metadata: { name: 'Left' }, + }, + [] + ), + createBlock( + 'kadence/header-column', + { + uniqueID: '56_26c786-91', + location: 'center-left', + metadata: { name: 'Center Left' }, + }, + [] + ), + ] + ), + createBlock( + 'kadence/header-column', + { + uniqueID: '56_43db6e-9f', + location: 'center', + metadata: { name: 'Center' }, + }, + [] + ), + createBlock( + 'kadence/header-section', + { + uniqueID: '56_08e616-f9', + location: 'right', + metadata: { name: 'Right Section' }, + }, + [ + createBlock( + 'kadence/header-column', + { + uniqueID: '56_a40af3-5d', + location: 'center-right', + metadata: { name: 'Center Right' }, + }, + [] + ), + createBlock( + 'kadence/header-column', + { + uniqueID: '56_aeac76-c2', + location: 'right', + metadata: { name: 'Right' }, + }, + [] + ), + ] + ), + ] + ), + createBlock( + 'kadence/header-row', + { + uniqueID: '56_6521bf-ac', + location: 'center', + vAlign: 'center', + metadata: { name: 'Middle Row' }, + }, + [ + createBlock( + 'kadence/header-section', + { + uniqueID: '56_25a2fe-74', + location: 'left', + metadata: { name: 'Left Section' }, + }, + [ + createBlock( + 'kadence/header-column', + { uniqueID: '56_2d679e-65', location: 'left', metadata: { name: 'Left' } }, + [ + createBlock( + 'kadence/image', + { + imgMaxWidth: 105, + sizeSlug: 'full', + linkDestination: 'none', + uniqueID: '56_d3383f-53', + globalAlt: true, + url: '/wp-content/plugins/kadence-blocks/includes/assets/images/placeholder/logo-dark.png', + }, + [] + ), + ] + ), + createBlock( + 'kadence/header-column', + { + uniqueID: '56_86cdcc-8c', + location: 'center-left', + metadata: { name: 'Center Left' }, + }, + [] + ), + ] + ), + createBlock( + 'kadence/header-column', + { + uniqueID: '56_7b35d4-c2', + location: 'center', + metadata: { name: 'Center' }, + }, + [] + ), + createBlock( + 'kadence/header-section', + { + uniqueID: '56_382fa0-28', + location: 'right', + metadata: { name: 'Right Section' }, + }, + [ + createBlock( + 'kadence/header-column', + { + uniqueID: '56_94b338-2b', + location: 'center-right', + metadata: { name: 'Center Right' }, + }, + [] + ), + createBlock( + 'kadence/header-column', + { + uniqueID: '56_e6b64e-67', + location: 'right', + metadata: { name: 'Right' }, + }, + [ + createBlock( + 'kadence/navigation', + { + uniqueID: '56_192eb5-9e', + templateKey: 'short', + }, + [] + ), + createBlock('kadence/advancedbtn', { uniqueID: '56_07c8cf-de' }, [ + createBlock( + 'kadence/singlebtn', + { + uniqueID: '56_1c3285-3f', + text: 'Call to Action', + sizePreset: 'small', + color: 'palette9', + background: 'palette3', + colorHover: 'palette9', + backgroundHover: 'palette6', + typography: [ + { + size: ['sm', '', ''], + sizeType: 'px', + lineHeight: ['', '', ''], + lineType: '', + letterSpacing: ['', '', ''], + letterType: 'px', + textTransform: 'uppercase', + family: '', + google: '', + style: '', + weight: '', + variant: '', + subset: '', + loadGoogle: true, + }, + ], + }, + [] + ), + ]), + ] + ), + ] + ), + ] + ), + createBlock( + 'kadence/header-row', + { + uniqueID: '56_71a213-0a', + location: 'bottom', + metadata: { name: 'Bottom Row' }, + }, + [ + createBlock( + 'kadence/header-section', + { + uniqueID: '56_bd4ab7-5e', + location: 'left', + metadata: { name: 'Left Section' }, + }, + [ + createBlock( + 'kadence/header-column', + { + uniqueID: '56_1a9d89-f7', + location: 'left', + metadata: { name: 'Left' }, + }, + [] + ), + createBlock( + 'kadence/header-column', + { + uniqueID: '56_4dd013-66', + location: 'center-left', + metadata: { name: 'Center Left' }, + }, + [] + ), + ] + ), + createBlock( + 'kadence/header-column', + { + uniqueID: '56_b7ded6-f6', + location: 'center', + metadata: { name: 'Center' }, + }, + [] + ), + createBlock( + 'kadence/header-section', + { + uniqueID: '56_16145e-3f', + location: 'right', + metadata: { name: 'Right Section' }, + }, + [ + createBlock( + 'kadence/header-column', + { + uniqueID: '56_6a401f-df', + location: 'center-right', + metadata: { name: 'Center Right' }, + }, + [] + ), + createBlock( + 'kadence/header-column', + { + uniqueID: '56_eea961-75', + location: 'right', + metadata: { name: 'Right' }, + }, + [] + ), + ] + ), + ] + ), + ]), + createBlock('kadence/header-container-tablet', { uniqueID: '56_97ea08-7c' }, [ + createBlock( + 'kadence/header-row', + { + uniqueID: '56_b888bd-ad', + metadata: { name: 'Top Row' }, + }, + [ + createBlock( + 'kadence/header-column', + { + uniqueID: '56_01cd63-f4', + location: 'tablet-left', + metadata: { name: 'Left' }, + }, + [] + ), + createBlock( + 'kadence/header-column', + { + uniqueID: '56_f363d3-79', + metadata: { name: 'Center', location: 'tablet-center' }, + }, + [] + ), + createBlock( + 'kadence/header-column', + { + uniqueID: '56_cf6da8-d2', + location: 'tablet-right', + metadata: { name: 'Right' }, + }, + [] + ), + ] + ), + createBlock( + 'kadence/header-row', + { + uniqueID: '56_e87b6f-48', + layout: 'fullwidth', + vAlignTablet: 'center', + metadata: { name: 'Middle Row' }, + }, + [ + createBlock( + 'kadence/header-column', + { + uniqueID: '56_0749e8-3e', + location: 'tablet-left', + metadata: { name: 'Left' }, + }, + [ + createBlock( + 'kadence/off-canvas-trigger', + { + uniqueID: '56_b4c1d7-f0', + iconSizeTablet: 25, + iconColorTablet: 'palette3', + iconColorHoverTablet: 'palette3', + iconBackgroundColorTablet: 'palette8', + iconBackgroundColorHoverTablet: 'palette8', + }, + [] + ), + ] + ), + createBlock( + 'kadence/header-column', + { + uniqueID: '56_2a5574-34', + metadata: { name: 'Center', location: 'tablet-center' }, + }, + [ + createBlock( + 'kadence/image', + { + imgMaxWidthTablet: 100, + sizeSlug: 'full', + linkDestination: 'none', + uniqueID: '56_6b3b28-b2', + url: '/wp-content/plugins/kadence-blocks/includes/assets/images/placeholder/logo-dark.png', + }, + [] + ), + ] + ), + createBlock( + 'kadence/header-column', + { + uniqueID: '56_35395a-c2', + location: 'tablet-right', + metadata: { name: 'Right' }, + }, + [] + ), + ] + ), + createBlock('kadence/header-row', { uniqueID: '56_d0d653-cb', metadata: { name: 'Bottom Row' } }, [ + createBlock( + 'kadence/header-column', + { + uniqueID: '56_b87607-e2', + location: 'tablet-left', + metadata: { name: 'Left' }, + }, + [] + ), + createBlock( + 'kadence/header-column', + { + uniqueID: '56_1fe859-b7', + metadata: { name: 'Center', location: 'tablet-center' }, + }, + [] + ), + createBlock( + 'kadence/header-column', + { + uniqueID: '56_9289e6-e4', + location: 'tablet-right', + metadata: { name: 'Right' }, + }, + [] + ), + ]), + ]), + createBlock( + 'kadence/off-canvas', + { + uniqueID: '56_6488f5-aa', + maxWidthTablet: 700, + widthTablet: 400, + backgroundColorTablet: 'palette5', + hAlignTablet: 'left', + vAlignTablet: 'top', + closeIconColorTablet: 'palette5', + closeIconBackgroundColorTablet: 'palette7', + }, + [createBlock('kadence/navigation', { uniqueID: '56_1d1567-c1', templateKey: 'short-vertical' }, [])] + ), + ]), + ]; +} + +export { postMeta, innerBlocks }; diff --git a/src/blocks/header/templates/mobile-3.js b/src/blocks/header/templates/mobile-3.js new file mode 100644 index 000000000..487cc26c9 --- /dev/null +++ b/src/blocks/header/templates/mobile-3.js @@ -0,0 +1,416 @@ +/** + * Template: Mobile-3 + * Post Type: kadence_header + */ + +import { createBlock } from '@wordpress/blocks'; + +const postMeta = { + _kad_header_shadow: [ + { + enable: false, + color: '#000000', + opacity: 0.2, + spread: 0, + blur: 2, + hOffset: 1, + vOffset: 1, + inset: false, + }, + ], +}; + +function innerBlocks() { + return [ + createBlock('kadence/header', {}, [ + createBlock('kadence/header-container-desktop', { uniqueID: '75_75241e-1a' }, [ + createBlock( + 'kadence/header-row', + { + uniqueID: '75_9c6e5b-f1', + location: 'top', + metadata: { name: 'Top Row' }, + }, + [ + createBlock( + 'kadence/header-section', + { + uniqueID: '75_e6e5f6-d6', + location: 'left', + metadata: { name: 'Left Section' }, + }, + [ + createBlock( + 'kadence/header-column', + { + uniqueID: '75_e6029f-2f', + location: 'left', + metadata: { name: 'Left' }, + }, + [] + ), + createBlock( + 'kadence/header-column', + { + uniqueID: '75_4d43ea-82', + location: 'center-left', + metadata: { name: 'Center Left' }, + }, + [] + ), + ] + ), + createBlock( + 'kadence/header-column', + { + uniqueID: '75_4cab15-1f', + location: 'center', + metadata: { name: 'Center' }, + }, + [] + ), + createBlock( + 'kadence/header-section', + { + uniqueID: '75_025625-9a', + location: 'right', + metadata: { name: 'Right Section' }, + }, + [ + createBlock( + 'kadence/header-column', + { + uniqueID: '75_104604-52', + location: 'center-right', + metadata: { name: 'Center Right' }, + }, + [] + ), + createBlock( + 'kadence/header-column', + { + uniqueID: '75_a6593f-e8', + location: 'right', + metadata: { name: 'Right' }, + }, + [] + ), + ] + ), + ] + ), + createBlock( + 'kadence/header-row', + { + uniqueID: '75_052627-9b', + location: 'center', + minHeight: 60, + vAlign: 'center', + metadata: { name: 'Middle Row' }, + }, + [ + createBlock( + 'kadence/header-section', + { + uniqueID: '75_75548f-65', + location: 'left', + metadata: { name: 'Left Section' }, + }, + [ + createBlock( + 'kadence/header-column', + { + uniqueID: '75_d7fa76-f9', + location: 'left', + metadata: { name: 'Left' }, + }, + [ + createBlock( + 'kadence/off-canvas-trigger', + { + uniqueID: '75_612cbd-ed', + iconColor: 'palette3', + iconColorHover: 'palette6', + }, + [] + ), + ] + ), + createBlock( + 'kadence/header-column', + { + uniqueID: '75_97f7be-2c', + location: 'center-left', + metadata: { name: 'Center Left' }, + }, + [] + ), + ] + ), + createBlock( + 'kadence/header-column', + { + uniqueID: '75_94819a-21', + location: 'center', + metadata: { name: 'Center' }, + }, + [] + ), + createBlock( + 'kadence/header-section', + { + uniqueID: '75_9f46b6-48', + location: 'right', + metadata: { name: 'Right Section' }, + }, + [ + createBlock( + 'kadence/header-column', + { + uniqueID: '75_ce6445-5f', + location: 'center-right', + metadata: { name: 'Center Right' }, + }, + [] + ), + createBlock( + 'kadence/header-column', + { uniqueID: '75_924e83-33', location: 'right', metadata: { name: 'Right' } }, + [ + createBlock( + 'kadence/image', + { + imgMaxWidth: 100, + sizeSlug: 'full', + linkDestination: 'none', + uniqueID: '75_21fad1-2e', + globalAlt: true, + url: '/wp-content/plugins/kadence-blocks/includes/assets/images/placeholder/logo-dark.png', + }, + [] + ), + ] + ), + ] + ), + ] + ), + createBlock( + 'kadence/header-row', + { + uniqueID: '75_0b7380-73', + location: 'bottom', + metadata: { name: 'Bottom Row' }, + }, + [ + createBlock( + 'kadence/header-section', + { + uniqueID: '75_29aab4-7b', + location: 'left', + metadata: { name: 'Left Section' }, + }, + [ + createBlock( + 'kadence/header-column', + { + uniqueID: '75_d3575e-df', + location: 'left', + metadata: { name: 'Left' }, + }, + [] + ), + createBlock( + 'kadence/header-column', + { + uniqueID: '75_0177d0-85', + location: 'center-left', + metadata: { name: 'Center Left' }, + }, + [] + ), + ] + ), + createBlock( + 'kadence/header-column', + { + uniqueID: '75_b88ba1-e1', + location: 'center', + metadata: { name: 'Center' }, + }, + [] + ), + createBlock( + 'kadence/header-section', + { + uniqueID: '75_3c4990-81', + location: 'right', + metadata: { name: 'Right Section' }, + }, + [ + createBlock( + 'kadence/header-column', + { + uniqueID: '75_450ff5-00', + location: 'center-right', + metadata: { name: 'Center Right' }, + }, + [] + ), + createBlock( + 'kadence/header-column', + { + uniqueID: '75_6c5dda-e1', + location: 'right', + metadata: { name: 'Right' }, + }, + [] + ), + ] + ), + ] + ), + ]), + createBlock('kadence/header-container-tablet', { uniqueID: '75_b3b399-34' }, [ + createBlock( + 'kadence/header-row', + { + uniqueID: '75_854e4a-ed', + metadata: { name: 'Top Row' }, + }, + [ + createBlock( + 'kadence/header-column', + { + uniqueID: '75_c4efb7-d6', + location: 'tablet-left', + metadata: { name: 'Left' }, + }, + [] + ), + createBlock( + 'kadence/header-column', + { + uniqueID: '75_98c204-ff', + metadata: { name: 'Center', location: 'tablet-center' }, + }, + [] + ), + createBlock( + 'kadence/header-column', + { + uniqueID: '75_345b24-92', + location: 'tablet-right', + metadata: { name: 'Right' }, + }, + [] + ), + ] + ), + createBlock( + 'kadence/header-row', + { + uniqueID: '75_e850e6-d6', + layout: 'fullwidth', + vAlignTablet: 'center', + metadata: { name: 'Middle Row' }, + }, + [ + createBlock( + 'kadence/header-column', + { + uniqueID: '75_c182e3-b7', + location: 'tablet-left', + metadata: { name: 'Left' }, + }, + [ + createBlock( + 'kadence/off-canvas-trigger', + { + uniqueID: '75_c5848e-ad', + icon: 'fe_alignJustify', + iconSizeTablet: 25, + iconColorTablet: 'palette3', + iconColorHoverTablet: 'palette3', + iconBackgroundColorTablet: 'palette8', + iconBackgroundColorHoverTablet: 'palette8', + }, + [] + ), + ] + ), + createBlock( + 'kadence/header-column', + { + uniqueID: '75_aba572-6e', + metadata: { name: 'Center', location: 'tablet-center' }, + }, + [] + ), + createBlock( + 'kadence/header-column', + { uniqueID: '75_20930f-fd', location: 'tablet-right', metadata: { name: 'Right' } }, + [ + createBlock( + 'kadence/image', + { + align: 'right', + imgMaxWidthTablet: 100, + sizeSlug: 'full', + linkDestination: 'none', + uniqueID: '75_851646-0e', + url: '/wp-content/plugins/kadence-blocks/includes/assets/images/placeholder/logo-dark.png', + }, + [] + ), + ] + ), + ] + ), + createBlock('kadence/header-row', { uniqueID: '75_866679-84', metadata: { name: 'Bottom Row' } }, [ + createBlock( + 'kadence/header-column', + { + uniqueID: '75_62546e-b6', + location: 'tablet-left', + metadata: { name: 'Left' }, + }, + [] + ), + createBlock( + 'kadence/header-column', + { + uniqueID: '75_218b70-b2', + metadata: { name: 'Center', location: 'tablet-center' }, + }, + [] + ), + createBlock( + 'kadence/header-column', + { + uniqueID: '75_fd2c7b-9b', + location: 'tablet-right', + metadata: { name: 'Right' }, + }, + [] + ), + ]), + ]), + createBlock( + 'kadence/off-canvas', + { + uniqueID: '75_4515e7-51', + maxWidthTablet: 700, + maxWidthMobile: '', + width: '', + widthTablet: 400, + closeIcon: 'fe_x', + closeIconPaddingTablet: ['sm', 'sm', '', ''], + }, + [createBlock('kadence/navigation', { uniqueID: '75_5f8548-59', templateKey: 'short' }, [])] + ), + ]), + ]; +} + +export { postMeta, innerBlocks }; diff --git a/src/blocks/header/templates/mobile-4.js b/src/blocks/header/templates/mobile-4.js new file mode 100644 index 000000000..758e43130 --- /dev/null +++ b/src/blocks/header/templates/mobile-4.js @@ -0,0 +1,589 @@ +/** + * Template: Mobile-4 + * Post Type: kadence_header + */ + +import { createBlock } from '@wordpress/blocks'; + +const postMeta = { + _kad_header_shadow: [ + { + enable: false, + color: '#000000', + opacity: 0.2, + spread: 0, + blur: 2, + hOffset: 1, + vOffset: 1, + inset: false, + }, + ], +}; + +function innerBlocks() { + return [ + createBlock('kadence/header', {}, [ + createBlock('kadence/header-container-desktop', { uniqueID: '88_67b2e2-6c' }, [ + createBlock( + 'kadence/header-row', + { + uniqueID: '88_d50707-f4', + location: 'top', + metadata: { name: 'Top Row' }, + }, + [ + createBlock( + 'kadence/header-section', + { + uniqueID: '88_11f577-89', + location: 'left', + metadata: { name: 'Left Section' }, + }, + [ + createBlock( + 'kadence/header-column', + { + uniqueID: '88_54daf2-8c', + location: 'left', + metadata: { name: 'Left' }, + }, + [] + ), + createBlock( + 'kadence/header-column', + { + uniqueID: '88_1e363c-0c', + location: 'center-left', + metadata: { name: 'Center Left' }, + }, + [] + ), + ] + ), + createBlock( + 'kadence/header-column', + { + uniqueID: '88_e8405a-48', + location: 'center', + metadata: { name: 'Center' }, + }, + [] + ), + createBlock( + 'kadence/header-section', + { + uniqueID: '88_5ddf80-27', + location: 'right', + metadata: { name: 'Right Section' }, + }, + [ + createBlock( + 'kadence/header-column', + { + uniqueID: '88_63c949-f5', + location: 'center-right', + metadata: { name: 'Center Right' }, + }, + [] + ), + createBlock( + 'kadence/header-column', + { + uniqueID: '88_1b22dd-5f', + location: 'right', + metadata: { name: 'Right' }, + }, + [] + ), + ] + ), + ] + ), + createBlock( + 'kadence/header-row', + { + uniqueID: '88_0f6798-80', + location: 'center', + background: { + color: 'palette8', + image: '', + imageID: '', + position: 'center center', + size: 'cover', + repeat: 'no-repeat', + attachment: 'scroll', + type: 'normal', + gradient: '', + }, + minHeight: 60, + vAlign: 'center', + metadata: { name: 'Middle Row' }, + }, + [ + createBlock( + 'kadence/header-section', + { + uniqueID: '88_e5c01e-88', + location: 'left', + metadata: { name: 'Left Section' }, + }, + [ + createBlock( + 'kadence/header-column', + { uniqueID: '88_393b2b-c0', location: 'left', metadata: { name: 'Left' } }, + [ + createBlock( + 'kadence/advancedbtn', + { + uniqueID: '88_382855-70', + margin: [ + { + desk: ['', '', '0', ''], + tablet: ['', '', '', ''], + mobile: ['', '', '', ''], + }, + ], + orientation: [null, '', ''], + }, + [ + createBlock( + 'kadence/singlebtn', + { + uniqueID: '88_6350c1-a0', + text: 'Call to Action', + sizePreset: 'small', + color: 'palette3', + colorHover: 'palette6', + borderStyle: [ + { + top: ['palette3', '', ''], + right: ['palette3', '', ''], + bottom: ['palette3', '', ''], + left: ['palette3', '', ''], + unit: 'px', + }, + ], + borderHoverStyle: [ + { + top: ['palette6', '', ''], + right: ['palette6', '', ''], + bottom: ['palette6', '', ''], + left: ['palette6', '', ''], + unit: 'px', + }, + ], + inheritStyles: 'outline', + typography: [ + { + size: ['sm', '', ''], + sizeType: 'px', + lineHeight: ['', '', ''], + lineType: '', + letterSpacing: [1, '', ''], + letterType: 'px', + textTransform: 'uppercase', + family: 'var( --global-heading-font-family, inherit )', + google: false, + style: 'normal', + weight: '600', + variant: '', + subset: '', + loadGoogle: true, + }, + ], + }, + [] + ), + ] + ), + ] + ), + createBlock( + 'kadence/header-column', + { + uniqueID: '88_3183e2-16', + location: 'center-left', + metadata: { name: 'Center Left' }, + }, + [] + ), + ] + ), + createBlock( + 'kadence/header-column', + { uniqueID: '88_36bddf-aa', location: 'center', metadata: { name: 'Center' } }, + [ + createBlock( + 'kadence/image', + { + sizeSlug: 'full', + linkDestination: 'none', + uniqueID: '88_9a8fe5-2f', + url: '/wp-content/plugins/kadence-blocks/includes/assets/images/placeholder/logo-dark.png', + }, + [] + ), + ] + ), + createBlock( + 'kadence/header-section', + { + uniqueID: '88_62d12b-3b', + location: 'right', + metadata: { name: 'Right Section' }, + }, + [ + createBlock( + 'kadence/header-column', + { + uniqueID: '88_03f8c1-8e', + location: 'center-right', + metadata: { name: 'Center Right' }, + }, + [] + ), + createBlock( + 'kadence/header-column', + { + uniqueID: '88_dd8a9c-92', + location: 'right', + metadata: { name: 'Right' }, + }, + [ + createBlock( + 'kadence/rowlayout', + { + uniqueID: '88_efca81-f3', + collapseGutter: 'skinny', + customRowGutter: [10, '', ''], + columnGutter: 'custom', + customGutter: [10, '', ''], + colLayout: 'equal', + maxWidth: 400, + firstColumnWidth: 65, + secondColumnWidth: 35, + kbVersion: 2, + }, + [ + createBlock( + 'kadence/column', + { + borderWidth: ['', '', '', ''], + uniqueID: '88_0090af-23', + kbVersion: 2, + }, + [ + createBlock( + 'kadence/advancedheading', + { + uniqueID: '88_eaaf9b-62', + letterSpacing: 1, + typography: 'var( --global-body-font-family, inherit )', + fontWeight: '600', + markBorder: '', + markBorderStyles: [ + { + top: [null, '', ''], + right: [null, '', ''], + bottom: [null, '', ''], + left: [null, '', ''], + unit: 'px', + }, + ], + tabletMarkBorderStyles: [ + { + top: [null, '', ''], + right: [null, '', ''], + bottom: [null, '', ''], + left: [null, '', ''], + unit: 'px', + }, + ], + mobileMarkBorderStyles: [ + { + top: [null, '', ''], + right: [null, '', ''], + bottom: [null, '', ''], + left: [null, '', ''], + unit: 'px', + }, + ], + textTransform: 'uppercase', + htmlTag: 'div', + fontSize: ['sm', '', ''], + }, + [] + ), + ] + ), + createBlock( + 'kadence/column', + { + id: 2, + borderWidth: ['', '', '', ''], + uniqueID: '88_26b104-ac', + kbVersion: 2, + }, + [ + createBlock( + 'kadence/off-canvas-trigger', + { + uniqueID: '88_267d25-20', + icon: 'ic_fourUp', + iconColor: 'palette3', + iconColorHover: 'palette6', + iconBackgroundColor: 'palette8', + iconBackgroundColorHover: 'palette8', + }, + [] + ), + ] + ), + ] + ), + ] + ), + ] + ), + ] + ), + createBlock( + 'kadence/header-row', + { + uniqueID: '88_35e498-43', + location: 'bottom', + metadata: { name: 'Bottom Row' }, + }, + [ + createBlock( + 'kadence/header-section', + { + uniqueID: '88_0cf0d0-db', + location: 'left', + metadata: { name: 'Left Section' }, + }, + [ + createBlock( + 'kadence/header-column', + { + uniqueID: '88_f1a019-a9', + location: 'left', + metadata: { name: 'Left' }, + }, + [] + ), + createBlock( + 'kadence/header-column', + { + uniqueID: '88_b1882a-e1', + location: 'center-left', + metadata: { name: 'Center Left' }, + }, + [] + ), + ] + ), + createBlock( + 'kadence/header-column', + { + uniqueID: '88_67a1f2-23', + location: 'center', + metadata: { name: 'Center' }, + }, + [] + ), + createBlock( + 'kadence/header-section', + { + uniqueID: '88_8d1992-53', + location: 'right', + metadata: { name: 'Right Section' }, + }, + [ + createBlock( + 'kadence/header-column', + { + uniqueID: '88_7dd8f8-55', + location: 'center-right', + metadata: { name: 'Center Right' }, + }, + [] + ), + createBlock( + 'kadence/header-column', + { + uniqueID: '88_aac09f-0f', + location: 'right', + metadata: { name: 'Right' }, + }, + [] + ), + ] + ), + ] + ), + ]), + createBlock('kadence/header-container-tablet', { uniqueID: '88_097579-d2' }, [ + createBlock( + 'kadence/header-row', + { + uniqueID: '88_e14f8f-0b', + metadata: { name: 'Top Row' }, + }, + [ + createBlock( + 'kadence/header-column', + { + uniqueID: '88_eb389f-fa', + location: 'tablet-left', + metadata: { name: 'Left' }, + }, + [] + ), + createBlock( + 'kadence/header-column', + { + uniqueID: '88_a61084-4e', + metadata: { name: 'Center', location: 'tablet-center' }, + }, + [] + ), + createBlock( + 'kadence/header-column', + { + uniqueID: '88_c53951-5e', + location: 'tablet-right', + metadata: { name: 'Right' }, + }, + [] + ), + ] + ), + createBlock( + 'kadence/header-row', + { + uniqueID: '88_6595d8-c9', + layout: 'fullwidth', + vAlignTablet: 'center', + metadata: { name: 'Middle Row' }, + }, + [ + createBlock( + 'kadence/header-column', + { + uniqueID: '88_e1408f-c4', + location: 'tablet-left', + metadata: { name: 'Left' }, + }, + [ + createBlock( + 'kadence/off-canvas-trigger', + { + uniqueID: '88_0159fa-ae', + iconSizeTablet: 25, + iconColorTablet: 'palette3', + iconColorHoverTablet: 'palette3', + iconBackgroundColorTablet: 'palette8', + iconBackgroundColorHoverTablet: 'palette8', + }, + [] + ), + ] + ), + createBlock( + 'kadence/header-column', + { + uniqueID: '88_1e6337-10', + metadata: { name: 'Center', location: 'tablet-center' }, + }, + [ + createBlock( + 'kadence/image', + { + imgMaxWidthTablet: 100, + sizeSlug: 'full', + linkDestination: 'none', + uniqueID: '88_f364a2-34', + url: '/wp-content/plugins/kadence-blocks/includes/assets/images/placeholder/logo-dark.png', + }, + [] + ), + ] + ), + createBlock( + 'kadence/header-column', + { + uniqueID: '88_120f5b-c3', + location: 'tablet-right', + metadata: { name: 'Right' }, + }, + [ + createBlock('kadence/advancedbtn', { uniqueID: '88_a7d78d-91' }, [ + createBlock( + 'kadence/singlebtn', + { + uniqueID: '88_b0ba2f-dd', + text: 'Join Today', + sizePreset: 'small', + background: 'palette4', + backgroundHover: 'palette3', + }, + [] + ), + ]), + ] + ), + ] + ), + createBlock( + 'kadence/header-row', + { + uniqueID: '88_acd27e-b5', + metadata: { name: 'Bottom Row' }, + }, + [ + createBlock( + 'kadence/header-column', + { + uniqueID: '88_21d99b-be', + location: 'tablet-left', + metadata: { name: 'Left' }, + }, + [] + ), + createBlock( + 'kadence/header-column', + { + uniqueID: '88_ef28da-f8', + metadata: { name: 'Center', location: 'tablet-center' }, + }, + [] + ), + createBlock( + 'kadence/header-column', + { + uniqueID: '88_a95cb8-d8', + location: 'tablet-right', + metadata: { name: 'Right' }, + }, + [] + ), + ] + ), + ]), + createBlock( + 'kadence/off-canvas', + { + uniqueID: '88_0808dd-d4', + maxWidthTablet: 700, + widthTablet: 500, + closeIcon: 'fe_x', + closeIconPaddingTablet: ['sm', 'sm', '', ''], + }, + [createBlock('kadence/navigation', { uniqueID: '88_df5f65-59', templateKey: 'short' }, [])] + ), + ]), + ]; +} + +export { postMeta, innerBlocks }; diff --git a/src/blocks/header/templates/multi-row-1.js b/src/blocks/header/templates/multi-row-1.js index 15d022d85..4b4ab4e0c 100644 --- a/src/blocks/header/templates/multi-row-1.js +++ b/src/blocks/header/templates/multi-row-1.js @@ -1,43 +1,41 @@ /** - * Template: Multi-row 1 + * Template: Multi-Row 5 * Post Type: kadence_header */ import { createBlock } from '@wordpress/blocks'; const postMeta = { - _kad_header_flex: { - direction: ['horizontal', '', ''], - justifyContent: ['', '', ''], - verticalAlignment: ['', '', ''], + _kad_header_typography: { + color: '', + size: ['', '', ''], + sizeType: 'px', + lineHeight: ['', '', ''], + lineType: '', + letterSpacing: ['', '', ''], + letterType: 'px', + textTransform: '', + family: '', + google: false, + style: '', + weight: '400', + variant: '', + subset: '', + loadGoogle: true, }, - _kad_header_width: ['100', '', ''], - _kad_header_widthUnit: '%', - _kad_header_shadow: [ - { - enable: false, - color: '#000000', - opacity: 0.20000000000000001, - spread: 0, - blur: 2, - hOffset: 1, - vOffset: 1, - inset: false, - }, - ], }; function innerBlocks() { return [ createBlock('kadence/header', {}, [ - createBlock('kadence/header-container-desktop', { uniqueID: '8_be1909-97' }, [ + createBlock('kadence/header-container-desktop', { uniqueID: '8_bfb1de-84' }, [ createBlock( 'kadence/header-row', { - uniqueID: '8_fb6ba9-c7', + uniqueID: '8_fefa38-05', location: 'top', background: { - color: 'palette5', + color: 'palette8', image: '', imageID: '', position: 'center center', @@ -47,16 +45,23 @@ function innerBlocks() { type: 'normal', gradient: '', }, - padding: ['xxs', 'lg', 'xxs', 'lg'], - maxWidth: 100, - maxWidthUnit: '%', + border: [ + { + top: ['', '', ''], + right: ['', '', ''], + bottom: ['#cbd7eb', '', 1], + left: ['', '', ''], + unit: 'px', + }, + ], + padding: ['sm', 'xs', 'xs', 'xs'], metadata: { name: 'Top Row' }, }, [ createBlock( 'kadence/header-section', { - uniqueID: '8_d2e513-f1', + uniqueID: '8_e9dda0-cc', location: 'left', metadata: { name: 'Left Section' }, }, @@ -64,7 +69,7 @@ function innerBlocks() { createBlock( 'kadence/header-column', { - uniqueID: '8_c7bab4-ae', + uniqueID: '8_0bb5c8-e1', location: 'left', metadata: { name: 'Left' }, }, @@ -73,7 +78,7 @@ function innerBlocks() { createBlock( 'kadence/header-column', { - uniqueID: '8_98e105-62', + uniqueID: '8_1dcafd-1a', location: 'center-left', metadata: { name: 'Center Left' }, }, @@ -83,52 +88,17 @@ function innerBlocks() { ), createBlock( 'kadence/header-column', - { - uniqueID: '8_5e39ab-6d', - location: 'center', - metadata: { name: 'Center' }, - }, + { uniqueID: '8_3851e3-8d', location: 'center', metadata: { name: 'Center' } }, [ createBlock( - 'kadence/advancedheading', + 'kadence/image', { - uniqueID: '8_5a3063-13', align: 'center', - color: 'palette9', - typography: 'var( --global-heading-font-family, inherit )', - fontWeight: '300', - markBorder: '', - markBorderStyles: [ - { - top: [null, '', ''], - right: [null, '', ''], - bottom: [null, '', ''], - left: [null, '', ''], - unit: 'px', - }, - ], - tabletMarkBorderStyles: [ - { - top: [null, '', ''], - right: [null, '', ''], - bottom: [null, '', ''], - left: [null, '', ''], - unit: 'px', - }, - ], - mobileMarkBorderStyles: [ - { - top: [null, '', ''], - right: [null, '', ''], - bottom: [null, '', ''], - left: [null, '', ''], - unit: 'px', - }, - ], - textTransform: 'capitalize', - colorClass: 'theme-palette9', - htmlTag: 'div', - fontSize: ['sm', '', ''], + imgMaxWidth: 80, + sizeSlug: 'full', + linkDestination: 'none', + uniqueID: '8_e1169c-91', + url: '/wp-content/plugins/kadence-blocks/includes/assets/images/placeholder/logo-dark.png', }, [] ), @@ -137,7 +107,7 @@ function innerBlocks() { createBlock( 'kadence/header-section', { - uniqueID: '8_075bea-3c', + uniqueID: '8_e62566-91', location: 'right', metadata: { name: 'Right Section' }, }, @@ -145,7 +115,7 @@ function innerBlocks() { createBlock( 'kadence/header-column', { - uniqueID: '8_aee3ed-ff', + uniqueID: '8_b46f9e-9f', location: 'center-right', metadata: { name: 'Center Right' }, }, @@ -154,7 +124,7 @@ function innerBlocks() { createBlock( 'kadence/header-column', { - uniqueID: '8_0d7d29-c6', + uniqueID: '8_f7a977-8c', location: 'right', metadata: { name: 'Right' }, }, @@ -167,10 +137,10 @@ function innerBlocks() { createBlock( 'kadence/header-row', { - uniqueID: '8_d388a8-e5', + uniqueID: '8_8baf12-66', location: 'center', background: { - color: 'palette9', + color: 'palette8', image: '', imageID: '', position: 'center center', @@ -180,50 +150,31 @@ function innerBlocks() { type: 'normal', gradient: '', }, - border: [ - { - top: ['', '', ''], - right: ['', '', ''], - bottom: ['palette6', '', 1], - left: ['', '', ''], - unit: 'px', - }, - ], - padding: ['md', 'lg', 'md', 'lg'], - maxWidth: 100, - maxWidthUnit: '%', + padding: ['xxs', 'xxs', 'xxs', 'xxs'], metadata: { name: 'Middle Row' }, }, [ createBlock( 'kadence/header-section', { - uniqueID: '8_be8cc6-77', + uniqueID: '8_4b9af6-48', location: 'left', metadata: { name: 'Left Section' }, }, [ createBlock( 'kadence/header-column', - { uniqueID: '8_38eca9-c2', location: 'left', metadata: { name: 'Left' } }, - [ - createBlock( - 'kadence/image', - { - sizeSlug: 'full', - linkDestination: 'none', - uniqueID: '8_7ceea4-52', - imageFilter: 'mayfair', - url: '/wp-content/plugins/kadence-blocks/includes/assets/images/placeholder/logo-dark.png', - }, - [] - ), - ] + { + uniqueID: '8_09478c-ee', + location: 'left', + metadata: { name: 'Left' }, + }, + [] ), createBlock( 'kadence/header-column', { - uniqueID: '8_b251bb-58', + uniqueID: '8_5229e1-19', location: 'center-left', metadata: { name: 'Center Left' }, }, @@ -234,16 +185,16 @@ function innerBlocks() { createBlock( 'kadence/header-column', { - uniqueID: '8_632700-11', + uniqueID: '8_e6bf9c-db', location: 'center', metadata: { name: 'Center' }, }, - [createBlock('kadence/navigation', { uniqueID: '8_35dcc4-2a' }, [])] + [createBlock('kadence/navigation', { uniqueID: '8_be1cc0-86', templateKey: 'long' }, [])] ), createBlock( 'kadence/header-section', { - uniqueID: '8_e4e150-77', + uniqueID: '8_636d75-de', location: 'right', metadata: { name: 'Right Section' }, }, @@ -251,7 +202,7 @@ function innerBlocks() { createBlock( 'kadence/header-column', { - uniqueID: '8_0340ee-76', + uniqueID: '8_9cd82a-2d', location: 'center-right', metadata: { name: 'Center Right' }, }, @@ -259,76 +210,12 @@ function innerBlocks() { ), createBlock( 'kadence/header-column', - { uniqueID: '8_5fd0c2-12', location: 'right', metadata: { name: 'Right' } }, - [ - createBlock( - 'kadence/icon', - { - uniqueID: '8_bb80f7-d7', - gap: ['xs', '', ''], - }, - [ - createBlock( - 'kadence/single-icon', - { - uniqueID: '8_6bac87-03', - icon: 'fa_facebook-n', - link: '#', - size: 15, - title: 'Facebook', - color: 'palette9', - background: 'palette6', - borderRadius: 50, - borderWidth: 0, - padding: [5, 5, 5, 5], - style: 'stacked', - margin: ['0', '0', '0', '0'], - hColor: 'palette9', - hBackground: 'palette6', - }, - [] - ), - createBlock( - 'kadence/single-icon', - { - uniqueID: '8_db3174-41', - icon: 'fa_instagram', - link: '#', - size: 15, - title: 'Instagram', - color: 'palette9', - background: 'palette6', - borderRadius: 50, - borderWidth: 0, - padding: [5, 5, 5, 5], - style: 'stacked', - hColor: 'palette9', - hBackground: 'palette6', - }, - [] - ), - createBlock( - 'kadence/single-icon', - { - uniqueID: '8_311e14-91', - icon: 'fa_youtube', - link: '#', - size: 15, - title: 'Youtube', - color: 'palette9', - background: 'palette6', - borderRadius: 50, - borderWidth: 0, - padding: [5, 5, 5, 5], - style: 'stacked', - hColor: 'palette9', - hBackground: 'palette6', - }, - [] - ), - ] - ), - ] + { + uniqueID: '8_b31977-5a', + location: 'right', + metadata: { name: 'Right' }, + }, + [] ), ] ), @@ -337,16 +224,27 @@ function innerBlocks() { createBlock( 'kadence/header-row', { - uniqueID: '8_b09dc6-18', + uniqueID: '8_aeb783-18', location: 'bottom', - layout: 'fullwidth', + background: { + color: 'palette8', + image: '', + imageID: '', + position: 'center center', + size: 'cover', + repeat: 'no-repeat', + attachment: 'scroll', + type: 'normal', + gradient: '', + }, + padding: ['', '', 'sm', ''], metadata: { name: 'Bottom Row' }, }, [ createBlock( 'kadence/header-section', { - uniqueID: '8_7de42f-2f', + uniqueID: '8_0c9b7f-56', location: 'left', metadata: { name: 'Left Section' }, }, @@ -354,7 +252,7 @@ function innerBlocks() { createBlock( 'kadence/header-column', { - uniqueID: '8_7dbebb-81', + uniqueID: '8_b2b367-1a', location: 'left', metadata: { name: 'Left' }, }, @@ -363,7 +261,7 @@ function innerBlocks() { createBlock( 'kadence/header-column', { - uniqueID: '8_1834be-97', + uniqueID: '8_3750c7-6c', location: 'center-left', metadata: { name: 'Center Left' }, }, @@ -374,16 +272,76 @@ function innerBlocks() { createBlock( 'kadence/header-column', { - uniqueID: '8_3f128f-1f', + uniqueID: '8_87c30d-f5', location: 'center', metadata: { name: 'Center' }, }, - [] + [ + createBlock( + 'kadence/advancedheading', + { + uniqueID: '8_0ebb76-c1', + typography: 'var( --global-heading-font-family, inherit )', + fontWeight: '800', + margin: ['', '0', '', ''], + padding: ['', 'xs', '', ''], + markBorder: '', + markBorderStyles: [ + { + top: [null, '', ''], + right: [null, '', ''], + bottom: [null, '', ''], + left: [null, '', ''], + unit: 'px', + }, + ], + tabletMarkBorderStyles: [ + { + top: [null, '', ''], + right: [null, '', ''], + bottom: [null, '', ''], + left: [null, '', ''], + unit: 'px', + }, + ], + mobileMarkBorderStyles: [ + { + top: [null, '', ''], + right: [null, '', ''], + bottom: [null, '', ''], + left: [null, '', ''], + unit: 'px', + }, + ], + textTransform: 'uppercase', + htmlTag: 'div', + fontSize: ['sm', '', ''], + fontHeight: [null, '', ''], + fontHeightType: 'em', + icon: 'fe_settings', + borderStyle: [ + { + top: ['', '', ''], + right: ['palette3', '', 1], + bottom: ['', '', ''], + left: ['', '', ''], + unit: 'px', + }, + ], + }, + [] + ), + createBlock( + 'kadence/navigation', + { uniqueID: '8_5e5f9b-cb', templateKey: 'long-vertical' }, + [] + ), + ] ), createBlock( 'kadence/header-section', { - uniqueID: '8_2d5b36-24', + uniqueID: '8_6cf044-e7', location: 'right', metadata: { name: 'Right Section' }, }, @@ -391,7 +349,7 @@ function innerBlocks() { createBlock( 'kadence/header-column', { - uniqueID: '8_8899ea-8c', + uniqueID: '8_9f8788-bb', location: 'center-right', metadata: { name: 'Center Right' }, }, @@ -400,7 +358,7 @@ function innerBlocks() { createBlock( 'kadence/header-column', { - uniqueID: '8_cb717b-da', + uniqueID: '8_11a44d-7c', location: 'right', metadata: { name: 'Right' }, }, @@ -411,33 +369,18 @@ function innerBlocks() { ] ), ]), - createBlock('kadence/header-container-tablet', { uniqueID: '8_729ba9-a5' }, [ + createBlock('kadence/header-container-tablet', { uniqueID: '8_c2e5c9-98' }, [ createBlock( 'kadence/header-row', { - uniqueID: '8_3207a2-2f', - layout: 'fullwidth', - background: { - color: 'palette5', - image: '', - imageID: '', - position: 'center center', - size: 'cover', - repeat: 'no-repeat', - attachment: 'scroll', - type: 'normal', - gradient: '', - }, - minHeightTablet: 2, - minHeightUnit: 'em', - vAlignTablet: 'center', + uniqueID: '8_457a2d-80', metadata: { name: 'Top Row' }, }, [ createBlock( 'kadence/header-column', { - uniqueID: '8_03edf6-99', + uniqueID: '8_60bd87-af', location: 'tablet-left', metadata: { name: 'Left' }, }, @@ -446,58 +389,15 @@ function innerBlocks() { createBlock( 'kadence/header-column', { - uniqueID: '8_a6dc83-53', - metadata: { name: 'Center' }, - location: 'tablet-center', + uniqueID: '8_1791f5-df', + metadata: { name: 'Center', location: 'tablet-center' }, }, - [ - createBlock( - 'kadence/advancedheading', - { - uniqueID: '8_182396-02', - align: 'center', - color: 'palette9', - markBorder: '', - markBorderStyles: [ - { - top: [null, '', ''], - right: [null, '', ''], - bottom: [null, '', ''], - left: [null, '', ''], - unit: 'px', - }, - ], - tabletMarkBorderStyles: [ - { - top: [null, '', ''], - right: [null, '', ''], - bottom: [null, '', ''], - left: [null, '', ''], - unit: 'px', - }, - ], - mobileMarkBorderStyles: [ - { - top: [null, '', ''], - right: [null, '', ''], - bottom: [null, '', ''], - left: [null, '', ''], - unit: 'px', - }, - ], - colorClass: 'theme-palette9', - htmlTag: 'div', - fontSize: ['', 'sm', ''], - fontHeight: ['', 2, ''], - }, - [] - ), - ] + [] ), createBlock( 'kadence/header-column', { - uniqueID: '8_61399c-38', + uniqueID: '8_9826a0-6c', location: 'tablet-right', metadata: { name: 'Right' }, }, @@ -508,10 +408,9 @@ function innerBlocks() { createBlock( 'kadence/header-row', { - uniqueID: '8_057f8b-cf', - layout: 'fullwidth', + uniqueID: '8_e4e4cd-eb', background: { - color: 'palette9', + color: 'palette8', image: '', imageID: '', position: 'center center', @@ -521,22 +420,20 @@ function innerBlocks() { type: 'normal', gradient: '', }, - minHeightUnit: 'em', - vAlignTablet: 'center', + paddingTablet: ['md', 'md', 'md', 'md'], metadata: { name: 'Middle Row' }, }, [ createBlock( 'kadence/header-column', - { uniqueID: '8_fd0621-82', location: 'tablet-left', metadata: { name: 'Left' } }, + { uniqueID: '8_f68495-b4', location: 'tablet-left', metadata: { name: 'Left' } }, [ createBlock( 'kadence/image', { sizeSlug: 'full', linkDestination: 'none', - uniqueID: '8_6b72dc-6d', - marginTablet: ['sm', '', 'sm', ''], + uniqueID: '8_209c35-41', url: '/wp-content/plugins/kadence-blocks/includes/assets/images/placeholder/logo-dark.png', }, [] @@ -546,78 +443,73 @@ function innerBlocks() { createBlock( 'kadence/header-column', { - uniqueID: '8_04c9c7-f1', - metadata: { name: 'Center' }, - location: 'tablet-center', + uniqueID: '8_2d1e60-a9', + metadata: { name: 'Center', location: 'tablet-center' }, }, [] ), createBlock( 'kadence/header-column', { - uniqueID: '8_f7b5df-47', + uniqueID: '8_2006d8-bf', location: 'tablet-right', metadata: { name: 'Right' }, }, [ createBlock( 'kadence/off-canvas-trigger', - { uniqueID: '8_cd4c25-4c', iconSizeTablet: 20 }, + { + uniqueID: '8_b5d85e-84', + icon: 'fe_menu', + iconSizeTablet: 30, + iconColorTablet: 'palette3', + }, [] ), ] ), ] ), - createBlock( - 'kadence/header-row', - { - uniqueID: '8_123946-0b', - metadata: { name: 'Bottom Row' }, - }, - [ - createBlock( - 'kadence/header-column', - { - uniqueID: '8_dd9a1d-70', - location: 'tablet-left', - metadata: { name: 'Left' }, - }, - [] - ), - createBlock( - 'kadence/header-column', - { - uniqueID: '8_803649-37', - metadata: { name: 'Center' }, - location: 'tablet-center', - }, - [] - ), - createBlock( - 'kadence/header-column', - { - uniqueID: '8_6d893f-e0', - location: 'tablet-right', - metadata: { name: 'Right' }, - }, - [] - ), - ] - ), + createBlock('kadence/header-row', { uniqueID: '8_377a88-c5', metadata: { name: 'Bottom Row' } }, [ + createBlock( + 'kadence/header-column', + { + uniqueID: '8_cd71bf-3b', + location: 'tablet-left', + metadata: { name: 'Left' }, + }, + [] + ), + createBlock( + 'kadence/header-column', + { + uniqueID: '8_b92c1b-3d', + metadata: { name: 'Center', location: 'tablet-center' }, + }, + [] + ), + createBlock( + 'kadence/header-column', + { + uniqueID: '8_28fe4f-e1', + location: 'tablet-right', + metadata: { name: 'Right' }, + }, + [] + ), + ]), ]), createBlock( 'kadence/off-canvas', { - uniqueID: '8_8696e1-1b', - slideFrom: 'right', - backgroundColorTablet: 'palette3', - hAlignTablet: 'center', - vAlignTablet: 'center', - closeIconSizeTablet: 20, - closeIconColorTablet: 'palette9', + uniqueID: '8_0e55b4-4b', + widthType: 'full', + backgroundColor: 'palette3', + padding: ['lg', 'md', 'xl', 'md'], + closeIconColor: 'palette9', + closeIconPadding: ['xs', 'xs', 'xs', 'xs'], }, - [createBlock('kadence/navigation', { uniqueID: '8_6cd84d-ff' }, [])] + [createBlock('kadence/navigation', { uniqueID: '8_e09777-12', templateKey: 'short' }, [])] ), ]), ]; diff --git a/src/blocks/header/templates/multi-row-2.js b/src/blocks/header/templates/multi-row-2.js index 91d62f63f..6f708666d 100644 --- a/src/blocks/header/templates/multi-row-2.js +++ b/src/blocks/header/templates/multi-row-2.js @@ -1,5 +1,5 @@ /** - * Template: Multi-row 2 + * Template: Multi-Row 4 * Post Type: kadence_header */ @@ -10,40 +10,37 @@ const postMeta = {}; function innerBlocks() { return [ createBlock('kadence/header', {}, [ - createBlock('kadence/header-container-desktop', { uniqueID: '8_25c9b0-6c' }, [ + createBlock('kadence/header-container-desktop', { uniqueID: '8_1890d6-03' }, [ createBlock( 'kadence/header-row', { - uniqueID: '8_8f8e7a-6a', + uniqueID: '8_587800-7f', location: 'top', - background: { - color: 'palette4', - image: '', - imageID: '', - position: 'center center', - size: 'cover', - repeat: 'no-repeat', - attachment: 'scroll', - type: 'normal', - gradient: '', - }, - padding: ['', 'lg', '', 'lg'], + padding: ['xxs', 'sm', 'xxs', 'sm'], metadata: { name: 'Top Row' }, }, [ createBlock( 'kadence/header-section', - { uniqueID: '8_6401bd-8b', location: 'left', metadata: { name: 'Left Section' } }, + { + uniqueID: '8_97bc57-fd', + location: 'left', + metadata: { name: 'Left Section' }, + }, [ createBlock( 'kadence/header-column', - { uniqueID: '8_1a6394-61', location: 'left', metadata: { name: 'Left' } }, - [createBlock('kadence/navigation', { uniqueID: '8_4b69a7-2f' }, [])] + { + uniqueID: '8_adf65f-81', + location: 'left', + metadata: { name: 'Left' }, + }, + [] ), createBlock( 'kadence/header-column', { - uniqueID: '8_b1b207-01', + uniqueID: '8_76e931-b1', location: 'center-left', metadata: { name: 'Center Left' }, }, @@ -53,17 +50,25 @@ function innerBlocks() { ), createBlock( 'kadence/header-column', - { uniqueID: '8_f6585e-d5', location: 'center', metadata: { name: 'Center' } }, + { + uniqueID: '8_c6a8f3-1e', + location: 'center', + metadata: { name: 'Center' }, + }, [] ), createBlock( 'kadence/header-section', - { uniqueID: '8_dd17ab-d9', location: 'right', metadata: { name: 'Right Section' } }, + { + uniqueID: '8_49d7f5-95', + location: 'right', + metadata: { name: 'Right Section' }, + }, [ createBlock( 'kadence/header-column', { - uniqueID: '8_cf98b5-84', + uniqueID: '8_148cdd-b1', location: 'center-right', metadata: { name: 'Center Right' }, }, @@ -71,7 +76,11 @@ function innerBlocks() { ), createBlock( 'kadence/header-column', - { uniqueID: '8_22bfd0-cd', location: 'right', metadata: { name: 'Right' } }, + { + uniqueID: '8_2e0c59-c4', + location: 'right', + metadata: { name: 'Right' }, + }, [] ), ] @@ -81,10 +90,10 @@ function innerBlocks() { createBlock( 'kadence/header-row', { - uniqueID: '8_93efb2-34', + uniqueID: '8_f4c6f4-49', location: 'center', background: { - color: 'palette9', + color: 'palette3', image: '', imageID: '', position: 'center center', @@ -94,23 +103,39 @@ function innerBlocks() { type: 'normal', gradient: '', }, - padding: ['xxs', 'lg', 'xxs', 'lg'], + padding: ['sm', 'sm', 'sm', 'sm'], metadata: { name: 'Middle Row' }, }, [ createBlock( 'kadence/header-section', - { uniqueID: '8_5f7254-ea', location: 'left', metadata: { name: 'Left Section' } }, + { + uniqueID: '8_d094cb-24', + location: 'left', + metadata: { name: 'Left Section' }, + }, [ createBlock( 'kadence/header-column', - { uniqueID: '8_e41aed-7d', location: 'left', metadata: { name: 'Left' } }, - [createBlock('kadence/navigation', { uniqueID: '8_35093b-2d' }, [])] + { uniqueID: '8_b264d1-e5', location: 'left', metadata: { name: 'Left' } }, + [ + createBlock( + 'kadence/image', + { + imgMaxWidth: 312, + sizeSlug: 'full', + linkDestination: 'none', + uniqueID: '8_aa64a4-35', + url: '/wp-content/plugins/kadence-blocks/includes/assets/images/placeholder/logo-light-lg.png', + }, + [] + ), + ] ), createBlock( 'kadence/header-column', { - uniqueID: '8_c82f51-63', + uniqueID: '8_6f1afc-1d', location: 'center-left', metadata: { name: 'Center Left' }, }, @@ -120,17 +145,25 @@ function innerBlocks() { ), createBlock( 'kadence/header-column', - { uniqueID: '8_3f83fa-06', location: 'center', metadata: { name: 'Center' } }, + { + uniqueID: '8_ea2e80-5a', + location: 'center', + metadata: { name: 'Center' }, + }, [] ), createBlock( 'kadence/header-section', - { uniqueID: '8_dbbe59-8e', location: 'right', metadata: { name: 'Right Section' } }, + { + uniqueID: '8_fec36b-63', + location: 'right', + metadata: { name: 'Right Section' }, + }, [ createBlock( 'kadence/header-column', { - uniqueID: '8_0a72a7-f1', + uniqueID: '8_ab437b-52', location: 'center-right', metadata: { name: 'Center Right' }, }, @@ -138,43 +171,102 @@ function innerBlocks() { ), createBlock( 'kadence/header-column', - { uniqueID: '8_9a3913-96', location: 'right', metadata: { name: 'Right' } }, + { uniqueID: '8_aabc3b-c5', location: 'right', metadata: { name: 'Right' } }, [ - createBlock('kadence/icon', { uniqueID: '8_1a291f-08', gap: ['md', '', ''] }, [ - createBlock( - 'kadence/single-icon', - { - uniqueID: '8_a6f5d6-26', - icon: 'fas_shopping-bag', - size: 20, - color: 'palette5', - hColor: 'palette3', - }, - [] - ), - createBlock( - 'kadence/single-icon', - { - uniqueID: '8_7f092b-cd', - icon: 'ic_person', - size: 20, - color: 'palette5', - hColor: 'palette3', - }, - [] - ), - createBlock( - 'kadence/single-icon', - { - uniqueID: '8_8ff89f-9f', - icon: 'fas_share-alt-square', - size: 20, - color: 'palette5', - hColor: 'palette3', - }, - [] - ), - ]), + createBlock( + 'kadence/rowlayout', + { + uniqueID: '8_9dec1a-e0', + colLayout: 'row', + padding: ['', '', '', ''], + kbVersion: 2, + }, + [ + createBlock( + 'kadence/column', + { + id: 2, + borderWidth: ['', '', '', ''], + uniqueID: '8_f663ed-44', + direction: ['horizontal', '', ''], + justifyContent: ['flex-end', '', ''], + verticalAlignment: 'middle', + kbVersion: 2, + }, + [ + createBlock( + 'kadence/navigation', + { + uniqueID: '8_fb93a2-43', + templateKey: 'short', + }, + [] + ), + createBlock( + 'kadence/advancedbtn', + { uniqueID: '8_6ac32e-04' }, + [ + createBlock( + 'kadence/singlebtn', + { + uniqueID: '8_c39aba-6d', + text: 'Subscribe', + sizePreset: 'small', + color: 'palette9', + colorHover: 'palette7', + borderStyle: [ + { + top: ['palette9', '', 1], + right: ['palette9', '', 1], + bottom: ['palette9', '', 1], + left: ['palette9', '', 1], + unit: 'px', + }, + ], + borderRadius: [0, 0, 0, 0], + inheritStyles: 'outline', + typography: [ + { + size: ['', '', ''], + sizeType: 'px', + lineHeight: ['', '', ''], + lineType: '', + letterSpacing: [1, '', ''], + letterType: 'px', + textTransform: 'uppercase', + family: '', + google: '', + style: '', + weight: '700', + variant: '', + subset: '', + loadGoogle: true, + }, + ], + }, + [] + ), + ] + ), + ] + ), + createBlock( + 'kadence/column', + { + borderWidth: ['', '', '', ''], + uniqueID: '8_b6adef-df', + kbVersion: 2, + }, + [ + createBlock( + 'kadence/navigation', + { uniqueID: '8_7739cd-d6', templateKey: 'long' }, + [] + ), + ] + ), + ] + ), ] ), ] @@ -184,50 +276,32 @@ function innerBlocks() { createBlock( 'kadence/header-row', { - uniqueID: '8_c471fc-9f', + uniqueID: '8_6e8392-d8', location: 'bottom', - background: { - color: 'palette6', - image: '', - imageID: '', - position: 'center center', - size: 'cover', - repeat: 'no-repeat', - attachment: 'scroll', - type: 'normal', - gradient: '', - }, - padding: ['xs', 'lg', 'xs', 'lg'], metadata: { name: 'Bottom Row' }, }, [ createBlock( 'kadence/header-section', - { uniqueID: '8_ac1077-45', location: 'left', metadata: { name: 'Left Section' } }, + { + uniqueID: '8_4d7b8d-57', + location: 'left', + metadata: { name: 'Left Section' }, + }, [ createBlock( 'kadence/header-column', - { uniqueID: '8_cc75e4-ee', location: 'left', metadata: { name: 'Left' } }, - [ - createBlock( - 'kadence/image', - { - align: 'center', - imgMaxWidth: 60, - sizeSlug: 'full', - linkDestination: 'none', - uniqueID: '8_7793cb-a0', - globalAlt: true, - url: '/wp-content/plugins/kadence-blocks/includes/assets/images/placeholder/logo-light.png', - }, - [] - ), - ] + { + uniqueID: '8_63025a-c5', + location: 'left', + metadata: { name: 'Left' }, + }, + [] ), createBlock( 'kadence/header-column', { - uniqueID: '8_70d8f2-9b', + uniqueID: '8_4b3f85-cc', location: 'center-left', metadata: { name: 'Center Left' }, }, @@ -237,17 +311,25 @@ function innerBlocks() { ), createBlock( 'kadence/header-column', - { uniqueID: '8_161e55-d6', location: 'center', metadata: { name: 'Center' } }, - [createBlock('kadence/navigation', { uniqueID: '8_bfcf4e-2f' }, [])] + { + uniqueID: '8_584583-a0', + location: 'center', + metadata: { name: 'Center' }, + }, + [] ), createBlock( 'kadence/header-section', - { uniqueID: '8_ccb71b-c0', location: 'right', metadata: { name: 'Right Section' } }, + { + uniqueID: '8_40b7f4-b0', + location: 'right', + metadata: { name: 'Right Section' }, + }, [ createBlock( 'kadence/header-column', { - uniqueID: '8_868d52-5c', + uniqueID: '8_338366-a5', location: 'center-right', metadata: { name: 'Center Right' }, }, @@ -255,51 +337,25 @@ function innerBlocks() { ), createBlock( 'kadence/header-column', - { uniqueID: '8_5ea247-14', location: 'right', metadata: { name: 'Right' } }, - [ - createBlock('kadence/icon', { uniqueID: '8_281164-82' }, [ - createBlock( - 'kadence/single-icon', - { - uniqueID: '8_f5703a-bd', - icon: 'fe_search', - size: 20, - color: 'palette9', - }, - [] - ), - ]), - ] + { + uniqueID: '8_01ca9b-76', + location: 'right', + metadata: { name: 'Right' }, + }, + [] ), ] ), ] ), ]), - createBlock('kadence/header-container-tablet', { uniqueID: '8_2eccef-84' }, [ - createBlock('kadence/header-row', { uniqueID: '8_a3c4fb-20', metadata: { name: 'Top Row' } }, [ - createBlock( - 'kadence/header-column', - { uniqueID: '8_5c2144-21', location: 'tablet-left', metadata: { name: 'Left' } }, - [] - ), - createBlock( - 'kadence/header-column', - { uniqueID: '8_450dc9-7d', metadata: { name: 'Center' }, location: 'tablet-center' }, - [] - ), - createBlock( - 'kadence/header-column', - { uniqueID: '8_fa1001-eb', location: 'tablet-right', metadata: { name: 'Right' } }, - [] - ), - ]), + createBlock('kadence/header-container-tablet', { uniqueID: '8_b336f2-0a' }, [ createBlock( 'kadence/header-row', { - uniqueID: '8_61eded-91', + uniqueID: '8_41f368-e9', background: { - color: 'palette6', + color: 'palette3', image: '', imageID: '', position: 'center center', @@ -309,27 +365,64 @@ function innerBlocks() { type: 'normal', gradient: '', }, - minHeightTablet: 60, - metadata: { name: 'Middle Row' }, + borderTablet: [ + { + top: ['', '', ''], + right: ['', '', ''], + bottom: ['palette5', '', 1], + left: ['', '', ''], + unit: '', + }, + ], + minHeightTablet: 40, + vAlignTablet: 'center', + metadata: { name: 'Top Row' }, }, [ createBlock( 'kadence/header-column', - { uniqueID: '8_0bb774-bc', location: 'tablet-left', metadata: { name: 'Left' } }, - [] - ), - createBlock( - 'kadence/header-column', - { uniqueID: '8_a273a9-b3', metadata: { name: 'Center' }, location: 'tablet-center' }, + { + uniqueID: '8_d656b4-bf', + location: 'tablet-left', + metadata: { name: 'Left' }, + }, [ createBlock( - 'kadence/image', + 'kadence/advancedheading', { - imgMaxWidthTablet: 100, - sizeSlug: 'full', - linkDestination: 'none', - uniqueID: '8_777df8-5e', - url: '/wp-content/plugins/kadence-blocks/includes/assets/images/placeholder/logo-light.png', + uniqueID: '8_a9128b-e5', + color: 'palette9', + tabletMargin: ['', '', '', 'xs'], + markBorder: '', + markBorderStyles: [ + { + top: [null, '', ''], + right: [null, '', ''], + bottom: [null, '', ''], + left: [null, '', ''], + unit: 'px', + }, + ], + tabletMarkBorderStyles: [ + { + top: [null, '', ''], + right: [null, '', ''], + bottom: [null, '', ''], + left: [null, '', ''], + unit: 'px', + }, + ], + mobileMarkBorderStyles: [ + { + top: [null, '', ''], + right: [null, '', ''], + bottom: [null, '', ''], + left: [null, '', ''], + unit: 'px', + }, + ], + colorClass: 'theme-palette9', + htmlTag: 'div', }, [] ), @@ -337,21 +430,31 @@ function innerBlocks() { ), createBlock( 'kadence/header-column', - { uniqueID: '8_996425-e5', location: 'tablet-right', metadata: { name: 'Right' } }, + { + uniqueID: '8_b5c118-e9', + metadata: { name: 'Center', location: 'tablet-center' }, + }, + [] + ), + createBlock( + 'kadence/header-column', + { + uniqueID: '8_38830e-1c', + location: 'tablet-right', + metadata: { name: 'Right' }, + }, [ - createBlock('kadence/icon', { uniqueID: '8_f05f7a-e0', tabletTextAlignment: 'right' }, [ - createBlock( - 'kadence/single-icon', - { - uniqueID: '8_50d361-8c', - icon: 'fe_search', - color: 'palette9', - hColor: 'palette9', - tabletSize: 25, - }, - [] - ), - ]), + createBlock( + 'kadence/off-canvas-trigger', + { + uniqueID: '8_68b6b6-18', + icon: 'fe_alignJustify', + iconSizeTablet: 30, + iconColorTablet: 'palette9', + paddingTablet: ['', 'xs', '', ''], + }, + [] + ), ] ), ] @@ -359,10 +462,9 @@ function innerBlocks() { createBlock( 'kadence/header-row', { - uniqueID: '8_987bd4-f2', - layout: 'fullwidth', + uniqueID: '8_d5ca03-c6', background: { - color: 'palette4', + color: 'palette3', image: '', imageID: '', position: 'center center', @@ -372,54 +474,149 @@ function innerBlocks() { type: 'normal', gradient: '', }, - paddingTablet: ['', 'sm', '', 'sm'], - metadata: { name: 'Bottom Row' }, + metadata: { name: 'Middle Row' }, }, [ createBlock( 'kadence/header-column', - { uniqueID: '8_2fd048-47', location: 'tablet-left', metadata: { name: 'Left' } }, - [createBlock('kadence/navigation', { uniqueID: '8_cb4fbd-a1' }, [])] - ), - createBlock( - 'kadence/header-column', - { uniqueID: '8_89dd8b-37', metadata: { name: 'Center' }, location: 'tablet-center' }, + { + uniqueID: '8_c33ced-f8', + location: 'tablet-left', + metadata: { name: 'Left' }, + }, [] ), createBlock( 'kadence/header-column', - { uniqueID: '8_b29fe1-88', location: 'tablet-right', metadata: { name: 'Right' } }, + { + uniqueID: '8_27b60f-a0', + metadata: { name: 'Center', location: 'tablet-center' }, + }, [ createBlock( - 'kadence/off-canvas-trigger', + 'kadence/image', { - uniqueID: '8_a1c772-cf', - icon: 'fe_alignJustify', - iconSizeTablet: 25, - iconColorTablet: 'palette9', - iconColorHoverTablet: 'palette9', + imgMaxWidthTablet: 200, + sizeSlug: 'full', + linkDestination: 'none', + uniqueID: '8_d8a46f-8d', + paddingTablet: ['sm', '', 'sm', ''], + url: '/wp-content/plugins/kadence-blocks/includes/assets/images/placeholder/logo-light-lg.png', }, [] ), ] ), + createBlock( + 'kadence/header-column', + { + uniqueID: '8_9d5720-39', + location: 'tablet-right', + metadata: { name: 'Right' }, + }, + [] + ), ] ), + createBlock('kadence/header-row', { uniqueID: '8_a67161-28', metadata: { name: 'Bottom Row' } }, [ + createBlock( + 'kadence/header-column', + { + uniqueID: '8_2e804b-08', + location: 'tablet-left', + metadata: { name: 'Left' }, + }, + [] + ), + createBlock( + 'kadence/header-column', + { + uniqueID: '8_2c4abc-e6', + metadata: { name: 'Center', location: 'tablet-center' }, + }, + [] + ), + createBlock( + 'kadence/header-column', + { + uniqueID: '8_a21857-97', + location: 'tablet-right', + metadata: { name: 'Right' }, + }, + [] + ), + ]), ]), createBlock( 'kadence/off-canvas', { - uniqueID: '8_4a9686-23', + uniqueID: '8_574392-6c', slideFrom: 'right', - backgroundColorTablet: 'palette6', - hAlignTablet: 'left', - vAlignTablet: 'top', - closeIcon: 'fe_xCircle', - closeIconSizeTablet: 25, + widthType: 'full', + containerMaxWidthTablet: 300, + backgroundColorTablet: 'palette4', + paddingTablet: ['xxl', 'xxl', 'xxl', 'xxl'], + hAlignTablet: 'center', + vAlignTablet: 'center', + closeIconSizeTablet: 30, closeIconColorTablet: 'palette9', - closeIconColorHoverTablet: 'palette9', + closeIconPaddingTablet: ['xs', 'xs', 'xs', 'xs'], }, - [createBlock('kadence/navigation', { uniqueID: '8_22e6f9-15' }, [])] + [ + createBlock('kadence/navigation', { uniqueID: '8_6c2466-33', templateKey: 'long-vertical' }, []), + createBlock( + 'kadence/navigation', + { + uniqueID: '8_292fe2-6c', + templateKey: 'short', + }, + [] + ), + createBlock('kadence/advancedbtn', { uniqueID: '8_c305dd-3b' }, [ + createBlock( + 'kadence/singlebtn', + { + uniqueID: '8_3445b2-5a', + text: 'Subscribe', + sizePreset: 'small', + widthType: 'full', + tabletPadding: ['0', '0', '0', '0'], + tabletMargin: ['0', '0', '', ''], + color: 'palette9', + colorHover: 'palette9', + tabletBorderStyle: [ + { + top: ['palette9', '', ''], + right: ['palette9', '', ''], + bottom: ['palette9', '', ''], + left: ['palette9', '', ''], + unit: '', + }, + ], + inheritStyles: 'outline', + typography: [ + { + size: ['', 'sm', ''], + sizeType: 'px', + lineHeight: ['', '', ''], + lineType: '', + letterSpacing: ['', 1, ''], + letterType: 'px', + textTransform: 'uppercase', + family: 'var( --global-heading-font-family, inherit )', + google: false, + style: 'normal', + weight: '300', + variant: '', + subset: '', + loadGoogle: true, + }, + ], + }, + [] + ), + ]), + ] ), ]), ]; diff --git a/src/blocks/header/templates/multi-row-3.js b/src/blocks/header/templates/multi-row-3.js index d2dcf9227..f31be8a09 100644 --- a/src/blocks/header/templates/multi-row-3.js +++ b/src/blocks/header/templates/multi-row-3.js @@ -11,7 +11,7 @@ const postMeta = { { enable: false, color: '#000000', - opacity: 0.20000000000000001, + opacity: 0.2, spread: 0, blur: 2, hOffset: 1, @@ -24,11 +24,11 @@ const postMeta = { function innerBlocks() { return [ createBlock('kadence/header', {}, [ - createBlock('kadence/header-container-desktop', { uniqueID: '8_dcfe32-61' }, [ + createBlock('kadence/header-container-desktop', { uniqueID: '8_cf5d2d-d1' }, [ createBlock( 'kadence/header-row', { - uniqueID: '8_c03f33-d7', + uniqueID: '8_d676cf-2a', location: 'top', background: { color: 'palette4', @@ -46,17 +46,25 @@ function innerBlocks() { [ createBlock( 'kadence/header-section', - { uniqueID: '8_a0a2a0-bf', location: 'left', metadata: { name: 'Left Section' } }, + { + uniqueID: '8_84c8a7-08', + location: 'left', + metadata: { name: 'Left Section' }, + }, [ createBlock( 'kadence/header-column', - { uniqueID: '8_0e527f-63', location: 'left', metadata: { name: 'Left' } }, + { + uniqueID: '8_093a19-78', + location: 'left', + metadata: { name: 'Left' }, + }, [] ), createBlock( 'kadence/header-column', { - uniqueID: '8_56ac77-3d', + uniqueID: '8_62c66d-07', location: 'center-left', metadata: { name: 'Center Left' }, }, @@ -66,12 +74,16 @@ function innerBlocks() { ), createBlock( 'kadence/header-column', - { uniqueID: '8_ca797e-13', location: 'center', metadata: { name: 'Center' } }, + { + uniqueID: '8_989487-de', + location: 'center', + metadata: { name: 'Center' }, + }, [ createBlock( 'kadence/advancedheading', { - uniqueID: '8_878588-fc', + uniqueID: '8_718d54-0d', align: 'center', color: 'palette9', typography: 'var( --global-heading-font-family, inherit )', @@ -115,12 +127,16 @@ function innerBlocks() { ), createBlock( 'kadence/header-section', - { uniqueID: '8_f20182-15', location: 'right', metadata: { name: 'Right Section' } }, + { + uniqueID: '8_50f4b8-58', + location: 'right', + metadata: { name: 'Right Section' }, + }, [ createBlock( 'kadence/header-column', { - uniqueID: '8_c76184-82', + uniqueID: '8_938fe4-f5', location: 'center-right', metadata: { name: 'Center Right' }, }, @@ -128,7 +144,11 @@ function innerBlocks() { ), createBlock( 'kadence/header-column', - { uniqueID: '8_07690d-fa', location: 'right', metadata: { name: 'Right' } }, + { + uniqueID: '8_af268b-d4', + location: 'right', + metadata: { name: 'Right' }, + }, [] ), ] @@ -138,7 +158,7 @@ function innerBlocks() { createBlock( 'kadence/header-row', { - uniqueID: '8_693740-f9', + uniqueID: '8_82a1be-98', location: 'center', layout: 'fullwidth', background: { @@ -159,17 +179,30 @@ function innerBlocks() { [ createBlock( 'kadence/header-section', - { uniqueID: '8_409ffa-a4', location: 'left', metadata: { name: 'Left Section' } }, + { + uniqueID: '8_f9e01a-bb', + location: 'left', + metadata: { name: 'Left Section' }, + }, [ createBlock( 'kadence/header-column', - { uniqueID: '8_b9a7ac-84', location: 'left', metadata: { name: 'Left' } }, - [createBlock('kadence/navigation', { uniqueID: '8_a14bfe-58' }, [])] + { uniqueID: '8_f3757c-f1', location: 'left', metadata: { name: 'Left' } }, + [ + createBlock( + 'kadence/navigation', + { + uniqueID: '8_e9bf08-b5', + templateKey: 'short', + }, + [] + ), + ] ), createBlock( 'kadence/header-column', { - uniqueID: '8_69c280-8d', + uniqueID: '8_a42e50-05', location: 'center-left', metadata: { name: 'Center Left' }, }, @@ -179,7 +212,7 @@ function innerBlocks() { ), createBlock( 'kadence/header-column', - { uniqueID: '8_acdd0e-cb', location: 'center', metadata: { name: 'Center' } }, + { uniqueID: '8_4d3aab-83', location: 'center', metadata: { name: 'Center' } }, [ createBlock( 'kadence/image', @@ -188,7 +221,7 @@ function innerBlocks() { imgMaxWidth: 100, sizeSlug: 'full', linkDestination: 'none', - uniqueID: '8_52d144-f3', + uniqueID: '8_f36657-ce', url: '/wp-content/plugins/kadence-blocks/includes/assets/images/placeholder/logo-dark.png', }, [] @@ -197,12 +230,16 @@ function innerBlocks() { ), createBlock( 'kadence/header-section', - { uniqueID: '8_328ae2-4f', location: 'right', metadata: { name: 'Right Section' } }, + { + uniqueID: '8_b6a60a-ec', + location: 'right', + metadata: { name: 'Right Section' }, + }, [ createBlock( 'kadence/header-column', { - uniqueID: '8_356866-d4', + uniqueID: '8_b83e93-01', location: 'center-right', metadata: { name: 'Center Right' }, }, @@ -210,30 +247,37 @@ function innerBlocks() { ), createBlock( 'kadence/header-column', - { uniqueID: '8_e8fbc9-9c', location: 'right', metadata: { name: 'Right' } }, + { uniqueID: '8_60df1f-25', location: 'right', metadata: { name: 'Right' } }, [ - createBlock('kadence/icon', { uniqueID: '8_60dbbb-24', gap: ['md', '', ''] }, [ - createBlock( - 'kadence/single-icon', - { - uniqueID: '8_5bfbdf-42', - icon: 'fas_search', - size: 20, - color: 'palette5', - margin: ['', 'md', '', ''], - hColor: 'palette3', - }, - [] - ), - ]), + createBlock( + 'kadence/icon', + { + uniqueID: '8_c19000-db', + gap: ['md', '', ''], + }, + [ + createBlock( + 'kadence/single-icon', + { + uniqueID: '8_ec126f-9c', + icon: 'fas_search', + size: 20, + color: 'palette5', + margin: ['', 'md', '', ''], + hColor: 'palette3', + }, + [] + ), + ] + ), createBlock( 'kadence/advancedbtn', - { hAlign: 'left', uniqueID: '8_394702-b0' }, + { hAlign: 'left', uniqueID: '8_f4452a-99' }, [ createBlock( 'kadence/singlebtn', { - uniqueID: '8_1251d6-e7', + uniqueID: '8_0b0239-ef', text: 'Contact', sizePreset: 'small', color: 'palette4', @@ -278,21 +322,33 @@ function innerBlocks() { ), createBlock( 'kadence/header-row', - { uniqueID: '8_885c65-f9', location: 'bottom', metadata: { name: 'Bottom Row' } }, + { + uniqueID: '8_94e89d-25', + location: 'bottom', + metadata: { name: 'Bottom Row' }, + }, [ createBlock( 'kadence/header-section', - { uniqueID: '8_8f5435-63', location: 'left', metadata: { name: 'Left Section' } }, + { + uniqueID: '8_ef2e08-69', + location: 'left', + metadata: { name: 'Left Section' }, + }, [ createBlock( 'kadence/header-column', - { uniqueID: '8_a42dda-2c', location: 'left', metadata: { name: 'Left' } }, + { + uniqueID: '8_db7e50-28', + location: 'left', + metadata: { name: 'Left' }, + }, [] ), createBlock( 'kadence/header-column', { - uniqueID: '8_dcf40e-2f', + uniqueID: '8_9b9e6b-c8', location: 'center-left', metadata: { name: 'Center Left' }, }, @@ -302,17 +358,25 @@ function innerBlocks() { ), createBlock( 'kadence/header-column', - { uniqueID: '8_fdc00e-2c', location: 'center', metadata: { name: 'Center' } }, + { + uniqueID: '8_f2bc66-2f', + location: 'center', + metadata: { name: 'Center' }, + }, [] ), createBlock( 'kadence/header-section', - { uniqueID: '8_8eee78-44', location: 'right', metadata: { name: 'Right Section' } }, + { + uniqueID: '8_938a0a-c0', + location: 'right', + metadata: { name: 'Right Section' }, + }, [ createBlock( 'kadence/header-column', { - uniqueID: '8_1dfe15-55', + uniqueID: '8_faf93a-3d', location: 'center-right', metadata: { name: 'Center Right' }, }, @@ -320,7 +384,11 @@ function innerBlocks() { ), createBlock( 'kadence/header-column', - { uniqueID: '8_3d1bab-a2', location: 'right', metadata: { name: 'Right' } }, + { + uniqueID: '8_81ff46-c4', + location: 'right', + metadata: { name: 'Right' }, + }, [] ), ] @@ -328,11 +396,11 @@ function innerBlocks() { ] ), ]), - createBlock('kadence/header-container-tablet', { uniqueID: '8_cfd599-d0' }, [ + createBlock('kadence/header-container-tablet', { uniqueID: '8_c6dc40-3f' }, [ createBlock( 'kadence/header-row', { - uniqueID: '8_7ffdea-ed', + uniqueID: '8_85c68f-65', background: { color: 'palette3', image: '', @@ -350,59 +418,205 @@ function innerBlocks() { [ createBlock( 'kadence/header-column', - { uniqueID: '8_406d8e-2e', location: 'tablet-left', metadata: { name: 'Left' } }, + { + uniqueID: '8_9513a8-e7', + location: 'tablet-left', + metadata: { name: 'Left' }, + }, [] ), createBlock( 'kadence/header-column', - { uniqueID: '8_0310f3-16', metadata: { name: 'Center' }, location: 'tablet-center' }, + { + uniqueID: '8_0be155-f9', + metadata: { name: 'Center', location: 'tablet-center' }, + }, + [ + createBlock( + 'kadence/advancedheading', + { + uniqueID: '8_2bfe81-30', + color: 'palette9', + fontWeight: '100', + markBorder: '', + markBorderStyles: [ + { + top: [null, '', ''], + right: [null, '', ''], + bottom: [null, '', ''], + left: [null, '', ''], + unit: 'px', + }, + ], + tabletMarkBorderStyles: [ + { + top: [null, '', ''], + right: [null, '', ''], + bottom: [null, '', ''], + left: [null, '', ''], + unit: 'px', + }, + ], + mobileMarkBorderStyles: [ + { + top: [null, '', ''], + right: [null, '', ''], + bottom: [null, '', ''], + left: [null, '', ''], + unit: 'px', + }, + ], + colorClass: 'theme-palette9', + htmlTag: 'div', + fontSize: ['', 'sm', ''], + }, + [] + ), + ] + ), + createBlock( + 'kadence/header-column', + { + uniqueID: '8_529ad8-82', + location: 'tablet-right', + metadata: { name: 'Right' }, + }, [] ), + ] + ), + createBlock( + 'kadence/header-row', + { + uniqueID: '8_68a701-2e', + minHeightTablet: 80, + vAlignTablet: 'center', + metadata: { name: 'Middle Row' }, + }, + [ createBlock( 'kadence/header-column', - { uniqueID: '8_961016-9f', location: 'tablet-right', metadata: { name: 'Right' } }, + { uniqueID: '8_6f537d-7d', location: 'tablet-left', metadata: { name: 'Left' } }, + [ + createBlock( + 'kadence/image', + { + sizeSlug: 'full', + linkDestination: 'none', + uniqueID: '8_746f4a-a0', + url: '/wp-content/plugins/kadence-blocks/includes/assets/images/placeholder/logo-dark.png', + }, + [] + ), + ] + ), + createBlock( + 'kadence/header-column', + { + uniqueID: '8_65af20-8c', + metadata: { name: 'Center', location: 'tablet-center' }, + }, [] ), + createBlock( + 'kadence/header-column', + { + uniqueID: '8_4e999c-64', + location: 'tablet-right', + metadata: { name: 'Right' }, + }, + [ + createBlock( + 'kadence/off-canvas-trigger', + { + uniqueID: '8_62c72d-52', + icon: 'fe_grid', + iconSizeTablet: 25, + iconColorTablet: 'palette3', + iconColorHoverTablet: 'palette3', + }, + [] + ), + ] + ), ] ), - createBlock('kadence/header-row', { uniqueID: '8_9b39c4-3f', metadata: { name: 'Middle Row' } }, [ + createBlock('kadence/header-row', { uniqueID: '8_da0c68-5e', metadata: { name: 'Bottom Row' } }, [ createBlock( 'kadence/header-column', - { uniqueID: '8_0fdcfe-0c', location: 'tablet-left', metadata: { name: 'Left' } }, + { + uniqueID: '8_6658fd-77', + location: 'tablet-left', + metadata: { name: 'Left' }, + }, [] ), createBlock( 'kadence/header-column', - { uniqueID: '8_a7ffd1-20', metadata: { name: 'Center' }, location: 'tablet-center' }, + { + uniqueID: '8_5756d8-9c', + metadata: { name: 'Center', location: 'tablet-center' }, + }, [] ), createBlock( 'kadence/header-column', - { uniqueID: '8_1d54d5-ce', location: 'tablet-right', metadata: { name: 'Right' } }, + { + uniqueID: '8_fe7dad-c4', + location: 'tablet-right', + metadata: { name: 'Right' }, + }, [] ), ]), - createBlock('kadence/header-row', { uniqueID: '8_5a4f2b-36', metadata: { name: 'Bottom Row' } }, [ - createBlock( - 'kadence/header-column', - { uniqueID: '8_a64ac6-5e', location: 'tablet-left', metadata: { name: 'Left' } }, - [] - ), - createBlock( - 'kadence/header-column', - { uniqueID: '8_bdebb8-da', metadata: { name: 'Center' }, location: 'tablet-center' }, - [] - ), + ]), + createBlock( + 'kadence/off-canvas', + { + uniqueID: '8_684fff-53', + slideFrom: 'right', + widthType: 'full', + containerMaxWidthTablet: 300, + backgroundColorTablet: 'palette8', + hAlignTablet: 'center', + vAlignTablet: 'center', + closeIconSizeTablet: 25, + closeIconColorTablet: 'palette3', + }, + [ createBlock( - 'kadence/header-column', - { uniqueID: '8_d49469-22', location: 'tablet-right', metadata: { name: 'Right' } }, + 'kadence/navigation', + { + uniqueID: '8_3603db-f6', + align: 'wide', + templateKey: 'short-vertical', + }, [] ), - ]), - ]), - createBlock('kadence/off-canvas', { uniqueID: '8_a8a561-62' }, [ - createBlock('core/paragraph', { placeholder: 'Create Awesome' }, []), - ]), + createBlock('kadence/advancedbtn', { uniqueID: '8_270dc9-47' }, [ + createBlock( + 'kadence/singlebtn', + { + uniqueID: '8_19f697-ce', + link: '#', + widthType: 'full', + color: 'palette3', + tabletBorderStyle: [ + { + top: ['palette3', '', 2], + right: ['palette3', '', 2], + bottom: ['palette3', '', 2], + left: ['palette3', '', 2], + unit: '', + }, + ], + inheritStyles: 'outline', + }, + [] + ), + ]), + ] + ), ]), ]; } diff --git a/src/blocks/header/templates/multi-row-4.js b/src/blocks/header/templates/multi-row-4.js index cd237c8b9..8f40b065b 100644 --- a/src/blocks/header/templates/multi-row-4.js +++ b/src/blocks/header/templates/multi-row-4.js @@ -1,5 +1,5 @@ /** - * Template: Multi-Row 4 + * Template: Multi-row 2 * Post Type: kadence_header */ @@ -10,14 +10,14 @@ const postMeta = {}; function innerBlocks() { return [ createBlock('kadence/header', {}, [ - createBlock('kadence/header-container-desktop', { uniqueID: '8_1e4c61-34' }, [ + createBlock('kadence/header-container-desktop', { uniqueID: '8_25c9b0-6c' }, [ createBlock( 'kadence/header-row', { - uniqueID: '8_d7adea-16', + uniqueID: '8_8f8e7a-6a', location: 'top', background: { - color: 'palette3', + color: 'palette4', image: '', imageID: '', position: 'center center', @@ -27,32 +27,36 @@ function innerBlocks() { type: 'normal', gradient: '', }, - border: [ - { - top: ['', '', ''], - right: ['', '', ''], - bottom: ['palette4', '', 1], - left: ['', '', ''], - unit: 'px', - }, - ], - padding: ['xxs', 'sm', 'xxs', 'sm'], + padding: ['', 'lg', '', 'lg'], metadata: { name: 'Top Row' }, }, [ createBlock( 'kadence/header-section', - { uniqueID: '8_8637b3-3b', location: 'left', metadata: { name: 'Left Section' } }, + { + uniqueID: '8_6401bd-8b', + location: 'left', + metadata: { name: 'Left Section' }, + }, [ createBlock( 'kadence/header-column', - { uniqueID: '8_3a30ac-d7', location: 'left', metadata: { name: 'Left' } }, - [] + { uniqueID: '8_1a6394-61', location: 'left', metadata: { name: 'Left' } }, + [ + createBlock( + 'kadence/navigation', + { + uniqueID: '8_4b69a7-2f', + templateKey: 'long', + }, + [] + ), + ] ), createBlock( 'kadence/header-column', { - uniqueID: '8_91c063-dd', + uniqueID: '8_b1b207-01', location: 'center-left', metadata: { name: 'Center Left' }, }, @@ -62,62 +66,25 @@ function innerBlocks() { ), createBlock( 'kadence/header-column', - { uniqueID: '8_620954-ad', location: 'center', metadata: { name: 'Center' } }, - [ - createBlock( - 'kadence/advancedheading', - { - uniqueID: '8_3bd042-ae', - color: 'palette9', - letterSpacing: 0.5, - tabletLetterSpacing: '', - mobileLetterSpacing: '', - typography: 'var( --global-heading-font-family, inherit )', - fontWeight: '100', - markBorder: '', - markBorderStyles: [ - { - top: [null, '', ''], - right: [null, '', ''], - bottom: [null, '', ''], - left: [null, '', ''], - unit: 'px', - }, - ], - tabletMarkBorderStyles: [ - { - top: [null, '', ''], - right: [null, '', ''], - bottom: [null, '', ''], - left: [null, '', ''], - unit: 'px', - }, - ], - mobileMarkBorderStyles: [ - { - top: [null, '', ''], - right: [null, '', ''], - bottom: [null, '', ''], - left: [null, '', ''], - unit: 'px', - }, - ], - colorClass: 'theme-palette9', - htmlTag: 'span', - fontSize: ['sm', '', ''], - }, - [] - ), - ] + { + uniqueID: '8_f6585e-d5', + location: 'center', + metadata: { name: 'Center' }, + }, + [] ), createBlock( 'kadence/header-section', - { uniqueID: '8_f1d8a5-7d', location: 'right', metadata: { name: 'Right Section' } }, + { + uniqueID: '8_dd17ab-d9', + location: 'right', + metadata: { name: 'Right Section' }, + }, [ createBlock( 'kadence/header-column', { - uniqueID: '8_fc37dc-ce', + uniqueID: '8_cf98b5-84', location: 'center-right', metadata: { name: 'Center Right' }, }, @@ -125,68 +92,12 @@ function innerBlocks() { ), createBlock( 'kadence/header-column', - { uniqueID: '8_e711b3-24', location: 'right', metadata: { name: 'Right' } }, - [ - createBlock('kadence/icon', { uniqueID: '8_68609e-60', gap: ['xs', '', ''] }, [ - createBlock( - 'kadence/single-icon', - { - uniqueID: '8_d6e58a-81', - icon: 'fa_facebook-n', - link: '#', - size: 15, - title: 'Facebook', - color: 'palette9', - background: 'palette4', - borderRadius: 50, - borderWidth: 0, - padding: [5, 5, 5, 5], - style: 'stacked', - hColor: 'palette9', - hBackground: 'palette6', - }, - [] - ), - createBlock( - 'kadence/single-icon', - { - uniqueID: '8_cb8f98-1c', - icon: 'fa_instagram', - link: '#', - size: 15, - title: 'Instagram', - color: 'palette9', - background: 'palette4', - borderRadius: 50, - borderWidth: 0, - padding: [5, 5, 5, 5], - style: 'stacked', - hColor: 'palette9', - hBackground: 'palette6', - }, - [] - ), - createBlock( - 'kadence/single-icon', - { - uniqueID: '8_d538e7-80', - icon: 'fa_youtube', - link: '#', - size: 15, - title: 'Youtube', - color: 'palette9', - background: 'palette4', - borderRadius: 50, - borderWidth: 0, - padding: [5, 5, 5, 5], - style: 'stacked', - hColor: 'palette9', - hBackground: 'palette6', - }, - [] - ), - ]), - ] + { + uniqueID: '8_22bfd0-cd', + location: 'right', + metadata: { name: 'Right' }, + }, + [] ), ] ), @@ -195,10 +106,10 @@ function innerBlocks() { createBlock( 'kadence/header-row', { - uniqueID: '8_89eaf0-b7', + uniqueID: '8_93efb2-34', location: 'center', background: { - color: 'palette3', + color: 'palette9', image: '', imageID: '', position: 'center center', @@ -208,26 +119,27 @@ function innerBlocks() { type: 'normal', gradient: '', }, - padding: ['sm', 'sm', 'sm', 'sm'], + padding: ['xxs', 'lg', 'xxs', 'lg'], metadata: { name: 'Middle Row' }, }, [ createBlock( 'kadence/header-section', - { uniqueID: '8_dbceb6-2f', location: 'left', metadata: { name: 'Left Section' } }, + { + uniqueID: '8_5f7254-ea', + location: 'left', + metadata: { name: 'Left Section' }, + }, [ createBlock( 'kadence/header-column', - { uniqueID: '8_fb386c-41', location: 'left', metadata: { name: 'Left' } }, + { uniqueID: '8_e41aed-7d', location: 'left', metadata: { name: 'Left' } }, [ createBlock( - 'kadence/image', + 'kadence/navigation', { - imgMaxWidth: 312, - sizeSlug: 'full', - linkDestination: 'none', - uniqueID: '8_fc5cfe-d6', - url: '/wp-content/plugins/kadence-blocks/includes/assets/images/placeholder/logo-light-lg.png', + uniqueID: '8_35093b-2d', + templateKey: 'long-vertical', }, [] ), @@ -236,7 +148,7 @@ function innerBlocks() { createBlock( 'kadence/header-column', { - uniqueID: '8_00ba5c-f8', + uniqueID: '8_c82f51-63', location: 'center-left', metadata: { name: 'Center Left' }, }, @@ -246,17 +158,25 @@ function innerBlocks() { ), createBlock( 'kadence/header-column', - { uniqueID: '8_357f76-69', location: 'center', metadata: { name: 'Center' } }, + { + uniqueID: '8_3f83fa-06', + location: 'center', + metadata: { name: 'Center' }, + }, [] ), createBlock( 'kadence/header-section', - { uniqueID: '8_c3ace8-31', location: 'right', metadata: { name: 'Right Section' } }, + { + uniqueID: '8_dbbe59-8e', + location: 'right', + metadata: { name: 'Right Section' }, + }, [ createBlock( 'kadence/header-column', { - uniqueID: '8_b851ec-e4', + uniqueID: '8_0a72a7-f1', location: 'center-right', metadata: { name: 'Center Right' }, }, @@ -264,90 +184,47 @@ function innerBlocks() { ), createBlock( 'kadence/header-column', - { uniqueID: '8_dacfb7-df', location: 'right', metadata: { name: 'Right' } }, + { uniqueID: '8_9a3913-96', location: 'right', metadata: { name: 'Right' } }, [ createBlock( - 'kadence/rowlayout', + 'kadence/icon', { - uniqueID: '8_79857a-80', - colLayout: 'row', - padding: ['', '', '', ''], - kbVersion: 2, + uniqueID: '8_1a291f-08', + gap: ['md', '', ''], }, [ createBlock( - 'kadence/column', + 'kadence/single-icon', + { + uniqueID: '8_a6f5d6-26', + icon: 'fas_shopping-bag', + size: 20, + color: 'palette5', + hColor: 'palette3', + }, + [] + ), + createBlock( + 'kadence/single-icon', { - id: 2, - borderWidth: ['', '', '', ''], - uniqueID: '8_8e4f3b-bb', - direction: ['horizontal', '', ''], - justifyContent: ['flex-end', '', ''], - verticalAlignment: 'middle', - kbVersion: 2, + uniqueID: '8_7f092b-cd', + icon: 'ic_person', + size: 20, + color: 'palette5', + hColor: 'palette3', }, - [ - createBlock( - 'kadence/navigation', - { uniqueID: '8_3d0d59-4f' }, - [] - ), - createBlock( - 'kadence/advancedbtn', - { uniqueID: '8_1d3abd-1b' }, - [ - createBlock( - 'kadence/singlebtn', - { - uniqueID: '8_49ae60-32', - text: 'Subscribe', - sizePreset: 'small', - color: 'palette9', - colorHover: 'palette7', - borderStyle: [ - { - top: ['palette9', '', 1], - right: ['palette9', '', 1], - bottom: ['palette9', '', 1], - left: ['palette9', '', 1], - unit: 'px', - }, - ], - borderRadius: [0, 0, 0, 0], - inheritStyles: 'outline', - typography: [ - { - size: ['', '', ''], - sizeType: 'px', - lineHeight: ['', '', ''], - lineType: '', - letterSpacing: [1, '', ''], - letterType: 'px', - textTransform: 'uppercase', - family: '', - google: '', - style: '', - weight: '700', - variant: '', - subset: '', - loadGoogle: true, - }, - ], - }, - [] - ), - ] - ), - ] + [] ), createBlock( - 'kadence/column', + 'kadence/single-icon', { - borderWidth: ['', '', '', ''], - uniqueID: '8_f01137-34', - kbVersion: 2, + uniqueID: '8_8ff89f-9f', + icon: 'fas_share-alt-square', + size: 20, + color: 'palette5', + hColor: 'palette3', }, - [createBlock('kadence/navigation', { uniqueID: '8_c82741-f7' }, [])] + [] ), ] ), @@ -359,21 +236,55 @@ function innerBlocks() { ), createBlock( 'kadence/header-row', - { uniqueID: '8_df7e5e-06', location: 'bottom', metadata: { name: 'Bottom Row' } }, + { + uniqueID: '8_c471fc-9f', + location: 'bottom', + background: { + color: 'palette6', + image: '', + imageID: '', + position: 'center center', + size: 'cover', + repeat: 'no-repeat', + attachment: 'scroll', + type: 'normal', + gradient: '', + }, + padding: ['xs', 'lg', 'xs', 'lg'], + metadata: { name: 'Bottom Row' }, + }, [ createBlock( 'kadence/header-section', - { uniqueID: '8_da77da-98', location: 'left', metadata: { name: 'Left Section' } }, + { + uniqueID: '8_ac1077-45', + location: 'left', + metadata: { name: 'Left Section' }, + }, [ createBlock( 'kadence/header-column', - { uniqueID: '8_61d7dc-63', location: 'left', metadata: { name: 'Left' } }, - [] + { uniqueID: '8_cc75e4-ee', location: 'left', metadata: { name: 'Left' } }, + [ + createBlock( + 'kadence/image', + { + align: 'center', + imgMaxWidth: 60, + sizeSlug: 'full', + linkDestination: 'none', + uniqueID: '8_7793cb-a0', + globalAlt: true, + url: '/wp-content/plugins/kadence-blocks/includes/assets/images/placeholder/logo-light.png', + }, + [] + ), + ] ), createBlock( 'kadence/header-column', { - uniqueID: '8_6ea788-0b', + uniqueID: '8_70d8f2-9b', location: 'center-left', metadata: { name: 'Center Left' }, }, @@ -383,17 +294,25 @@ function innerBlocks() { ), createBlock( 'kadence/header-column', - { uniqueID: '8_fc6f4f-6c', location: 'center', metadata: { name: 'Center' } }, - [] + { + uniqueID: '8_161e55-d6', + location: 'center', + metadata: { name: 'Center' }, + }, + [createBlock('kadence/navigation', { uniqueID: '8_bfcf4e-2f', templateKey: 'short' }, [])] ), createBlock( 'kadence/header-section', - { uniqueID: '8_77071e-1f', location: 'right', metadata: { name: 'Right Section' } }, + { + uniqueID: '8_ccb71b-c0', + location: 'right', + metadata: { name: 'Right Section' }, + }, [ createBlock( 'kadence/header-column', { - uniqueID: '8_f7f3f2-3a', + uniqueID: '8_868d52-5c', location: 'center-right', metadata: { name: 'Center Right' }, }, @@ -401,70 +320,219 @@ function innerBlocks() { ), createBlock( 'kadence/header-column', - { uniqueID: '8_c07288-da', location: 'right', metadata: { name: 'Right' } }, - [] + { + uniqueID: '8_5ea247-14', + location: 'right', + metadata: { name: 'Right' }, + }, + [ + createBlock('kadence/icon', { uniqueID: '8_281164-82' }, [ + createBlock( + 'kadence/single-icon', + { + uniqueID: '8_f5703a-bd', + icon: 'fe_search', + size: 20, + color: 'palette9', + }, + [] + ), + ]), + ] ), ] ), ] ), ]), - createBlock('kadence/header-container-tablet', { uniqueID: '8_4d7dc3-65' }, [ - createBlock('kadence/header-row', { uniqueID: '8_f62ef1-21', metadata: { name: 'Top Row' } }, [ - createBlock( - 'kadence/header-column', - { uniqueID: '8_c4f25f-6e', location: 'tablet-left', metadata: { name: 'Left' } }, - [] - ), - createBlock( - 'kadence/header-column', - { uniqueID: '8_b76c81-fb', metadata: { name: 'Center' }, location: 'tablet-center' }, - [] - ), - createBlock( - 'kadence/header-column', - { uniqueID: '8_eb802f-8c', location: 'tablet-right', metadata: { name: 'Right' } }, - [] - ), - ]), - createBlock('kadence/header-row', { uniqueID: '8_8f1a3f-19', metadata: { name: 'Middle Row' } }, [ - createBlock( - 'kadence/header-column', - { uniqueID: '8_f22052-b3', location: 'tablet-left', metadata: { name: 'Left' } }, - [] - ), - createBlock( - 'kadence/header-column', - { uniqueID: '8_3109c0-ba', metadata: { name: 'Center' }, location: 'tablet-center' }, - [] - ), - createBlock( - 'kadence/header-column', - { uniqueID: '8_2bc25e-55', location: 'tablet-right', metadata: { name: 'Right' } }, - [] - ), - ]), - createBlock('kadence/header-row', { uniqueID: '8_82407b-53', metadata: { name: 'Bottom Row' } }, [ - createBlock( - 'kadence/header-column', - { uniqueID: '8_de19fd-4d', location: 'tablet-left', metadata: { name: 'Left' } }, - [] - ), - createBlock( - 'kadence/header-column', - { uniqueID: '8_a6d1c4-f9', metadata: { name: 'Center' }, location: 'tablet-center' }, - [] - ), - createBlock( - 'kadence/header-column', - { uniqueID: '8_ea7703-87', location: 'tablet-right', metadata: { name: 'Right' } }, - [] - ), - ]), - ]), - createBlock('kadence/off-canvas', { uniqueID: '8_504714-28' }, [ - createBlock('core/paragraph', { placeholder: 'Create Awesome' }, []), + createBlock('kadence/header-container-tablet', { uniqueID: '8_2eccef-84' }, [ + createBlock( + 'kadence/header-row', + { + uniqueID: '8_a3c4fb-20', + metadata: { name: 'Top Row' }, + }, + [ + createBlock( + 'kadence/header-column', + { + uniqueID: '8_5c2144-21', + location: 'tablet-left', + metadata: { name: 'Left' }, + }, + [] + ), + createBlock( + 'kadence/header-column', + { + uniqueID: '8_450dc9-7d', + metadata: { name: 'Center', location: 'tablet-center' }, + }, + [] + ), + createBlock( + 'kadence/header-column', + { + uniqueID: '8_fa1001-eb', + location: 'tablet-right', + metadata: { name: 'Right' }, + }, + [] + ), + ] + ), + createBlock( + 'kadence/header-row', + { + uniqueID: '8_61eded-91', + background: { + color: 'palette6', + image: '', + imageID: '', + position: 'center center', + size: 'cover', + repeat: 'no-repeat', + attachment: 'scroll', + type: 'normal', + gradient: '', + }, + minHeightTablet: 60, + metadata: { name: 'Middle Row' }, + }, + [ + createBlock( + 'kadence/header-column', + { + uniqueID: '8_0bb774-bc', + location: 'tablet-left', + metadata: { name: 'Left' }, + }, + [] + ), + createBlock( + 'kadence/header-column', + { + uniqueID: '8_a273a9-b3', + metadata: { name: 'Center', location: 'tablet-center' }, + }, + [ + createBlock( + 'kadence/image', + { + imgMaxWidthTablet: 100, + sizeSlug: 'full', + linkDestination: 'none', + uniqueID: '8_777df8-5e', + url: '/wp-content/plugins/kadence-blocks/includes/assets/images/placeholder/logo-light.png', + }, + [] + ), + ] + ), + createBlock( + 'kadence/header-column', + { + uniqueID: '8_996425-e5', + location: 'tablet-right', + metadata: { name: 'Right' }, + }, + [ + createBlock('kadence/icon', { uniqueID: '8_f05f7a-e0', tabletTextAlignment: 'right' }, [ + createBlock( + 'kadence/single-icon', + { + uniqueID: '8_50d361-8c', + icon: 'fe_search', + color: 'palette9', + hColor: 'palette9', + tabletSize: 25, + }, + [] + ), + ]), + ] + ), + ] + ), + createBlock( + 'kadence/header-row', + { + uniqueID: '8_987bd4-f2', + layout: 'fullwidth', + background: { + color: 'palette4', + image: '', + imageID: '', + position: 'center center', + size: 'cover', + repeat: 'no-repeat', + attachment: 'scroll', + type: 'normal', + gradient: '', + }, + paddingTablet: ['', 'sm', '', 'sm'], + metadata: { name: 'Bottom Row' }, + }, + [ + createBlock( + 'kadence/header-column', + { + uniqueID: '8_2fd048-47', + location: 'tablet-left', + metadata: { name: 'Left' }, + }, + [createBlock('kadence/navigation', { uniqueID: '8_cb4fbd-a1', templateKey: 'short' }, [])] + ), + createBlock( + 'kadence/header-column', + { + uniqueID: '8_89dd8b-37', + metadata: { + name: 'Center', + location: 'tablet-center', + }, + }, + [] + ), + createBlock( + 'kadence/header-column', + { + uniqueID: '8_b29fe1-88', + location: 'tablet-right', + metadata: { name: 'Right' }, + }, + [ + createBlock( + 'kadence/off-canvas-trigger', + { + uniqueID: '8_a1c772-cf', + icon: 'fe_alignJustify', + iconSizeTablet: 25, + iconColorTablet: 'palette9', + iconColorHoverTablet: 'palette9', + }, + [] + ), + ] + ), + ] + ), ]), + createBlock( + 'kadence/off-canvas', + { + uniqueID: '8_4a9686-23', + slideFrom: 'right', + backgroundColorTablet: 'palette6', + hAlignTablet: 'left', + vAlignTablet: 'top', + closeIcon: 'fe_xCircle', + closeIconSizeTablet: 25, + closeIconColorTablet: 'palette9', + closeIconColorHoverTablet: 'palette9', + }, + [createBlock('kadence/navigation', { uniqueID: '8_22e6f9-15', templateKey: 'short' }, [])] + ), ]), ]; } diff --git a/src/blocks/header/templates/multi-row-5.js b/src/blocks/header/templates/multi-row-5.js index 2ea6bffaf..0d1a7f290 100644 --- a/src/blocks/header/templates/multi-row-5.js +++ b/src/blocks/header/templates/multi-row-5.js @@ -1,41 +1,43 @@ /** - * Template: Multi-Row 5 + * Template: Multi-row 1 * Post Type: kadence_header */ import { createBlock } from '@wordpress/blocks'; const postMeta = { - _kad_header_typography: { - color: '', - size: ['', '', ''], - sizeType: 'px', - lineHeight: ['', '', ''], - lineType: '', - letterSpacing: ['', '', ''], - letterType: 'px', - textTransform: '', - family: '', - google: false, - style: '', - weight: '400', - variant: '', - subset: '', - loadGoogle: true, + _kad_header_flex: { + direction: ['horizontal', '', ''], + justifyContent: ['', '', ''], + verticalAlignment: ['', '', ''], }, + _kad_header_width: ['100', '', ''], + _kad_header_widthUnit: '%', + _kad_header_shadow: [ + { + enable: false, + color: '#000000', + opacity: 0.2, + spread: 0, + blur: 2, + hOffset: 1, + vOffset: 1, + inset: false, + }, + ], }; function innerBlocks() { return [ createBlock('kadence/header', {}, [ - createBlock('kadence/header-container-desktop', { uniqueID: '8_eac20d-0e' }, [ + createBlock('kadence/header-container-desktop', { uniqueID: '8_be1909-97' }, [ createBlock( 'kadence/header-row', { - uniqueID: '8_01e9d8-55', + uniqueID: '8_fb6ba9-c7', location: 'top', background: { - color: 'palette8', + color: 'palette5', image: '', imageID: '', position: 'center center', @@ -45,32 +47,33 @@ function innerBlocks() { type: 'normal', gradient: '', }, - border: [ - { - top: ['', '', ''], - right: ['', '', ''], - bottom: ['#cbd7eb', '', 1], - left: ['', '', ''], - unit: 'px', - }, - ], - padding: ['sm', 'xs', 'xs', 'xs'], + padding: ['xxs', 'lg', 'xxs', 'lg'], + maxWidth: 100, + maxWidthUnit: '%', metadata: { name: 'Top Row' }, }, [ createBlock( 'kadence/header-section', - { uniqueID: '8_cb0e82-52', location: 'left', metadata: { name: 'Left Section' } }, + { + uniqueID: '8_d2e513-f1', + location: 'left', + metadata: { name: 'Left Section' }, + }, [ createBlock( 'kadence/header-column', - { uniqueID: '8_0ea44e-76', location: 'left', metadata: { name: 'Left' } }, + { + uniqueID: '8_c7bab4-ae', + location: 'left', + metadata: { name: 'Left' }, + }, [] ), createBlock( 'kadence/header-column', { - uniqueID: '8_338fd5-28', + uniqueID: '8_98e105-62', location: 'center-left', metadata: { name: 'Center Left' }, }, @@ -80,17 +83,52 @@ function innerBlocks() { ), createBlock( 'kadence/header-column', - { uniqueID: '8_ca4eb9-b0', location: 'center', metadata: { name: 'Center' } }, + { + uniqueID: '8_5e39ab-6d', + location: 'center', + metadata: { name: 'Center' }, + }, [ createBlock( - 'kadence/image', + 'kadence/advancedheading', { + uniqueID: '8_5a3063-13', align: 'center', - imgMaxWidth: 80, - sizeSlug: 'full', - linkDestination: 'none', - uniqueID: '8_7c4342-4e', - url: '/wp-content/plugins/kadence-blocks/includes/assets/images/placeholder/logo-dark.png', + color: 'palette9', + typography: 'var( --global-heading-font-family, inherit )', + fontWeight: '300', + markBorder: '', + markBorderStyles: [ + { + top: [null, '', ''], + right: [null, '', ''], + bottom: [null, '', ''], + left: [null, '', ''], + unit: 'px', + }, + ], + tabletMarkBorderStyles: [ + { + top: [null, '', ''], + right: [null, '', ''], + bottom: [null, '', ''], + left: [null, '', ''], + unit: 'px', + }, + ], + mobileMarkBorderStyles: [ + { + top: [null, '', ''], + right: [null, '', ''], + bottom: [null, '', ''], + left: [null, '', ''], + unit: 'px', + }, + ], + textTransform: 'capitalize', + colorClass: 'theme-palette9', + htmlTag: 'div', + fontSize: ['sm', '', ''], }, [] ), @@ -98,12 +136,16 @@ function innerBlocks() { ), createBlock( 'kadence/header-section', - { uniqueID: '8_91ea52-93', location: 'right', metadata: { name: 'Right Section' } }, + { + uniqueID: '8_075bea-3c', + location: 'right', + metadata: { name: 'Right Section' }, + }, [ createBlock( 'kadence/header-column', { - uniqueID: '8_bdba40-3e', + uniqueID: '8_aee3ed-ff', location: 'center-right', metadata: { name: 'Center Right' }, }, @@ -111,7 +153,11 @@ function innerBlocks() { ), createBlock( 'kadence/header-column', - { uniqueID: '8_299831-a6', location: 'right', metadata: { name: 'Right' } }, + { + uniqueID: '8_0d7d29-c6', + location: 'right', + metadata: { name: 'Right' }, + }, [] ), ] @@ -121,10 +167,10 @@ function innerBlocks() { createBlock( 'kadence/header-row', { - uniqueID: '8_591a9a-34', + uniqueID: '8_d388a8-e5', location: 'center', background: { - color: 'palette8', + color: 'palette9', image: '', imageID: '', position: 'center center', @@ -134,23 +180,50 @@ function innerBlocks() { type: 'normal', gradient: '', }, - padding: ['xxs', 'xxs', 'xxs', 'xxs'], + border: [ + { + top: ['', '', ''], + right: ['', '', ''], + bottom: ['palette6', '', 1], + left: ['', '', ''], + unit: 'px', + }, + ], + padding: ['md', 'lg', 'md', 'lg'], + maxWidth: 100, + maxWidthUnit: '%', metadata: { name: 'Middle Row' }, }, [ createBlock( 'kadence/header-section', - { uniqueID: '8_4bafef-da', location: 'left', metadata: { name: 'Left Section' } }, + { + uniqueID: '8_be8cc6-77', + location: 'left', + metadata: { name: 'Left Section' }, + }, [ createBlock( 'kadence/header-column', - { uniqueID: '8_b1e937-75', location: 'left', metadata: { name: 'Left' } }, - [] + { uniqueID: '8_38eca9-c2', location: 'left', metadata: { name: 'Left' } }, + [ + createBlock( + 'kadence/image', + { + sizeSlug: 'full', + linkDestination: 'none', + uniqueID: '8_7ceea4-52', + imageFilter: 'mayfair', + url: '/wp-content/plugins/kadence-blocks/includes/assets/images/placeholder/logo-dark.png', + }, + [] + ), + ] ), createBlock( 'kadence/header-column', { - uniqueID: '8_49423f-ae', + uniqueID: '8_b251bb-58', location: 'center-left', metadata: { name: 'Center Left' }, }, @@ -160,17 +233,25 @@ function innerBlocks() { ), createBlock( 'kadence/header-column', - { uniqueID: '8_2dfff2-71', location: 'center', metadata: { name: 'Center' } }, - [createBlock('kadence/navigation', { uniqueID: '8_bed1fc-74' }, [])] + { + uniqueID: '8_632700-11', + location: 'center', + metadata: { name: 'Center' }, + }, + [createBlock('kadence/navigation', { uniqueID: '8_35dcc4-2a', templateKey: 'long' }, [])] ), createBlock( 'kadence/header-section', - { uniqueID: '8_b61893-ea', location: 'right', metadata: { name: 'Right Section' } }, + { + uniqueID: '8_e4e150-77', + location: 'right', + metadata: { name: 'Right Section' }, + }, [ createBlock( 'kadence/header-column', { - uniqueID: '8_f335de-3d', + uniqueID: '8_0340ee-76', location: 'center-right', metadata: { name: 'Center Right' }, }, @@ -178,8 +259,76 @@ function innerBlocks() { ), createBlock( 'kadence/header-column', - { uniqueID: '8_299a6e-3e', location: 'right', metadata: { name: 'Right' } }, - [] + { uniqueID: '8_5fd0c2-12', location: 'right', metadata: { name: 'Right' } }, + [ + createBlock( + 'kadence/icon', + { + uniqueID: '8_bb80f7-d7', + gap: ['xs', '', ''], + }, + [ + createBlock( + 'kadence/single-icon', + { + uniqueID: '8_6bac87-03', + icon: 'fa_facebook-n', + link: '#', + size: 15, + title: 'Facebook', + color: 'palette9', + background: 'palette6', + borderRadius: 50, + borderWidth: 0, + padding: [5, 5, 5, 5], + style: 'stacked', + margin: ['0', '0', '0', '0'], + hColor: 'palette9', + hBackground: 'palette6', + }, + [] + ), + createBlock( + 'kadence/single-icon', + { + uniqueID: '8_db3174-41', + icon: 'fa_instagram', + link: '#', + size: 15, + title: 'Instagram', + color: 'palette9', + background: 'palette6', + borderRadius: 50, + borderWidth: 0, + padding: [5, 5, 5, 5], + style: 'stacked', + hColor: 'palette9', + hBackground: 'palette6', + }, + [] + ), + createBlock( + 'kadence/single-icon', + { + uniqueID: '8_311e14-91', + icon: 'fa_youtube', + link: '#', + size: 15, + title: 'Youtube', + color: 'palette9', + background: 'palette6', + borderRadius: 50, + borderWidth: 0, + padding: [5, 5, 5, 5], + style: 'stacked', + hColor: 'palette9', + hBackground: 'palette6', + }, + [] + ), + ] + ), + ] ), ] ), @@ -188,36 +337,33 @@ function innerBlocks() { createBlock( 'kadence/header-row', { - uniqueID: '8_e847b2-fd', + uniqueID: '8_b09dc6-18', location: 'bottom', - background: { - color: 'palette8', - image: '', - imageID: '', - position: 'center center', - size: 'cover', - repeat: 'no-repeat', - attachment: 'scroll', - type: 'normal', - gradient: '', - }, - padding: ['', '', 'sm', ''], + layout: 'fullwidth', metadata: { name: 'Bottom Row' }, }, [ createBlock( 'kadence/header-section', - { uniqueID: '8_d03b94-a6', location: 'left', metadata: { name: 'Left Section' } }, + { + uniqueID: '8_7de42f-2f', + location: 'left', + metadata: { name: 'Left Section' }, + }, [ createBlock( 'kadence/header-column', - { uniqueID: '8_3146f7-fe', location: 'left', metadata: { name: 'Left' } }, + { + uniqueID: '8_7dbebb-81', + location: 'left', + metadata: { name: 'Left' }, + }, [] ), createBlock( 'kadence/header-column', { - uniqueID: '8_de2b33-4d', + uniqueID: '8_1834be-97', location: 'center-left', metadata: { name: 'Center Left' }, }, @@ -227,15 +373,89 @@ function innerBlocks() { ), createBlock( 'kadence/header-column', - { uniqueID: '8_f67b49-32', location: 'center', metadata: { name: 'Center' } }, + { + uniqueID: '8_3f128f-1f', + location: 'center', + metadata: { name: 'Center' }, + }, + [] + ), + createBlock( + 'kadence/header-section', + { + uniqueID: '8_2d5b36-24', + location: 'right', + metadata: { name: 'Right Section' }, + }, + [ + createBlock( + 'kadence/header-column', + { + uniqueID: '8_8899ea-8c', + location: 'center-right', + metadata: { name: 'Center Right' }, + }, + [] + ), + createBlock( + 'kadence/header-column', + { + uniqueID: '8_cb717b-da', + location: 'right', + metadata: { name: 'Right' }, + }, + [] + ), + ] + ), + ] + ), + ]), + createBlock('kadence/header-container-tablet', { uniqueID: '8_729ba9-a5' }, [ + createBlock( + 'kadence/header-row', + { + uniqueID: '8_3207a2-2f', + layout: 'fullwidth', + background: { + color: 'palette5', + image: '', + imageID: '', + position: 'center center', + size: 'cover', + repeat: 'no-repeat', + attachment: 'scroll', + type: 'normal', + gradient: '', + }, + minHeightTablet: 2, + minHeightUnit: 'em', + vAlignTablet: 'center', + metadata: { name: 'Top Row' }, + }, + [ + createBlock( + 'kadence/header-column', + { + uniqueID: '8_03edf6-99', + location: 'tablet-left', + metadata: { name: 'Left' }, + }, + [] + ), + createBlock( + 'kadence/header-column', + { + uniqueID: '8_a6dc83-53', + metadata: { name: 'Center', location: 'tablet-center' }, + }, [ createBlock( 'kadence/advancedheading', { - uniqueID: '8_b2c27e-57', - typography: 'var( --global-heading-font-family, inherit )', - fontWeight: '900', - fontStyle: 'italic', + uniqueID: '8_182396-02', + align: 'center', + color: 'palette9', markBorder: '', markBorderStyles: [ { @@ -264,96 +484,138 @@ function innerBlocks() { unit: 'px', }, ], + colorClass: 'theme-palette9', htmlTag: 'div', - fontSize: ['md', '', ''], - fontHeight: [2.1000000000000001, '', ''], - fontHeightType: 'em', - icon: 'ic_wrench', + fontSize: ['', 'sm', ''], + fontHeight: ['', 2, ''], }, [] ), - createBlock('kadence/navigation', { uniqueID: '8_8962b2-f4' }, []), ] ), createBlock( - 'kadence/header-section', - { uniqueID: '8_92e755-23', location: 'right', metadata: { name: 'Right Section' } }, + 'kadence/header-column', + { + uniqueID: '8_61399c-38', + location: 'tablet-right', + metadata: { name: 'Right' }, + }, + [] + ), + ] + ), + createBlock( + 'kadence/header-row', + { + uniqueID: '8_057f8b-cf', + layout: 'fullwidth', + background: { + color: 'palette9', + image: '', + imageID: '', + position: 'center center', + size: 'cover', + repeat: 'no-repeat', + attachment: 'scroll', + type: 'normal', + gradient: '', + }, + minHeightUnit: 'em', + vAlignTablet: 'center', + metadata: { name: 'Middle Row' }, + }, + [ + createBlock( + 'kadence/header-column', + { uniqueID: '8_fd0621-82', location: 'tablet-left', metadata: { name: 'Left' } }, [ createBlock( - 'kadence/header-column', + 'kadence/image', { - uniqueID: '8_26ce2a-22', - location: 'center-right', - metadata: { name: 'Center Right' }, + sizeSlug: 'full', + linkDestination: 'none', + uniqueID: '8_6b72dc-6d', + marginTablet: ['sm', '', 'sm', ''], + url: '/wp-content/plugins/kadence-blocks/includes/assets/images/placeholder/logo-dark.png', }, [] ), + ] + ), + createBlock( + 'kadence/header-column', + { + uniqueID: '8_04c9c7-f1', + metadata: { name: 'Center', location: 'tablet-center' }, + }, + [] + ), + createBlock( + 'kadence/header-column', + { + uniqueID: '8_f7b5df-47', + location: 'tablet-right', + metadata: { name: 'Right' }, + }, + [ createBlock( - 'kadence/header-column', - { uniqueID: '8_144dd9-dc', location: 'right', metadata: { name: 'Right' } }, + 'kadence/off-canvas-trigger', + { uniqueID: '8_cd4c25-4c', iconSizeTablet: 20 }, [] ), ] ), ] ), + createBlock( + 'kadence/header-row', + { + uniqueID: '8_123946-0b', + metadata: { name: 'Bottom Row' }, + }, + [ + createBlock( + 'kadence/header-column', + { + uniqueID: '8_dd9a1d-70', + location: 'tablet-left', + metadata: { name: 'Left' }, + }, + [] + ), + createBlock( + 'kadence/header-column', + { + uniqueID: '8_803649-37', + metadata: { name: 'Center', location: 'tablet-center' }, + }, + [] + ), + createBlock( + 'kadence/header-column', + { + uniqueID: '8_6d893f-e0', + location: 'tablet-right', + metadata: { name: 'Right' }, + }, + [] + ), + ] + ), ]), - createBlock('kadence/header-container-tablet', { uniqueID: '8_c1d23d-cd' }, [ - createBlock('kadence/header-row', { uniqueID: '8_a9c2dc-41', metadata: { name: 'Top Row' } }, [ - createBlock( - 'kadence/header-column', - { uniqueID: '8_8c9896-8d', location: 'tablet-left', metadata: { name: 'Left' } }, - [] - ), - createBlock( - 'kadence/header-column', - { uniqueID: '8_2b878a-1d', metadata: { name: 'Center' }, location: 'tablet-center' }, - [] - ), - createBlock( - 'kadence/header-column', - { uniqueID: '8_46c129-e2', location: 'tablet-right', metadata: { name: 'Right' } }, - [] - ), - ]), - createBlock('kadence/header-row', { uniqueID: '8_9f31c1-da', metadata: { name: 'Middle Row' } }, [ - createBlock( - 'kadence/header-column', - { uniqueID: '8_b83edd-1e', location: 'tablet-left', metadata: { name: 'Left' } }, - [] - ), - createBlock( - 'kadence/header-column', - { uniqueID: '8_b459e0-e6', metadata: { name: 'Center' }, location: 'tablet-center' }, - [] - ), - createBlock( - 'kadence/header-column', - { uniqueID: '8_ba9b38-48', location: 'tablet-right', metadata: { name: 'Right' } }, - [] - ), - ]), - createBlock('kadence/header-row', { uniqueID: '8_73e416-36', metadata: { name: 'Bottom Row' } }, [ - createBlock( - 'kadence/header-column', - { uniqueID: '8_d0ef5c-c5', location: 'tablet-left', metadata: { name: 'Left' } }, - [] - ), - createBlock( - 'kadence/header-column', - { uniqueID: '8_b7d315-57', metadata: { name: 'Center' }, location: 'tablet-center' }, - [] - ), - createBlock( - 'kadence/header-column', - { uniqueID: '8_33f42a-11', location: 'tablet-right', metadata: { name: 'Right' } }, - [] - ), - ]), - ]), - createBlock('kadence/off-canvas', { uniqueID: '8_0cbe19-86' }, [ - createBlock('core/paragraph', { placeholder: 'Create Awesome' }, []), - ]), + createBlock( + 'kadence/off-canvas', + { + uniqueID: '8_8696e1-1b', + slideFrom: 'right', + backgroundColorTablet: 'palette3', + hAlignTablet: 'center', + vAlignTablet: 'center', + closeIconSizeTablet: 20, + closeIconColorTablet: 'palette9', + }, + [createBlock('kadence/navigation', { uniqueID: '8_6cd84d-ff', templateKey: 'long-vertical' }, [])] + ), ]), ]; } diff --git a/src/blocks/icon/edit.js b/src/blocks/icon/edit.js index 53439e8c3..b1b315fa4 100644 --- a/src/blocks/icon/edit.js +++ b/src/blocks/icon/edit.js @@ -126,7 +126,7 @@ function KadenceIcons(props) { const blockProps = useBlockProps({ className, - ['data-align']: + 'data-align': 'left' === blockAlignment || 'right' === blockAlignment || 'center' === blockAlignment ? blockAlignment : undefined, diff --git a/src/blocks/image/block.json b/src/blocks/image/block.json index 895ea294e..b70d7f30c 100644 --- a/src/blocks/image/block.json +++ b/src/blocks/image/block.json @@ -381,6 +381,20 @@ "imagePosition": { "type": "string", "default": "" + }, + "tooltip": { + "type": "string", + "source": "html", + "selector": ".kb-tooltip-hidden-content", + "__experimentalRole": "content" + }, + "tooltipPlacement": { + "type": "string", + "default": "" + }, + "tooltipDash": { + "type": "boolean", + "default": false } }, "supports": { diff --git a/src/blocks/image/edit.js b/src/blocks/image/edit.js index 373544006..04ce56712 100644 --- a/src/blocks/image/edit.js +++ b/src/blocks/image/edit.js @@ -36,8 +36,6 @@ import { getPostOrFseId, } from '@kadence/helpers'; -/* global wp */ - /** * Import Css */ @@ -550,7 +548,7 @@ export function ImageEdit(props) { const blockProps = useBlockProps({ ref, className: classes, - ['data-align']: 'center' === align ? align : undefined, + 'data-align': 'center' === align ? align : undefined, }); return ( diff --git a/src/blocks/image/edit.native.js b/src/blocks/image/edit.native.js deleted file mode 100644 index 93bcb05ea..000000000 --- a/src/blocks/image/edit.native.js +++ /dev/null @@ -1,653 +0,0 @@ -/** - * External dependencies - */ -import { View, TouchableWithoutFeedback } from 'react-native'; - -/** - * WordPress dependencies - */ -import { Component } from '@wordpress/element'; -import { - requestMediaImport, - mediaUploadSync, - requestImageFailedRetryDialog, - requestImageUploadCancelDialog, - requestImageFullscreenPreview, - setFeaturedImage, -} from '@wordpress/react-native-bridge'; -import { - Icon, - ToolbarButton, - ToolbarGroup, - Image, - WIDE_ALIGNMENTS, - LinkSettingsNavigation, - BottomSheet, - BottomSheetTextControl, - BottomSheetSelectControl, - FooterMessageControl, - FooterMessageLink, - Badge, -} from '@wordpress/components'; -import { - BlockCaption, - MediaPlaceholder, - MediaUpload, - MediaUploadProgress, - MEDIA_TYPE_IMAGE, - BlockControls, - InspectorControls, - BlockAlignmentToolbar, - BlockStyles, - store as blockEditorStore, -} from '@wordpress/block-editor'; -import { __, _x, sprintf } from '@wordpress/i18n'; -import { getProtocol, hasQueryArg } from '@wordpress/url'; -import { doAction, hasAction } from '@wordpress/hooks'; -import { compose, withPreferredColorScheme } from '@wordpress/compose'; -import { withSelect, withDispatch } from '@wordpress/data'; -import { image as placeholderIcon, replace, fullscreen, textColor } from '@wordpress/icons'; -import { store as coreStore } from '@wordpress/core-data'; -import { store as editPostStore } from '@wordpress/edit-post'; - -/** - * Internal dependencies - */ -import styles from './styles.scss'; -import { getUpdatedLinkTargetSettings } from './utils'; -import { KadencePanelBody } from '@kadence/components'; - -import { - LINK_DESTINATION_CUSTOM, - LINK_DESTINATION_ATTACHMENT, - LINK_DESTINATION_MEDIA, - MEDIA_ID_NO_FEATURED_IMAGE_SET, -} from './constants'; - -const getUrlForSlug = (image, sizeSlug) => { - if (!sizeSlug) { - return undefined; - } - return image?.media_details?.sizes?.[sizeSlug]?.source_url; -}; - -export class ImageEdit extends Component { - constructor(props) { - super(props); - - this.state = { - isCaptionSelected: false, - }; - - this.finishMediaUploadWithSuccess = this.finishMediaUploadWithSuccess.bind(this); - this.finishMediaUploadWithFailure = this.finishMediaUploadWithFailure.bind(this); - this.mediaUploadStateReset = this.mediaUploadStateReset.bind(this); - this.onSelectMediaUploadOption = this.onSelectMediaUploadOption.bind(this); - this.updateMediaProgress = this.updateMediaProgress.bind(this); - this.updateImageURL = this.updateImageURL.bind(this); - this.onSetLinkDestination = this.onSetLinkDestination.bind(this); - this.onSetNewTab = this.onSetNewTab.bind(this); - this.onSetSizeSlug = this.onSetSizeSlug.bind(this); - this.onImagePressed = this.onImagePressed.bind(this); - this.onSetFeatured = this.onSetFeatured.bind(this); - this.onFocusCaption = this.onFocusCaption.bind(this); - this.updateAlignment = this.updateAlignment.bind(this); - this.accessibilityLabelCreator = this.accessibilityLabelCreator.bind(this); - this.setMappedAttributes = this.setMappedAttributes.bind(this); - this.onSizeChangeValue = this.onSizeChangeValue.bind(this); - - this.linkSettingsOptions = { - url: { - label: __('Image Link URL'), - placeholder: __('Add URL'), - autoFocus: false, - autoFill: true, - }, - openInNewTab: { - label: __('Open in new tab'), - }, - linkRel: { - label: __('Link Rel'), - placeholder: _x('None', 'Link rel attribute value placeholder'), - }, - }; - } - - componentDidMount() { - const { attributes, setAttributes } = this.props; - // This will warn when we have `id` defined, while `url` is undefined. - // This may help track this issue: https://github.com/wordpress-mobile/WordPress-Android/issues/9768 - // where a cancelled image upload was resulting in a subsequent crash. - if (attributes.id && !attributes.url) { - // eslint-disable-next-line no-console - console.warn('Attributes has id with no url.'); - } - - // Detect any pasted image and start an upload - if (!attributes.id && attributes.url && getProtocol(attributes.url) === 'file:') { - requestMediaImport(attributes.url, (id, url) => { - if (url) { - setAttributes({ id, url }); - } - }); - } - - // Make sure we mark any temporary images as failed if they failed while - // the editor wasn't open - if (attributes.id && attributes.url && getProtocol(attributes.url) === 'file:') { - mediaUploadSync(); - } - } - - componentWillUnmount() { - // this action will only exist if the user pressed the trash button on the block holder - if (hasAction('blocks.onRemoveBlockCheckUpload') && this.state.isUploadInProgress) { - doAction('blocks.onRemoveBlockCheckUpload', this.props.attributes.id); - } - } - - componentDidUpdate(previousProps) { - const { image, attributes, setAttributes } = this.props; - if (!previousProps.image && image) { - const url = getUrlForSlug(image, attributes?.sizeSlug) || image.source_url; - setAttributes({ url }); - } - } - - static getDerivedStateFromProps(props, state) { - // Avoid a UI flicker in the toolbar by insuring that isCaptionSelected - // is updated immediately any time the isSelected prop becomes false - return { - isCaptionSelected: props.isSelected && state.isCaptionSelected, - }; - } - - accessibilityLabelCreator(caption) { - // Checks if caption is empty. - return (typeof caption === 'string' && caption.trim().length === 0) || caption === undefined || caption === null - ? /* translators: accessibility text. Empty image caption. */ - 'Image caption. Empty' - : sprintf( - /* translators: accessibility text. %s: image caption. */ - __('Image caption. %s'), - caption - ); - } - - onImagePressed() { - const { attributes, image } = this.props; - - if (this.state.isUploadInProgress) { - requestImageUploadCancelDialog(attributes.id); - } else if (attributes.id && getProtocol(attributes.url) === 'file:') { - requestImageFailedRetryDialog(attributes.id); - } else if (!this.state.isCaptionSelected) { - requestImageFullscreenPreview(attributes.url, image && image.source_url); - } - - this.setState({ - isCaptionSelected: false, - }); - } - - updateMediaProgress(payload) { - const { setAttributes } = this.props; - if (payload.mediaUrl) { - setAttributes({ url: payload.mediaUrl }); - } - - if (!this.state.isUploadInProgress) { - this.setState({ isUploadInProgress: true }); - } - } - - finishMediaUploadWithSuccess(payload) { - const { setAttributes } = this.props; - - setAttributes({ url: payload.mediaUrl, id: payload.mediaServerId }); - this.setState({ isUploadInProgress: false }); - } - - finishMediaUploadWithFailure(payload) { - const { setAttributes } = this.props; - - setAttributes({ id: payload.mediaId }); - this.setState({ isUploadInProgress: false }); - } - - mediaUploadStateReset() { - const { setAttributes } = this.props; - - setAttributes({ id: null, url: null }); - this.setState({ isUploadInProgress: false }); - } - - updateImageURL(url) { - this.props.setAttributes({ - url, - width: undefined, - height: undefined, - }); - } - - updateAlignment(nextAlign) { - const extraUpdatedAttributes = Object.values(WIDE_ALIGNMENTS.alignments).includes(nextAlign) - ? { width: undefined, height: undefined } - : {}; - this.props.setAttributes({ - ...extraUpdatedAttributes, - align: nextAlign, - }); - } - - onSetLinkDestination(href) { - this.props.setAttributes({ - linkDestination: LINK_DESTINATION_CUSTOM, - href, - }); - } - - onSetNewTab(value) { - const updatedLinkTarget = getUpdatedLinkTargetSettings(value, this.props.attributes); - this.props.setAttributes(updatedLinkTarget); - } - - onSetSizeSlug(sizeSlug) { - const { image, setAttributes } = this.props; - - const url = getUrlForSlug(image, sizeSlug); - if (!url) { - return null; - } - setAttributes({ - url, - width: undefined, - height: undefined, - sizeSlug, - }); - } - - onSelectMediaUploadOption(media) { - const { imageDefaultSize } = this.props; - const { id, url, destination } = this.props.attributes; - const mediaAttributes = { - id: media.id, - url: media.url, - caption: media.caption, - }; - - let additionalAttributes; - // Reset the dimension attributes if changing to a different image. - if (!media.id || media.id !== id) { - additionalAttributes = { - width: undefined, - height: undefined, - sizeSlug: imageDefaultSize, - }; - } else { - // Keep the same url when selecting the same file, so "Image Size" option is not changed. - additionalAttributes = { url }; - } - - let href; - switch (destination) { - case LINK_DESTINATION_MEDIA: - href = media.url; - break; - case LINK_DESTINATION_ATTACHMENT: - href = media.link; - break; - } - mediaAttributes.href = href; - - this.props.setAttributes({ - ...mediaAttributes, - ...additionalAttributes, - }); - } - - onFocusCaption() { - if (this.props.onFocus) { - this.props.onFocus(); - } - if (!this.state.isCaptionSelected) { - this.setState({ - isCaptionSelected: true, - }); - } - } - - getPlaceholderIcon() { - return ( - - ); - } - - getWidth() { - const { attributes } = this.props; - const { align, width } = attributes; - - return Object.values(WIDE_ALIGNMENTS.alignments).includes(align) ? '100%' : width; - } - - setMappedAttributes({ url: href, ...restAttributes }) { - const { setAttributes } = this.props; - - return href === undefined - ? setAttributes({ - ...restAttributes, - linkDestination: LINK_DESTINATION_CUSTOM, - }) - : setAttributes({ - ...restAttributes, - href, - linkDestination: LINK_DESTINATION_CUSTOM, - }); - } - - getLinkSettings() { - const { isLinkSheetVisible } = this.state; - const { - attributes: { href: url, ...unMappedAttributes }, - } = this.props; - const mappedAttributes = { ...unMappedAttributes, url }; - - return ( - - ); - } - - getAltTextSettings() { - const { - attributes: { alt }, - } = this.props; - - const updateAlt = (newAlt) => { - this.props.setAttributes({ alt: newAlt }); - }; - - return ( - - {__('Describe the purpose of the image. Leave empty if the image is purely decorative.')} - - - } - /> - ); - } - - onSizeChangeValue(newValue) { - this.onSetSizeSlug(newValue); - } - - onSetFeatured(mediaId) { - const { closeSettingsBottomSheet } = this.props; - setFeaturedImage(mediaId); - closeSettingsBottomSheet(); - } - - getFeaturedButtonPanel(isFeaturedImage) { - const { attributes, getStylesFromColorScheme } = this.props; - - const setFeaturedButtonStyle = getStylesFromColorScheme(styles.setFeaturedButton, styles.setFeaturedButtonDark); - - const removeFeaturedButton = () => ( - this.onSetFeatured(MEDIA_ID_NO_FEATURED_IMAGE_SET)} - /> - ); - - const setFeaturedButton = () => ( - this.onSetFeatured(attributes.id)} - /> - ); - - return isFeaturedImage ? removeFeaturedButton() : setFeaturedButton(); - } - - render() { - const { isCaptionSelected } = this.state; - const { - attributes, - isSelected, - image, - clientId, - imageDefaultSize, - context: { imageCrop = false } = {}, - featuredImageId, - wasBlockJustInserted, - } = this.props; - const { align, url, alt, id, sizeSlug, className } = attributes; - - const imageSizes = Array.isArray(this.props.imageSizes) ? this.props.imageSizes : []; - // Only map available image sizes for the user to choose. - const sizeOptions = imageSizes - .filter(({ slug }) => getUrlForSlug(image, slug)) - .map(({ name, slug }) => ({ value: slug, label: name })); - - let selectedSizeOption = sizeSlug || imageDefaultSize; - let sizeOptionsValid = sizeOptions.find((option) => option.value === selectedSizeOption); - - if (!sizeOptionsValid) { - // Default to 'full' size if the default large size is not available. - sizeOptionsValid = sizeOptions.find((option) => option.value === 'full'); - selectedSizeOption = 'full'; - } - - // By default, it's only possible to set images that have been uploaded to a site's library as featured. - // The 'canImageBeFeatured' check filters out images that haven't been uploaded based on the following: - // - Images that are embedded in a post but are uploaded elsewhere have an id of 'undefined'. - // - Image that are uploading or have failed to upload are given a temporary negative ID. - const canImageBeFeatured = typeof attributes.id !== 'undefined' && attributes.id > 0; - - const isFeaturedImage = canImageBeFeatured && featuredImageId === attributes.id; - - const getToolbarEditButton = (open) => ( - - - - - - - ); - - const getInspectorControls = () => ( - - - - - - - {image && sizeOptionsValid && ( - - )} - {this.getAltTextSettings()} - - - {this.getLinkSettings(true)} - - - {canImageBeFeatured && this.getFeaturedButtonPanel(isFeaturedImage)} - - - - ); - - if (!url) { - return ( - - - - ); - } - - const alignToFlex = { - left: 'flex-start', - center: 'center', - right: 'flex-end', - full: 'center', - wide: 'center', - }; - - const additionalImageProps = { - height: '100%', - resizeMode: imageCrop ? 'cover' : 'contain', - }; - - const getImageComponent = (openMediaOptions, getMediaOptions) => ( - - - - {isSelected && getInspectorControls()} - {isSelected && getMediaOptions()} - {!this.state.isCaptionSelected && getToolbarEditButton(openMediaOptions)} - { - return ( - - {alt} - - ); - }} - /> - - - - - ); - - return ( - { - return getImageComponent(open, getMediaOptions); - }} - /> - ); - } -} - -export default compose([ - withSelect((select, props) => { - const { getMedia } = select(coreStore); - const { getSettings, wasBlockJustInserted } = select(blockEditorStore); - const { getEditedPostAttribute } = select('core/editor'); - const { - attributes: { id, url }, - isSelected, - clientId, - } = props; - const { imageSizes, imageDefaultSize } = getSettings(); - const isNotFileUrl = id && getProtocol(url) !== 'file:'; - const featuredImageId = getEditedPostAttribute('featured_media'); - - const shouldGetMedia = - (isSelected && isNotFileUrl) || - // Edge case to update the image after uploading if the block gets unselected - // Check if it's the original image and not the resized one with queryparams - (!isSelected && isNotFileUrl && url && !hasQueryArg(url, 'w')); - - return { - image: shouldGetMedia ? getMedia(id) : null, - imageSizes, - imageDefaultSize, - featuredImageId, - wasBlockJustInserted: wasBlockJustInserted(clientId, 'inserter_menu'), - }; - }), - withDispatch((dispatch) => { - return { - closeSettingsBottomSheet() { - dispatch(editPostStore).closeGeneralSidebar(); - }, - }; - }), - withPreferredColorScheme, -])(ImageEdit); diff --git a/src/blocks/image/editor.scss b/src/blocks/image/editor.scss index dd199b3e6..68fb02eda 100644 --- a/src/blocks/image/editor.scss +++ b/src/blocks/image/editor.scss @@ -4,6 +4,9 @@ figure.wp-block-kadence-image:not(.wp-block) { .editor-styles-wrapper .wp-block-kadence-image:not(:last-child) { margin-bottom: var(--global-md-spacing, 1em ); } +.kb-image-tooltip-border { + border-bottom: 1px dashed currentColor; +} .wp-block-kadence-image { position: relative; img { diff --git a/src/blocks/image/image.js b/src/blocks/image/image.js index 32e2a0f92..f22474c0d 100644 --- a/src/blocks/image/image.js +++ b/src/blocks/image/image.js @@ -194,6 +194,9 @@ export default function Image({ heightTransparent, sizeSlugTransparent, imagePosition, + tooltip, + tooltipPlacement, + tooltipDash, } = attributes; const previewURL = dynamicURL ? dynamicURL : url; @@ -1619,7 +1622,48 @@ export default function Image({
- + + setAttributes({ tooltip: newValue })} + /> + { + setAttributes({ tooltipPlacement: val }); + }} + /> + { + setAttributes({ tooltipDash: value }); + }} + /> + { setNaturalSize(pick(event.target, ['naturalWidth', 'naturalHeight'])); }} + className={`kb-img ${tooltipDash && tooltip ? ' kb-image-tooltip-border' : ''}`} /> {temporaryURL && } {!useRatio && ( diff --git a/src/blocks/image/save.js b/src/blocks/image/save.js index 998182492..8aa2f5076 100644 --- a/src/blocks/image/save.js +++ b/src/blocks/image/save.js @@ -50,8 +50,11 @@ export default function save({ attributes }) { widthTransparent, heightTransparent, sizeSlugTransparent, + tooltip, + tooltipPlacement, + tooltipDash, } = attributes; - + const tooltipID = tooltip && uniqueID ? `kb-image-tooltip-${uniqueID}` : undefined; const classes = classnames({ [`align${align}`]: align, [`size-${sizeSlug}`]: sizeSlug, @@ -83,6 +86,7 @@ export default function save({ attributes }) { [`wp-image-${id}`]: id, [`skip-lazy`]: preventLazyLoad, [`kb-skip-lazy`]: preventLazyLoad, + [`kb-image-tooltip-border`]: !link && tooltipDash && tooltipID, }); const imgClassesSticky = classnames({ 'kb-img': true, @@ -115,7 +119,16 @@ export default function save({ attributes }) { relAttr = relAttr ? relAttr.concat(' sponsored') : 'sponsored'; } let image = ( - {globalAlt + {globalAlt ); if (useRatio) { image = ( @@ -169,7 +182,9 @@ export default function save({ attributes }) { {link && true ? (
{figure}
+ {tooltipID && ( + + )}
); } - return
{figure}
; + return ( +
+ {figure} + {tooltipID && ( + + )} +
+ ); } diff --git a/src/blocks/image/style.scss b/src/blocks/image/style.scss index 3e09e2278..a87ad01cf 100644 --- a/src/blocks/image/style.scss +++ b/src/blocks/image/style.scss @@ -15,6 +15,12 @@ margin-bottom: 1em; } .wp-block-kadence-image { + .kb-image-tooltip-border { + border-bottom: 1px dashed currentColor; + &.kb-advanced-image-link { + display: block; + } + } img { max-width: 100%; border: 0 solid currentColor; diff --git a/src/blocks/image/transforms.native.js b/src/blocks/image/transforms.native.js deleted file mode 100644 index 839cdfe3c..000000000 --- a/src/blocks/image/transforms.native.js +++ /dev/null @@ -1,12 +0,0 @@ -/** - * Internal dependencies - */ -import webTransforms from './transforms.js'; -import transformationCategories from '../transformationCategories'; - -const transforms = { - ...webTransforms, - supportedMobileTransforms: transformationCategories.media, -}; - -export default transforms; diff --git a/src/blocks/navigation-link/components/backend-styles/index.js b/src/blocks/navigation-link/components/backend-styles/index.js index 786e2e43a..9cb85a63b 100644 --- a/src/blocks/navigation-link/components/backend-styles/index.js +++ b/src/blocks/navigation-link/components/backend-styles/index.js @@ -673,7 +673,7 @@ export default function BackendStyles(props) { // css.set_selector( '.header-navigation[class*="header-navigation-dropdown-animation-fade"] #menu-item-' . $item->ID . '.kadence-menu-mega-enabled > .sub-menu' ); // css.add_property( 'margin-left', '-' . ( $data['mega_menu_custom_width'] ? floor( $data['mega_menu_custom_width'] / 2 ) : '400' ) . 'px' ); - } else if (previewMegaMenuWidth === 'full' && currentRef?.current) { + } else if ((previewMegaMenuWidth === 'full' || previewMegaMenuWidth === '') && currentRef?.current) { css.set_selector( `.wp-block-kadence-navigation .menu-container ul.menu .wp-block-kadence-navigation-link${uniqueID} > ul.sub-menu` ); @@ -687,7 +687,7 @@ export default function BackendStyles(props) { ).toString() + 'px' ); - } else if (previewMegaMenuWidth === 'container' || previewMegaMenuWidth === '') { + } else if (previewMegaMenuWidth === 'container') { css.set_selector( ` .wp-block-kadence-navigation .menu-container ul.menu .wp-block-kadence-navigation-link${uniqueID}` ); diff --git a/src/blocks/navigation-link/edit.js b/src/blocks/navigation-link/edit.js index a4c82c3cf..068b6d077 100644 --- a/src/blocks/navigation-link/edit.js +++ b/src/blocks/navigation-link/edit.js @@ -25,7 +25,7 @@ import { ButtonGroup, } from '@wordpress/components'; import { plusCircle, addSubmenu, plusCircleFilled } from '@wordpress/icons'; -import { displayShortcut, isKeyboardEvent, ENTER } from '@wordpress/keycodes'; +import { isKeyboardEvent, ENTER } from '@wordpress/keycodes'; import { __ } from '@wordpress/i18n'; import { BlockControls, @@ -588,7 +588,7 @@ export default function Edit(props) { } } - const megaMenuWidthClass = 'kadence-menu-mega-width-' + (megaMenuWidth ? megaMenuWidth : 'container'); + const megaMenuWidthClass = 'kadence-menu-mega-width-' + (megaMenuWidth ? megaMenuWidth : 'full'); const showSubMenusWithLogic = showSubMenus || isSelected || childSelected; const blockProps = useBlockProps({ @@ -836,9 +836,10 @@ export default function Edit(props) {

{__('Higlight Labels', 'kadence-blocks')}

@@ -859,9 +860,10 @@ export default function Edit(props) {

{__('Icons', 'kadence-blocks')}

diff --git a/src/blocks/navigation/components/backend-styles/index.js b/src/blocks/navigation/components/backend-styles/index.js index 3a18937e5..3556014a1 100644 --- a/src/blocks/navigation/components/backend-styles/index.js +++ b/src/blocks/navigation/components/backend-styles/index.js @@ -3,7 +3,7 @@ import { KadenceBlocksCSS, getPreviewSize, getSpacingOptionOutput } from '@kaden export default function BackendStyles(props) { const { attributes, isSelected, previewDevice, metaAttributes, context } = props; - const { uniqueID } = attributes; + const { uniqueID, id, templateKey } = attributes; const { padding, @@ -167,7 +167,12 @@ export default function BackendStyles(props) { navigationVerticalSpacingMobile ); - const previewOrientation = getPreviewSize(previewDevice, orientation, orientationTablet, orientationMobile); + const inTemplatePreviewMode = !id && templateKey; + const previewOrientation = inTemplatePreviewMode + ? templateKey.includes('vertical') + ? 'vertical' + : 'horizontal' + : getPreviewSize(previewDevice, orientation, orientationTablet, orientationMobile); const previewStyle = getPreviewSize(previewDevice, style, styleTablet, styleMobile); const previewParentActive = getPreviewSize(previewDevice, parentActive, parentActiveTablet, parentActiveMobile); const previewDropdownWidth = getPreviewSize(previewDevice, dropdownWidth, dropdownWidthTablet, dropdownWidthMobile); diff --git a/src/blocks/navigation/components/form-title/index.js b/src/blocks/navigation/components/form-title/index.js index 037cbd284..4d93261ba 100644 --- a/src/blocks/navigation/components/form-title/index.js +++ b/src/blocks/navigation/components/form-title/index.js @@ -1,7 +1,7 @@ /** * WordPress dependencies */ -import { __ } from '@wordpress/i18n'; +import { __, sprintf } from '@wordpress/i18n'; import { Placeholder, Button, TextControl, TextareaControl, ButtonGroup } from '@wordpress/components'; import { useState } from '@wordpress/element'; import { formBlockIcon } from '@kadence/icons'; diff --git a/src/blocks/navigation/components/menu-editor/edit.js b/src/blocks/navigation/components/menu-editor/edit.js index 09a6efdad..05e30d50d 100644 --- a/src/blocks/navigation/components/menu-editor/edit.js +++ b/src/blocks/navigation/components/menu-editor/edit.js @@ -5,11 +5,12 @@ import { get, debounce } from 'lodash'; import { __ } from '@wordpress/i18n'; import { PREVENT_BLOCK_DELETE } from './constants'; import { moreHorizontal, edit, trash } from '@wordpress/icons'; +import { memo } from 'react'; import { DndContext } from '@dnd-kit/core'; import { SortableContext, useSortable, verticalListSortingStrategy } from '@dnd-kit/sortable'; -const DragHandle = React.memo((props) => ( +const DragHandle = memo((props) => (
@@ -82,9 +83,12 @@ function BlockItem({ thisBlock, activeBlock, toggleCollapse, collapsed }) { /> )} - {labelOrTitle} + setIsEditing(!isEditing)}> + {labelOrTitle} + { wp.data.dispatch('core/block-editor').removeBlock(clientId, false); }; -export default function MenuEdit({ closeModal, blocks }) { +export default function MenuEdit({ blocks }) { const [collapsed, setCollapsed] = useState([]); const [activeBlock, setActiveBlock] = useState(null); @@ -244,63 +248,28 @@ export default function MenuEdit({ closeModal, blocks }) { return (
- {/*
*/} - {/* NAME:{' '}*/} - {/* console.log(value)}*/} - {/* value={''}*/} - {/* withoutInteractiveFormatting={true}*/} - {/* allowedFormats={[]}*/} - {/* />*/} - {/*
*/} - - - - {flattenedItems.map((block) => ( - - ))} - - - - {/*
*/} - {/* {*/} - {/* console.log('INSERT NEW BLOCK');*/} - {/* }}*/} - {/* style={{*/} - {/* width: '100%',*/} - {/* color: '#000',*/} - {/* borderColor: '#000',*/} - {/* display: 'flex',*/} - {/* alignItems: 'center',*/} - {/* justifyContent: 'center',*/} - {/* }}*/} - {/* >*/} - {/* Add Navigation Item*/} - {/* */} - {/*
*/} - -
- -
+ {blocks.length === 0 ? ( +

{__('Insert links to get started.', 'kadence-blocks')}

+ ) : ( + + + {flattenedItems.map((block) => ( + + ))} + + + )}
); } diff --git a/src/blocks/navigation/components/menu-editor/editor.scss b/src/blocks/navigation/components/menu-editor/editor.scss index 42a088ac0..20ddb42f3 100644 --- a/src/blocks/navigation/components/menu-editor/editor.scss +++ b/src/blocks/navigation/components/menu-editor/editor.scss @@ -6,11 +6,24 @@ .left-column { flex: 1; padding-bottom: 30px; + max-width: 350px; } .right-column { + display: flex; + flex-direction: column; flex: 2; padding: 0 20px 0 40px; + justify-content: space-between; + + .footer { + display: flex; + justify-content: space-between; + align-items: center; + padding: 10px 0 0 0; + width: 100%; + background-color: #FFF; + } } .menu-container { @@ -86,7 +99,6 @@ line-height: 16px; letter-spacing: 0em; - .edit-menu-name { color: #757575; font-size: 12px; @@ -114,6 +126,7 @@ flex: 1; } + .block-settings { transform: rotate(90deg); } diff --git a/src/blocks/navigation/components/menu-editor/index.js b/src/blocks/navigation/components/menu-editor/index.js index e48deb633..ab94ee436 100644 --- a/src/blocks/navigation/components/menu-editor/index.js +++ b/src/blocks/navigation/components/menu-editor/index.js @@ -4,14 +4,25 @@ import { __ } from '@wordpress/i18n'; import { useState } from '@wordpress/element'; -import { useSelect, useDispatch } from '@wordpress/data'; -import { PostSelectorCheckbox } from '@kadence/components'; +import { useSelect } from '@wordpress/data'; +import { PostSelectorCheckbox, KadenceRadioButtons } from '@kadence/components'; import { createBlock } from '@wordpress/blocks'; +import { TextControl, Button } from '@wordpress/components'; +import { link } from '@wordpress/icons'; import MenuEdit from './edit'; import './editor.scss'; -export default function MenuEditor({ clientId, closeModal }) { +export default function MenuEditor({ + clientId, + closeModal, + title, + setTitle, + updateBlocksCallback, + orientation, + orientationTablet, + setMetaAttribute, +}) { const [sidebarTab, setSidebarTab] = useState('posts'); const { blocks } = useSelect( @@ -40,7 +51,8 @@ export default function MenuEditor({ clientId, closeModal }) { }); if (navItems.length !== 0) { - wp.data.dispatch('core/block-editor').insertBlocks(navItems, 99999, clientId, false, null); + updateBlocksCallback(navItems); + // wp.data.dispatch('core/block-editor').insertBlocks(navItems, 99999, clientId, false, null); } }; @@ -48,6 +60,46 @@ export default function MenuEditor({ clientId, closeModal }) {
+ { + setMetaAttribute(value, 'orientation'); + }} + /> + + { + setMetaAttribute(value, 'orientationTablet'); + }} + /> + + {kadence_blocks_params.postTypesSearchable.map((postType) => ( + + setSidebarTab(sidebarTab === postType.value ? null : postType.value) + } + postType={postType.value} + title={postType.label} + onSelect={onSelect} + /> + ))} +
- {blocks.length !== 0 ? ( - - ) : ( -

{__('Insert links to get started.', 'kadence-blocks')}

- )} +
+ + + +
+ +
+ + +
); diff --git a/src/blocks/navigation/edit-inner.js b/src/blocks/navigation/edit-inner.js index 5f08d6b58..ad028254d 100644 --- a/src/blocks/navigation/edit-inner.js +++ b/src/blocks/navigation/edit-inner.js @@ -93,8 +93,9 @@ export function EditInner(props) { const [navPlaceholderBlocks, setNavPlaceholderBlocks] = useState([]); const [isOpen, setOpen] = useState(false); - const openModal = () => setOpen(true); - const closeModal = () => setOpen(false); + const closeModal = () => { + setOpen(false); + }; const paddingMouseOver = mouseOverVisualizer(); const marginMouseOver = mouseOverVisualizer(); @@ -448,7 +449,13 @@ export function EditInner(props) { dropdownBorderRadiusUnit, } = metaAttributes; - const previewOrientation = getPreviewSize(previewDevice, orientation, orientationTablet, orientationMobile); + const inTemplatePreviewMode = !id && templateKey; + + const previewOrientation = inTemplatePreviewMode + ? templateKey.includes('vertical') + ? 'vertical' + : 'horizontal' + : getPreviewSize(previewDevice, orientation, orientationTablet, orientationMobile); const previewDropdownHorizontalAlignment = getPreviewSize( previewDevice, dropdownHorizontalAlignment, @@ -497,24 +504,24 @@ export function EditInner(props) { }; const navClasses = classnames('navigation', { - ['nav--toggle-sub']: true, + 'nav--toggle-sub': true, [`navigation-desktop-dropdown-animation-${dropdownReveal ? dropdownReveal : 'none'}`]: - !previewDevice || previewDevice == 'Desktop', - [`navigation-tablet-dropdown-animation-${dropdownRevealTablet}`]: previewDevice == 'Tablet', - [`navigation-mobile-dropdown-animation-${dropdownRevealMobile}`]: previewDevice == 'Mobile', - [`navigation-desktop-style-${style}`]: !previewDevice || previewDevice == 'Desktop', - [`navigation-tablet-style-${styleTablet}`]: previewDevice == 'Tablet', - [`navigation-mobile-style-${styleMobile}`]: previewDevice == 'Mobile', - [`navigation-desktop-collapse-sub-menus-${collapseSubMenus}`]: !previewDevice || previewDevice == 'Desktop', - [`navigation-tablet-collapse-sub-menus-${collapseSubMenusTablet}`]: previewDevice == 'Tablet', - [`navigation-mobile-collapse-sub-menus-${collapseSubMenusMobile}`]: previewDevice == 'Mobile', + !previewDevice || previewDevice === 'Desktop', + [`navigation-tablet-dropdown-animation-${dropdownRevealTablet}`]: previewDevice === 'Tablet', + [`navigation-mobile-dropdown-animation-${dropdownRevealMobile}`]: previewDevice === 'Mobile', + [`navigation-desktop-style-${style}`]: !previewDevice || previewDevice === 'Desktop', + [`navigation-tablet-style-${styleTablet}`]: previewDevice === 'Tablet', + [`navigation-mobile-style-${styleMobile}`]: previewDevice === 'Mobile', + [`navigation-desktop-collapse-sub-menus-${collapseSubMenus}`]: !previewDevice || previewDevice === 'Desktop', + [`navigation-tablet-collapse-sub-menus-${collapseSubMenusTablet}`]: previewDevice === 'Tablet', + [`navigation-mobile-collapse-sub-menus-${collapseSubMenusMobile}`]: previewDevice === 'Mobile', //we don't need to apply this setting in the editor // [`navigation-desktop-parent-toggles-menus-${parentTogglesMenus}`]: !previewDevice || previewDevice == 'Desktop', - // [`navigation-tablet-parent-toggles-menus-${parentTogglesMenusTablet}`]: previewDevice == 'Tablet', - // [`navigation-mobile-parent-toggles-menus-${parentTogglesMenusMobile}`]: previewDevice == 'Mobile', - [`navigation-desktop-parent-active-${parentActive}`]: !previewDevice || previewDevice == 'Desktop', - [`navigation-tablet-parent-active-${parentActiveTablet}`]: previewDevice == 'Tablet', - [`navigation-mobile-parent-active-${parentActiveMobile}`]: previewDevice == 'Mobile', + // [`navigation-tablet-parent-toggles-menus-${parentTogglesMenusTablet}`]: previewDevice === 'Tablet', + // [`navigation-mobile-parent-toggles-menus-${parentTogglesMenusMobile}`]: previewDevice === 'Mobile', + [`navigation-desktop-parent-active-${parentActive}`]: !previewDevice || previewDevice === 'Desktop', + [`navigation-tablet-parent-active-${parentActiveTablet}`]: previewDevice === 'Tablet', + [`navigation-mobile-parent-active-${parentActiveMobile}`]: previewDevice === 'Mobile', }); const innerNavClasses = classnames('menu', { @@ -523,14 +530,13 @@ export function EditInner(props) { }); const [title, setTitle] = useNavigationProp('title'); - const [isAdding, addNew] = useEntityPublish('kadence_navigation', id); let [blocks, onInput, onChange] = useEntityBlockEditor('postType', 'kadence_navigation', id); //if this nav block is getting created through the header onboarding //then we need to auto create some basic block structure const applyTemplateKeyBlocks = (templateKey) => { - if (templateKey == 'long-vertical') { + if (templateKey === 'long-vertical') { setNavPlaceholderBlocks([ createBlock('kadence/navigation', {}, [ createBlock('kadence/navigation-link', { label: 'about', url: '#' }), @@ -541,10 +547,7 @@ export function EditInner(props) { createBlock('kadence/navigation-link', { label: 'shop', url: '#' }), ]), ]); - setMetaAttribute('vertical', 'orientationMobile'); - setMetaAttribute('vertical', 'orientationTablet'); - setMetaAttribute('vertical', 'orientation'); - } else if (templateKey == 'long') { + } else if (templateKey === 'long') { setNavPlaceholderBlocks([ createBlock('kadence/navigation', {}, [ createBlock('kadence/navigation-link', { label: 'about', url: '#' }), @@ -555,7 +558,7 @@ export function EditInner(props) { createBlock('kadence/navigation-link', { label: 'shop', url: '#' }), ]), ]); - } else if (templateKey == 'short-vertical') { + } else if (templateKey === 'short-vertical') { setNavPlaceholderBlocks([ createBlock('kadence/navigation', {}, [ createBlock('kadence/navigation-link', { label: 'about', url: '#' }), @@ -563,9 +566,6 @@ export function EditInner(props) { createBlock('kadence/navigation-link', { label: 'contact', url: '#' }), ]), ]); - setMetaAttribute('vertical', 'orientationMobile'); - setMetaAttribute('vertical', 'orientationTablet'); - setMetaAttribute('vertical', 'orientation'); } else { setNavPlaceholderBlocks([ createBlock('kadence/navigation', {}, [ @@ -578,11 +578,11 @@ export function EditInner(props) { }; useEffect(() => { - if (blocks.length == 0) { + if (!blocks || blocks.length == 0) { if (templateKey) { - //this nav is meant to be a premade template, set it's title and publish it, and give it innerblocks based on it's template key + //this nav is meant to be a premade template, set it's title and give it innerblocks based on it's template key applyTemplateKeyBlocks(templateKey); - setTitle(templateKey + ' navigation'); + //setTitle(templateKey + ' navigation'); } else { //otherwise it's a normal nav block and just needs the placeholder put in place setNavPlaceholderBlocks([createBlock('kadence/navigation', {})]); @@ -598,7 +598,7 @@ export function EditInner(props) { } }, [isSelected]); - if (blocks.length === 0) { + if (!blocks || blocks.length === 0) { blocks = navPlaceholderBlocks; } @@ -610,48 +610,41 @@ export function EditInner(props) { return get(blocks, [0], {}); }, [blocks]); - const onAdd = async (title, direction, style, initialDescription) => { - try { - const response = await addNew(); - - if (response.id) { - onChange( - [ - { - ...newBlock, - innerBlocks: [ - createBlock('kadence/navigation-link', { - label: __('Home', 'kadence-blocks'), - url: '/', - }), - ], - }, - ], - clientId - ); - - setTitle(title); - - const updatedMeta = meta; - updatedMeta._kad_navigation_description = initialDescription; - updatedMeta._kad_navigation_orientation = direction === 'skip' ? 'horizontal' : direction; - - // Once we get templates, they'll go here - // if( style === 'a' ) { - // - // } else if ( style === 'b' ) { - // - // } - - setMeta({ ...meta, updatedMeta }); - await wp.data.dispatch('core').saveEditedEntityRecord('postType', 'kadence_navigation', id); - - openModal(); - } - } catch (error) { - console.error(error); - } - }; + // const onAdd = async () => { + // try { + // const response = await addNew(); + // + // if (response.id) { + // onChange( + // [ + // { + // ...newBlock, + // innerBlocks: [ + // createBlock('kadence/navigation-link', { + // label: __('Home', 'kadence-blocks'), + // url: '/', + // }), + // ], + // }, + // ], + // clientId + // ); + // + // // setTitle(''); + // + // const updatedMeta = meta; + // // updatedMeta._kad_navigation_description = initialDescription; + // // updatedMeta._kad_navigation_orientation = direction === 'skip' ? 'horizontal' : direction; + // + // setMeta({ ...meta, updatedMeta }); + // await wp.data.dispatch('core').saveEditedEntityRecord('postType', 'kadence_navigation', id); + // + // openModal(); + // } + // } catch (error) { + // console.error(error); + // } + // }; const navAppender = () => { return ( @@ -709,28 +702,28 @@ export function EditInner(props) { return ( <> - {orientationValue == 'vertical' && ( + {orientationValue === 'vertical' && ( setMetaAttribute(value, 'collapseSubMenus' + size)} /> )} - {orientationValue == 'vertical' && collapseSubMenusValue && ( + {orientationValue === 'vertical' && collapseSubMenusValue && ( setMetaAttribute(value, 'parentTogglesMenus' + size)} /> )} - {orientationValue != 'vertical' && ( + {orientationValue !== 'vertical' && ( setMetaAttribute(value, 'stretch' + size)} /> )} - {orientationValue != 'vertical' && stretchValue && ( + {orientationValue !== 'vertical' && stretchValue && ( { + onChange( + [ + { + ...newBlock, + innerBlocks: [...navigationInnerBlocks, ...navItems], + }, + ], + clientId + ); + }; + + useEffect(() => { + if (navigationInnerBlocks.length === 0 && !templateKey) { + setOpen(true); + } + }, [navigationInnerBlocks.length]); + + if (inTemplatePreviewMode) { + //This displays this block as a preview. It should have some temporary inner blocks to display + //it will not work in any other function. As soon as it's clicked, it should be replaced with a real nav onboarding to make a post. return ( - <> - -
-
+ ); } @@ -915,6 +927,20 @@ export function EditInner(props) { }} )} + {isOpen && ( + + + + )} - {isOpen && ( - - - - )} {!direct && ( <> @@ -952,6 +973,11 @@ export function EditInner(props) { )} + + +
setMetaAttribute(value, 'spacingUnit')} showUnit={true} /> - {(previewOrientation == 'vertical' || - style == 'underline' || + {(previewOrientation === 'vertical' || + style === 'underline' || style === 'standard' || style === '') && ( - - - - )} diff --git a/src/blocks/navigation/edit.js b/src/blocks/navigation/edit.js index d0a5a71c6..e57ab5387 100644 --- a/src/blocks/navigation/edit.js +++ b/src/blocks/navigation/edit.js @@ -66,6 +66,24 @@ export function Edit(props) { fillStretchMobile, } = metaAttributes; + const inTemplatePreviewMode = !id && templateKey; + + const previewOrientation = inTemplatePreviewMode + ? templateKey.includes('vertical') + ? 'vertical' + : 'horizontal' + : orientation; + const previewOrientationTablet = inTemplatePreviewMode + ? templateKey.includes('vertical') + ? 'vertical' + : 'horizontal' + : orientationTablet; + const previewOrientationMobile = inTemplatePreviewMode + ? templateKey.includes('vertical') + ? 'vertical' + : 'horizontal' + : orientationMobile; + const { post, postExists, isLoading, currentPostType, postId } = useSelect( (select) => { return { @@ -81,22 +99,14 @@ export function Edit(props) { [id] ); - const { previewDevice } = useSelect( - (select) => { - return { - previewDevice: select('kadenceblocks/data').getPreviewDeviceType(), - }; - }, - [clientId] - ); - const { addUniqueID } = useDispatch('kadenceblocks/data'); - const { isUniqueID, isUniqueBlock, parentData, isPreviewMode } = useSelect( + const { isUniqueID, isUniqueBlock, parentData, previewDevice, isPreviewMode } = useSelect( (select) => { return { isUniqueID: (value) => select('kadenceblocks/data').isUniqueID(value), isUniqueBlock: (value, clientId) => select('kadenceblocks/data').isUniqueBlock(value, clientId), isPreviewMode: select('core/block-editor').getSettings().__unstableIsPreviewMode, + previewDevice: select('kadenceblocks/data').getPreviewDeviceType(), parentData: { rootBlock: select('core/block-editor').getBlock( select('core/block-editor').getBlockHierarchyRootClientId(clientId) @@ -136,21 +146,17 @@ export function Edit(props) { [`navigation-desktop-layout-fill-stretch-${fillStretch}`]: !previewDevice || previewDevice == 'Desktop', [`navigation-tablet-layout-fill-stretch-${fillStretchTablet}`]: previewDevice == 'Tablet', [`navigation-mobile-layout-fill-stretch-${fillStretchMobile}`]: previewDevice == 'Mobile', - [`navigation-desktop-orientation-${orientation ? orientation : 'horizontal'}`]: + [`navigation-desktop-orientation-${previewOrientation ? previewOrientation : 'horizontal'}`]: !previewDevice || previewDevice == 'Desktop', - [`navigation-tablet-orientation-${orientationTablet ? orientationTablet : 'horizontal'}`]: + [`navigation-tablet-orientation-${previewOrientationTablet ? previewOrientationTablet : 'horizontal'}`]: previewDevice == 'Tablet', - [`navigation-mobile-orientation-${orientationMobile ? orientationMobile : 'horizontal'}`]: + [`navigation-mobile-orientation-${previewOrientationMobile ? previewOrientationMobile : 'horizontal'}`]: previewDevice == 'Mobile', }); const blockProps = useBlockProps({ className: blockClasses, }); - if (isPreviewMode) { - return <>{formTemplateContactIcon}; - } - { /* Directly editing from via kadence_navigation post type */ } @@ -174,16 +180,17 @@ export function Edit(props) { //if this is a templated navigation (usually coming from header onboarding) //then it should get premade with some templated content based on templateKey - useEffect(() => { - if (!id && templateKey) { - makeNavigationPost(); - } - }, []); + // commented out for now because we just make placeholder content instead of an actual post + // useEffect(() => { + // if (!id && templateKey) { + // makeNavigationPost(); + // } + // }, []); return (
{/* No navigation selected or selected navigation was deleted from the site, display chooser */} - {(id === 0 || (undefined === postExists && !isLoading)) && ( + {((id === 0 && !templateKey) || (undefined === postExists && !isLoading)) && ( )} - {/* Navigation selected and loaded, display it */} - {((id > 0 && templateKey) || (id > 0 && !isEmpty(post) && post.status !== 'trash')) && ( + {/* Navigation selected and loaded (or this is a template), display it */} + {((!id && templateKey) || (id > 0 && !isEmpty(post) && post.status !== 'trash')) && ( @@ -282,7 +289,7 @@ export function Edit(props) { export default Edit; function Chooser({ id, post, commit, postExists }) { - const [isAdding, addNew] = useEntityAutoDraft('kadence_navigation', 'kadence_navigation'); + const [isAdding, addNew] = useEntityAutoDraftAndPublish('kadence_navigation', 'kadence_navigation'); const onAdd = async () => { try { const response = await addNew(); diff --git a/src/blocks/posts/edit.js b/src/blocks/posts/edit.js index 8f5cb8f47..6f90bad55 100644 --- a/src/blocks/posts/edit.js +++ b/src/blocks/posts/edit.js @@ -1026,6 +1026,7 @@ function KadencePosts(props) { } > {image && post.featured_image_src_large && post.featured_image_src_large[0] !== undefined && ( + // eslint-disable-next-line jsx-a11y/anchor-is-valid
+ {/* eslint-disable-next-line jsx-a11y/anchor-is-valid */} {authorLink ? ( + // eslint-disable-next-line jsx-a11y/anchor-is-valid {post.author_info.display_name} @@ -1218,6 +1221,7 @@ function KadencePosts(props) { {readmore && (

+ {/* eslint-disable-next-line jsx-a11y/anchor-is-valid */} {readmoreLabel ? readmoreLabel : __('Read More', 'kadence-blocks')} diff --git a/src/blocks/singlebtn/edit.js b/src/blocks/singlebtn/edit.js index a77bfd979..cbe3da303 100644 --- a/src/blocks/singlebtn/edit.js +++ b/src/blocks/singlebtn/edit.js @@ -2406,7 +2406,7 @@ export default function KadenceButtonEdit(props) { {!isDynamicReplaced && ( setAttributes({ text: value })} allowedFormats={applyFilters( diff --git a/src/blocks/spacer/edit.js b/src/blocks/spacer/edit.js index 80f5a5cde..08fe3d48f 100644 --- a/src/blocks/spacer/edit.js +++ b/src/blocks/spacer/edit.js @@ -316,7 +316,7 @@ function KadenceSpacerDivider(props) { mobileValue={mobileDividerWidth ? mobileDividerWidth : ''} onChangeMobile={(value) => setAttributes({ mobileDividerWidth: value })} min={0} - max={dividerWidthUnits == 'px' ? 3000 : 100} + max={dividerWidthUnits === 'px' ? 3000 : 100} step={1} unit={dividerWidthUnits} onUnit={(value) => setAttributes({ dividerWidthUnits: value })} diff --git a/src/blocks/tabs/deprecated.js b/src/blocks/tabs/deprecated.js index 9c55e671d..6a38f2c12 100644 --- a/src/blocks/tabs/deprecated.js +++ b/src/blocks/tabs/deprecated.js @@ -100,7 +100,8 @@ export default [ value={ titles[index] && titles[index].text ? titles[index].text - : sprintf(__('Tab %d'), 1 + index) + : // translators: %d: Tab number + sprintf(__('Tab %d'), 1 + index) } className={'kt-title-text'} /> @@ -115,7 +116,8 @@ export default [ value={ titles[index] && titles[index].text ? titles[index].text - : sprintf(__('Tab %d'), 1 + index) + : // translators: %d: Tab number + sprintf(__('Tab %d'), 1 + index) } className={'kt-title-text'} /> @@ -505,7 +507,8 @@ export default [ value={ titles[index] && titles[index].text ? titles[index].text - : sprintf(__('Tab %d'), 1 + index) + : // translators: %d: Tab number + sprintf(__('Tab %d'), 1 + index) } className={'kt-title-text'} /> @@ -520,7 +523,8 @@ export default [ value={ titles[index] && titles[index].text ? titles[index].text - : sprintf(__('Tab %d'), 1 + index) + : // translators: %d: Tab number + sprintf(__('Tab %d'), 1 + index) } className={'kt-title-text'} /> @@ -914,7 +918,8 @@ export default [ value={ titles[index] && titles[index].text ? titles[index].text - : sprintf(__('Tab %d'), 1 + index) + : // translators: %d: Tab number + sprintf(__('Tab %d'), 1 + index) } className={'kt-title-text'} /> @@ -929,7 +934,8 @@ export default [ value={ titles[index] && titles[index].text ? titles[index].text - : sprintf(__('Tab %d'), 1 + index) + : // translators: %d: Tab number + sprintf(__('Tab %d'), 1 + index) } className={'kt-title-text'} /> @@ -1250,7 +1256,8 @@ export default [ value={ titles[index] && titles[index].text ? titles[index].text - : sprintf(__('Tab %d'), 1 + index) + : // translators: %d: Tab number + sprintf(__('Tab %d'), 1 + index) } className={'kt-title-text'} /> diff --git a/src/blocks/tabs/edit.js b/src/blocks/tabs/edit.js index 989f52d4c..5ee68e8f0 100644 --- a/src/blocks/tabs/edit.js +++ b/src/blocks/tabs/edit.js @@ -1419,6 +1419,7 @@ function KadenceTabs(props) { const newtabs = titles; // Translators: %d is the tab number. newtabs.push({ + // translators: %d: Tab number text: sprintf(__('Tab %d', 'kadence-blocks'), tabCount + 1), icon: titles[0].icon, iconSide: titles[0].iconSide, diff --git a/src/blocks/tabs/save.js b/src/blocks/tabs/save.js index b94e841a3..c0665a16a 100644 --- a/src/blocks/tabs/save.js +++ b/src/blocks/tabs/save.js @@ -93,7 +93,8 @@ function KadenceTabsSave({ attributes }) { value={ titles[index] && titles[index].text ? titles[index].text - : sprintf(__('Tab %d'), 1 + index) + : // translators: %d: Tab number + sprintf(__('Tab %d'), 1 + index) } className={'kt-title-text'} /> @@ -109,7 +110,8 @@ function KadenceTabsSave({ attributes }) { value={ titles[index] && titles[index].text ? titles[index].text - : sprintf(__('Tab %d'), 1 + index) + : // translators: %d: Tab number + sprintf(__('Tab %d'), 1 + index) } className={'kt-title-text'} /> diff --git a/src/blocks/testimonial/carousel-item-wrap.js b/src/blocks/testimonial/carousel-item-wrap.js index 72d4a1740..3a1085024 100644 --- a/src/blocks/testimonial/carousel-item-wrap.js +++ b/src/blocks/testimonial/carousel-item-wrap.js @@ -13,6 +13,11 @@ export default function TestimonialItemWrap(props) { const columns = context['kadence/testimonials-columns']; const gap = context['kadence/testimonials-gap']; const gapUnit = context['kadence/testimonials-gap-unit']; + + if (layout && layout !== 'carousel') { + return props.children; + } + const previewColumns = getPreviewSize( previewDevice, undefined !== columns?.[0] ? columns[0] : 3, @@ -26,9 +31,7 @@ export default function TestimonialItemWrap(props) { undefined !== gap?.[2] ? gap[2] : '' ); const gapSize = getGapSizeOptionOutput(previewGap, gapUnit ? gapUnit : 'px'); - if (layout && layout !== 'carousel') { - return props.children; - } + return (

-
- -
+
{/**/}
@@ -68,9 +66,7 @@ class KadenceDashboard extends Component { case 'help': return ( - - - + {/**/} ); case 'changelog': diff --git a/src/early-filters.js b/src/early-filters.js index b82241af4..3753e35a9 100644 --- a/src/early-filters.js +++ b/src/early-filters.js @@ -81,13 +81,14 @@ const kadenceHeaderTemplatePartNotice = createHigherOrderComponent((BlockEdit) = const showNotice = isHeaderTemplate && props.clientId === firstBlock && !blockExists(blocks, 'kadence/header'); const { getEntityRecord } = select('core'); const { saveEntityRecord } = useDispatch('core'); + const { removeBlocks, insertBlock } = useDispatch('core/block-editor'); const siteSettings = getEntityRecord('root', 'site'); const isNoticeDismissed = get(siteSettings, 'kadence_blocks_header_notice_dismissed', false); const deleteBlocksAndInsert = () => { - useDispatch('core/block-editor').removeBlocks(blocks.map((block) => block.clientId)); - useDispatch('core/block-editor').insertBlock(createBlock('kadence/header', {})); + removeBlocks(blocks.map((block) => block.clientId)); + insertBlock(createBlock('kadence/header', {})); saveEntityRecord('root', 'site', { kadence_blocks_header_notice_dismissed: true, }); diff --git a/src/extension/image-picker/components/Result.js b/src/extension/image-picker/components/Result.js index fb58aab5b..df9eb52aa 100755 --- a/src/extension/image-picker/components/Result.js +++ b/src/extension/image-picker/components/Result.js @@ -1,7 +1,7 @@ import classNames from 'classnames'; import { Button, Icon } from '@wordpress/components'; import { download as DownloadIcon, check as CheckIcon } from '@wordpress/icons'; -import { useState, useEffect } from '@wordpress/element'; +import { useState, useEffect, useRef } from '@wordpress/element'; import { useSelect, useDispatch } from '@wordpress/data'; import downloadToMediaLibrary from '../functions/downloadToMediaLibrary'; import { __ } from '@wordpress/i18n'; @@ -52,7 +52,7 @@ export default function Result(props) { setLocalIsDownloading(false); } }, [isDownloading]); - const resultButton = React.useRef(null); + const resultButton = useRef(null); const isCurrent = index == currentUserSelectionIndex; diff --git a/src/extension/image-picker/components/SearchForm.js b/src/extension/image-picker/components/SearchForm.js index 383d9b7f3..d80573070 100644 --- a/src/extension/image-picker/components/SearchForm.js +++ b/src/extension/image-picker/components/SearchForm.js @@ -15,7 +15,7 @@ export default function SearchForm(props) {
{ diff --git a/src/packages/components/src/inline-pop-color/index.js b/src/packages/components/src/inline-pop-color/index.js index 8c31196c7..0c22df165 100644 --- a/src/packages/components/src/inline-pop-color/index.js +++ b/src/packages/components/src/inline-pop-color/index.js @@ -11,7 +11,7 @@ import { hexToRGBA } from '@kadence/helpers'; import { map }from 'lodash'; import { useSetting } from '@wordpress/block-editor'; import { useState } from '@wordpress/element'; - + /** * Internal block libraries */ @@ -26,7 +26,6 @@ import { Path, } from '@wordpress/components'; import { DOWN } from '@wordpress/keycodes'; - /* global kadence_blocks_params */ // eslint-disable-next-line camelcase const ColorSelectorSVGIcon = () => ( diff --git a/src/packages/components/src/inspector-control-tabs/editor.scss b/src/packages/components/src/inspector-control-tabs/editor.scss index 542ebe28c..44a026be0 100644 --- a/src/packages/components/src/inspector-control-tabs/editor.scss +++ b/src/packages/components/src/inspector-control-tabs/editor.scss @@ -1,11 +1,11 @@ -$color-gray-200: #EDF2F7; -$color-gray-300: #E2E8F0; -$color-gray-400: #CBD5E0; -$color-gray-500: #A0AEC0; +$color-gray-200: #edf2f7; +$color-gray-300: #e2e8f0; +$color-gray-400: #cbd5e0; +$color-gray-500: #a0aec0; $color-gray-600: #718096; -$color-gray-700: #4A5568; -$color-gray-800: #2D3748; -.kadence-blocks-inspector-tabs{ +$color-gray-700: #4a5568; +$color-gray-800: #2d3748; +.kadence-blocks-inspector-tabs { display: flex; //margin-bottom: -1px; div { @@ -19,34 +19,32 @@ $color-gray-800: #2D3748; flex-direction: column; align-items: center; justify-content: center; - background-color: #FFF; + background-color: #fff; height: 75px; - color:#4A5568; + color: #4a5568; line-height: 1.8; border: 0; - background: #EDF2F7; - border-top: 1px solid #CBD5E0; + background: #edf2f7; + border-top: 1px solid #cbd5e0; //border-bottom: 1px solid #e0e0e0; svg { fill: currentColor; } &:hover { - color: #2D3748; + color: #2d3748; } } .is-active { box-shadow: inset 0 -3px 0px 0px var(--wp-admin-theme-color, #00669b); //background-color: #f0f0f0; - color: #2D3748; + color: #2d3748; background: white; //border-bottom: 3px solid var(--wp-admin-theme-color, #00669b); svg { - // color: var(--wp-admin-theme-color, #00669b); + // color: var(--wp-admin-theme-color, #00669b); } } - - } [data-kadence-hide-advanced="true"] { @@ -55,20 +53,20 @@ $color-gray-800: #2D3748; } } .components-panel[data-kadence-hide-advanced] .block-editor-block-card__description { - display: none; + display: none; } .components-panel[data-kadence-hide-advanced] .block-editor-block-card__content .block-editor-block-card__title { - margin: 0; + margin: 0; } .components-panel[data-kadence-hide-advanced] .block-editor-block-card__content { - margin: 0; + margin: 0; } .components-panel[data-kadence-hide-advanced] .block-editor-block-inspector .components-panel__body { - border-color: #CBD5E0; + border-color: #cbd5e0; } .components-panel[data-kadence-hide-advanced] .components-base-control__label { - font-size: inherit; - text-transform: inherit; + font-size: inherit; + text-transform: inherit; } // Hover Tab Styles @@ -76,12 +74,12 @@ $color-gray-800: #2D3748; .kt-hover-tabs { padding-top: 0; } - .kt-hover-tabs .components-tab-panel__tabs { + .kt-hover-tabs .components-tab-panel__tabs { margin-bottom: 15px; border: 0; } .kt-hover-tabs .components-tab-panel__tabs button { - border: 1px solid #CBD5E0; + border: 1px solid #cbd5e0; height: 34px; padding: 4px 5px 4px; color: #575757; @@ -90,13 +88,25 @@ $color-gray-800: #2D3748; width: 50%; background: transparent; box-shadow: none !important; - color: #4A5568; + color: #4a5568; } .kt-hover-tabs .components-tab-panel__tabs button.active-tab { box-shadow: none; - color: #2D3748; + color: #2d3748; background: rgba(0, 0, 0, 0.04); - background: #EDF2F7; + background: #edf2f7; border-color: var(--wp-admin-theme-color, #00669b); } -} \ No newline at end of file +} + +//extra highlighting for panels opened within panels +.components-panel__body .components-panel__body.is-opened { + border-bottom-right-radius: 10px; + border-bottom-left-radius: 10px; + overflow: auto; + background: #efefef; + + .components-panel__body-title:hover { + background-color: #d5d5d5; + } +} diff --git a/src/packages/components/src/onboarding-modal/editor.scss b/src/packages/components/src/onboarding-modal/editor.scss index 78a9cbf4b..f2a626f59 100644 --- a/src/packages/components/src/onboarding-modal/editor.scss +++ b/src/packages/components/src/onboarding-modal/editor.scss @@ -23,87 +23,145 @@ display: flex; justify-content: center; padding: 0 30px 30px 30px; + } - .width-m { - max-width: 600px; - width: 100%; + .body-name { + display: flex; + } + + .width-m { + max-width: 600px; + width: 100%; + } + + .width-l { + max-width: 850px; + width: 100%; + padding-bottom: 50px; + } + + .form-container { + flex: 1; + padding: 20px; + display: flex; + flex-direction: column; + margin-left: 25px; + } + + // desktop and tablet only + @media (min-width: 769px) { + .form-container { + min-width: 400px; + } + } + + .form-container input, .form-container textarea { + margin-bottom: 20px; + padding: 20px 10px; + font-size: 16px; + border: 1px solid #ccc; + border-radius: 4px; + width: 100%; + } + + @media (max-width: 768px) { + .image { + display: none !important; } - .width-l { - max-width: 850px; + .form-container { width: 100%; + padding: 20px; } + } - input[type=text], input[type=textarea] { + .width-f { + display: flex; + flex: 1; - } + .image { + margin-top: -80px; + margin-left: -30px; + background-color: #011227; + //flex: 1; + height: calc(100vh - 70px); /* Adjust height to span to footer */ - .type-selection { display: flex; - border-bottom: 1px solid #d9d9d9; + align-items: baseline; + justify-content: center; - .is-pressed { - border-bottom: 1px solid #000 !important; - background: #FFF; - color: #000; - font-weight: bold; + img { + max-height: 86vh; + max-width: 100%; } } - .options { - display: flex; - flex-wrap: wrap; - justify-content: space-between; - margin-top: 20px; - text-align: center; - //overflow-y: scroll; - - &.options-mobile .option:not(.blank) { - width: 48%; - } + } - .blank { - padding: 20px; - border: 2px dashed #d9d9d9; - border-radius: 5px; + .type-selection { + display: flex; + border-bottom: 1px solid #d9d9d9; - .components-button:focus { - outline: none; - box-shadow: none; - } + .is-pressed { + border-bottom: 1px solid #000 !important; + background: #FFF; + color: #000; + font-weight: bold; + } + } - &:hover { - border: 2px dashed #0073e6; - } + .options { + display: flex; + flex-wrap: wrap; + justify-content: space-between; + margin-top: 20px; + text-align: center; - &.is-selected { - border: 2px dashed #0073e6; - } + &.options-mobile .option:not(.blank) { + width: 48%; + } + + .blank { + padding: 20px; + border: 2px dashed #d9d9d9; + border-radius: 5px; + + .components-button:focus { + outline: none; + box-shadow: none; } - .option { - width: 100%; - margin-bottom: 25px; + &:hover { + border: 2px dashed #0073e6; } - .option-mobile { - width: 48%; - margin-bottom: 20px; + &.is-selected { + border: 2px dashed #0073e6; } + } - .option-image { - margin-bottom: 10px; - border: 2px solid #d9d9d9; - border-radius: 5px; - cursor: pointer; + .option { + width: 100%; + margin-bottom: 25px; + } - &:hover { - border: 2px solid #0073e6; - } + .option-mobile { + width: 48%; + margin-bottom: 20px; + } - &.is-selected { - border: 2px solid #0073e6; - } + .option-image { + margin-bottom: 10px; + border: 2px solid #d9d9d9; + border-radius: 5px; + cursor: pointer; + + &:hover { + border: 2px solid #0073e6; + } + + &.is-selected { + border: 2px solid #0073e6; } } } diff --git a/src/packages/components/src/onboarding-modal/index.js b/src/packages/components/src/onboarding-modal/index.js index b6c13743f..f9bc31c6c 100644 --- a/src/packages/components/src/onboarding-modal/index.js +++ b/src/packages/components/src/onboarding-modal/index.js @@ -62,8 +62,7 @@ const OnboardingModal = ({ steps, isOpen, onRequestClose, onSubmit }) => {
- {/*{JSON.stringify(formData)}
*/} -
+
{React.createElement(steps[currentStep].component, { data: formData, onChange: (data) => handleChange(data), diff --git a/src/packages/components/src/panel-body/index.js b/src/packages/components/src/panel-body/index.js index f51f01abc..86fdd3297 100644 --- a/src/packages/components/src/panel-body/index.js +++ b/src/packages/components/src/panel-body/index.js @@ -7,25 +7,44 @@ import { withSelect, withDispatch } from '@wordpress/data' import { showSettings } from '@kadence/helpers'; import { get } from 'lodash'; -function KadencePanelBody ({ - children, - title, - initialOpen = true, - isOpened, - toggleOpened, - className = '', - icon = '', - buttonProps = {}, - blockSlug = false, - index = false, - panelName - }) { +const proSvg = + + + Pro + +; + +function KadencePanelBody( { + children, + title, + initialOpen = true, + isOpened, + toggleOpened, + className = '', + icon = '', + buttonProps = {}, + blockSlug = false, + index = false, + proTag = false, + panelName, + } ) { /* If the block slug is set, check the panel name against the allowed settings for the user */ if( blockSlug !== false && !showSettings( panelName, blockSlug ) ) { return null; } + if( proTag ) { + buttonProps.icon = proSvg; + buttonProps.iconPosition = 'right'; + } + return ( { getPosts(); }, [ tab, page ] ); @@ -89,7 +99,7 @@ export default function PostSelectorCheckbox( { postType = 'posts', title = '', apiFetch( { - path : addQueryArgs( `/wp/v2/${postType}`, args), + path : addQueryArgs( `/wp/v2/${ correctPostType(postType) }`, args), parse: false, } ) .then( ( response ) => { diff --git a/src/packages/components/src/range/range-control/index.js b/src/packages/components/src/range/range-control/index.js index f698305b3..1c161755c 100644 --- a/src/packages/components/src/range/range-control/index.js +++ b/src/packages/components/src/range/range-control/index.js @@ -30,6 +30,7 @@ export default function RangeControl({ lockUnits = false, units = ['px', 'em', 'rem'], reset, + initialPosition = undefined, }) { return [ onChange && ( @@ -58,6 +59,7 @@ export default function RangeControl({ step={step} help={help} allowReset={true} + initialPosition={initialPosition} />
{(onUnit || showUnit) && ( diff --git a/src/packages/components/src/range/responsive-range-control/index.js b/src/packages/components/src/range/responsive-range-control/index.js index 375283443..c082cae83 100644 --- a/src/packages/components/src/range/responsive-range-control/index.js +++ b/src/packages/components/src/range/responsive-range-control/index.js @@ -37,6 +37,7 @@ export default function ResponsiveRangeControls({ units = ['px', 'em', 'rem'], allowEmpty = true, className = '', + initialPosition = undefined, reset, }) { const [deviceType, setDeviceType] = useState('Desktop'); @@ -84,6 +85,7 @@ export default function ResponsiveRangeControls({ showUnit={showUnit} units={units} lockUnits={allowResponsiveUnitChange ? false : true} + initialPosition={initialPosition} /> ); output.Tablet = ( @@ -98,6 +100,7 @@ export default function ResponsiveRangeControls({ showUnit={showUnit} units={units} lockUnits={allowResponsiveUnitChange ? false : true} + initialPosition={initialPosition} /> ); output.Desktop = ( @@ -111,6 +114,7 @@ export default function ResponsiveRangeControls({ onUnit={onUnit} showUnit={showUnit} units={units} + initialPosition={initialPosition} /> ); return [ diff --git a/src/packages/components/src/typography/inline-typography-control/index.js b/src/packages/components/src/typography/inline-typography-control/index.js index af30542bd..08a80dce0 100644 --- a/src/packages/components/src/typography/inline-typography-control/index.js +++ b/src/packages/components/src/typography/inline-typography-control/index.js @@ -3,8 +3,6 @@ * */ -/* global kadence_blocks_params */ - /** * Import External diff --git a/src/packages/components/src/typography/typography-control/index.js b/src/packages/components/src/typography/typography-control/index.js index 0ce0ebaf2..e37d11531 100644 --- a/src/packages/components/src/typography/typography-control/index.js +++ b/src/packages/components/src/typography/typography-control/index.js @@ -3,8 +3,6 @@ * */ -/* global kadence_blocks_params */ - /** * Internal block libraries */ diff --git a/src/packages/helpers/src/convert-color/index.js b/src/packages/helpers/src/convert-color/index.js index cedbd9067..0616cc999 100644 --- a/src/packages/helpers/src/convert-color/index.js +++ b/src/packages/helpers/src/convert-color/index.js @@ -3,7 +3,6 @@ * @param {string} string the word string. * @returns {string} with var if needed. */ -/* global kadence_blocks_params */ import hexToRGBA from '../hex-to-rgba'; // eslint-disable-next-line camelcase diff --git a/src/packages/helpers/src/deprecated-kadence-color-output/index.js b/src/packages/helpers/src/deprecated-kadence-color-output/index.js index c495ecab9..498d4b2f9 100644 --- a/src/packages/helpers/src/deprecated-kadence-color-output/index.js +++ b/src/packages/helpers/src/deprecated-kadence-color-output/index.js @@ -3,7 +3,6 @@ * @param {string} string the word string. * @returns {string} with var if needed. */ -/* global kadence_blocks_params */ import hexToRGBA from '../hex-to-rgba'; // eslint-disable-next-line camelcase diff --git a/src/packages/helpers/src/kadence-color-output/index.js b/src/packages/helpers/src/kadence-color-output/index.js index c495ecab9..498d4b2f9 100644 --- a/src/packages/helpers/src/kadence-color-output/index.js +++ b/src/packages/helpers/src/kadence-color-output/index.js @@ -3,7 +3,6 @@ * @param {string} string the word string. * @returns {string} with var if needed. */ -/* global kadence_blocks_params */ import hexToRGBA from '../hex-to-rgba'; // eslint-disable-next-line camelcase diff --git a/src/plugins/block-defaults/typography-defaults.js b/src/plugins/block-defaults/typography-defaults.js index 0ec6cb41a..5a58983af 100644 --- a/src/plugins/block-defaults/typography-defaults.js +++ b/src/plugins/block-defaults/typography-defaults.js @@ -1,5 +1,3 @@ -/* global kadence_blocks_params */ - import { Component, Fragment, useEffect, useState } from '@wordpress/element'; import { ToggleControl, Button, Tooltip, Modal, Dashicon } from '@wordpress/components'; diff --git a/src/plugins/block-globals/typography.js b/src/plugins/block-globals/typography.js index c5489b175..43ee4a291 100644 --- a/src/plugins/block-globals/typography.js +++ b/src/plugins/block-globals/typography.js @@ -1,4 +1,3 @@ -/* global kadence_blocks_params */ import { TypographyControls, MeasurementControls, PopColorControl } from '@kadence/components'; import { map, debounce } from 'lodash'; /** diff --git a/src/plugins/prebuilt-library/ai-wizard/components/chips-input/index.js b/src/plugins/prebuilt-library/ai-wizard/components/chips-input/index.js index 9be39e02c..b5e97e8cc 100644 --- a/src/plugins/prebuilt-library/ai-wizard/components/chips-input/index.js +++ b/src/plugins/prebuilt-library/ai-wizard/components/chips-input/index.js @@ -43,12 +43,12 @@ export function ChipsInput(props) { function maybeUpdateTags() { const trimmedInput = inputValue.replace(',', '').trim(); const newSelectedItems = [...tags]; - const duplicatedValues = newSelectedItems.indexOf(trimmedInput); if (trimmedInput.length === 0) { return; } + const duplicatedValues = newSelectedItems.indexOf(trimmedInput); if (duplicatedValues !== -1) { setInputValue(''); return; diff --git a/src/plugins/prebuilt-library/ai-wizard/components/photo-collection/index.js b/src/plugins/prebuilt-library/ai-wizard/components/photo-collection/index.js index e0b81345a..624ff4201 100644 --- a/src/plugins/prebuilt-library/ai-wizard/components/photo-collection/index.js +++ b/src/plugins/prebuilt-library/ai-wizard/components/photo-collection/index.js @@ -211,12 +211,12 @@ export function PhotoCollection({ photos, loading, isLocal, collectionLink, titl
{loading && (
- {__('Loading...', 'kadence-blocks')} + {__('Loading…', 'kadence-blocks')}
)} {isDownloading && (
- {__('Importing Images...', 'kadence-blocks')} + {__('Importing Images…', 'kadence-blocks')}
)}
diff --git a/src/plugins/prebuilt-library/ai-wizard/components/wizard/index.js b/src/plugins/prebuilt-library/ai-wizard/components/wizard/index.js index 0aa643b6d..a2f4a608e 100644 --- a/src/plugins/prebuilt-library/ai-wizard/components/wizard/index.js +++ b/src/plugins/prebuilt-library/ai-wizard/components/wizard/index.js @@ -8,7 +8,7 @@ import classnames from 'classnames'; */ import { useState, useEffect, useRef } from '@wordpress/element'; import { Modal } from '@wordpress/components'; -import { __ } from '@wordpress/i18n'; +import { __, sprintf } from '@wordpress/i18n'; import { focus } from '@wordpress/dom'; /** diff --git a/src/plugins/prebuilt-library/ai-wizard/pages/about-your-site.js b/src/plugins/prebuilt-library/ai-wizard/pages/about-your-site.js index 06bc9d62c..2a3043553 100644 --- a/src/plugins/prebuilt-library/ai-wizard/pages/about-your-site.js +++ b/src/plugins/prebuilt-library/ai-wizard/pages/about-your-site.js @@ -142,13 +142,13 @@ export function AboutYourSite() { if (entityType === ENTITY_TYPE_INDIVIDUAL) { return sprintf( // translators: %s: company or individual name - __('I am %s, a...', 'kadence-blocks'), + __('I am %s, a…', 'kadence-blocks'), companyName ); } return sprintf( // translators: %s: company or individual name - __('%s is a...', 'kadence-blocks'), + __('%s is a…', 'kadence-blocks'), companyName ); } diff --git a/src/plugins/prebuilt-library/ai-wizard/pages/the-details.js b/src/plugins/prebuilt-library/ai-wizard/pages/the-details.js index d38e1920f..6c9a5df92 100644 --- a/src/plugins/prebuilt-library/ai-wizard/pages/the-details.js +++ b/src/plugins/prebuilt-library/ai-wizard/pages/the-details.js @@ -193,7 +193,7 @@ export function TheDetails() { id="2" label={__('Keywords', 'kadence-blocks')} hideLabelFromVision - placeholder={__('Add Keyword...', 'kadence-blocks')} + placeholder={__('Add Keyword…', 'kadence-blocks')} tags={keywords} maxTags={maxTags} selectedTags={(selectedTags) => diff --git a/src/plugins/prebuilt-library/ai-wizard/utils/verticals-helper.js b/src/plugins/prebuilt-library/ai-wizard/utils/verticals-helper.js index 5629ab9fe..fe2e7f8f4 100644 --- a/src/plugins/prebuilt-library/ai-wizard/utils/verticals-helper.js +++ b/src/plugins/prebuilt-library/ai-wizard/utils/verticals-helper.js @@ -14,7 +14,7 @@ export function verticalsHelper() { if (!cachedData) { getVerticalsFromProphecy(); } else { - setPexelLinks(SafeParseJSON(cachedData, false)); + // setPexelLinks(SafeParseJSON(cachedData, false)); setLoading(false); } }, []); diff --git a/src/plugins/prebuilt-library/cloud-library.js b/src/plugins/prebuilt-library/cloud-library.js index 1f6f3ade6..ecffa8a76 100644 --- a/src/plugins/prebuilt-library/cloud-library.js +++ b/src/plugins/prebuilt-library/cloud-library.js @@ -555,7 +555,7 @@ function CloudSections({ importContent, clientId, reload = false, onReload, tab, {!isError && isImporting && (
-

{__('Preparing Content...', 'kadence-blocks')}

+

{__('Preparing Content…', 'kadence-blocks')}

)} {isError && ( @@ -611,7 +611,7 @@ function CloudSections({ importContent, clientId, reload = false, onReload, tab, (keywords && keywords.some((x) => x.toLowerCase().includes(search.toLowerCase())))) ) { return ( -
+
)} {isError && isErrorType === 'general' && ( @@ -1456,7 +1456,7 @@ function PatternLibrary({ importContent, clientId, reload = false, onReload }) { {!isError && isImporting && (
-

{__('Preparing Content...', 'kadence-blocks')}

+

{__('Preparing Content…', 'kadence-blocks')}

)} {isError && isErrorType === 'general' && ( diff --git a/src/plugins/prebuilt-library/pattern-list.js b/src/plugins/prebuilt-library/pattern-list.js index ff0c9988c..ae3065c6b 100644 --- a/src/plugins/prebuilt-library/pattern-list.js +++ b/src/plugins/prebuilt-library/pattern-list.js @@ -16,17 +16,6 @@ import { Icon, __experimentalHeading as Heading, } from '@wordpress/components'; -import { - arrowLeft, - download, - previous, - next, - chevronLeft, - chevronDown, - update, - close, - plusCircle, -} from '@wordpress/icons'; import { kadenceNewIcon, aiIcon, aiSettings } from '@kadence/icons'; import { tryParseJSON } from '@kadence/helpers'; import { useMemo, useEffect, useState } from '@wordpress/element'; @@ -81,7 +70,7 @@ function BannerHeader({ selectedCategory }) { )} - {selectedCategory == 'post-loop' && ( + {selectedCategory === 'post-loop' && ( <> {__('These patterns require you to have some posts.', 'kadence-blocks')}{' '} @@ -208,6 +197,7 @@ function GenerateHeader({ context, contextLabel, contextState, generateContext } } function LaunchWizard({ launchWizard }) { const launchWizardHeadline = __('Supercharge your web design process with Kadence AI', 'kadence-blocks'); + // eslint-disable-next-line @wordpress/i18n-no-collapsible-whitespace const launchWizardBody = __( `To fill your library with thoughtful, relevant, and unique content, simply enter your site goals and information into our prompt wizard. Our design library includes context-driven design patterns that are easy to use, saving you time and effort during the design process. It @@ -346,6 +336,7 @@ function ProOnlyHeader({ launchWizard }) { const data_key = window?.kadence_blocks_params?.proData?.api_key ? kadence_blocks_params.proData.api_key : ''; const activateLink = window?.kadence_blocks_params?.homeLink ? kadence_blocks_params.homeLink : ''; const hasPro = kadence_blocks_params.pro && kadence_blocks_params.pro === 'true' ? true : false; + // eslint-disable-next-line @wordpress/i18n-no-collapsible-whitespace const launchWizardBody = __( `Fill your library with thoughtful, relevant, and unique content. It only takes a few minutes to get started.`, @@ -861,7 +852,7 @@ function PatternList({ >
-

{__('Preparing Content...', 'kadence-blocks')}

+

{__('Preparing Content…', 'kadence-blocks')}

diff --git a/src/plugins/prebuilt-library/pattern-preview/shadow.js b/src/plugins/prebuilt-library/pattern-preview/shadow.js index 4621fa85f..7a3da1356 100644 --- a/src/plugins/prebuilt-library/pattern-preview/shadow.js +++ b/src/plugins/prebuilt-library/pattern-preview/shadow.js @@ -2,7 +2,7 @@ * WordPress dependencies */ import { useResizeObserver } from '@wordpress/compose'; -import { useState, useMemo, useRef, useEffect } from '@wordpress/element'; +import { useState, useRef, useEffect } from '@wordpress/element'; import { Disabled, Spinner } from '@wordpress/components'; import root from 'react-shadow'; diff --git a/src/plugins/prebuilt-library/preview-item.js b/src/plugins/prebuilt-library/preview-item.js index ed43e0248..bfcb8ba4b 100644 --- a/src/plugins/prebuilt-library/preview-item.js +++ b/src/plugins/prebuilt-library/preview-item.js @@ -12,25 +12,16 @@ const { localStorage } = window; */ import { debounce } from 'lodash'; import Masonry from 'react-masonry-css'; -import AutoHeightBlockPreview from '../auto'; +import AutoHeightBlockPreview from './block-preview/auto'; /** * WordPress dependencies */ const { applyFilters } = wp.hooks; -import { withSelect, withDispatch, useSelect } from '@wordpress/data'; -import { rawHandler } from '@wordpress/blocks'; -import { Button, TextControl, SelectControl, VisuallyHidden, ExternalLink, Spinner } from '@wordpress/components'; -import { arrowLeft, download, previous, update, next, chevronLeft, chevronDown } from '@wordpress/icons'; -import { __, sprintf } from '@wordpress/i18n'; -import { useDisabled, useMergeRefs } from '@wordpress/compose'; -import { memo, useMemo } from '@wordpress/element'; -import { - BlockEditorProvider, - __experimentalBlockPatternsList, - store as blockEditorStore, -} from '@wordpress/block-editor'; +import { useSelect } from '@wordpress/data'; +import { useMemo } from '@wordpress/element'; +import { BlockEditorProvider, store as blockEditorStore } from '@wordpress/block-editor'; export function PreviewItem({ blocks, diff --git a/src/plugins/prebuilt-library/replace/replace-images.js b/src/plugins/prebuilt-library/replace/replace-images.js index a68f2d6fb..8a4c38d90 100644 --- a/src/plugins/prebuilt-library/replace/replace-images.js +++ b/src/plugins/prebuilt-library/replace/replace-images.js @@ -25,7 +25,7 @@ export default function replaceImages(content, images, categories, context, vari const aRoll = images.data?.[0]?.images; const bRoll = images.data?.[1]?.images || images.data?.[0]?.images; let pRoll = images.data?.[2]?.images; - if (!pRoll && categories?.[0] == 'team' && teamCollection?.data?.[0]?.images) { + if (!pRoll && categories?.[0] === 'team' && teamCollection?.data?.[0]?.images) { pRoll = teamCollection?.data?.[0]?.images; } if (!pRoll) { diff --git a/src/plugins/prebuilt-library/single-template-library.js b/src/plugins/prebuilt-library/single-template-library.js index b70f952f1..adb8884ef 100644 --- a/src/plugins/prebuilt-library/single-template-library.js +++ b/src/plugins/prebuilt-library/single-template-library.js @@ -198,7 +198,7 @@ class SingleTemplateLibrary extends Component { {!this.state.errorItems && this.state.isImporting && (
-

{__('Preparing Content...', 'kadence-blocks')}

+

{__('Preparing Content…', 'kadence-blocks')}

)} {this.state.errorItems && ( diff --git a/src/plugins/prebuilt-library/templates-library.js b/src/plugins/prebuilt-library/templates-library.js index 975c3a24b..f06ea15d1 100644 --- a/src/plugins/prebuilt-library/templates-library.js +++ b/src/plugins/prebuilt-library/templates-library.js @@ -211,7 +211,7 @@ class TemplatesLibrary extends Component { {!this.state.errorItems && this.state.isImporting && (
-

{__('Preparing Content...', 'kadence-blocks')}

+

{__('Preparing Content…', 'kadence-blocks')}

)} {this.state.errorItems && ( diff --git a/src/plugins/settings.js b/src/plugins/settings.js index fd4afe94b..2a75dd97d 100644 --- a/src/plugins/settings.js +++ b/src/plugins/settings.js @@ -1,6 +1,5 @@ import { useState } from '@wordpress/element'; -import { Dashicon, Tooltip, SelectControl, Button, Modal, ToggleControl } from '@wordpress/components'; -import { map } from 'lodash'; +import { ToggleControl } from '@wordpress/components'; import { useDispatch } from '@wordpress/data'; import { store as noticesStore } from '@wordpress/notices'; @@ -39,7 +38,7 @@ function KadenceSetting(props) { return ( <> - {type == 'toggle' && ( + {type === 'toggle' && ( null ]; + $attributes = []; $captchaSettings = new Kadence_Blocks_Form_Captcha_Settings( $attributes ); - $this->assertFalse($captchaSettings->using_kadence_blocks_settings); + $this->assertTrue($captchaSettings->using_kadence_blocks_settings); $attributes = [ 'useKbSettings' => true ]; $captchaSettings = new Kadence_Blocks_Form_Captcha_Settings( $attributes ); $this->assertTrue($captchaSettings->using_kadence_blocks_settings); + + $attributes = [ 'useKbSettings' => false ]; + $captchaSettings = new Kadence_Blocks_Form_Captcha_Settings( $attributes ); + $this->assertFalse($captchaSettings->using_kadence_blocks_settings); + } + + public function testBlankDefaults() { + $attributes = []; + $captchaSettings = new Kadence_Blocks_Form_Captcha_Settings( $attributes ); + $this->assertEquals('googlev2', $captchaSettings->service); } public function testGetCaptchaService() { @@ -56,19 +66,19 @@ public function testGetCaptchaService() { public function testGetPublicKey () { // Using Block settings - $attributes = [ 'type' => '', 'recaptchaSiteKey' => 'my_recaptchaSiteKey' ]; + $attributes = [ 'type' => '', 'useKbSettings' => false, 'recaptchaSiteKey' => 'my_recaptchaSiteKey' ]; $captchaSettings = new Kadence_Blocks_Form_Captcha_Settings( $attributes ); $this->assertEquals( 'my_recaptchaSiteKey', $captchaSettings->public_key); - $attributes = [ 'type' => 'turnstile', 'turnstileSiteKey' => 'my_turnstileSiteKey' ]; + $attributes = [ 'type' => 'turnstile', 'useKbSettings' => false, 'turnstileSiteKey' => 'my_turnstileSiteKey' ]; $captchaSettings = new Kadence_Blocks_Form_Captcha_Settings( $attributes ); $this->assertEquals( 'my_turnstileSiteKey', $captchaSettings->public_key); - $attributes = [ 'type' => 'hcaptcha', 'hCaptchaSiteKey' => 'hCaptchaSiteKey' ]; + $attributes = [ 'type' => 'hcaptcha', 'useKbSettings' => false, 'hCaptchaSiteKey' => 'hCaptchaSiteKey' ]; $captchaSettings = new Kadence_Blocks_Form_Captcha_Settings( $attributes ); $this->assertEquals( 'hCaptchaSiteKey', $captchaSettings->public_key); - // Using global settings + // Using using_kadence_blocks_settings settings add_option( 'kadence_blocks_recaptcha_site_key', 'my_option_recaptchaSiteKey' ); $attributes = [ 'type' => 'googlev3', 'useKbSettings' => true, 'recaptchaSiteKey' => 'my_recaptchaSiteKey' ]; $captchaSettings = new Kadence_Blocks_Form_Captcha_Settings( $attributes ); @@ -89,19 +99,19 @@ public function testGetPublicKey () { public function testGetPrivateKey () { // Using Block settings - $attributes = [ 'type' => '', 'recaptchaSecretKey' => 'my_recaptchaSecretKey' ]; + $attributes = [ 'type' => '', 'useKbSettings' => false, 'recaptchaSecretKey' => 'my_recaptchaSecretKey' ]; $captchaSettings = new Kadence_Blocks_Form_Captcha_Settings( $attributes ); $this->assertEquals( 'my_recaptchaSecretKey', $captchaSettings->secret_key); - $attributes = [ 'type' => 'turnstile', 'turnstileSecretKey' => 'my_turnstileSecretKey' ]; + $attributes = [ 'type' => 'turnstile', 'useKbSettings' => false, 'turnstileSecretKey' => 'my_turnstileSecretKey' ]; $captchaSettings = new Kadence_Blocks_Form_Captcha_Settings( $attributes ); $this->assertEquals( 'my_turnstileSecretKey', $captchaSettings->secret_key); - $attributes = [ 'type' => 'hcaptcha', 'hCaptchaSecretKey' => 'hCaptchaSecretKey' ]; + $attributes = [ 'type' => 'hcaptcha', 'useKbSettings' => false, 'hCaptchaSecretKey' => 'hCaptchaSecretKey' ]; $captchaSettings = new Kadence_Blocks_Form_Captcha_Settings( $attributes ); $this->assertEquals( 'hCaptchaSecretKey', $captchaSettings->secret_key); - // Using global settings + // Using using_kadence_blocks_settings settings add_option( 'kadence_blocks_recaptcha_secret_key', 'my_option_recaptchaSecretKey' ); $attributes = [ 'type' => 'googlev3', 'useKbSettings' => true, 'recaptchaSecretKey' => 'my_recaptchaSecretKey' ]; $captchaSettings = new Kadence_Blocks_Form_Captcha_Settings( $attributes );