From ad0d7afeed818471ff87ed0488be349b833a5f89 Mon Sep 17 00:00:00 2001 From: Peter Todd Date: Fri, 13 Mar 2026 11:04:00 +0000 Subject: [PATCH 1/4] Fix color channel state bugs --- .../components/ColorChannelComponents.tsx | 209 ++++++++--------- src/react/components/avivatorish/hooks.ts | 100 ++++---- src/react/components/avivatorish/state.tsx | 69 ++---- src/react/components/avivatorish/utils.ts | 219 ++++++++++-------- 4 files changed, 288 insertions(+), 309 deletions(-) diff --git a/src/react/components/ColorChannelComponents.tsx b/src/react/components/ColorChannelComponents.tsx index f63543f44..9e27108f8 100644 --- a/src/react/components/ColorChannelComponents.tsx +++ b/src/react/components/ColorChannelComponents.tsx @@ -1,15 +1,7 @@ -import * as d3 from "d3"; -import { useCallback, useEffect, useId, useMemo, useState } from "react"; -import { shallow } from "zustand/shallow"; -import { - type VivContextType, - VivProvider, - useChannelsStore, - useChannelsStoreApi, - useLoader, - useMetadata, - useViewerStore, -} from "./avivatorish/state"; +import { resolveAutoHistogramXScaleFromValues, resolveAutoHistogramYScale } from "@/lib/utils"; +import { isArray } from "@/lib/utils"; +import ExpandMoreIcon from "@mui/icons-material/ExpandMore"; +import HighlightOffIcon from "@mui/icons-material/HighlightOff"; // some of this is quite bloated - could use dynamic imports for some of the more complex components import { Accordion, @@ -23,21 +15,23 @@ import { Select, Slider, } from "@mui/material"; -import ExpandMoreIcon from "@mui/icons-material/ExpandMore"; -import HighlightOffIcon from "@mui/icons-material/HighlightOff"; -import { PopoverPicker } from "./ColorPicker"; -import { getSingleSelectionStats } from "./avivatorish/utils"; -import HistogramWidget, { - type HistogramLayer, - type HistogramScaleType, -} from "./HistogramWidget"; +import * as d3 from "d3"; +import { useCallback, useEffect, useId, useMemo, useState } from "react"; import { useDebounce } from "use-debounce"; +import { shallow } from "zustand/shallow"; import { useTheme } from "../hooks"; +import { PopoverPicker } from "./ColorPicker"; +import HistogramWidget, { type HistogramLayer, type HistogramScaleType } from "./HistogramWidget"; import { - resolveAutoHistogramXScaleFromValues, - resolveAutoHistogramYScale, -} from "@/lib/utils"; -import { isArray } from "@/lib/utils"; + type VivContextType, + VivProvider, + useChannelsStore, + useChannelsStoreApi, + useLoader, + useMetadata, + useViewerStore, +} from "./avivatorish/state"; +import { buildSelectionForSource, getSingleSelectionStats } from "./avivatorish/utils"; type Range = [number, number]; type ScaleMode = "auto" | HistogramScaleType; @@ -47,19 +41,14 @@ const HISTOGRAM_HEIGHT = 78; const stopAccordionToggle = (event: React.SyntheticEvent) => { event.stopPropagation(); }; -const toggleScaleMode = ( - mode: ScaleMode, - resolvedMode: HistogramScaleType, -): ScaleMode => { +const toggleScaleMode = (mode: ScaleMode, resolvedMode: HistogramScaleType): ScaleMode => { if (mode === "auto") { return resolvedMode === "log" ? "linear" : "log"; } return mode === "log" ? "linear" : "log"; }; -export default function MainVivColorDialog({ - vivStores, -}: { vivStores: VivContextType }) { +export default function MainVivColorDialog({ vivStores }: { vivStores: VivContextType }) { return ( @@ -68,13 +57,11 @@ export default function MainVivColorDialog({ } const ChannelChooserMUI = ({ index }: { index: number }) => { - const channels = useMetadata()?.Pixels.Channels.map( - (c) => c.Name, - ) as string[]; + const channels = useMetadata()?.Pixels.Channels.map((c) => c.Name) as string[]; const selections = useChannelsStore(({ selections }) => selections); const channelsStore = useChannelsStoreApi(); const id = useId(); - const name = channels[selections[index].c]; + const name = channels[selections[index].c ?? 0]; return ( <> @@ -104,9 +91,7 @@ const ChannelChooserMUI = ({ index }: { index: number }) => { }; const ChannelChooser = ({ index }: { index: number }) => { - const channels = useMetadata()?.Pixels.Channels.map( - (c) => c.Name, - ) as string[]; + const channels = useMetadata()?.Pixels.Channels.map((c) => c.Name) as string[]; const { selections, setPropertiesForChannel } = useChannelsStore( ({ selections, setPropertiesForChannel }) => ({ selections, @@ -115,18 +100,8 @@ const ChannelChooser = ({ index }: { index: number }) => { shallow, ); const loader = useLoader(); - const { - setIsChannelLoading, - isChannelLoading, - removeIsChannelLoading, - use3d, - } = useViewerStore( - ({ - setIsChannelLoading, - isChannelLoading, - removeIsChannelLoading, - use3d, - }) => ({ + const { setIsChannelLoading, isChannelLoading, removeIsChannelLoading, use3d } = useViewerStore( + ({ setIsChannelLoading, isChannelLoading, removeIsChannelLoading, use3d }) => ({ setIsChannelLoading, isChannelLoading, removeIsChannelLoading, @@ -139,7 +114,7 @@ const ChannelChooser = ({ index }: { index: number }) => { <>