Skip to content

Fix Double Sliders on Manage Protected Zones Interface [SYNTH-164] #1396

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

Merged
PepperLola merged 2 commits into from
Jul 9, 2026
Merged

Fix Double Sliders on Manage Protected Zones Interface [SYNTH-164] #1396

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d56a0dc
fix: remove extra scroll container
RoushilS Jul 9, 2026
f2a5127
Merge branch 'dev' into roushils/164/double-slider-fix
PepperLola Jul 9, 2026
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
80 changes: 38 additions & 42 deletions fission/src/ui/panels/configuring/assembly-config/interfaces/zones/ManageZonesBase.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import PreferencesSystem from "@/systems/preferences/PreferencesSystem"
import type { Alliance } from "@/systems/preferences/PreferenceTypes"
import World from "@/systems/World"
import Label from "@/ui/components/Label"
import ScrollView from "@/ui/components/ScrollView"
import { AddButton, DeleteButton, EditButton } from "@/ui/components/StyledComponents"
import type { BaseZonePreferences } from "./ZoneConfigBase"

Expand Down Expand Up @@ -72,51 +71,48 @@ export default function ManageZonesBase<TZone extends BaseZonePreferences>(props
return (
<>
{zones?.length > 0 ? (
<ScrollView>
<Stack gap={4}>
{zones.map((zonePrefs: TZone, i: number) => {
const item = getListItem(zonePrefs)
return (
<Stack gap={4}>
{zones.map((zonePrefs: TZone, i: number) => {
const item = getListItem(zonePrefs)
return (
<Stack
key={`${item.name}-${item.alliance}-${i}`}
justifyContent={"space-between"}
alignItems={"center"}
gap={"1rem"}
>
<Stack direction="row" gap={8}>
<Box
className={`w-12 h-12 rounded-lg`}
sx={{
bgcolor: item.alliance === "red" ? "redAlliance.main" : "blueAlliance.main",
}}
/>
<Stack direction="row" gap={4} className="w-max">
<Label size="sm">{item.name}</Label>
{item.pointsLabel ? <Label size="sm">{item.pointsLabel}</Label> : null}
</Stack>
</Stack>
<Stack
key={`${item.name}-${item.alliance}-${i}`}
justifyContent={"space-between"}
direction={"row-reverse"}
gap={"0.25rem"}
justifyContent={"center"}
alignItems={"center"}
gap={"1rem"}
>
<Stack direction="row" gap={8}>
<Box
className={`w-12 h-12 rounded-lg`}
sx={{
bgcolor:
item.alliance === "red" ? "redAlliance.main" : "blueAlliance.main",
}}
/>
<Stack direction="row" gap={4} className="w-max">
<Label size="sm">{item.name}</Label>
{item.pointsLabel ? <Label size="sm">{item.pointsLabel}</Label> : null}
</Stack>
</Stack>
<Stack
direction={"row-reverse"}
gap={"0.25rem"}
justifyContent={"center"}
alignItems={"center"}
>
{EditButton(() => {
selectZone(zonePrefs)
saveZonesGeneric(zones, selectedField, persistZones)
})}
{DeleteButton(() => {
const newZones = zones.filter((_, idx) => idx !== i)
setZones(newZones)
saveZonesGeneric(newZones, selectedField, persistZones)
})}
</Stack>
{EditButton(() => {
selectZone(zonePrefs)
saveZonesGeneric(zones, selectedField, persistZones)
})}
{DeleteButton(() => {
const newZones = zones.filter((_, idx) => idx !== i)
setZones(newZones)
saveZonesGeneric(newZones, selectedField, persistZones)
})}
</Stack>
)
})}
</Stack>
</ScrollView>
</Stack>
)
})}
</Stack>
) : (
<Label size="md">{emptyLabel}</Label>
)}
Expand Down
Loading