Skip to content

Extract nested ternary operations into independent statements #712

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sonarqube-agent wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Extract nested ternary operations into independent statements #712

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions src/components/internal-components/InternalShadowIconButton/InternalShadowIconButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,10 @@ export const InternalShadowIconButton = <C extends ElementType = "button">(
...rest
} = props;

const defaultColorFilter = props.disabled
? disabledIconColor
: defaultIconColor || null;

const icon = iconName && (
<OakBox $position="relative">
<OakIcon
Expand Down Expand Up @@ -158,13 +162,7 @@ export const InternalShadowIconButton = <C extends ElementType = "button">(
iconName={iconName}
$width={"spacing-24"}
$height={"spacing-24"}
$colorFilter={
props.disabled
? disabledIconColor
: defaultIconColor
? defaultIconColor
: null
}
$colorFilter={defaultColorFilter}
data-icon-for="button"
alt=""
/>
Expand Down
61 changes: 31 additions & 30 deletions src/components/layout-and-structure/OakGridArea/OakGridArea.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,47 +67,48 @@ const parseSpanStart = (value?: string | null) => {
return `span ${span}`;
};

const resolveResponsiveValue = <T,>(
value: ResponsiveValues<T> | undefined,
index: number,
): T | undefined => {
return Array.isArray(value) ? value[index] : value;
};

const gridArea = css<OakGridAreaProps>`
flex-direction: column;
${responsiveStyle(
"grid-column",
(props) => {
return Array.isArray(props.$colSpan)
? props.$colSpan.map((span, index) =>
combineSpanStart(
Array.isArray(props.$colStart)
? props.$colStart[index]
: props.$colStart,
span,
),
)
: combineSpanStart(
Array.isArray(props.$colStart)
? props.$colStart[0]
: props.$colStart,
props.$colSpan,
);
if (Array.isArray(props.$colSpan)) {
return props.$colSpan.map((span, index) =>
combineSpanStart(
resolveResponsiveValue(props.$colStart, index),
span,
),
);
}
return combineSpanStart(
resolveResponsiveValue(props.$colStart, 0),
props.$colSpan,
);
},
(value) => parseSpanStart(value),
)};
${responsiveStyle(
"grid-row",
(props) => {
return Array.isArray(props.$rowSpan)
? props.$rowSpan.map((span, index) =>
combineSpanStart(
Array.isArray(props.$rowStart)
? props.$rowStart[index]
: props.$rowStart,
span,
),
)
: combineSpanStart(
Array.isArray(props.$rowStart)
? props.$rowStart[0]
: props.$rowStart,
props.$rowSpan,
);
if (Array.isArray(props.$rowSpan)) {
return props.$rowSpan.map((span, index) =>
combineSpanStart(
resolveResponsiveValue(props.$rowStart, index),
span,
),
);
}
return combineSpanStart(
resolveResponsiveValue(props.$rowStart, 0),
props.$rowSpan,
);
},
(value) => parseSpanStart(value),
)};
Expand Down
3 changes: 2 additions & 1 deletion src/components/owa/OakSaveCount/OakSaveCount.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,9 @@ export const OakSaveCount = ({
const iconName =
hasCount && count > 0 ? "bookmark-filled" : "bookmark-outlined";
const showTruncatedCount = hasCount && count > 99;
const unitSuffix = hasCount && count === 1 ? "" : "s";
const ariaLabel = hasCount
? `${label}: ${count} saved unit${count === 1 ? "" : "s"}`
? `${label}: ${count} saved unit${unitSuffix}`
: label;

return (
Expand Down
25 changes: 11 additions & 14 deletions src/components/owa/teacher/OakUnitListItem/OakUnitListItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,15 @@ export const OakUnitListItem = <element extends ElementType = "a">(
...rest
} = props;

let indexBoxBackground: "bg-neutral-stronger" | "bg-decorative3-subdued" | "bg-decorative3-main";
if (unavailable) {
indexBoxBackground = "bg-neutral-stronger";
} else if (isLegacy) {
indexBoxBackground = "bg-decorative3-subdued";
} else {
indexBoxBackground = "bg-decorative3-main";
}

return (
<OakLI $listStyle={"none"} $width={"100%"}>
{/* Desktop layout */}
Expand All @@ -134,13 +143,7 @@ export const OakUnitListItem = <element extends ElementType = "a">(
onClick={unavailable ? undefined : onClick}
>
<StyledOakIndexBox
$background={
unavailable
? "bg-neutral-stronger"
: isLegacy
? "bg-decorative3-subdued"
: "bg-decorative3-main"
}
$background={indexBoxBackground}
$justifyContent={"center"}
$alignItems={"center"}
$minWidth="spacing-64"
Expand Down Expand Up @@ -221,13 +224,7 @@ export const OakUnitListItem = <element extends ElementType = "a">(
href={unavailable ? undefined : href}
>
<OakFlex
$background={
unavailable
? "bg-neutral-stronger"
: isLegacy
? "bg-decorative3-subdued"
: "bg-decorative3-main"
}
$background={indexBoxBackground}
$justifyContent={"center"}
$alignItems={"center"}
$borderRadius="border-radius-m"
Expand Down