feat: using extraProps in Image

gravity-ui · Jan 30, 2024 · b7c6d1c · b7c6d1c
1 parent fc9f16f
commit b7c6d1c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/src/blocks/Tabs/Tabs.tsx b/src/blocks/Tabs/Tabs.tsx
@@ -73,7 +73,9 @@ export const TabsBlock = ({
 
         if (activeTabData.caption && imageProps) {
             Object.assign(imageProps, {
-                'aria-describedby': captionId,
+                extraProps: {
+                    'aria-describedby': captionId,
+                },
             });
         }
     }

diff --git a/src/components/Image/Image.tsx b/src/components/Image/Image.tsx
@@ -1,6 +1,7 @@
 import React, {
     CSSProperties,
     Fragment,
+    HTMLProps,
     MouseEventHandler,
     ReactEventHandler,
     useContext,
@@ -12,14 +13,15 @@ import {ProjectSettingsContext} from '../../context/projectSettingsContext';
 import {ImageDeviceProps, ImageObjectProps, QAProps} from '../../models';
 import {getQaAttrubutes} from '../../utils';
 import {isCompressible} from '../../utils/imageCompress';
-import ImageBase from '../ImageBase/ImageBase';
+import ImageBase, {ImageBaseProps} from '../ImageBase/ImageBase';
 
 export interface ImageProps extends Partial<ImageObjectProps>, Partial<ImageDeviceProps>, QAProps {
     style?: CSSProperties;
     className?: string;
     onClick?: MouseEventHandler;
     onLoad?: ReactEventHandler<HTMLDivElement>;
     containerClassName?: string;
+    extraProps?: Omit<HTMLProps<HTMLImageElement>, keyof ImageBaseProps>;
 }
 
 export interface DeviceSpecificFragmentProps extends QAProps {
@@ -66,6 +68,7 @@ const Image = (props: ImageProps) => {
         onLoad,
         containerClassName,
         qa,
+        extraProps,
     } = props;
     const [imgLoadingError, setImgLoadingError] = useState(false);
 
@@ -123,6 +126,7 @@ const Image = (props: ImageProps) => {
                 onClick={onClick}
                 onError={() => setImgLoadingError(true)}
                 onLoad={onLoad}
+                {...extraProps}
             />
         </picture>
     );

diff --git a/src/models/constructor-items/common.ts b/src/models/constructor-items/common.ts
@@ -124,7 +124,7 @@ interface LoopProps {
 
 // images
 
-export interface ImageInfoProps extends Pick<HTMLProps<HTMLImageElement>, 'aria-describedby'> {
+export interface ImageInfoProps {
     alt?: string;
     disableCompress?: boolean;
 }