FIX REfining behaviour
All checks were successful
continuous-integration/drone/push Build is passing
All checks were successful
continuous-integration/drone/push Build is passing
This commit is contained in:
parent
7c73d5079f
commit
4da8e85464
|
|
@ -1 +1 @@
|
||||||
<?php return array('dependencies' => array('react', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-data', 'wp-element', 'wp-i18n', 'wp-primitives'), 'version' => '3da4dd74b01a483d6218');
|
<?php return array('dependencies' => array('react', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-data', 'wp-element', 'wp-i18n', 'wp-primitives'), 'version' => '2b98bbfc592b1bc1d2e2');
|
||||||
|
|
|
||||||
|
|
@ -1173,7 +1173,6 @@ function save({
|
||||||
const {
|
const {
|
||||||
title,
|
title,
|
||||||
iconUrl,
|
iconUrl,
|
||||||
iconName,
|
|
||||||
hasTitle,
|
hasTitle,
|
||||||
hasIcon,
|
hasIcon,
|
||||||
variant,
|
variant,
|
||||||
|
|
@ -1182,31 +1181,6 @@ function save({
|
||||||
logoUrl,
|
logoUrl,
|
||||||
iconPosition
|
iconPosition
|
||||||
} = attributes;
|
} = attributes;
|
||||||
const ICON_FILES = {
|
|
||||||
key: 'icon_key.svg',
|
|
||||||
chain: 'icon_chain.svg',
|
|
||||||
house: 'icon_house.svg',
|
|
||||||
bulb: 'icon_bulb.svg',
|
|
||||||
warning: 'icon_warning.svg',
|
|
||||||
acoustic: 'icon_acoustic.svg',
|
|
||||||
documentation: 'icon_documentation.svg',
|
|
||||||
notification: 'icon_notification.svg',
|
|
||||||
search: 'icon_search.svg',
|
|
||||||
info: 'icon_info.svg',
|
|
||||||
tip: 'icon_tip.svg',
|
|
||||||
euro: 'icon_euro.svg'
|
|
||||||
};
|
|
||||||
const buildIconUrlFromName = () => {
|
|
||||||
const filename = ICON_FILES[iconName];
|
|
||||||
if (!filename) return '';
|
|
||||||
try {
|
|
||||||
return new URL(`./img/${filename}`, "file:///Users/martoni_sato/Local%20Sites/homegrade-network/app/public/wp-content/plugins/homegrade-blocks/blocks/highlight/src/save.js").toString();
|
|
||||||
} catch (e) {
|
|
||||||
return '';
|
|
||||||
}
|
|
||||||
};
|
|
||||||
const isLikelyIconName = value => typeof value === 'string' && Object.keys(ICON_FILES).includes(value);
|
|
||||||
const resolvedIconUrl = !iconUrl || isLikelyIconName(iconUrl) ? buildIconUrlFromName() : iconUrl;
|
|
||||||
return (0,_wordpress_element__WEBPACK_IMPORTED_MODULE_0__.createElement)("section", {
|
return (0,_wordpress_element__WEBPACK_IMPORTED_MODULE_0__.createElement)("section", {
|
||||||
..._wordpress_block_editor__WEBPACK_IMPORTED_MODULE_1__.useBlockProps.save({
|
..._wordpress_block_editor__WEBPACK_IMPORTED_MODULE_1__.useBlockProps.save({
|
||||||
className: `homegrade-blocks-highlight ${variant ? `homegrade-blocks-highlight--${variant}` : ''}`
|
className: `homegrade-blocks-highlight ${variant ? `homegrade-blocks-highlight--${variant}` : ''}`
|
||||||
|
|
@ -1217,7 +1191,7 @@ function save({
|
||||||
className: "icon"
|
className: "icon"
|
||||||
}, (0,_wordpress_element__WEBPACK_IMPORTED_MODULE_0__.createElement)("img", {
|
}, (0,_wordpress_element__WEBPACK_IMPORTED_MODULE_0__.createElement)("img", {
|
||||||
className: "icon__image",
|
className: "icon__image",
|
||||||
src: resolvedIconUrl,
|
src: iconUrl,
|
||||||
alt: ""
|
alt: ""
|
||||||
})), (0,_wordpress_element__WEBPACK_IMPORTED_MODULE_0__.createElement)(_wordpress_block_editor__WEBPACK_IMPORTED_MODULE_1__.RichText.Content, {
|
})), (0,_wordpress_element__WEBPACK_IMPORTED_MODULE_0__.createElement)(_wordpress_block_editor__WEBPACK_IMPORTED_MODULE_1__.RichText.Content, {
|
||||||
tagName: "h3",
|
tagName: "h3",
|
||||||
|
|
@ -1229,7 +1203,7 @@ function save({
|
||||||
className: "icon"
|
className: "icon"
|
||||||
}, (0,_wordpress_element__WEBPACK_IMPORTED_MODULE_0__.createElement)("img", {
|
}, (0,_wordpress_element__WEBPACK_IMPORTED_MODULE_0__.createElement)("img", {
|
||||||
className: "icon__image",
|
className: "icon__image",
|
||||||
src: resolvedIconUrl,
|
src: iconUrl,
|
||||||
alt: ""
|
alt: ""
|
||||||
})), (0,_wordpress_element__WEBPACK_IMPORTED_MODULE_0__.createElement)("div", {
|
})), (0,_wordpress_element__WEBPACK_IMPORTED_MODULE_0__.createElement)("div", {
|
||||||
className: "homegrade-blocks-highlight__content__innerblocks"
|
className: "homegrade-blocks-highlight__content__innerblocks"
|
||||||
|
|
|
||||||
File diff suppressed because one or more lines are too long
|
|
@ -22,10 +22,8 @@
|
||||||
align-items: center;
|
align-items: center;
|
||||||
}
|
}
|
||||||
.homegrade-blocks-highlight .icon img {
|
.homegrade-blocks-highlight .icon img {
|
||||||
width: 30px;
|
width: 100%;
|
||||||
max-width: 80%;
|
height: 100%;
|
||||||
max-height: 100%;
|
|
||||||
height: auto;
|
|
||||||
}
|
}
|
||||||
.homegrade-blocks-highlight__titling h3 {
|
.homegrade-blocks-highlight__titling h3 {
|
||||||
padding-left: 10px;
|
padding-left: 10px;
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
{"version":3,"file":"./style-index.css","mappings":";;;AAAA;;;;;EAAA;AAQC;EACC;AADF;AAGC;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;AADF;AAGE;EACC;EACA;EACA;EACA;AADH;AAKE;EACC;AAHH;AAaC;EACC;AAXF;AAaC;EACC;AAXF,C","sources":["webpack://multiblocks/./src/style.scss"],"sourcesContent":["/**\n * The following styles get applied both on the front of your site\n * and in the editor.\n *\n * Replace them with your own styles or remove the file completely.\n */\n\n.homegrade-blocks-highlight {\n\t&__block-title {\n\t\tmargin: 0 !important;\n\t}\n\t.icon {\n\t\tbackground-color: black;\n\t\tborder-radius: 50%;\n\t\taspect-ratio: 1/1;\n\t\twidth: 40px;\n\t\theight: 40px;\n\t\tpadding: 10px;\n\t\tdisplay: flex;\n\t\tjustify-content: center;\n\t\talign-items: center;\n\n\t\timg {\n\t\t\twidth: 30px;\n\t\t\tmax-width: 80%;\n\t\t\tmax-height: 100%;\n\t\t\theight: auto;\n\t\t}\n\t}\n\t&__titling {\n\t\th3 {\n\t\t\tpadding-left: 10px;\n\t\t}\n\t}\n\n\t// ul li {\n\t// \tlist-style-type: disc;\n\t// \tlist-style-position: inside;\n\t// \tmargin-left: 1.5em;\n\t// }\n\n\tp + ul {\n\t\tpadding-top: 16px;\n\t}\n\tul + p {\n\t\tpadding-top: 16px;\n\t}\n}\n"],"names":[],"sourceRoot":""}
|
{"version":3,"file":"./style-index.css","mappings":";;;AAAA;;;;;EAAA;AAQC;EACC;AADF;AAGC;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;AADF;AAGE;EACC;EACA;AADH;AAKE;EACC;AAHH;AAaC;EACC;AAXF;AAaC;EACC;AAXF,C","sources":["webpack://multiblocks/./src/style.scss"],"sourcesContent":["/**\n * The following styles get applied both on the front of your site\n * and in the editor.\n *\n * Replace them with your own styles or remove the file completely.\n */\n\n.homegrade-blocks-highlight {\n\t&__block-title {\n\t\tmargin: 0 !important;\n\t}\n\t.icon {\n\t\tbackground-color: black;\n\t\tborder-radius: 50%;\n\t\taspect-ratio: 1/1;\n\t\twidth: 40px;\n\t\theight: 40px;\n\t\tpadding: 10px;\n\t\tdisplay: flex;\n\t\tjustify-content: center;\n\t\talign-items: center;\n\n\t\timg {\n\t\t\twidth: 100%;\n\t\t\theight: 100%;\n\t\t}\n\t}\n\t&__titling {\n\t\th3 {\n\t\t\tpadding-left: 10px;\n\t\t}\n\t}\n\n\t// ul li {\n\t// \tlist-style-type: disc;\n\t// \tlist-style-position: inside;\n\t// \tmargin-left: 1.5em;\n\t// }\n\n\tp + ul {\n\t\tpadding-top: 16px;\n\t}\n\tul + p {\n\t\tpadding-top: 16px;\n\t}\n}\n"],"names":[],"sourceRoot":""}
|
||||||
|
|
@ -3,45 +3,8 @@ import { __ } from '@wordpress/i18n';
|
||||||
import { useSelect, useDispatch } from '@wordpress/data'; // pour les querry
|
import { useSelect, useDispatch } from '@wordpress/data'; // pour les querry
|
||||||
|
|
||||||
export default function save({ attributes }) {
|
export default function save({ attributes }) {
|
||||||
const {
|
const { title, iconUrl, hasTitle, hasIcon, variant, hasLogo, logoAlt, logoUrl, iconPosition } =
|
||||||
title,
|
attributes;
|
||||||
iconUrl,
|
|
||||||
iconName,
|
|
||||||
hasTitle,
|
|
||||||
hasIcon,
|
|
||||||
variant,
|
|
||||||
hasLogo,
|
|
||||||
logoAlt,
|
|
||||||
logoUrl,
|
|
||||||
iconPosition,
|
|
||||||
} = attributes;
|
|
||||||
|
|
||||||
const ICON_FILES = {
|
|
||||||
key: 'icon_key.svg',
|
|
||||||
chain: 'icon_chain.svg',
|
|
||||||
house: 'icon_house.svg',
|
|
||||||
bulb: 'icon_bulb.svg',
|
|
||||||
warning: 'icon_warning.svg',
|
|
||||||
acoustic: 'icon_acoustic.svg',
|
|
||||||
documentation: 'icon_documentation.svg',
|
|
||||||
notification: 'icon_notification.svg',
|
|
||||||
search: 'icon_search.svg',
|
|
||||||
info: 'icon_info.svg',
|
|
||||||
tip: 'icon_tip.svg',
|
|
||||||
euro: 'icon_euro.svg',
|
|
||||||
};
|
|
||||||
const buildIconUrlFromName = () => {
|
|
||||||
const filename = ICON_FILES[iconName];
|
|
||||||
if (!filename) return '';
|
|
||||||
try {
|
|
||||||
return new URL(`./img/${filename}`, import.meta.url).toString();
|
|
||||||
} catch (e) {
|
|
||||||
return '';
|
|
||||||
}
|
|
||||||
};
|
|
||||||
const isLikelyIconName = (value) =>
|
|
||||||
typeof value === 'string' && Object.keys(ICON_FILES).includes(value);
|
|
||||||
const resolvedIconUrl = !iconUrl || isLikelyIconName(iconUrl) ? buildIconUrlFromName() : iconUrl;
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<section
|
<section
|
||||||
|
|
@ -59,7 +22,7 @@ export default function save({ attributes }) {
|
||||||
>
|
>
|
||||||
{hasIcon && iconPosition === 'top' && (
|
{hasIcon && iconPosition === 'top' && (
|
||||||
<div className="icon">
|
<div className="icon">
|
||||||
<img className="icon__image" src={resolvedIconUrl} alt="" />
|
<img className="icon__image" src={iconUrl} alt="" />
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
|
|
@ -73,7 +36,7 @@ export default function save({ attributes }) {
|
||||||
<div className="homegrade-blocks-highlight__content">
|
<div className="homegrade-blocks-highlight__content">
|
||||||
{hasIcon && iconPosition === 'side' && !hasTitle && (
|
{hasIcon && iconPosition === 'side' && !hasTitle && (
|
||||||
<div className="icon">
|
<div className="icon">
|
||||||
<img className="icon__image" src={resolvedIconUrl} alt="" />
|
<img className="icon__image" src={iconUrl} alt="" />
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -21,10 +21,8 @@
|
||||||
align-items: center;
|
align-items: center;
|
||||||
|
|
||||||
img {
|
img {
|
||||||
width: 30px;
|
width: 100%;
|
||||||
max-width: 80%;
|
height: 100%;
|
||||||
max-height: 100%;
|
|
||||||
height: auto;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
&__titling {
|
&__titling {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user