Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions .github/workflows/bokeh-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ defaults:
shell: bash -l {0}

env:
CHROME_VER: "118.0.5993.88"
CHROME_REV: "chromium_2670"
CHROME_VER: "141.0.7390.54"
CHROME_REV: "chromium_3265"

jobs:
build:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/bokehjs-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ on:
pull_request:

env:
CHROME_VER: "118.0.5993.88"
CHROME_REV: "chromium_2670"
CHROME_VER: "141.0.7390.54"
CHROME_REV: "chromium_3265"

jobs:
test:
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ repos:
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.14.0
hooks:
- id: ruff
- id: ruff-check
stages: [pre-commit]

- repo: https://github.com/abravalheri/validate-pyproject
Expand Down
2 changes: 1 addition & 1 deletion bokehjs/make/tasks/test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ function sys_path(): string {
// - bokehjs/test/devtools/devtools.ts
// - .github/workflows/bokehjs-ci.yml
// - .github/workflows/bokeh-ci.yml
const supported_chromium_revision = "r2670" // 118.0.5993.88
const supported_chromium_revision = "r3265" // 141.0.7390.54

function chrome(): string {
const bokeh_chrome = process.env.BOKEH_CHROME
Expand Down
2 changes: 1 addition & 1 deletion bokehjs/src/lib/core/util/array.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {min, min_by, max_by, includes, filter} from "./arrayable"
export {
map, reduce, min, min_by, max, max_by, sum, cumsum, every, some,
find, find_last, find_index, find_last_index, sorted_index,
is_empty, includes, contains, sort_by,
is_empty, includes, contains, sort_by, subselect,
} from "./arrayable"

const {slice} = Array.prototype
Expand Down
4 changes: 1 addition & 3 deletions bokehjs/src/lib/models/annotations/title.ts
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,7 @@ export class TitleView extends TextAnnotationView {

protected override _get_size(): Size {
const offset = (value: number) => {
// XXX: The magic 2px is for backwards compatibility. This will be removed at
// some point, but currently there is no point breaking half of visual tests.
return value == 0 ? 0 : 2 + value + this.model.standoff
return value == 0 ? 0 : value + this.model.standoff
}
const {width, height} = super._get_size()
if (this.panel!.is_horizontal) {
Expand Down
10 changes: 2 additions & 8 deletions bokehjs/src/lib/models/plots/plot_canvas.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1397,14 +1397,8 @@ export class PlotView extends LayoutDOMView implements Paintable {
protected _paint_outline(ctx: Context2d, frame_box: BBox): void {
const {outline_line} = this.visuals
if (outline_line.doit) {
outline_line.set_value(ctx)
const {x, y, width, height} = this._shrink_to_canvas(frame_box)
ctx.strokeRect(x, y, width, height)
// TODO This should be equivalent, but results in a lot of trivial image
// differences in frame corners. Switch to this approach when migrating
// to newer version of Chromium in integration tests.
// ctx.rect_bbox(this._shrink_to_canvas(frame_box))
// outline_line.apply(ctx)
ctx.rect_bbox(this._shrink_to_canvas(frame_box))
outline_line.apply(ctx)
}
}

Expand Down
10 changes: 9 additions & 1 deletion bokehjs/src/lib/models/tools/inspectors/hover_tool.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import {Signal} from "core/signaling"
import type {Arrayable, Color, Dict} from "core/types"
import type {MoveEvent} from "core/ui_events"
import {assert, unreachable} from "core/util/assert"
import type {BBox} from "core/util/bbox"
import {color2css, color2hex} from "core/util/color"
import {enumerate} from "core/util/iterator"
import {entries} from "core/util/object"
Expand Down Expand Up @@ -129,6 +130,7 @@ export class HoverToolView extends InspectToolView {
declare model: HoverTool

protected _current_sxy: [number, number, InspectDims] | null = null
protected _current_bbox: BBox | null = null

public readonly ttmodels: Map<GlyphRenderer, Tooltip> = new Map()

Expand Down Expand Up @@ -184,7 +186,11 @@ export class HoverToolView extends InspectToolView {
this.connect(this.plot_view.repainted, () => {
if (this.model.active && this._current_sxy != null) {
const [sx, sy, dims] = this._current_sxy
this._inspect(sx, sy, dims)
// Avoid triggering inspections if the bbox moves below, as this can lead to infinite
// loops if bbox changes are caused by the inspection itself.
if (this._current_bbox != null && this._current_bbox.equals(this.plot_view.frame.bbox)) {
this._inspect(sx, sy, dims)
}
}
})

Expand Down Expand Up @@ -282,6 +288,7 @@ export class HoverToolView extends InspectToolView {

if (dims != null) {
this._current_sxy = [sx, sy, dims]
this._current_bbox = this.plot_view.frame.bbox.clone()
this._inspect(sx, sy, dims)
} else {
this._clear()
Expand All @@ -290,6 +297,7 @@ export class HoverToolView extends InspectToolView {

override _move_exit(): void {
this._current_sxy = null
this._current_bbox = null
this._clear()
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Row bbox=[0, 0, 400, 600]
Figure bbox=[0, 0, 200, 600]
Canvas bbox=[0, 0, 200, 600]
CartesianFrame bbox=[5, 27, 190, 568]
Title bbox=[5, 0, 190, 27]
CartesianFrame bbox=[5, 25, 190, 570]
Title bbox=[5, 0, 190, 25]
Figure bbox=[200, 0, 200, 600]
Canvas bbox=[0, 0, 200, 600]
CartesianFrame bbox=[5, 27, 190, 568]
Title bbox=[5, 0, 190, 27]
CartesianFrame bbox=[5, 25, 190, 570]
Title bbox=[5, 0, 190, 25]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Column bbox=[0, 0, 600, 400]
Figure bbox=[0, 0, 600, 200]
Canvas bbox=[0, 0, 600, 200]
CartesianFrame bbox=[5, 27, 590, 168]
Title bbox=[5, 0, 590, 27]
CartesianFrame bbox=[5, 25, 590, 170]
Title bbox=[5, 0, 590, 25]
Figure bbox=[0, 200, 600, 200]
Canvas bbox=[0, 0, 600, 200]
CartesianFrame bbox=[5, 27, 590, 168]
Title bbox=[5, 0, 590, 27]
CartesianFrame bbox=[5, 25, 590, 170]
Title bbox=[5, 0, 590, 25]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -2,97 +2,97 @@ GridPlot bbox=[0, 0, 750, 300]
GridBox bbox=[0, 0, 750, 300]
Figure bbox=[0, 0, 150, 150]
Canvas bbox=[0, 0, 150, 150]
CartesianFrame bbox=[20, 42, 125, 86]
BoxAnnotation bbox=[41, 56, 83, 58]
CartesianFrame bbox=[20, 40, 125, 88]
BoxAnnotation bbox=[41, 55, 83, 58]
LinearAxis bbox=[20, 128, 125, 22]
LinearAxis bbox=[0, 42, 20, 86]
Title bbox=[20, 0, 125, 42]
LinearAxis bbox=[0, 40, 20, 88]
Title bbox=[20, 0, 125, 40]
Figure bbox=[150, 0, 150, 150]
Canvas bbox=[0, 0, 150, 150]
CartesianFrame bbox=[20, 42, 125, 86]
BoxAnnotation bbox=[41, 56, 83, 58]
BoxAnnotation bbox=[78, 80, 10, 10]
CartesianFrame bbox=[20, 40, 125, 88]
BoxAnnotation bbox=[41, 55, 83, 58]
BoxAnnotation bbox=[78, 79, 10, 10]
LinearAxis bbox=[20, 128, 125, 22]
LinearAxis bbox=[0, 42, 20, 86]
Title bbox=[20, 0, 125, 42]
LinearAxis bbox=[0, 40, 20, 88]
Title bbox=[20, 0, 125, 40]
Figure bbox=[300, 0, 150, 150]
Canvas bbox=[0, 0, 150, 150]
CartesianFrame bbox=[20, 42, 125, 86]
BoxAnnotation bbox=[41, 56, 83, 58]
BoxAnnotation bbox=[36, 80, 10, 10]
BoxAnnotation bbox=[119, 80, 10, 10]
BoxAnnotation bbox=[78, 51, 10, 10]
BoxAnnotation bbox=[78, 109, 10, 10]
BoxAnnotation bbox=[36, 51, 10, 10]
BoxAnnotation bbox=[119, 51, 10, 10]
BoxAnnotation bbox=[36, 109, 10, 10]
BoxAnnotation bbox=[119, 109, 10, 10]
CartesianFrame bbox=[20, 40, 125, 88]
BoxAnnotation bbox=[41, 55, 83, 58]
BoxAnnotation bbox=[36, 79, 10, 10]
BoxAnnotation bbox=[119, 79, 10, 10]
BoxAnnotation bbox=[78, 50, 10, 10]
BoxAnnotation bbox=[78, 108, 10, 10]
BoxAnnotation bbox=[36, 50, 10, 10]
BoxAnnotation bbox=[119, 50, 10, 10]
BoxAnnotation bbox=[36, 108, 10, 10]
BoxAnnotation bbox=[119, 108, 10, 10]
LinearAxis bbox=[20, 128, 125, 22]
LinearAxis bbox=[0, 42, 20, 86]
Title bbox=[20, 0, 125, 42]
LinearAxis bbox=[0, 40, 20, 88]
Title bbox=[20, 0, 125, 40]
Figure bbox=[450, 0, 150, 150]
Canvas bbox=[0, 0, 150, 150]
CartesianFrame bbox=[20, 42, 125, 86]
BoxAnnotation bbox=[41, 56, 83, 58]
BoxAnnotation bbox=[78, 80, 10, 10]
BoxAnnotation bbox=[36, 80, 10, 10]
BoxAnnotation bbox=[119, 80, 10, 10]
BoxAnnotation bbox=[78, 51, 10, 10]
BoxAnnotation bbox=[78, 109, 10, 10]
BoxAnnotation bbox=[36, 51, 10, 10]
BoxAnnotation bbox=[119, 51, 10, 10]
BoxAnnotation bbox=[36, 109, 10, 10]
BoxAnnotation bbox=[119, 109, 10, 10]
CartesianFrame bbox=[20, 40, 125, 88]
BoxAnnotation bbox=[41, 55, 83, 58]
BoxAnnotation bbox=[78, 79, 10, 10]
BoxAnnotation bbox=[36, 79, 10, 10]
BoxAnnotation bbox=[119, 79, 10, 10]
BoxAnnotation bbox=[78, 50, 10, 10]
BoxAnnotation bbox=[78, 108, 10, 10]
BoxAnnotation bbox=[36, 50, 10, 10]
BoxAnnotation bbox=[119, 50, 10, 10]
BoxAnnotation bbox=[36, 108, 10, 10]
BoxAnnotation bbox=[119, 108, 10, 10]
LinearAxis bbox=[20, 128, 125, 22]
LinearAxis bbox=[0, 42, 20, 86]
Title bbox=[20, 0, 125, 42]
LinearAxis bbox=[0, 40, 20, 88]
Title bbox=[20, 0, 125, 40]
Figure bbox=[600, 0, 150, 150]
Canvas bbox=[0, 0, 150, 150]
CartesianFrame bbox=[20, 42, 125, 86]
BoxAnnotation bbox=[41, 56, 83, 58]
BoxAnnotation bbox=[36, 80, 10, 10]
BoxAnnotation bbox=[119, 80, 10, 10]
CartesianFrame bbox=[20, 40, 125, 88]
BoxAnnotation bbox=[41, 55, 83, 58]
BoxAnnotation bbox=[36, 79, 10, 10]
BoxAnnotation bbox=[119, 79, 10, 10]
LinearAxis bbox=[20, 128, 125, 22]
LinearAxis bbox=[0, 42, 20, 86]
Title bbox=[20, 0, 125, 42]
LinearAxis bbox=[0, 40, 20, 88]
Title bbox=[20, 0, 125, 40]
Figure bbox=[0, 150, 150, 150]
Canvas bbox=[0, 0, 150, 150]
CartesianFrame bbox=[20, 42, 125, 86]
BoxAnnotation bbox=[41, 56, 83, 58]
BoxAnnotation bbox=[78, 51, 10, 10]
BoxAnnotation bbox=[78, 109, 10, 10]
CartesianFrame bbox=[20, 40, 125, 88]
BoxAnnotation bbox=[41, 55, 83, 58]
BoxAnnotation bbox=[78, 50, 10, 10]
BoxAnnotation bbox=[78, 108, 10, 10]
LinearAxis bbox=[20, 128, 125, 22]
LinearAxis bbox=[0, 42, 20, 86]
Title bbox=[20, 0, 125, 42]
LinearAxis bbox=[0, 40, 20, 88]
Title bbox=[20, 0, 125, 40]
Figure bbox=[150, 150, 150, 150]
Canvas bbox=[0, 0, 150, 150]
CartesianFrame bbox=[20, 42, 125, 86]
BoxAnnotation bbox=[41, 56, 83, 58]
BoxAnnotation bbox=[36, 80, 10, 10]
CartesianFrame bbox=[20, 40, 125, 88]
BoxAnnotation bbox=[41, 55, 83, 58]
BoxAnnotation bbox=[36, 79, 10, 10]
LinearAxis bbox=[20, 128, 125, 22]
LinearAxis bbox=[0, 42, 20, 86]
Title bbox=[20, 0, 125, 42]
LinearAxis bbox=[0, 40, 20, 88]
Title bbox=[20, 0, 125, 40]
Figure bbox=[300, 150, 150, 150]
Canvas bbox=[0, 0, 150, 150]
CartesianFrame bbox=[20, 42, 125, 86]
BoxAnnotation bbox=[41, 56, 83, 58]
BoxAnnotation bbox=[119, 80, 10, 10]
CartesianFrame bbox=[20, 40, 125, 88]
BoxAnnotation bbox=[41, 55, 83, 58]
BoxAnnotation bbox=[119, 79, 10, 10]
LinearAxis bbox=[20, 128, 125, 22]
LinearAxis bbox=[0, 42, 20, 86]
Title bbox=[20, 0, 125, 42]
LinearAxis bbox=[0, 40, 20, 88]
Title bbox=[20, 0, 125, 40]
Figure bbox=[450, 150, 150, 150]
Canvas bbox=[0, 0, 150, 150]
CartesianFrame bbox=[20, 42, 125, 86]
BoxAnnotation bbox=[41, 56, 83, 58]
BoxAnnotation bbox=[78, 51, 10, 10]
CartesianFrame bbox=[20, 40, 125, 88]
BoxAnnotation bbox=[41, 55, 83, 58]
BoxAnnotation bbox=[78, 50, 10, 10]
LinearAxis bbox=[20, 128, 125, 22]
LinearAxis bbox=[0, 42, 20, 86]
Title bbox=[20, 0, 125, 42]
LinearAxis bbox=[0, 40, 20, 88]
Title bbox=[20, 0, 125, 40]
Figure bbox=[600, 150, 150, 150]
Canvas bbox=[0, 0, 150, 150]
CartesianFrame bbox=[20, 42, 125, 86]
BoxAnnotation bbox=[41, 56, 83, 58]
BoxAnnotation bbox=[78, 109, 10, 10]
CartesianFrame bbox=[20, 40, 125, 88]
BoxAnnotation bbox=[41, 55, 83, 58]
BoxAnnotation bbox=[78, 108, 10, 10]
LinearAxis bbox=[20, 128, 125, 22]
LinearAxis bbox=[0, 42, 20, 86]
Title bbox=[20, 0, 125, 42]
LinearAxis bbox=[0, 40, 20, 88]
Title bbox=[20, 0, 125, 40]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
Row bbox=[0, 0, 400, 200]
Figure bbox=[0, 0, 200, 200]
Canvas bbox=[0, 0, 200, 200]
CartesianFrame bbox=[33, 27, 162, 151]
CartesianFrame bbox=[33, 25, 162, 153]
LinearAxis bbox=[33, 178, 162, 22]
LinearAxis bbox=[0, 27, 33, 151]
BoxAnnotation bbox=[49, 87, 89, 46]
BoxAnnotation bbox=[98, 42, 73, 68]
Title bbox=[33, 0, 162, 27]
LinearAxis bbox=[0, 25, 33, 153]
BoxAnnotation bbox=[49, 86, 89, 46]
BoxAnnotation bbox=[98, 40, 73, 69]
Title bbox=[33, 0, 162, 25]
Figure bbox=[200, 0, 200, 200]
Canvas bbox=[0, 0, 200, 200]
CartesianFrame bbox=[33, 27, 162, 151]
CartesianFrame bbox=[33, 25, 162, 153]
LinearAxis bbox=[33, 178, 162, 22]
LinearAxis bbox=[0, 27, 33, 151]
BoxAnnotation bbox=[49, 87, 89, 46]
BoxAnnotation bbox=[98, 42, 73, 68]
Title bbox=[33, 0, 162, 27]
LinearAxis bbox=[0, 25, 33, 153]
BoxAnnotation bbox=[49, 86, 89, 46]
BoxAnnotation bbox=[98, 40, 73, 69]
Title bbox=[33, 0, 162, 25]
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ Column bbox=[0, 0, 513, 338]
TextInput bbox=[5, 150, 203, 48]
Figure bbox=[213, 0, 300, 300]
Canvas bbox=[0, 0, 300, 300]
CartesianFrame bbox=[20, 27, 250, 251]
GlyphRenderer bbox=[31, 38, 228, 229]
Line bbox=[31, 38, 228, 229]
CartesianFrame bbox=[20, 25, 250, 253]
GlyphRenderer bbox=[31, 37, 228, 230]
Line bbox=[31, 37, 228, 230]
LinearAxis bbox=[20, 278, 250, 22]
LinearAxis bbox=[0, 27, 20, 251]
Title bbox=[20, 0, 250, 27]
ToolbarPanel bbox=[270, 27, 30, 251]
Toolbar bbox=[270, 27, 30, 251]
LinearAxis bbox=[0, 25, 20, 253]
Title bbox=[20, 0, 250, 25]
ToolbarPanel bbox=[270, 25, 30, 253]
Toolbar bbox=[270, 25, 30, 253]
OnOffButton bbox=[0, 25, 30, 30]
OnOffButton bbox=[0, 55, 30, 30]
OnOffButton bbox=[0, 86, 30, 30]
Expand Down
Loading