fix selector using clientId

Author: kaeizen

src/components/block-wrapper/index.js

@@ -20,6 +20,7 @@ const BlockWrapper = memo( props => {
 	const {
 		align = undefined,
 		className: blockClassName = '',
+		blockStyle = undefined,
 		blockHoverClass = '',
 		children,
 		hoverRef,
@@ -40,6 +41,8 @@ const BlockWrapper = memo( props => {
 		// We force-removed the block alignment wrapper div (see src/blocks.js),
 		// so we need to add our own data-align attribute.
 		'data-align': align,
+		// Add data-block-style attribute to replace data-block selectors.
+		'data-block-style': blockStyle,
 	} )
 
 	// Remove the custom CSS names here because we will be adding it in the BlockDiv component, we need to do this for our current styles to work.

src/higher-order/with-block-wrapper-is-hovered/index.js

@@ -35,6 +35,7 @@ const withBlockWrapperIsHovered = createHigherOrderComponent(
 			<BlockWrapper
 				align={ props.attributes.align }
 				className={ props.attributes.className }
+				blockStyle={ props.attributes.blockStyle }
 				blockHoverClass={ blockHoverClass }
 				// These are needed by isHovered
 				hoverRef={ ref }

src/util/block-styles.js

@@ -29,7 +29,5 @@ export const isBlockStyleAttributesModified = ( blockName, styleSlug, _blockAttr
 		}
 	} )
 
-	// console.log( 'ismodified, current', blockAttrs, 'blockstyle', blockStyleAttrs )
-
 	return Object.keys( blockAttrs ).length
 }