fixup! fixup! ✨(frontend) convert to figure/figcaption structure if caption exists

Author: Ovgodd

src/frontend/apps/impress/src/features/docs/doc-editor/components/custom-blocks/AccessibleImageBlock.tsx

@@ -33,20 +33,8 @@ export const accessibleImageRender = (
     imgSelector?.setAttribute('alt', block.props.caption);
     imgSelector?.removeAttribute('aria-hidden');
     imgSelector?.setAttribute('tabindex', '0');
-  };
 
-  const accessibleImage = () => {
-    imgSelector?.setAttribute('alt', '');
-    imgSelector?.setAttribute('role', 'presentation');
-    imgSelector?.setAttribute('aria-hidden', 'true');
-    imgSelector?.setAttribute('tabindex', '-1');
-  };
-
-  // Set accessibility attributes for the image
-  withCaption ? accessibleImageWithCaption() : accessibleImage();
-
-  // Fix RGAA 1.9.1: Convert to figure/figcaption structure if caption exists
-  if (block.props.caption) {
+    // Fix RGAA 1.9.1: Convert to figure/figcaption structure if caption exists
     const captionElement = dom.querySelector('.bn-file-caption');
 
     if (captionElement) {
@@ -89,6 +77,21 @@ export const accessibleImageRender = (
         dom: figureElement,
       };
     }
+  };
+
+  const accessibleImage = () => {
+    imgSelector?.setAttribute('alt', '');
+    imgSelector?.setAttribute('role', 'presentation');
+    imgSelector?.setAttribute('aria-hidden', 'true');
+    imgSelector?.setAttribute('tabindex', '-1');
+  };
+
+  // Set accessibility attributes for the image
+  const result = withCaption ? accessibleImageWithCaption() : accessibleImage();
+
+  // Return the result if accessibleImageWithCaption created a figure, otherwise return original
+  if (result) {
+    return result;
   }
 
   return {