Fix: accordion issue

themeum · Jun 14, 2022 · b502015 · b502015
1 parent 650abe7
commit b502015
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/assets/reactjs/src/blocks/accordion/Edit.js b/assets/reactjs/src/blocks/accordion/Edit.js
@@ -65,6 +65,8 @@ class AccordionBlock extends Component {
 			},
 		} = this.props;
 
+		if(!uniqueId) setAttributes({uniqueId: clientId.substr(0, 6)})
+
 		return (
 			<Fragment>
 				<InspectorControls>
@@ -85,7 +87,7 @@ class AccordionBlock extends Component {
 					setAttributes
 				})}
 
-				<div className={`qubely-block-accordion qubely-block-${clientId}${className ? ` ${className}` : ""}`}>
+				<div className={`qubely-block-accordion qubely-block-${uniqueId}${className ? ` ${className}` : ""}`}>
 					<InnerBlocks
 						template={this.getAccordionTemplate(attributes)}
 						allowedBlocks={["qubely/accordion-item"]}

diff --git a/assets/reactjs/src/blocks/accordion/Save.js b/assets/reactjs/src/blocks/accordion/Save.js
@@ -5,10 +5,9 @@ const {
 } = wp.qubelyComponents;
 class Save extends Component {
 	render() {
-		const { clientId, attributes } = this.props;
-		const { animation, uniqueId, itemToggle, interaction } = attributes;
+		const { animation, uniqueId, itemToggle, interaction } = this.props.attributes;
 		const interactionClass = IsInteraction(interaction) ? "qubley-block-interaction" : "";
-		const className = `qubely-block-accordion ${interactionClass} qubely-block-${clientId}`;
+		const className = `qubely-block-accordion ${interactionClass} qubely-block-${uniqueId}`;
 		return (
 			<div className={className} {...animationAttr(animation)} data-item-toggle={itemToggle}>
 				<InnerBlocks.Content />