Skip to content
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

Fix Size Scale Resizing #436

Merged
merged 4 commits into from
Dec 12, 2024
Merged

Fix Size Scale Resizing #436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e3b8969
Bugfix: Ensure row scale always uses the correct max value
Dec 11, 2024
3cd3bc4
Remove unused subsetAtom & BackgroundRects
Dec 12, 2024
186a7b4
SizeHeader jsdoc
Dec 12, 2024
022500f
Merge branch 'main' into 407-fix-scale-resizing
NateLanza Dec 12, 2024
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
19 changes: 0 additions & 19 deletions packages/upset/src/atoms/subsetAtoms.ts
View file
Open in desktop

This file was deleted.

63 changes: 0 additions & 63 deletions packages/upset/src/components/BackgroundRects.tsx
View file
Open in desktop

This file was deleted.

14 changes: 7 additions & 7 deletions packages/upset/src/components/Header/SizeHeader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ import { sortByOrderSelector, sortBySelector } from '../../atoms/config/sortByAt
import { dimensionsSelector } from '../../atoms/dimensionsAtom';
import { itemsAtom } from '../../atoms/itemsAtoms';
import { maxSize } from '../../atoms/maxSizeAtom';
import { subsetSelector } from '../../atoms/subsetAtoms';
import { useScale } from '../../hooks/useScale';
import translate from '../../utils/transform';
import { Axis } from '../custom/Axis';
import { ProvenanceContext } from '../Root';
import { contextMenuAtom } from '../../atoms/contextMenuAtom';
import { HeaderSortArrow } from '../custom/HeaderSortArrow';
import { flattenedRowsSelector } from '../../atoms/renderRowsAtom';

/** @jsxImportSource @emotion/react */
const hide = css`
Expand All @@ -30,13 +30,16 @@ const show = css`
transition: opacity 0.5s;
`;

/**
* Header showing label & axis for cardinality bars
*/
export const SizeHeader: FC = () => {
const { actions } = useContext(ProvenanceContext);
const sliderRef = useRef<SVGRectElement>(null);
const sliderParentRef = useRef<SVGGElement>(null);
const dimensions = useRecoilValue(dimensionsSelector);
const items = useRecoilValue(itemsAtom);
const subsets = useRecoilValue(subsetSelector);
const subsets = useRecoilValue(flattenedRowsSelector).map((r) => r.row);
const sortBy = useRecoilValue(sortBySelector);
const sortByOrder = useRecoilValue(sortByOrderSelector);

Expand Down Expand Up @@ -109,17 +112,14 @@ export const SizeHeader: FC = () => {
* control and set a value
*/
useEffect(() => {
if (advancedScale) return;
const subs = Object.values(subsets.values);
if (subs.length === 0) return;
if (advancedScale || subsets.length === 0) return;

const sizes = subs.map((s) => s.size);
const sizes = subsets.map((s) => s.size);
const maxS = Math.max(...sizes);
setMaxSize(maxS);
}, [subsets, maxSize, advancedScale]);

const globalScale = useScale([0, itemCount], [0, dimensions.attribute.width]);

const detailScale = useScale([0, maxC], [0, dimensions.attribute.width]);

useEffect(() => {
Expand Down
Loading