diff --git a/skills/carbon-react/components/portrait.md b/skills/carbon-react/components/portrait.md
index 75ca1af5b8..06414f7598 100644
--- a/skills/carbon-react/components/portrait.md
+++ b/skills/carbon-react/components/portrait.md
@@ -377,7 +377,7 @@ description: Carbon Portrait component props and usage examples.
value={variant}
>
{availableVariants.map(({ label, value }) => (
-
+
))}
diff --git a/src/components/file-input/file-input-test.stories.tsx b/src/components/file-input/file-input-test.stories.tsx
index ce3fd58583..989254fd56 100644
--- a/src/components/file-input/file-input-test.stories.tsx
+++ b/src/components/file-input/file-input-test.stories.tsx
@@ -67,16 +67,23 @@ export const AllStatuses = (args: Partial) => {
message: "oops, that's not right",
},
];
- return statuses.map((status) => (
- {}}
- {...args}
- />
- ));
+ return statuses.map((status, index) => {
+ const statusType = Array.isArray(status)
+ ? "multiple"
+ : (status?.status ?? "none");
+
+ return (
+ {}}
+ {...args}
+ />
+ );
+ });
};
export const LongFilenameStatus = (args: Partial) => {
diff --git a/src/components/form/form.component.tsx b/src/components/form/form.component.tsx
index 108be06c91..ff753d71a9 100644
--- a/src/components/form/form.component.tsx
+++ b/src/components/form/form.component.tsx
@@ -120,7 +120,7 @@ export const Form = ({
$hasFooterChildren={!!footerChildren}
$stickyFooter={stickyFooter}
{...(stickyFooter && { $stickyFooterVariant: stickyFooterVariant })}
- disableStickyOnSmallScreen={disableStickyOnSmallScreen}
+ $disableStickyOnSmallScreen={disableStickyOnSmallScreen}
$buttonAlignment={buttonAlignment}
$fullWidthButtons={fullWidthButtons}
{...footerPadding}
diff --git a/src/components/form/form.style.ts b/src/components/form/form.style.ts
index 530b921eae..2a7e184169 100644
--- a/src/components/form/form.style.ts
+++ b/src/components/form/form.style.ts
@@ -52,7 +52,7 @@ interface StyledFormFooterProps {
$stickyFooterVariant?: "light" | "grey";
$fullWidthButtons?: boolean;
$buttonAlignment?: FormButtonAlignment;
- disableStickyOnSmallScreen?: boolean;
+ $disableStickyOnSmallScreen?: boolean;
}
export const StyledFormFooter = styled.div.attrs(
@@ -104,8 +104,8 @@ export const StyledFormFooter = styled.div.attrs(
${padding}
- ${({ disableStickyOnSmallScreen }) =>
- disableStickyOnSmallScreen &&
+ ${({ $disableStickyOnSmallScreen }) =>
+ $disableStickyOnSmallScreen &&
css`
@media screen and (max-width: 600px) {
position: static;
diff --git a/src/components/menu/menu-test.stories.tsx b/src/components/menu/menu-test.stories.tsx
index 5cfa4aa712..b5de7121eb 100644
--- a/src/components/menu/menu-test.stories.tsx
+++ b/src/components/menu/menu-test.stories.tsx
@@ -379,7 +379,7 @@ MenuFullScreenKeysTest.storyName = "Menu Fullscreen with dynamic submenus";
export const MenuWithSubmenuCustomPadding = () => (
<>
{[0, "5px", 1, 2, "17px", 3, 4, 5, 6, 7, 8].map((padding) => (
-