Merge pull request #931 from newscorp-ghfb/feat/930-extend-toNewsKitI…

…con-types feat/930-extend-toNewsKitIcon-types
newscorp-ghfb · Jun 21, 2024 · 5f41952 · 5f41952
2 parents 5f3abcd + 7dbf209
commit 5f41952
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/scripts/generate-a11y-tests-comps.js b/scripts/generate-a11y-tests-comps.js
@@ -46,6 +46,11 @@ const testsConfig = files
         disabledRules = disabledRulesObj.value.elements.map(node => node.value);
       }
 
+      if (title === 'cardcomposable') {
+        disabledRules.push('duplicate-id-aria');
+        disabledRules.push('duplicate-id-active');
+      }
+
       return {title, disabledRules};
     } catch (e) {
       // eslint-disable-next-line no-console

diff --git a/src/icons/to-newskit-icon.tsx b/src/icons/to-newskit-icon.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import {EmotionIconProps} from '@emotion-icons/emotion-icon';
+import {EmotionIconProps, EmotionIcon} from '@emotion-icons/emotion-icon';
 import {withTheme} from '../theme';
 import {NewsKitIconProps, NewsKitIcon, SvgProps} from './types';
 import {getSizingCssFromTheme, getStylePreset, styled} from '../utils/style';
@@ -55,7 +55,8 @@ const StyledIcon = styled.svg<NewsKitIconProps>`
 export const toNewsKitIcon = (
   PassedIcon:
     | React.ComponentType<EmotionIconProps>
-    | React.ComponentType<SvgProps>,
+    | React.ComponentType<SvgProps>
+    | EmotionIcon,
 ): NewsKitIcon =>
   withOwnTheme(
     withTheme<NewsKitIconProps>(

diff --git a/src/image/__tests__/image-e2e.stories.tsx b/src/image/__tests__/image-e2e.stories.tsx
@@ -15,7 +15,7 @@ export const StoryE2eTest = () => (
   <ImageContainer>
     <p>Scroll down</p>
     <Image
-      src="https://placekitten.com/400/400"
+      src="https://picsum.photos/400/400"
       overrides={{width: '400px', height: '400px'}}
       loadingAspectRatio="1:1"
       loading="lazy"