Skip to content

brush merge#2370

Draft
Fil wants to merge 26 commits intofil/brush-data-optionsfrom
fil/brush-merge
Draft

brush merge#2370
Fil wants to merge 26 commits intofil/brush-data-optionsfrom
fil/brush-merge

Conversation

@Fil
Copy link
Contributor

@Fil Fil commented Feb 20, 2026

This branch merges all the branches that depend on fil/brush-dataless (#2360), fixes the conflicts, and changes the tests and examples of cross-facet brushing to a timeline

Enregistrement.de.l.ecran.2026-02-20.a.16.26.58.mov

(This branch combines everything, so while it may be better for testing, it's probably not as good for reviewing.)

@Fil Fil mentioned this pull request Feb 20, 2026
# Conflicts:
#	src/interactions/brush.d.ts
#	src/interactions/brush.js
#	test/plots/brush.ts
@Fil
Copy link
Contributor Author

Fil commented Feb 24, 2026

A diagram of the whole system:

⏺ main
│
└── pixel-round (#2371)
      │
      ├── dataless-crosshair (#2372) ─────────────────────┐
      │                                                   │
      └── brush-dataless (#2360)                          │
            │                                             │
            ├── brush-across-facets (#2369) ───┐          │
            │                                  │          │
            ├── brush-data-options (#2363) ────┤          │
            │                                  │          │
            └── brush+tip (#2361) ─────────────┤          │
                                               │          │
                                               ▼          ▼
                                          brush-merge (#2370)

Each of these PRs can be reviewed independently:

The "merge" PR #2370 is for testing that everything works together.

@Fil Fil changed the base branch from fil/brush-dataless to fil/brush-data-options February 24, 2026 15:02
@Fil Fil changed the base branch from fil/brush-data-options to fil/brush-across-facets February 24, 2026 15:02
@Fil Fil changed the base branch from fil/brush-across-facets to fil/brush-data-options February 24, 2026 15:03
# Conflicts:
#	src/interactions/brush.js
#	test/plots/brush.ts
@Fil Fil requested a review from allisonhorst February 24, 2026 17:24
@allisonhorst
Copy link

I just went through all of the tests, looking great! The only thing I noted was the sticky tooltip behavior that I mentioned in the tip+brush PR.

Fil added 3 commits March 2, 2026 14:10
it needs to be an object since context gets spread  in src/interactions/pointer.js:25
# Conflicts:
#	docs/interactions/brush.md
#	src/interactions/brush.d.ts
@Fil Fil force-pushed the fil/brush-data-options branch from 730aa57 to 4d19cab Compare March 2, 2026 13:54
@Fil Fil force-pushed the fil/brush-merge branch 2 times, most recently from c9d40f9 to d9d64e1 Compare March 2, 2026 14:06
Fil added 2 commits March 2, 2026 15:29
# Conflicts:
#	docs/interactions/brush.md
#	src/interactions/brush.d.ts
#	test/brush-test.ts
@Fil Fil force-pushed the fil/brush-merge branch from d9d64e1 to 1f84fd2 Compare March 2, 2026 14:37
Fil and others added 2 commits March 3, 2026 11:22
Combines multi-plot brush reuse (per-plot state via context.interaction,
cross-plot sync in data space, WeakMap-based renderFilter updates) with
data/styling support (brush(data, options), filterData, applyAttr).

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Combines multi-plot brush reuse with data/styling support and
brush-across-facets (context.interaction.brushing flag).
@Fil Fil force-pushed the fil/brush-merge branch from a05b9ab to 1801480 Compare March 3, 2026 10:37
Fil added 2 commits March 3, 2026 11:38
Plot.brush() without data should not call maybeTuple, which would set
default channel accessors and require scales to exist.
@Fil Fil force-pushed the fil/brush-merge branch from 1801480 to 5a1bae0 Compare March 3, 2026 10:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants