From aef92ad934554c563c7feee217dd71301cb960e6 Mon Sep 17 00:00:00 2001
From: Oliver Foster <oliver.foster@kineo.com>
Date: Tue, 5 Dec 2023 18:53:30 +0000
Subject: [PATCH 1/2] Fix: Allow classNamePrefixSeparator in image.jsx (fixes
 #478)

---
 templates/image.jsx | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/templates/image.jsx b/templates/image.jsx
index 36368bd7..50df8e8f 100644
--- a/templates/image.jsx
+++ b/templates/image.jsx
@@ -22,12 +22,13 @@ export default function Image(props) {
   );
   const hasSource = Boolean(src);
   if (!hasSource) return null;
+  const classNamePrefixSeparator = (props.classNamePrefixSeparator || '__');
   const attributionClassNamePrefixes = (props.attributionClassNamePrefixes || props.classNamePrefixes);
   return (
     <span
       id={props.id}
       className={classes([
-        prefixClasses(props.classNamePrefixes, ['__image-container']),
+        prefixClasses(props.classNamePrefixes, [`${classNamePrefixSeparator}image-container`]),
         props.classes,
         props.attribution && 'has-attribution'
       ])}
@@ -35,7 +36,7 @@ export default function Image(props) {
 
       <img
         className={classes([
-          prefixClasses(props.classNamePrefixes, ['__image']),
+          prefixClasses(props.classNamePrefixes, [`${classNamePrefixSeparator}image`]),
           props?._srcFocalPoint && `object-position-${props?._srcFocalPoint}`
         ])}
         src={src}
@@ -47,8 +48,8 @@ export default function Image(props) {
       />
 
       {props.attribution &&
-      <span className={prefixClasses(attributionClassNamePrefixes, ['__attribution'])}>
-        <span className={prefixClasses(attributionClassNamePrefixes, ['__attribution-inner'])}>
+      <span className={prefixClasses(attributionClassNamePrefixes, [`${classNamePrefixSeparator}attribution`])}>
+        <span className={prefixClasses(attributionClassNamePrefixes, [`${classNamePrefixSeparator}attribution-inner`])}>
           {html(props.attribution)}
         </span>
       </span>

From 77776cd50d0f3714879ebfc2513e660f5c09835b Mon Sep 17 00:00:00 2001
From: kirsty-hames <kirsty-hames@users.noreply.github.com>
Date: Wed, 6 Dec 2023 10:18:13 +0000
Subject: [PATCH 2/2] revert classNamePrefixSeparator being applied to
 attribution

---
 templates/image.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/image.jsx b/templates/image.jsx
index 50df8e8f..b50c8fb6 100644
--- a/templates/image.jsx
+++ b/templates/image.jsx
@@ -48,8 +48,8 @@ export default function Image(props) {
       />
 
       {props.attribution &&
-      <span className={prefixClasses(attributionClassNamePrefixes, [`${classNamePrefixSeparator}attribution`])}>
-        <span className={prefixClasses(attributionClassNamePrefixes, [`${classNamePrefixSeparator}attribution-inner`])}>
+      <span className={prefixClasses(attributionClassNamePrefixes, ['__attribution'])}>
+        <span className={prefixClasses(attributionClassNamePrefixes, ['__attribution-inner'])}>
           {html(props.attribution)}
         </span>
       </span>